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 36925A0A02 for ; Mon, 17 May 2021 18:16:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 30E5440041; Mon, 17 May 2021 18:16:30 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 2A7A0410F9 for ; Mon, 17 May 2021 18:16:27 +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 1lifup-0008Kn-LR; Mon, 17 May 2021 16:16:23 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Min Hu , Jerin Jacob , dpdk stable Date: Mon, 17 May 2021 18:09:38 +0200 Message-Id: <20210517161039.3132619-149-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 'eventdev: fix memory leakage on thread creation failure' 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/467f58fe22b071f05c8d277f6d99b319a7ef29ec Thanks. Christian Ehrhardt --- >From 467f58fe22b071f05c8d277f6d99b319a7ef29ec Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 30 Apr 2021 17:34:38 +0800 Subject: [PATCH] eventdev: fix memory leakage on thread creation failure [ upstream commit f6681ab76bc5983f0571aaa4154ef839978c1088 ] This patch fixes the issue that epoll_events memory is not released after the intr thread created fail. Fixes: 3810ae435783 ("eventdev: add interrupt driven queues to Rx adapter") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) Acked-by: Jerin Jacob --- lib/librte_eventdev/rte_event_eth_rx_adapter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/librte_eventdev/rte_event_eth_rx_adapter.c index 84b0882e3f..6303318943 100644 --- a/lib/librte_eventdev/rte_event_eth_rx_adapter.c +++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.c @@ -1298,6 +1298,7 @@ rxa_create_intr_thread(struct rte_event_eth_rx_adapter *rx_adapter) return 0; RTE_EDEV_LOG_ERR("Failed to create interrupt thread err = %d\n", err); + rte_free(rx_adapter->epoll_events); error: rte_ring_free(rx_adapter->intr_ring); rx_adapter->intr_ring = NULL; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:35.242497051 +0200 +++ 0149-eventdev-fix-memory-leakage-on-thread-creation-failu.patch 2021-05-17 17:40:29.427811493 +0200 @@ -1 +1 @@ -From f6681ab76bc5983f0571aaa4154ef839978c1088 Mon Sep 17 00:00:00 2001 +From 467f58fe22b071f05c8d277f6d99b319a7ef29ec Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f6681ab76bc5983f0571aaa4154ef839978c1088 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/eventdev/rte_event_eth_rx_adapter.c | 1 + + lib/librte_eventdev/rte_event_eth_rx_adapter.c | 1 + @@ -19,5 +20,5 @@ -diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c -index d317e89c1b..13dfb28401 100644 ---- a/lib/eventdev/rte_event_eth_rx_adapter.c -+++ b/lib/eventdev/rte_event_eth_rx_adapter.c -@@ -1436,6 +1436,7 @@ rxa_create_intr_thread(struct rte_event_eth_rx_adapter *rx_adapter) +diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/librte_eventdev/rte_event_eth_rx_adapter.c +index 84b0882e3f..6303318943 100644 +--- a/lib/librte_eventdev/rte_event_eth_rx_adapter.c ++++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.c +@@ -1298,6 +1298,7 @@ rxa_create_intr_thread(struct rte_event_eth_rx_adapter *rx_adapter)