From patchwork Mon Jun 26 09:18:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souradeep Chakrabarti X-Patchwork-Id: 112830 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7374105vqr; Mon, 26 Jun 2023 03:20:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6krwMnatqUfPvglvauLukcwAr5XnD+k2x2GELX7nzzg9zCrwGwOs/QxCIra8Yo72qk8rLG X-Received: by 2002:a05:6a20:7d9f:b0:125:766d:5974 with SMTP id v31-20020a056a207d9f00b00125766d5974mr9571287pzj.24.1687774816978; Mon, 26 Jun 2023 03:20:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687774816; cv=none; d=google.com; s=arc-20160816; b=Wq1UDS9L52/8zQ/MtoJj8FCjqz5M1IUtVUeXHlHHDOtEIHbUaj+3lwNaZz4MUWzYGQ 6OH1D1O2tTFcWscMVDbCr6cWUMiGWjrORiqVVazx8UkDXnN4ve9h63Eh6dreqB7qq3SG rK1XKsBIDeEibKTwOOH3YvqzcwwoDIrxyZw7GRbt/iXcz29GXOAHMWjKJXe+fOMFZQ+V t8drvmwU07K5mEYOGjD5dLfTz1fjMMk80iXz2I9O7tgmJK1LRUCxmikJVDFr2I44nsJY SmZNDc1s6f9FoEp8+x+V43Hzsni3G9KC/NTiV0cO6ZlO1frnWlLIt28a8bQEC5iLphb8 eEqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature:dkim-filter; bh=w0RTwq6xnEh5PToktxOWxF1t6KZX1z6EpuCc02QAfJw=; fh=qKGHJM/OaNHTo96+1HG2BqACTjy4q9C0dbufp/+3Ef4=; b=wxXzV/5N8Opd3nmBEa1h8nm6SXfKGTC3sFl4L9/Wy2ew5FGc55yEEcpuqN2IPAPW+V 95axsg/4xmXr6xf385lRwT3sHd4WWtRUU8sIo04qZtxb0U4b7KQiJhYXKUWVZYM/3jhH dus0rTRJ75NpR3yD5xFPbsiwb5HizLvAP7c5KrZI7c+VOKuH7pjwXgwCTU+5cwmQUKgU aIcBEmWqJkTlAKeRx1n1m2Ehk/Um8Va1WWgXwl11G0d6BZ+2AGucpgLOPdOOtEBn6kQy +jpp2iYSQXxsMqKWiGGG37zb9ySlENSiNnLkpyCzE9c+uVfteV8gdMgG1J1cz8Uk/WTv Bnpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b="VHls5pA/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p9-20020a170902b08900b001b54856820esi4438186plr.79.2023.06.26.03.20.02; Mon, 26 Jun 2023 03:20:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b="VHls5pA/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230197AbjFZJVO (ORCPT + 99 others); Mon, 26 Jun 2023 05:21:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229940AbjFZJUw (ORCPT ); Mon, 26 Jun 2023 05:20:52 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C06891BE4; Mon, 26 Jun 2023 02:18:20 -0700 (PDT) Received: by linux.microsoft.com (Postfix, from userid 1099) id 559A121C3F2C; Mon, 26 Jun 2023 02:18:20 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 559A121C3F2C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1687771100; bh=w0RTwq6xnEh5PToktxOWxF1t6KZX1z6EpuCc02QAfJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VHls5pA/ruzwRNkIcImhFmzyr8irMnHGZRx2V6Qjgi+qr8THoNSAGAwg0qUH78FLZ M2PQDhE/cZxJWCL9f7NHyRAHnVNAuU6il0ikj2vt7tX4kK0NtP3N4kGlR0FMKvHUXI xR4St1XZsUv4BYi+UBJmk6aZpJa4pkL9gKC8ih9I= From: souradeep chakrabarti To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, longli@microsoft.com, sharmaajay@microsoft.com, leon@kernel.org, cai.huoqing@linux.dev, ssengar@linux.microsoft.com, vkuznets@redhat.com, tglx@linutronix.de, linux-hyperv@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org Cc: stable@vger.kernel.org, schakrabarti@microsoft.com, Souradeep Chakrabarti Subject: [PATCH 1/2 V3 net] net: mana: Fix MANA VF unload when host is unresponsive Date: Mon, 26 Jun 2023 02:18:18 -0700 Message-Id: <1687771098-26775-1-git-send-email-schakrabarti@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1687771058-26634-1-git-send-email-schakrabarti@linux.microsoft.com> References: <1687771058-26634-1-git-send-email-schakrabarti@linux.microsoft.com> X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL, USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769757565421688496?= X-GMAIL-MSGID: =?utf-8?q?1769760166616748573?= From: Souradeep Chakrabarti This patch addresses the VF unload issue, where mana_dealloc_queues() gets stuck in infinite while loop, because of host unresponsiveness. It adds a timeout in the while loop, to fix it. Fixes: ca9c54d2d6a5ab2430c4eda364c77125d62e5e0f (net: mana: Add a driver for Microsoft Azure Network Adapter) Signed-off-by: Souradeep Chakrabarti --- V2 -> V3: * Splitted the patch in two parts. * Removed the unnecessary braces from mana_dealloc_queues(). --- drivers/net/ethernet/microsoft/mana/mana_en.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index d907727c7b7a..cb5c43c3c47e 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -2329,7 +2329,10 @@ static int mana_dealloc_queues(struct net_device *ndev) { struct mana_port_context *apc = netdev_priv(ndev); struct gdma_dev *gd = apc->ac->gdma_dev; + unsigned long timeout; struct mana_txq *txq; + struct sk_buff *skb; + struct mana_cq *cq; int i, err; if (apc->port_is_up) @@ -2348,13 +2351,25 @@ static int mana_dealloc_queues(struct net_device *ndev) * * Drain all the in-flight TX packets */ + + timeout = jiffies + 120 * HZ; for (i = 0; i < apc->num_queues; i++) { txq = &apc->tx_qp[i].txq; - - while (atomic_read(&txq->pending_sends) > 0) + while (atomic_read(&txq->pending_sends) > 0 && + time_before(jiffies, timeout)) usleep_range(1000, 2000); } + for (i = 0; i < apc->num_queues; i++) { + txq = &apc->tx_qp[i].txq; + cq = &apc->tx_qp[i].tx_cq; + while (atomic_read(&txq->pending_sends)) { + skb = skb_dequeue(&txq->pending_skbs); + mana_unmap_skb(skb, apc); + napi_consume_skb(skb, cq->budget); + atomic_sub(1, &txq->pending_sends); + } + } /* We're 100% sure the queues can no longer be woken up, because * we're sure now mana_poll_tx_cq() can't be running. */