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 6AB40A0A0E for ; Mon, 17 May 2021 18:21:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA835410F7; Mon, 17 May 2021 18:21:33 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 2B44B40041 for ; Mon, 17 May 2021 18:21:32 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifzn-0000Nq-DH; Mon, 17 May 2021 16:21:31 +0000 From: Christian Ehrhardt To: Lance Richardson Cc: Ajit Khaparde , Stephen Hemminger , dpdk stable Date: Mon, 17 May 2021 18:21:09 +0200 Message-Id: <20210517162125.3178901-5-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517162125.3178901-1-christian.ehrhardt@canonical.com> References: <20210517162125.3178901-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix dynamic VNIC count' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/64e80dd923730f0ec39aa1e906f5a7484ae126ec Thanks. Christian Ehrhardt --- >From 64e80dd923730f0ec39aa1e906f5a7484ae126ec Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Wed, 28 Apr 2021 18:03:44 -0400 Subject: [PATCH] net/bnxt: fix dynamic VNIC count [ upstream commit a0c2315a2a5f0a83d5d77ec745ac1de04a1e962b ] Ensure that the current count of in-use VNICs is decremented when a VNIC is freed. Don't attempt VNIC allocation when the maximum supported number of VNICs is currently allocated. Fixes: 49d0709b257f ("net/bnxt: delete and flush L2 filters cleanly") Fixes: d24610f7bfda ("net/bnxt: allow flow creation when RSS is enabled") Signed-off-by: Lance Richardson Reviewed-by: Ajit Khaparde Reported-by: Stephen Hemminger --- drivers/net/bnxt/bnxt.h | 2 +- drivers/net/bnxt/bnxt_flow.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 386d9c3cf0..d5818e647c 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -573,7 +573,7 @@ struct bnxt { uint32_t max_ring_grps; struct bnxt_ring_grp_info *grp_info; - unsigned int nr_vnics; + uint16_t nr_vnics; #define BNXT_GET_DEFAULT_VNIC(bp) (&(bp)->vnic_info[0]) struct bnxt_vnic_info *vnic_info; diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c index e110c20f15..1a2a9200a8 100644 --- a/drivers/net/bnxt/bnxt_flow.c +++ b/drivers/net/bnxt/bnxt_flow.c @@ -922,6 +922,9 @@ static int bnxt_vnic_prep(struct bnxt *bp, struct bnxt_vnic_info *vnic) uint64_t rx_offloads = dev_conf->rxmode.offloads; int rc; + if (bp->nr_vnics > bp->max_vnics - 1) + return -ENOMEM; + rc = bnxt_vnic_grp_alloc(bp, vnic); if (rc) goto ret; @@ -1514,6 +1517,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev, bnxt_hwrm_vnic_ctx_free(bp, vnic); bnxt_hwrm_vnic_free(bp, vnic); vnic->rx_queue_cnt = 0; + bp->nr_vnics--; PMD_DRV_LOG(DEBUG, "Free VNIC\n"); } } @@ -1893,6 +1897,7 @@ done: bnxt_hwrm_vnic_free(bp, vnic); vnic->rx_queue_cnt = 0; + bp->nr_vnics--; } } else { rte_flow_error_set(error, -ret, -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:36.982348044 +0200 +++ 0194-net-bnxt-fix-dynamic-VNIC-count.patch 2021-05-17 17:40:29.559812531 +0200 @@ -1 +1 @@ -From a0c2315a2a5f0a83d5d77ec745ac1de04a1e962b Mon Sep 17 00:00:00 2001 +From 64e80dd923730f0ec39aa1e906f5a7484ae126ec Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a0c2315a2a5f0a83d5d77ec745ac1de04a1e962b ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 72513fe66b..8558565617 100644 +index 386d9c3cf0..d5818e647c 100644 @@ -26 +27 @@ -@@ -720,7 +720,7 @@ struct bnxt { +@@ -573,7 +573,7 @@ struct bnxt { @@ -36 +37 @@ -index 844bf1520f..73fd24cd9a 100644 +index e110c20f15..1a2a9200a8 100644 @@ -39 +40 @@ -@@ -925,6 +925,9 @@ static int bnxt_vnic_prep(struct bnxt *bp, struct bnxt_vnic_info *vnic) +@@ -922,6 +922,9 @@ static int bnxt_vnic_prep(struct bnxt *bp, struct bnxt_vnic_info *vnic) @@ -49 +50 @@ -@@ -1550,6 +1553,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev, +@@ -1514,6 +1517,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev, @@ -57 +58 @@ -@@ -2011,6 +2015,7 @@ done: +@@ -1893,6 +1897,7 @@ done: