diff options
author | Yulong Pei <yulong.pei@intel.com> | 2023-01-05 02:26:32 +0000 |
---|---|---|
committer | Beno�t Ganne <bganne@cisco.com> | 2023-01-13 09:57:00 +0000 |
commit | f9a17487982ebc231ad0f32f15f261453aef8a88 (patch) | |
tree | edbfdc326ad1b0fc25f2efa083e94010c025c2a8 /build/external/patches/xdp-tools_1.2.9/0002-libxdp-fix-asm-types.h-file-not-found-issue.patch | |
parent | 809eb669c7a353cd06da58ccdf8578053b1233ca (diff) |
af_xdp: update af_xdp driver plugin to depend on libxdp
AF_XDP support is deprecated in libbpf since v0.7.0 [1], the libxdp library
now provides the functionality which once was in libbpf, this commit updates
af_xdp plugin to depend on libxdp, libbpf still remains a dependency even if
libxdp is present, as it need use libbpf APIs for program loading.
libxdp is distributed within xdp-tool [2], xdp-tools package also
include libbpf in it as dependency, so here installed libxdp v1.2.9 and
libbpf v0.8.0, both from xdp-tool-1.2.9 package.
More information about libxdp compatibility can be found in the libxdp
README [3].
In libbpf v0.8.0, The bpf_prog_load function was deprecated and changed to
bpf_object__open_file and bpf_object__next_program and bpf_object__load,
The bpf_get_link_xdp_id and bpf_set_link_xdp_fd functions were deprecated
and changed to bpf_xdp_attach and bpf_xdp_detach, The bpf_object__unload
function was deprecated and changed to bpf_object__close.
[1] https://github.com/libbpf/libbpf/commit/277846bc6c15
[2] https://github.com/xdp-project/xdp-tools/releases/tag/v1.2.9
[3] https://github.com/xdp-project/xdp-tools/blob/master/lib/libxdp/README.org
Type: improvement
Change-Id: Ifbf6e3aa38bc6e0b77561f26311fd11c15ddb47e
Signed-off-by: Yulong Pei <yulong.pei@intel.com>
Diffstat (limited to 'build/external/patches/xdp-tools_1.2.9/0002-libxdp-fix-asm-types.h-file-not-found-issue.patch')
-rw-r--r-- | build/external/patches/xdp-tools_1.2.9/0002-libxdp-fix-asm-types.h-file-not-found-issue.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/build/external/patches/xdp-tools_1.2.9/0002-libxdp-fix-asm-types.h-file-not-found-issue.patch b/build/external/patches/xdp-tools_1.2.9/0002-libxdp-fix-asm-types.h-file-not-found-issue.patch new file mode 100644 index 00000000000..1ba3cc5418e --- /dev/null +++ b/build/external/patches/xdp-tools_1.2.9/0002-libxdp-fix-asm-types.h-file-not-found-issue.patch @@ -0,0 +1,32 @@ +From 51ea3b590f5e0a6b34b5148af43996029fd60ac6 Mon Sep 17 00:00:00 2001 +From: Yulong <yulong.pei@intel.com> +Date: Fri, 6 Jan 2023 07:46:10 +0000 +Subject: [PATCH 2/2] libxdp: fix asm/types.h file not found issue + +The file asm/types.h located in /usr/include/$(uname -m)-linux-gnu, +the path string already assigned to ARCH_INCLUDES when run xdp-tools +configure, so include ARCH_INCLUDES to CFLAGS and BPF_CFLAGS directly. + +Signed-off-by: Yulong <yulong.pei@intel.com> +--- + lib/defines.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/defines.mk b/lib/defines.mk +index f134c43..515411c 100644 +--- a/lib/defines.mk ++++ b/lib/defines.mk +@@ -40,8 +40,8 @@ endif + + DEFINES += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + +-CFLAGS += -std=gnu11 -Wextra -Werror $(DEFINES) +-BPF_CFLAGS += $(DEFINES) $(filter -ffile-prefix-map=%,$(CFLAGS)) ++CFLAGS += -std=gnu11 -Wextra -Werror $(DEFINES) $(ARCH_INCLUDES) ++BPF_CFLAGS += $(DEFINES) $(filter -ffile-prefix-map=%,$(CFLAGS)) $(ARCH_INCLUDES) + + CONFIGMK := $(LIB_DIR)/../config.mk + LIBMK := Makefile $(CONFIGMK) $(LIB_DIR)/defines.mk $(LIB_DIR)/common.mk $(LIB_DIR)/../version.mk +-- +2.25.1 + |