65 lines
1.5 KiB
Diff
65 lines
1.5 KiB
Diff
From e1543baea37db002238a30d120a58472fb6471a7 Mon Sep 17 00:00:00 2001
|
|
From: Haiyue Wang <haiyue.wang@intel.com>
|
|
Date: Wed, 9 Feb 2022 20:43:58 +0800
|
|
Subject: [PATCH] net/af_xdp: make UMEM configure more readable
|
|
|
|
[ upstream commit e1543baea37db002238a30d120a58472fb6471a7 ]
|
|
|
|
The below compile time defined style make the code not so readable, the
|
|
first function end block is after "#endif" segment.
|
|
|
|
#if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG)
|
|
|
|
xdp_umem_configure()
|
|
{
|
|
|
|
#else
|
|
xdp_umem_configure()
|
|
{
|
|
|
|
#endif
|
|
'shared code block'
|
|
}
|
|
|
|
Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
|
|
Acked-by: Ciara Loftus <ciara.loftus@intel.com>
|
|
---
|
|
drivers/net/af_xdp/rte_eth_af_xdp.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 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 1b6192fa44..802f912cb7 100644
|
|
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
|
|
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
|
|
@@ -1078,6 +1078,12 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
|
|
__atomic_store_n(&umem->refcnt, 1, __ATOMIC_RELEASE);
|
|
}
|
|
|
|
+ return umem;
|
|
+
|
|
+err:
|
|
+ xdp_umem_destroy(umem);
|
|
+ return NULL;
|
|
+}
|
|
#else
|
|
static struct
|
|
xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
|
|
@@ -1138,13 +1144,13 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
|
|
}
|
|
umem->mz = mz;
|
|
|
|
-#endif
|
|
return umem;
|
|
|
|
err:
|
|
xdp_umem_destroy(umem);
|
|
return NULL;
|
|
}
|
|
+#endif
|
|
|
|
static int
|
|
load_custom_xdp_prog(const char *prog_path, int if_index, struct bpf_map **map)
|
|
--
|
|
2.33.0
|
|
|