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 A40CCA0C47 for ; Tue, 10 Aug 2021 17:40:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9B316411C5; Tue, 10 Aug 2021 17:40:54 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 2798B4014F for ; Tue, 10 Aug 2021 17:40:53 +0200 (CEST) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 0CF2E3F0B8 for ; Tue, 10 Aug 2021 15:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610053; bh=1GvQG36hj9dK7r2Z/5aYH9S8+Hj07XLDqouO/m8QKXQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ez8qivQo5lUIE+TJKYQYe8Hm7Ltvei1T7fBceWuEb7GldjsEb+M0aUsnkTJ60Mxws ozKlVZ2mFmzPmhBS0CxIyUaljDBHCWEGcJQQuSQHB86+jyDg94sYsihp3l40l5f8Bv 4QwKVShnai1trY2SL/Nr5+Dth8kOZ8CAZFL6h1jC7viU1oSzYQ6h5DSKYIH6dKGSz0 kwed3qyjCL7J6nfN6Lyg1Q1J7ya9cigmsEdsYutiAHYeQoBCr0L/h9Jom81wZanBI4 oShY5sU0cD2Ki87/lFcy084zSflPAL8KUJnKQlIMSY6bubXfr+EMcewcz0mqYi6FMe Cmqa5DUzLdAbQ== Received: by mail-ej1-f72.google.com with SMTP id v3-20020a1709063383b02905b4d1d1e27cso1119464eja.19 for ; Tue, 10 Aug 2021 08:40:53 -0700 (PDT) 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=1GvQG36hj9dK7r2Z/5aYH9S8+Hj07XLDqouO/m8QKXQ=; b=ejnBnJ+ZeMQMOyamcBrVBZXDWrDJteIBIWTctNNFVMdtlGQw5A60KyUMwldxVOAPJ8 /bf6Mya9utqdx87nnnFDS+hhTvp2aoj8zEoZe264WSUt7nBeo385D6dTaNJdvb+Ihr2m h2lrXu8SWZoRJzYyJLuwaRgcKl+jbHXMR7XS1uqNpoCJPT5bjc8g8SIugppnbGvn1dxd FDNbzBRl0bsY49u6IFmYTguz85BeDY/Oj+5LrlCKYyunHoW1owLqNzNJHcliPOmTc1AV N7NHH5y+KY5oxoiEeV3vNwgBOCWpfxQycip/zro7Hm3Rm3qt0TUY06+o6zAU7RLb6nEC XJuw== X-Gm-Message-State: AOAM530TNP9zMfSwl4jc15xjvA5MeQ7g08RegQ7qki8tGI3yIcmqHsDP 0Mx2+acF6mVoSzT7IkY+LGSewfG0AWgPem3zb6aEc3hihCN1oNUbq4t7QMnrGQAXFsguSts+LzZ GK5YFrPDJUSFcx3ugrXtZQrDm X-Received: by 2002:a17:906:585a:: with SMTP id h26mr28668154ejs.31.1628610052311; Tue, 10 Aug 2021 08:40:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6UKZa3HDxvQBenOjOuL0wY2nvb0h9CLZTF+xekd8rA6uEMX60Q9D7arBs8gEsiKR8q597Mg== X-Received: by 2002:a17:906:585a:: with SMTP id h26mr28668137ejs.31.1628610052074; Tue, 10 Aug 2021 08:40:52 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id i16sm9725499edr.38.2021.08.10.08.40.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:40:51 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Tue, 10 Aug 2021 17:38:48 +0200 Message-Id: <20210810154022.749358-8-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.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 19.11.10 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.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/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/024de731711286fdbad0d1a453d7caead139534a Thanks. Christian Ehrhardt --- >From 024de731711286fdbad0d1a453d7caead139534a 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 faaf0d0479..29b59eca41 100644 --- a/drivers/net/bnxt/bnxt_flow.c +++ b/drivers/net/bnxt/bnxt_flow.c @@ -1541,10 +1541,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"); } @@ -1926,12 +1923,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.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:13.393809344 +0200 +++ 0008-net-bnxt-use-common-function-to-free-VNIC-resource.patch 2021-08-10 15:11:12.902637262 +0200 @@ -1 +1 @@ -From 3e3fecf4b81e243d7e532bce416ebb2524901f7e Mon Sep 17 00:00:00 2001 +From 024de731711286fdbad0d1a453d7caead139534a 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 faaf0d0479..29b59eca41 100644 @@ -24 +25 @@ -@@ -1577,10 +1577,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev, +@@ -1541,10 +1541,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev, @@ -36 +37 @@ -@@ -2045,12 +2042,7 @@ done: +@@ -1926,12 +1923,7 @@ done: