From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ake Koomsin <ake@igel.co.jp>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 4.14 15/19] virtio_net: avoid using netif_tx_disable() for serializing tx routine
Date: Tue, 30 Oct 2018 09:28:20 -0400 [thread overview]
Message-ID: <20181030132824.218056-15-sashal@kernel.org> (raw)
In-Reply-To: <20181030132824.218056-1-sashal@kernel.org>
From: Ake Koomsin <ake@igel.co.jp>
[ Upstream commit 05c998b738fdd3e5d6a257bcacc8f34b6284d795 ]
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() in case 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_bh()/netif_tx_unlock_bh() 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>
Acked-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 910c46b47769..f528e9ac3413 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1872,8 +1872,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_bh(vi->dev);
netif_device_detach(vi->dev);
- netif_tx_disable(vi->dev);
+ netif_tx_unlock_bh(vi->dev);
cancel_delayed_work_sync(&vi->refill);
if (netif_running(vi->dev)) {
@@ -1909,7 +1910,9 @@ static int virtnet_restore_up(struct virtio_device *vdev)
}
}
+ netif_tx_lock_bh(vi->dev);
netif_device_attach(vi->dev);
+ netif_tx_unlock_bh(vi->dev);
return err;
}
--
2.17.1
next prev parent reply other threads:[~2018-10-30 13:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-30 13:28 [PATCH AUTOSEL 4.14 01/19] bpf: do not blindly change rlimit in reuseport net selftest Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 02/19] Revert "perf tools: Fix PMU term format max value calculation" Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 03/19] net/mlx5: Take only bit 24-26 of wqe.pftype_wq for page fault type Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 04/19] xfrm: policy: use hlist rcu variants on insert Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 05/19] perf vendor events intel: Fix wrong filter_band* values for uncore events Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 06/19] sparc: Fix single-pcr perf event counter management Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 07/19] sparc: Throttle perf events properly Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 08/19] sparc64: Make proc_id signed Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 09/19] net: fec: don't dump RX FIFO register when not available Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 10/19] sched/fair: Fix the min_vruntime update logic in dequeue_entity() Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 11/19] perf tools: Fix use of alternatives to find JDIR Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 12/19] perf cpu_map: Align cpu map synthesized events properly Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 13/19] x86/fpu: Remove second definition of fpu in __fpu__restore_sig() Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 14/19] net: qla3xxx: Remove overflowing shift statement Sasha Levin
2018-10-30 13:28 ` Sasha Levin [this message]
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 16/19] r8169: fix NAPI handling under high load Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 17/19] selftests: ftrace: Add synthetic event syntax testcase Sasha Levin
2018-10-30 14:58 ` Steven Rostedt
2018-10-30 18:21 ` Sasha Levin
2018-11-01 17:34 ` Masami Hiramatsu
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 18/19] net: fix pskb_trim_rcsum_slow() with odd trim offset Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 19/19] i2c: rcar: cleanup DMA for all kinds of failure Sasha Levin
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=20181030132824.218056-15-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=ake@igel.co.jp \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.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).