packages/dpdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

af_xdp: del XDP_USE_SG and XDP_PKT_CONTD definition

Browse Source 
(cherry picked from commit 7d0f478b5096ea8832b36d43ad6694558d8b4f59)
This commit is contained in:
yangchen 2024-09-27 12:54:13 +08:00 committed by openeuler-sync-bot
parent 0a194c05f0
commit 954ae72bb7
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
0482-af_xdp-del-XDP_USE_SG-and-XDP_PKT_CONTD-definition.patch Normal file
View File

@ -0,0 +1,42 @@
From 44d343f8b1f764bbd62225555c946186c6e688e2 Mon Sep 17 00:00:00 2001
From: yangchen <yangchen145@huawei.com>
Date: Fri, 27 Sep 2024 12:49:19 +0800
Subject: [PATCH] af_xdp: del XDP_USE_SG and XDP_PKT_CONTD definition
---
drivers/net/af_xdp/rte_eth_af_xdp.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 186497b..4faa2af 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -62,15 +62,6 @@
#define PF_XDP AF_XDP
#endif
-/* XDP_USE_SG and XDP_PKT_CONTD are defined in linux/if_xdp.h, but not present before kernel-6.x. */
-#ifndef XDP_USE_SG
-#define XDP_USE_SG (1 << 4)
-#endif
-
-#ifndef XDP_PKT_CONTD
-#define XDP_PKT_CONTD (1 << 0)
-#endif
-
RTE_LOG_REGISTER_DEFAULT(af_xdp_logtype, NOTICE);
#define AF_XDP_LOG(level, fmt, args...) \
@@ -378,7 +369,9 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
desc = xsk_ring_cons__rx_desc(rx, idx_rx++);
addr = desc->addr;
len = desc->len;
+#if defined(XDP_PKT_CONTD)
eop = !(desc->options & XDP_PKT_CONTD);
+#endif
offset = xsk_umem__extract_offset(addr);
addr = xsk_umem__extract_addr(addr);
--
2.33.0

6
dpdk.spec
View File

@ -1,6 +1,6 @@
Name: dpdk
Version: 21.11
Release: 73
Release: 74
Packager: packaging@6wind.com
URL: http://dpdk.org
%global source_version 21.11
@ -515,6 +515,7 @@ patch6478: 0478-adapt-libbpf-0.8.0.patch
patch9479: 0479-config-arm-adapt-RTE_MAX_LCORE-to-640.patch
patch9480: 0480-af_xdp-support-recv-multi-buffer.patch
Patch9481: 0481-net-af_xdp-add-interrupt-support.patch
Patch9482: 0482-af_xdp-del-XDP_USE_SG-and-XDP_PKT_CONTD-definition.patch
Summary: Data Plane Development Kit core
Group: System Environment/Libraries
@ -673,6 +674,9 @@ strip -g $RPM_BUILD_ROOT/lib/modules/%{kern_devel_ver}/extra/dpdk/igb_uio.ko
/usr/sbin/depmod
%changelog
* Sun Sep 29 2024 yangchen <yangchen145@huawei.com> - 21.11-74
af_xdp: del XDP_USE_SG and XDP_PKT_CONTD definition
* Fri Sep 27 2024 jiangheng <jiangheng14@huawei.com> - 21.11-73
net/af_xdp: add interrupt support