diff mbox series

[5.7,65/79] hv_netvsc: do not use VF device if link is down

Message ID	20200810151815.446891982@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=uOiG=BU=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, "Shah, Ashish N" <ashish.n.shah@intel.com>, Stephen Hemminger <stephen@networkplumber.org>, Haiyang Zhang <haiyangz@microsoft.com>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 5.7 65/79] hv_netvsc: do not use VF device if link is down Date: Mon, 10 Aug 2020 17:21:24 +0200 Message-Id: <20200810151815.446891982@linuxfoundation.org> In-Reply-To: <20200810151812.114485777@linuxfoundation.org> References: <20200810151812.114485777@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.7,02/79] USB: serial: qcserial: add EM7305 QDL product ID [5.7,05/79] usb: xhci: Fix ASMedia ASM1142 DMA addressing [5.7,09/79] ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value. [5.7,10/79] ALSA: hda/ca0132 - Fix AE-5 microphone selection commands. [5.7,12/79] staging: android: ashmem: Fix lockdep warning for write operation [5.7,15/79] Bluetooth: Fix slab-out-of-bounds read in hci_extended_inquiry_result_evt() [5.7,16/79] Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_evt() [5.7,18/79] omapfb: dss: Fix max fclk divider for omap36xx [5.7,20/79] Smack: fix use-after-free in smk_write_relabel_self() [5.7,22/79] lkdtm/heap: Avoid edge and middle of slabs [5.7,24/79] mtd: properly check all write ioctls for permissions [5.7,26/79] leds: lm36274: fix use-after-free on unbind [5.7,27/79] leds: da903x: fix use-after-free on unbind [5.7,31/79] bpf: Fix NULL pointer dereference in __btf_resolve_helper_id() [5.7,32/79] net/9p: validate fds in p9_fd_open [5.7,34/79] drm/nouveau/fbcon: fix module unload when fbcon init has failed for some reason [5.7,35/79] drm/nouveau/fbcon: zero-initialise the mode_cmd2 structure [5.7,36/79] io_uring: fix lockup in io_fail_links() [5.7,39/79] drm/panel: Fix auo, kd101n80-45na horizontal noise on edges of panel [5.7,42/79] i2c: slave: improve sanity check when registering [5.7,43/79] i2c: slave: add sanity check when unregistering [5.7,46/79] ALSA: hda: fix NULL pointer dereference during suspend [5.7,48/79] cfg80211: check vendor command doit pointer before use [5.7,50/79] atm: fix atm_dev refcnt leaks in atmtcp_remove_persistent [5.7,53/79] Revert "powerpc/kasan: Fix shadow pages allocation failure" [5.7,55/79] ipv4: Silence suspicious RCU usage warning [5.7,57/79] ipv6: Fix nexthop refcnt leak when creating ipv6 route info [5.7,58/79] rxrpc: Fix race between recvmsg and sendmsg on immediate call failure [5.7,59/79] vxlan: Ensure FDB dump is performed under RCU [5.7,62/79] devlink: ignore -EOPNOTSUPP errors on dumpit [5.7,63/79] appletalk: Fix atalk_proc_init() return path [5.7,65/79] hv_netvsc: do not use VF device if link is down [5.7,67/79] net: gre: recompute gre csum for sctp over gre tunnels [5.7,71/79] net: thunderx: use spin_lock_bh in nicvf_set_rx_mode_task() [5.7,72/79] openvswitch: Prevent kernel-infoleak in ovs_ct_put_key() [5.7,75/79] tcp: apply a floor of 1 for RTT samples from TCP timestamps [5.7,76/79] mptcp: be careful on subflow creation [5.7,77/79] mptcp: fix bogus sendmsg() return code under pressure [5.7,79/79] arm64: kaslr: Use standard early random function

Commit Message

Greg KH Aug. 10, 2020, 3:21 p.m. UTC

From: Stephen Hemminger <stephen@networkplumber.org>

[ Upstream commit 7c9864bbccc23e1812ac82966555d68c13ea4006 ]

If the accelerated networking SRIOV VF device has lost carrier
use the synthetic network device which is available as backup
path. This is a rare case since if VF link goes down, normally
the VMBus device will also loose external connectivity as well.
But if the communication is between two VM's on the same host
the VMBus device will still work.

Reported-by: "Shah, Ashish N" <ashish.n.shah@intel.com>
Fixes: 0c195567a8f6 ("netvsc: transparent VF management")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/hyperv/netvsc_drv.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff mbox series

Patch

--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -532,12 +532,13 @@  static int netvsc_xmit(struct sk_buff *s
 	u32 hash;
 	struct hv_page_buffer pb[MAX_PAGE_BUFFER_COUNT];
 
-	/* if VF is present and up then redirect packets
-	 * already called with rcu_read_lock_bh
+	/* If VF is present and up then redirect packets to it.
+	 * Skip the VF if it is marked down or has no carrier.
+	 * If netpoll is in uses, then VF can not be used either.
 	 */
 	vf_netdev = rcu_dereference_bh(net_device_ctx->vf_netdev);
 	if (vf_netdev && netif_running(vf_netdev) &&
-	    !netpoll_tx_running(net))
+	    netif_carrier_ok(vf_netdev) && !netpoll_tx_running(net))
 		return netvsc_vf_xmit(net, vf_netdev, skb);
 
 	/* We will atmost need two pages to describe the rndis