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 D5C1443829 for ; Tue, 5 Mar 2024 16:36:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CFBA5415D7; Tue, 5 Mar 2024 16:36:06 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 2F31342E32 for ; Tue, 5 Mar 2024 16:36:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G7o5YVY0GZoAT8jmK5aBfpvK409PhVc2JftuvcjK6IE=; b=H1ZYvZcw0vl/K5QbgDZ2nDuWlFhOwPyZPTImAgEksa081kSnuQ69RFGIuMgcziRqlg+ArN 3cC2scKg8YNSCiVZyAVv5yS/2x7kg2JJlb5Ph7ZqLEjW+/MMePmiSHEC147E7K2MgfGVN5 Ifqck3dvXgmyldfYpKMseWACdlBUotg= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-340-t5r3LmLpO_eK3ui2tbgkhg-1; Tue, 05 Mar 2024 10:35:50 -0500 X-MC-Unique: t5r3LmLpO_eK3ui2tbgkhg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F8E21C01E87; Tue, 5 Mar 2024 15:35:50 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C395200AE7F; Tue, 5 Mar 2024 15:35:48 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Ciara Loftus , Ferruh Yigit , dpdk stable Subject: patch 'net/af_xdp: fix memzone leak on config failure' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:13 +0000 Message-ID: <20240305153449.263666-40-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 21.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/24. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/13696b1aa8c91c1b1659c6a7a60bc1ac59794950 Thanks. Kevin --- >From 13696b1aa8c91c1b1659c6a7a60bc1ac59794950 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 5 Dec 2023 20:23:51 +0800 Subject: [PATCH] net/af_xdp: fix memzone leak on config failure [ upstream commit 960775fc5b7d43cfbf9fa31e4c0b36c4da79615a ] In xdp_umem_configure() allocated memzone for the 'umem', we should free it when xsk_umem__create() call fails, otherwise it will lead to memory zone leak. To fix it move 'umem->mz = mz;' assignment after 'mz == NULL' check. Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD") Signed-off-by: Yunjian Wang Acked-by: Ciara Loftus Acked-by: Ferruh Yigit --- drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index 6bc7178fc5..dde4024267 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -1180,4 +1180,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, goto err; } + umem->mz = mz; ret = xsk_umem__create(&umem->umem, mz->addr, @@ -1190,5 +1191,4 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, goto err; } - umem->mz = mz; #endif -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.616074085 +0000 +++ 0040-net-af_xdp-fix-memzone-leak-on-config-failure.patch 2024-03-05 14:08:54.657520784 +0000 @@ -1 +1 @@ -From 960775fc5b7d43cfbf9fa31e4c0b36c4da79615a Mon Sep 17 00:00:00 2001 +From 13696b1aa8c91c1b1659c6a7a60bc1ac59794950 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 960775fc5b7d43cfbf9fa31e4c0b36c4da79615a ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 353c8688ec..2d151e45c7 100644 +index 6bc7178fc5..dde4024267 100644 @@ -25 +26 @@ -@@ -1235,4 +1235,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -1180,4 +1180,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, @@ -31 +32 @@ -@@ -1245,5 +1246,4 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -1190,5 +1191,4 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, @@ -36 +37 @@ - return umem; + #endif