mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-11-01 17:20:39 +00:00
73 lines
2.6 KiB
Diff
73 lines
2.6 KiB
Diff
From 87ff2afc1a9d20c65b34fe63043a01f481d5642a Mon Sep 17 00:00:00 2001
|
|
From: Dexuan Cui <decui@microsoft.com>
|
|
Date: Wed, 27 Jan 2016 22:29:42 -0800
|
|
Subject: [PATCH 31/44] Drivers: hv: vmbus: add a per-channel rescind callback
|
|
|
|
This will be used by the coming hv_sock driver.
|
|
|
|
Signed-off-by: Dexuan Cui <decui@microsoft.com>
|
|
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
(cherry picked from commit 499e8401a515d04daa986b995da710d2b9737764)
|
|
---
|
|
drivers/hv/channel_mgmt.c | 11 +++++++++++
|
|
include/linux/hyperv.h | 9 +++++++++
|
|
2 files changed, 20 insertions(+)
|
|
|
|
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
|
|
index 60ca25b93b4c..76864c98a110 100644
|
|
--- a/drivers/hv/channel_mgmt.c
|
|
+++ b/drivers/hv/channel_mgmt.c
|
|
@@ -741,6 +741,10 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr)
|
|
spin_unlock_irqrestore(&channel->lock, flags);
|
|
|
|
if (channel->device_obj) {
|
|
+ if (channel->chn_rescind_callback) {
|
|
+ channel->chn_rescind_callback(channel);
|
|
+ return;
|
|
+ }
|
|
/*
|
|
* We will have to unregister this device from the
|
|
* driver core.
|
|
@@ -1110,3 +1114,10 @@ bool vmbus_are_subchannels_present(struct vmbus_channel *primary)
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(vmbus_are_subchannels_present);
|
|
+
|
|
+void vmbus_set_chn_rescind_callback(struct vmbus_channel *channel,
|
|
+ void (*chn_rescind_cb)(struct vmbus_channel *))
|
|
+{
|
|
+ channel->chn_rescind_callback = chn_rescind_cb;
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(vmbus_set_chn_rescind_callback);
|
|
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
|
|
index 05966e279ec8..ad04017ba06f 100644
|
|
--- a/include/linux/hyperv.h
|
|
+++ b/include/linux/hyperv.h
|
|
@@ -768,6 +768,12 @@ struct vmbus_channel {
|
|
void (*sc_creation_callback)(struct vmbus_channel *new_sc);
|
|
|
|
/*
|
|
+ * Channel rescind callback. Some channels (the hvsock ones), need to
|
|
+ * register a callback which is invoked in vmbus_onoffer_rescind().
|
|
+ */
|
|
+ void (*chn_rescind_callback)(struct vmbus_channel *channel);
|
|
+
|
|
+ /*
|
|
* The spinlock to protect the structure. It is being used to protect
|
|
* test-and-set access to various attributes of the structure as well
|
|
* as all sc_list operations.
|
|
@@ -853,6 +859,9 @@ int vmbus_request_offers(void);
|
|
void vmbus_set_sc_create_callback(struct vmbus_channel *primary_channel,
|
|
void (*sc_cr_cb)(struct vmbus_channel *new_sc));
|
|
|
|
+void vmbus_set_chn_rescind_callback(struct vmbus_channel *channel,
|
|
+ void (*chn_rescind_cb)(struct vmbus_channel *));
|
|
+
|
|
/*
|
|
* Retrieve the (sub) channel on which to send an outgoing request.
|
|
* When a primary channel has multiple sub-channels, we choose a
|
|
--
|
|
2.11.1
|
|
|