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 7CBFBA0A0C for ; Mon, 17 May 2021 18:16:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 75A27410E2; Mon, 17 May 2021 18:16:49 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 7103640F35 for ; Mon, 17 May 2021 18:16:48 +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 1lifvC-0008P4-9Y; Mon, 17 May 2021 16:16:46 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Min Hu , Ferruh Yigit , dpdk stable Date: Mon, 17 May 2021 18:09:46 +0200 Message-Id: <20210517161039.3132619-157-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix leak on remove' 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/8dc5c2029fabae40938f99ef2cdd83bd4bad9cf4 Thanks. Christian Ehrhardt --- >From 8dc5c2029fabae40938f99ef2cdd83bd4bad9cf4 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Thu, 22 Apr 2021 10:05:02 +0800 Subject: [PATCH] net/bonding: fix leak on remove [ upstream commit 144dc4739975602eec9f8c5f33d1a1bb7df7fcdb ] If the bond device was created by vdev mode, the kvlist was not free when the bond device removed. Fixes: 8d30fe7fa737 ("bonding: support port hotplug") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) Reviewed-by: Ferruh Yigit --- drivers/net/bonding/rte_eth_bond_pmd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index e7cb418053..68cf5fef69 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3447,6 +3447,8 @@ bond_remove(struct rte_vdev_device *dev) rte_bitmap_free(internals->vlan_filter_bmp); rte_free(internals->vlan_filter_bmpmem); + if (internals->kvlist != NULL) + rte_kvargs_free(internals->kvlist); rte_eth_dev_release_port(eth_dev); return 0; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:35.545098144 +0200 +++ 0157-net-bonding-fix-leak-on-remove.patch 2021-05-17 17:40:29.435811555 +0200 @@ -1 +1 @@ -From 144dc4739975602eec9f8c5f33d1a1bb7df7fcdb Mon Sep 17 00:00:00 2001 +From 8dc5c2029fabae40938f99ef2cdd83bd4bad9cf4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 144dc4739975602eec9f8c5f33d1a1bb7df7fcdb ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 2e9cea5b8e..25b1f771a1 100644 +index e7cb418053..68cf5fef69 100644 @@ -23,4 +24,4 @@ -@@ -3467,6 +3467,8 @@ bond_remove(struct rte_vdev_device *dev) - ret = bond_ethdev_stop(eth_dev); - bond_ethdev_close(eth_dev); - } +@@ -3447,6 +3447,8 @@ bond_remove(struct rte_vdev_device *dev) + rte_bitmap_free(internals->vlan_filter_bmp); + rte_free(internals->vlan_filter_bmpmem); + @@ -31 +32 @@ - return ret; + return 0;