From patchwork Mon Aug 10 15:21:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 266621 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DE0AC433DF for ; Mon, 10 Aug 2020 15:39:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4FC1D22D6F for ; Mon, 10 Aug 2020 15:39:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597073959; bh=i0VkiJMEi5DxsVNBcNuzWr1qQezrzgwZMZRQemU+IyQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dOqfnOM0WETFYQMhmQIP58/S+HNiK7NcPNalyoYe/dqOtUqIedS7VF5enuzsMW5ki cFkAsLToBLIAG4OtwpJiscQQgkTdTZdRSRco/VFHBrBZsRPXNRzQjZR/ftrHGwsS0a 3C2sVWrLm/abxlcNTiniyFa01JvuToE5EoxkHmu4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728480AbgHJPZB (ORCPT ); Mon, 10 Aug 2020 11:25:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:58568 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728140AbgHJPZA (ORCPT ); Mon, 10 Aug 2020 11:25:00 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7DF6420772; Mon, 10 Aug 2020 15:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597073100; bh=i0VkiJMEi5DxsVNBcNuzWr1qQezrzgwZMZRQemU+IyQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KM+3FQ4iQYhjxJqpOrObpsbChEeaxiI18mEQIajeurpJeA4A47YNcCGVYglJLcRgN WfvHsET8dWrQGZOJRet54Npycnn3gIfDjxUGKGysGp7s7yscECKE7t9ZdIR9DYE5lI wXjdzvWVVpQfOuLcEA1HLrDJleJaOvt5h8OIZR30= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Shah, Ashish N" , Stephen Hemminger , Haiyang Zhang , "David S. Miller" 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> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200810151812.114485777@linuxfoundation.org> References: <20200810151812.114485777@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stephen Hemminger [ 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" Fixes: 0c195567a8f6 ("netvsc: transparent VF management") Signed-off-by: Stephen Hemminger Reviewed-by: Haiyang Zhang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/hyperv/netvsc_drv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- 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