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 9E880A0C45 for ; Thu, 10 Jun 2021 14:08:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96CB4410FB; Thu, 10 Jun 2021 14:08:23 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 287C34003C for ; Thu, 10 Jun 2021 14:08:22 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJTw-0000CH-Dx; Thu, 10 Jun 2021 12:08:20 +0000 From: Christian Ehrhardt To: Yunjian Wang Cc: Viacheslav Ovsiienko , dpdk stable Date: Thu, 10 Jun 2021 14:06:33 +0200 Message-Id: <20210610120641.885862-45-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx4: fix leak when configured repeatedly' 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 06/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/bb7601591b8467a38515cb1597a7511e6a0d5f0e Thanks. Christian Ehrhardt --- >From bb7601591b8467a38515cb1597a7511e6a0d5f0e Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Thu, 13 May 2021 11:38:56 +0800 Subject: [PATCH] net/mlx4: fix leak when configured repeatedly [ upstream commit 6f14d4d75aa07210d13fe0a7fcc5c26273c835d1 ] Currently, configuring a mlx device, it will allocate its own process private in mlx5_proc_priv_init() and only frees it when closing the device. This will lead to a memory leak, when a device is configured repeatedly. For example: for(...) do rte_eth_dev_configure rte_eth_rx_queue_setup rte_eth_tx_queue_setup rte_eth_dev_start rte_eth_dev_stop done Fixes: 97d37d2c1f6b ("net/mlx4: remove device register remap") Signed-off-by: Yunjian Wang Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx4/mlx4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 96f5af8069..8397f408f4 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -204,6 +204,7 @@ mlx4_proc_priv_init(struct rte_eth_dev *dev) struct mlx4_proc_priv *ppriv; size_t ppriv_size; + mlx4_proc_priv_uninit(dev); /* * UAR register table follows the process private structure. BlueFlame * registers for Tx queues are stored in the table. -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:05:00.179414948 +0200 +++ 0045-net-mlx4-fix-leak-when-configured-repeatedly.patch 2021-06-10 14:04:58.086024792 +0200 @@ -1 +1 @@ -From 6f14d4d75aa07210d13fe0a7fcc5c26273c835d1 Mon Sep 17 00:00:00 2001 +From bb7601591b8467a38515cb1597a7511e6a0d5f0e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6f14d4d75aa07210d13fe0a7fcc5c26273c835d1 ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 7cd35cd3ca..c522157a0a 100644 +index 96f5af8069..8397f408f4 100644 @@ -34 +35 @@ -@@ -201,6 +201,7 @@ mlx4_proc_priv_init(struct rte_eth_dev *dev) +@@ -204,6 +204,7 @@ mlx4_proc_priv_init(struct rte_eth_dev *dev)