From: Mohammed Gamal <mgamal@redhat.com>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, devel@linuxdriverproject.org,
kys@microsoft.com, haiyangz@microsoft.com,
sthemmin@microsoft.com, vkuznets@redhat.com, cavery@redhat.com,
otubo@redhat.com, Mohammed Gamal <mgamal@redhat.com>
Subject: [RFC PATCH 2/2] hv_netvsc: Change GPADL teardown order according to Hyper-V version
Date: Tue, 23 Jan 2018 10:34:05 +0100 [thread overview]
Message-ID: <1516700045-32142-3-git-send-email-mgamal@redhat.com> (raw)
In-Reply-To: <1516700045-32142-1-git-send-email-mgamal@redhat.com>
Commit 0cf737808ae7 ("hv_netvsc: netvsc_teardown_gpadl() split")
introduced a regression causing VMs not to shutdown on pre-Wind2016
hosts after netvsc_remove_device() is called. This was caused as the
GPADL teardown sequence was changed.
This patch restores the old behavior for pre-Win2016 hosts, while
keeping the changes from 0cf7378 for Win2016 and higher hosts.
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
---
drivers/net/hyperv/netvsc.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 3982f76..d09bb3b 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -575,8 +575,17 @@ void netvsc_device_remove(struct hv_device *device)
cancel_work_sync(&net_device->subchan_work);
+ /*
+ * Revoke receive buffer. If host is pre-Win2016 then tear down
+ * receive buffer GPADL. Do the same for send buffer.
+ */
netvsc_revoke_recv_buf(device, net_device);
+ if (vmbus_proto_version < VERSION_WIN10)
+ netvsc_teardown_recv_buf_gpadl(device, net_device);
+
netvsc_revoke_send_buf(device, net_device);
+ if (vmbus_proto_version < VERSION_WIN10)
+ netvsc_teardown_send_buf_gpadl(device, net_device);
RCU_INIT_POINTER(net_device_ctx->nvdev, NULL);
@@ -589,8 +598,14 @@ void netvsc_device_remove(struct hv_device *device)
/* Now, we can close the channel safely */
vmbus_close(device->channel);
- netvsc_teardown_recv_buf_gpadl(device, net_device);
- netvsc_teardown_send_buf_gpadl(device, net_device);
+ /*
+ * If host is Win2016 or higher then we do the GPADL tear down
+ * here after VMBus is closed, instead of doing it earlier.
+ */
+ if (vmbus_proto_version >= VERSION_WIN10) {
+ netvsc_teardown_recv_buf_gpadl(device, net_device);
+ netvsc_teardown_send_buf_gpadl(device, net_device);
+ }
/* And dissassociate NAPI context from device */
for (i = 0; i < net_device->num_chn; i++)
--
1.8.3.1
next prev parent reply other threads:[~2018-01-23 9:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-23 9:34 [RFC PATCH 0/2] hv_netvsc: Fix shutdown regression on Win2012 hosts Mohammed Gamal
2018-01-23 9:34 ` [RFC PATCH 1/2] hv_netvsc: Split netvsc_revoke_buf() and netvsc_teardown_gpadl() Mohammed Gamal
2018-01-30 19:29 ` Stephen Hemminger
2018-01-31 11:16 ` Mohammed Gamal
2018-01-31 23:01 ` Stephen Hemminger
2018-02-01 8:37 ` Mohammed Gamal
2018-02-01 22:34 ` Mohammed Gamal
2018-02-01 22:38 ` Stephen Hemminger
2018-01-23 9:34 ` Mohammed Gamal [this message]
2018-01-30 19:30 ` [RFC PATCH 2/2] hv_netvsc: Change GPADL teardown order according to Hyper-V version Stephen Hemminger
2018-01-23 15:43 ` [RFC PATCH 0/2] hv_netvsc: Fix shutdown regression on Win2012 hosts Haiyang Zhang
2018-01-23 16:33 ` Stephen Hemminger
2018-01-26 18:10 ` Stephen Hemminger
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=1516700045-32142-3-git-send-email-mgamal@redhat.com \
--to=mgamal@redhat.com \
--cc=cavery@redhat.com \
--cc=devel@linuxdriverproject.org \
--cc=haiyangz@microsoft.com \
--cc=kys@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=otubo@redhat.com \
--cc=sthemmin@microsoft.com \
--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;
as well as URLs for NNTP newsgroup(s).