52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From 955acb9594cec548ae57319bfc99d4297d773675 Mon Sep 17 00:00:00 2001
|
|
From: Yunjian Wang <wangyunjian@huawei.com>
|
|
Date: Fri, 23 Feb 2024 09:45:45 +0800
|
|
Subject: [PATCH] net/af_xdp: fix leak on XSK configuration failure
|
|
|
|
[ upstream commit 955acb9594cec548ae57319bfc99d4297d773675 ]
|
|
|
|
In xdp_umem_configure() allocated some resources for the
|
|
xsk umem, we should delete them when xsk configure fails,
|
|
otherwise it will lead to resources leak.
|
|
|
|
Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
|
|
Reviewed-by: Ciara Loftus <ciara.loftus@intel.com>
|
|
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
|
|
---
|
|
drivers/net/af_xdp/rte_eth_af_xdp.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
|
|
index 2d151e45c7..268a130c49 100644
|
|
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
|
|
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
|
|
@@ -960,6 +960,9 @@ remove_xdp_program(struct pmd_internals *internals)
|
|
static void
|
|
xdp_umem_destroy(struct xsk_umem_info *umem)
|
|
{
|
|
+ (void)xsk_umem__delete(umem->umem);
|
|
+ umem->umem = NULL;
|
|
+
|
|
#if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG)
|
|
umem->mb_pool = NULL;
|
|
#else
|
|
@@ -992,11 +995,8 @@ eth_dev_close(struct rte_eth_dev *dev)
|
|
break;
|
|
xsk_socket__delete(rxq->xsk);
|
|
|
|
- if (__atomic_fetch_sub(&rxq->umem->refcnt, 1, __ATOMIC_ACQUIRE) - 1
|
|
- == 0) {
|
|
- (void)xsk_umem__delete(rxq->umem->umem);
|
|
+ if (__atomic_fetch_sub(&rxq->umem->refcnt, 1, __ATOMIC_ACQUIRE) - 1 == 0)
|
|
xdp_umem_destroy(rxq->umem);
|
|
- }
|
|
|
|
/* free pkt_tx_queue */
|
|
rte_free(rxq->pair);
|
|
--
|
|
2.33.0
|
|
|