From: Ake Koomsin <ake@igel.co.jp>
To: Jason Wang <jasowang@redhat.com>
Cc: ake@igel.co.jp, "Michael S. Tsirkin" <mst@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] virtio_net: avoid using netif_tx_disable() for serializing tx routine
Date: Wed, 17 Oct 2018 16:59:18 +0900 [thread overview]
Message-ID: <20181017075918.7043-1-ake@igel.co.jp> (raw)
In-Reply-To: <f04bee7a-3892-102d-2be0-f4fda4048e74@redhat.com>
Commit 713a98d90c5e ("virtio-net: serialize tx routine during reset")
introduces netif_tx_disable() after netif_device_detach() in order to
avoid use-after-free of tx queues. However, there are two issues.
1) Its operation is redundant with netif_device_detach() if the interface
is running.
2) In case of the interface is not running before suspending and
resuming, the tx does not get resumed by netif_device_attach().
This results in losing network connectivity.
It is better to use netif_tx_lock()/netif_tx_unlock() instead for
serializing tx routine during reset. This also preserves the symmetry
of netif_device_detach() and netif_device_attach().
Fixes commit 713a98d90c5e ("virtio-net: serialize tx routine during reset")
Signed-off-by: Ake Koomsin <ake@igel.co.jp>
---
drivers/net/virtio_net.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 3f5aa59c37b7..41ccf9c994a4 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2267,8 +2267,9 @@ static void virtnet_freeze_down(struct virtio_device *vdev)
/* Make sure no work handler is accessing the device */
flush_work(&vi->config_work);
+ netif_tx_lock(vi->dev);
netif_device_detach(vi->dev);
- netif_tx_disable(vi->dev);
+ netif_tx_unlock(vi->dev);
cancel_delayed_work_sync(&vi->refill);
if (netif_running(vi->dev)) {
@@ -2304,7 +2305,9 @@ static int virtnet_restore_up(struct virtio_device *vdev)
}
}
+ netif_tx_lock(vi->dev);
netif_device_attach(vi->dev);
+ netif_tx_unlock(vi->dev);
return err;
}
--
2.19.1
next prev parent reply other threads:[~2018-10-17 8:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-11 7:51 [PATCH] virtio_net: enable tx after resuming from suspend Ake Koomsin
2018-10-11 9:44 ` Jason Wang
2018-10-11 10:22 ` ake
2018-10-11 13:06 ` Jason Wang
2018-10-12 4:30 ` ake
2018-10-12 8:23 ` Jason Wang
2018-10-12 9:18 ` ake
2018-10-15 10:08 ` ake
2018-10-16 8:53 ` Jason Wang
2018-10-16 10:15 ` ake
2018-10-17 6:18 ` Jason Wang
2018-10-17 7:59 ` Ake Koomsin [this message]
2018-10-17 9:02 ` [PATCH v2] virtio_net: avoid using netif_tx_disable() for serializing tx routine Jason Wang
2018-10-17 10:44 ` [PATCH v3] " Ake Koomsin
2018-10-17 12:30 ` Jason Wang
2018-10-17 15:09 ` Michael S. Tsirkin
2018-10-18 3:25 ` ake
2018-10-18 5:30 ` David Miller
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=20181017075918.7043-1-ake@igel.co.jp \
--to=ake@igel.co.jp \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/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).