From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E9B1641E9F for ; Wed, 15 Mar 2023 15:37:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6232427F2; Wed, 15 Mar 2023 15:37:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 3310F427F2 for ; Wed, 15 Mar 2023 15:37:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rdIlI6P6lwbNsLVDXHIGONX/tbFufCYjjPVnejfS67A=; b=hHYcLZc1V9dH6vDXFGr6nwY+KJMk+Iao4aGQwOPd3NVU34E9DDAR7Q/z7ZvKBWRUi/Y89q Ocl6nMuRRcJJ1m9ulvBnkbi0cAJ+BeWLYLpMIoB8HIH7VasHJZugAanFSSGPXCn+byna56 Cs5d8x+iOhBJwLzQeOqkPpyox7vm22U= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-180-ClVM46QhPvqspOrk015SFA-1; Wed, 15 Mar 2023 10:37:10 -0400 X-MC-Unique: ClVM46QhPvqspOrk015SFA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 819EA801779; Wed, 15 Mar 2023 14:37:09 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id F41EA40C6E67; Wed, 15 Mar 2023 14:37:08 +0000 (UTC) From: Kevin Traynor To: Rakesh Kudurumalla Cc: dpdk stable Subject: patch 'net/cnxk: fix LBK BPID usage' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:15 +0000 Message-Id: <20230315143640.677317-22-ktraynor@redhat.com> In-Reply-To: <20230315143640.677317-1-ktraynor@redhat.com> References: <20230315143640.677317-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/20/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c0a24be8f27b49592d125bc403d77a2a40e1763f Thanks. Kevin --- >From c0a24be8f27b49592d125bc403d77a2a40e1763f Mon Sep 17 00:00:00 2001 From: Rakesh Kudurumalla Date: Fri, 3 Mar 2023 13:40:01 +0530 Subject: [PATCH] net/cnxk: fix LBK BPID usage [ upstream commit c9b0bb00d201b57d1d1cdf7820d1a174d652f1ef ] BPIDs are not disabled while freeing resources for NIX device as a result a new BPID is assigned which leads to exhaustion of BPID's after soft exit of application. This patch fixes the same. Fixes: d2bebb1feece ("net/cnxk: support flow control operations") Signed-off-by: Rakesh Kudurumalla --- drivers/net/cnxk/cnxk_ethdev.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c index 8ba35ac36f..94d1b17443 100644 --- a/drivers/net/cnxk/cnxk_ethdev.c +++ b/drivers/net/cnxk/cnxk_ethdev.c @@ -761,4 +761,25 @@ cnxk_rss_ethdev_to_nix(struct cnxk_eth_dev *dev, uint64_t ethdev_rss, } +static int +nix_rxchan_cfg_disable(struct cnxk_eth_dev *dev) +{ + struct roc_nix *nix = &dev->nix; + struct roc_nix_fc_cfg fc_cfg; + int rc; + + if (!roc_nix_is_lbk(nix)) + return 0; + + memset(&fc_cfg, 0, sizeof(struct roc_nix_fc_cfg)); + fc_cfg.type = ROC_NIX_FC_RXCHAN_CFG; + fc_cfg.rxchan_cfg.enable = false; + rc = roc_nix_fc_config_set(nix, &fc_cfg); + if (rc) { + plt_err("Failed to setup flow control, rc=%d(%s)", rc, roc_error_msg_get(rc)); + return rc; + } + return 0; +} + static void nix_free_queue_mem(struct cnxk_eth_dev *dev) @@ -1096,4 +1117,5 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev) roc_nix_tm_fini(nix); + nix_rxchan_cfg_disable(dev); roc_nix_lf_free(nix); } @@ -1313,4 +1335,5 @@ tm_fini: free_nix_lf: nix_free_queue_mem(dev); + rc |= nix_rxchan_cfg_disable(dev); rc |= roc_nix_lf_free(nix); fail_configure: @@ -1794,4 +1817,9 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool reset) nix_free_queue_mem(dev); + /* free nix bpid */ + rc = nix_rxchan_cfg_disable(dev); + if (rc) + plt_err("Failed to free nix bpid, rc=%d", rc); + /* Free nix lf resources */ rc = roc_nix_lf_free(nix); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:21.143128436 +0000 +++ 0022-net-cnxk-fix-LBK-BPID-usage.patch 2023-03-15 14:30:20.584123696 +0000 @@ -1 +1 @@ -From c9b0bb00d201b57d1d1cdf7820d1a174d652f1ef Mon Sep 17 00:00:00 2001 +From c0a24be8f27b49592d125bc403d77a2a40e1763f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c9b0bb00d201b57d1d1cdf7820d1a174d652f1ef ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 22072d29b0..e99335b117 100644 +index 8ba35ac36f..94d1b17443 100644 @@ -23 +24 @@ -@@ -901,4 +901,25 @@ cnxk_rss_ethdev_to_nix(struct cnxk_eth_dev *dev, uint64_t ethdev_rss, +@@ -761,4 +761,25 @@ cnxk_rss_ethdev_to_nix(struct cnxk_eth_dev *dev, uint64_t ethdev_rss, @@ -49 +50 @@ -@@ -1219,4 +1240,5 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev) +@@ -1096,4 +1117,5 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev) @@ -55 +56 @@ -@@ -1457,4 +1479,5 @@ tm_fini: +@@ -1313,4 +1335,5 @@ tm_fini: @@ -61 +62 @@ -@@ -2027,4 +2050,9 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool reset) +@@ -1794,4 +1817,9 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool reset)