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 08F92A0C4C for ; Mon, 12 Jul 2021 15:09:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F24C04069D; Mon, 12 Jul 2021 15:09:58 +0200 (CEST) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 739824069D for ; Mon, 12 Jul 2021 15:09:57 +0200 (CEST) Received: by mail-wm1-f49.google.com with SMTP id h18-20020a05600c3512b029020e4ceb9588so14438334wmq.5 for ; Mon, 12 Jul 2021 06:09:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jPU8lCPo1vDEGxaTlEdxgONa5okLnSxNPfZXC85HMWY=; b=AMJgo0UhiCnns0Avc+IfAA5QaROC100k48hKx+ueMD4URC770mTlT1WCmudwTk4Bly IJJq+Tmy9iU27NgA9044HJYeNJGvuwXc3ZGbNh8tL0zpgSGkoHl2LFx/ANRE2ieLm/vR pOYqLDR9XAoe8rluVQfnP+lk992RgjOiKQ0kRnQga7iYW1Zj8YPyoVD36LSFPVOSX/gJ gUw7rJowgY8tEPmqrDk3BecSZU9U2k7VhEX8V8FD5GDQfELIB79P80U2aSZ9bwCCX8G/ CbrsJaMubP5Krk8HiMIclbbmhqsRMCu/cYeskxu8DUmaUPjEeVcj7YXMkLdcDHa/7gcF /l6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jPU8lCPo1vDEGxaTlEdxgONa5okLnSxNPfZXC85HMWY=; b=sZu2N6EIsVAW6tw3+keendT6yn9Gh2CqYWc7hVSsXpBAz7jzxzgB3tIXHoYWDlbbLi yaz3f50uJveO7ST5G0cMx45Qwyd4QKQ4upneKax0uR4IX2wDv4WSRIubgu+SeG5nD2o1 74LSACPTUNsePrLN4sZ1c1OiEiHVz4rMPAyDy+i48K9L1P7Gpo9vtNX6p3QPpo6SDLGX f/UBLRU+hK2+xPnGFKJlJqJBB4QJd42Nzg+8Jf/e9SYRBFXz5FJGSUibXJAj8FDwJfC3 t+rpna96kQf3usu3nRpfzhqtn47WI/c/lC+OmC04xSu0Nx1OMeWGUwP+LjHWwTCCF3kj ESzA== X-Gm-Message-State: AOAM531R9h0cJ2fogub9R2PWOh2StdpM93wHN+t4EVWvIT/zu4qnTxln bj+0WtlwodJVzAGdbHh/RQw= X-Google-Smtp-Source: ABdhPJwdh3rbmGPiP+anasvX1AZUmlm+vZNj2hpbSdkt8SSFsgy1YyuscZHsgMjLs+ZOq+Hcoq/Apw== X-Received: by 2002:a7b:c0d8:: with SMTP id s24mr7368197wmh.181.1626095397209; Mon, 12 Jul 2021 06:09:57 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id r4sm14658842wre.84.2021.07.12.06.09.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:09:53 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Mon, 12 Jul 2021 14:04:08 +0100 Message-Id: <20210712130551.2462159-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: use common function to free VNIC resource' has been queued to stable release 20.11.3 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 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/92e631ec91e3a514fadd05bbc0fc8c513578cfc5 Thanks. Luca Boccassi --- >From 92e631ec91e3a514fadd05bbc0fc8c513578cfc5 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Mon, 31 May 2021 12:56:41 +0530 Subject: [PATCH] net/bnxt: use common function to free VNIC resource [ upstream commit 3e3fecf4b81e243d7e532bce416ebb2524901f7e ] Use the function bnxt_vnic_destroy() to destroy VNIC resources and thereby eliminate few duplicate code. Fixes: 8d0a244b40b2 ("net/bnxt: cleanup VNIC after flow validate") Fixes: 49d0709b257f ("net/bnxt: delete and flush L2 filters cleanly") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_flow.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c index f5b43d45ab..646d8dc54f 100644 --- a/drivers/net/bnxt/bnxt_flow.c +++ b/drivers/net/bnxt/bnxt_flow.c @@ -1570,10 +1570,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev, vnic = find_matching_vnic(bp, filter); if (vnic) { if (STAILQ_EMPTY(&vnic->filter)) { - rte_free(vnic->fw_grp_ids); - bnxt_hwrm_vnic_ctx_free(bp, vnic); - bnxt_hwrm_vnic_free(bp, vnic); - vnic->rx_queue_cnt = 0; + bnxt_vnic_cleanup(bp, vnic); bp->nr_vnics--; PMD_DRV_LOG(DEBUG, "Free VNIC\n"); } @@ -2035,12 +2032,7 @@ done: */ if (vnic && !vnic->func_default && STAILQ_EMPTY(&vnic->flow_list)) { - rte_free(vnic->fw_grp_ids); - if (vnic->rx_queue_cnt > 1) - bnxt_hwrm_vnic_ctx_free(bp, vnic); - - bnxt_hwrm_vnic_free(bp, vnic); - vnic->rx_queue_cnt = 0; + bnxt_vnic_cleanup(bp, vnic); bp->nr_vnics--; } } else { -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:37.541196307 +0100 +++ 0013-net-bnxt-use-common-function-to-free-VNIC-resource.patch 2021-07-12 13:41:36.198116528 +0100 @@ -1 +1 @@ -From 3e3fecf4b81e243d7e532bce416ebb2524901f7e Mon Sep 17 00:00:00 2001 +From 92e631ec91e3a514fadd05bbc0fc8c513578cfc5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3e3fecf4b81e243d7e532bce416ebb2524901f7e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index ed201a3552..59489b591a 100644 +index f5b43d45ab..646d8dc54f 100644 @@ -24 +25 @@ -@@ -1577,10 +1577,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev, +@@ -1570,10 +1570,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev, @@ -36 +37 @@ -@@ -2045,12 +2042,7 @@ done: +@@ -2035,12 +2032,7 @@ done: