46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From 960775fc5b7d43cfbf9fa31e4c0b36c4da79615a Mon Sep 17 00:00:00 2001
|
|
From: Yunjian Wang <wangyunjian@huawei.com>
|
|
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")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
|
|
Acked-by: Ciara Loftus <ciara.loftus@intel.com>
|
|
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
|
|
---
|
|
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 353c8688ec..2d151e45c7 100644
|
|
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
|
|
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
|
|
@@ -1234,6 +1234,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,
|
|
@@ -1244,7 +1245,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.33.0
|
|
|