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 9C77743C60 for ; Thu, 7 Mar 2024 02:35:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9754A42EF9; Thu, 7 Mar 2024 02:35:37 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id E6D8242E64 for ; Thu, 7 Mar 2024 02:35:36 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-41307c29eaaso3366615e9.2 for ; Wed, 06 Mar 2024 17:35:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775336; x=1710380136; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vFF+XO3/qq8ZqtXYiz6IfO+MuhvtkEPVpR4/62mKvRU=; b=DSwchsXeHkdC0g9P5Ac47JJqGBbXK10XZDBtC7WxopzWEJghnZlcjcX9Lcc/nnFy44 jWqsr0Do0QdSyXRrP7dW9Ad5IHAvfJpCcnXOINs0rx810H0p9MdIqKwyTlAsq4lKZXLn LKk5R/gyg+rCoxpGJp72gYBS0h694YFg7GmEJohE/BU7NCKFN37AMSvL+hYxhgIZoYJm SPR+yzY72Eh4EhZqhZ3mbynd/jramDv/kwWKQj2t6JYbG22sq6xDjr27UT1fWowKATbP daYRF1D1wTe0OC9ey+ngU8d2mE1X7MJ9B9PXZy6yLS0OAxPRxMRsaGBoSPcKpV49ysR9 F8IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775336; x=1710380136; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vFF+XO3/qq8ZqtXYiz6IfO+MuhvtkEPVpR4/62mKvRU=; b=bXKlP2cAaS7YyymNKCDIeFtqfR2J/y+t2LF4zxar6832z8lS8VT3EA/IFtVxdBNZtW +Abw4dQ5GgFZPHRmF3qf0fyOMUUBGipiZ/0w5L6OfXAw1kXw/2amG8Yn7nXIvVQdeFxu sG/xHbfyE8OV0hN4tnJ3fg+zS6MnbvbpQHxWelUS9jibAjOqOCqfYUnvYd8f0b4iRSn9 pU52DgvU04zGBeI246wxC0krWPzldA3z0BPOU6DbAmr5pOCgqEa/+moLgfLJrSkZt9z3 uZXHadlqO8OQIH3sObDIEEjf9e8c8yV892zER5m4R+riWOEh/v4YQKO+d6RZJSb41InQ AtoA== X-Forwarded-Encrypted: i=1; AJvYcCVEgM4Z0O+WeSYQuP4xrcAqVWRPAq0JlJ4NNVggY5MfV5AtHiXohqucJKVM8Wlg19wOLPMXbZVNhOmiCdIlT4A= X-Gm-Message-State: AOJu0YyXUv1X5537kCidv+LnIOMsEUravhojd7sdO0i44w0QkQwahjOJ PcA6ob1rU9+H+AOYu4X6IqOt2EQMM3zkBnub20xttPzmVdarmp8Nj1CcMnHWcRs= X-Google-Smtp-Source: AGHT+IFxSiq5M6gUfZt9kfm5GsoOe26rimvCfpk1zkCZWXaNhUMMPpkkBQvbCLO4X9XQELS6RVF5ag== X-Received: by 2002:a05:600c:4504:b0:412:b42c:8ff1 with SMTP id t4-20020a05600c450400b00412b42c8ff1mr13816765wmo.21.1709775336595; Wed, 06 Mar 2024 17:35:36 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id p11-20020a05600c358b00b00412ebd587ebsm881339wmq.3.2024.03.06.17.35.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:35:35 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.5 Date: Thu, 7 Mar 2024 01:31:17 +0000 Message-Id: <20240307013159.1735343-60-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.5 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/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/173ff75d7452517cd9c26373013c0d218a70c2ac Thanks. Luca Boccassi --- >From 173ff75d7452517cd9c26373013c0d218a70c2ac 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 738f4158e0..70af6267d8 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -1211,6 +1211,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, AF_XDP_LOG(ERR, "Failed to reserve memzone for af_xdp umem.\n"); goto err; } + umem->mz = mz; ret = xsk_umem__create(&umem->umem, mz->addr, ETH_AF_XDP_NUM_BUFFERS * ETH_AF_XDP_FRAME_SIZE, @@ -1221,7 +1222,6 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, AF_XDP_LOG(ERR, "Failed to create umem\n"); goto err; } - umem->mz = mz; return umem; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:39.964605948 +0000 +++ 0060-net-af_xdp-fix-memzone-leak-on-config-failure.patch 2024-03-07 01:05:34.826940610 +0000 @@ -1 +1 @@ -From 960775fc5b7d43cfbf9fa31e4c0b36c4da79615a Mon Sep 17 00:00:00 2001 +From 173ff75d7452517cd9c26373013c0d218a70c2ac 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 738f4158e0..70af6267d8 100644 @@ -25 +26 @@ -@@ -1234,6 +1234,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -1211,6 +1211,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, @@ -33 +34 @@ -@@ -1244,7 +1245,6 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -1221,7 +1222,6 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,