From: kys@exchange.microsoft.com
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com,
vkuznets@redhat.com, jasowang@redhat.com,
leann.ogasawara@canonical.com
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Subject: [PATCH 05/15] Drivers: hv: vmbus: Enhance the rescind callback functionality
Date: Thu, 1 Dec 2016 09:28:42 -0800 [thread overview]
Message-ID: <1480613332-7788-5-git-send-email-kys@exchange.microsoft.com> (raw)
In-Reply-To: <1480613332-7788-1-git-send-email-kys@exchange.microsoft.com>
From: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
drivers/hv/channel_mgmt.c | 11 +++++++----
include/linux/hyperv.h | 7 ++++---
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index f9c5827..d83c1ac 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -825,8 +825,10 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr)
if (channel->device_obj) {
if (channel->chn_rescind_callback) {
- channel->chn_rescind_callback(channel);
- goto out;
+ channel->chn_rescind_callback(channel,
+ channel->rescind_arg);
+ if (is_hvsock_channel(channel))
+ goto out;
}
/*
* We will have to unregister this device from the
@@ -1215,9 +1217,10 @@ bool vmbus_are_subchannels_present(struct vmbus_channel *primary)
}
EXPORT_SYMBOL_GPL(vmbus_are_subchannels_present);
-void vmbus_set_chn_rescind_callback(struct vmbus_channel *channel,
- void (*chn_rescind_cb)(struct vmbus_channel *))
+void vmbus_set_chn_rescind_callback(struct vmbus_channel *channel, void *arg,
+ void (*chn_rescind_cb)(struct vmbus_channel *, void *))
{
channel->chn_rescind_callback = chn_rescind_cb;
+ channel->rescind_arg = arg;
}
EXPORT_SYMBOL_GPL(vmbus_set_chn_rescind_callback);
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 5a2d2dd..5051eca 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -800,7 +800,8 @@ struct vmbus_channel {
* 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);
+ void (*chn_rescind_callback)(struct vmbus_channel *channel, void *arg);
+ void *rescind_arg;
/*
* The spinlock to protect the structure. It is being used to protect
@@ -959,8 +960,8 @@ static inline void clear_low_latency_mode(struct vmbus_channel *c)
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 *));
+void vmbus_set_chn_rescind_callback(struct vmbus_channel *channel, void *arg,
+ void (*chn_rescind_cb)(struct vmbus_channel *, void *));
/*
* Retrieve the (sub) channel on which to send an outgoing request.
--
1.7.4.1
next prev parent reply other threads:[~2016-12-01 15:35 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-01 17:28 [PATCH 00/15] Drivers: hv: CPU management fixes and a new uio driver kys
2016-12-01 17:28 ` [PATCH 01/15] Drivers: hv: vmbus: Raise retry/wait limits in vmbus_post_msg() kys
2016-12-01 17:28 ` [PATCH 02/15] hyperv: Add a function to detect hv_device kys
2016-12-01 20:33 ` Greg KH
2016-12-02 5:46 ` KY Srinivasan
2016-12-01 20:35 ` Greg KH
2016-12-01 20:38 ` Greg KH
2016-12-02 6:02 ` KY Srinivasan
2016-12-02 6:48 ` Greg KH
2016-12-02 7:14 ` KY Srinivasan
2016-12-02 7:36 ` Greg KH
2016-12-02 15:38 ` KY Srinivasan
2016-12-02 16:02 ` Greg KH
2016-12-02 21:41 ` KY Srinivasan
2016-12-01 17:28 ` [PATCH 03/15] hyperv: Fix spelling of HV_UNKOWN kys
2016-12-01 17:28 ` [PATCH 04/15] Drivers: hv: vmbus: Prevent sending data on a rescinded channel kys
2016-12-01 20:36 ` Greg KH
2016-12-05 10:01 ` Dan Carpenter
2016-12-05 15:50 ` KY Srinivasan
2016-12-01 17:28 ` kys [this message]
2016-12-01 20:36 ` [PATCH 05/15] Drivers: hv: vmbus: Enhance the rescind callback functionality Greg KH
2016-12-01 17:28 ` [PATCH 06/15] hv: acquire vmbus_connection.channel_mutex in vmbus_free_channels() kys
2016-12-01 20:37 ` Greg KH
2016-12-02 6:11 ` KY Srinivasan
2016-12-01 17:28 ` [PATCH 07/15] hv: allocate synic pages for all present CPUs kys
2016-12-01 17:28 ` [PATCH 08/15] hv: init percpu_list in hv_synic_alloc() kys
2016-12-01 17:28 ` [PATCH 09/15] hv: change clockevents unbind tactics kys
2016-12-01 17:28 ` [PATCH 10/15] hv: switch to cpuhp state machine for synic init/cleanup kys
2016-12-01 17:28 ` [PATCH 11/15] hv: make CPU offlining prevention fine-grained kys
2016-12-01 17:28 ` [PATCH 12/15] hv: don't reset hv_context.tsc_page on crash kys
2016-12-01 17:28 ` [PATCH 13/15] vmbus: add support for dynamic device id's kys
2016-12-01 17:28 ` [PATCH 14/15] uio-hv-generic: new userspace i/o driver for VMBus kys
2016-12-01 17:28 ` [PATCH 15/15] Tools: hv: kvp: configurable external scripts path kys
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1480613332-7788-5-git-send-email-kys@exchange.microsoft.com \
--to=kys@exchange.microsoft.com \
--cc=apw@canonical.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=jasowang@redhat.com \
--cc=kys@microsoft.com \
--cc=leann.ogasawara@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=olaf@aepfle.de \
--cc=vkuznets@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®