From 32a92e3088ed865e60d71ffd10c158a10bf794e5 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 21 Sep 2023 20:43:19 +0000 Subject: [PATCH] import CS xdp-tools-1.4.0-1.el9 --- .gitignore | 2 +- .xdp-tools.metadata | 2 +- ...figure-Don-t-fail-on-missing-bpftool.patch | 117 ++++++++++++++++++ SPECS/xdp-tools.spec | 30 ++++- 4 files changed, 147 insertions(+), 4 deletions(-) create mode 100644 SOURCES/xdp-tools-1.4.0-configure-Don-t-fail-on-missing-bpftool.patch diff --git a/.gitignore b/.gitignore index 35057ed..d2fe3c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xdp-tools-1.2.6.tar.gz +SOURCES/xdp-tools-1.4.0.tar.gz diff --git a/.xdp-tools.metadata b/.xdp-tools.metadata index 74d69bb..96ed339 100644 --- a/.xdp-tools.metadata +++ b/.xdp-tools.metadata @@ -1 +1 @@ -5d71cebf2dd5da7934d5d672349c7ee711682de1 SOURCES/xdp-tools-1.2.6.tar.gz +52041558a7e1060d255c9d8a023bdd586c20973e SOURCES/xdp-tools-1.4.0.tar.gz diff --git a/SOURCES/xdp-tools-1.4.0-configure-Don-t-fail-on-missing-bpftool.patch b/SOURCES/xdp-tools-1.4.0-configure-Don-t-fail-on-missing-bpftool.patch new file mode 100644 index 0000000..b73d747 --- /dev/null +++ b/SOURCES/xdp-tools-1.4.0-configure-Don-t-fail-on-missing-bpftool.patch @@ -0,0 +1,117 @@ +From 7760d84998f1fd042b3842f598296efe264fc385 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= +Date: Thu, 9 Feb 2023 17:57:41 +0100 +Subject: [PATCH] configure: Don't fail on missing bpftool +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Instead of bailing out of configure if bpftool is not found, just disable +compilation of the tools that require it (i.e., xdp-bench, xdp-monitor and +xdp-trafficgen which use BPF skeletons). + +Signed-off-by: Toke Høiland-Jørgensen +--- + Makefile | 8 +++++++- + configure | 9 +++++---- + lib/testing/test-tool.c | 4 ++++ + lib/util/util.mk | 13 +++++++++++-- + 4 files changed, 27 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 5c22e854db8d..d5dc21fb076c 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,8 +14,14 @@ MAKEFLAGS += --no-print-directory + endif + + include version.mk ++include config.mk ++ ++UTILS := xdp-filter xdp-loader xdp-dump ++ ++ifneq ($(BPFTOOL),) ++UTILS += xdp-bench xdp-monitor xdp-trafficgen ++endif + +-UTILS := xdp-filter xdp-loader xdp-dump xdp-bench xdp-monitor xdp-trafficgen + SUBDIRS := lib $(UTILS) + .PHONY: check_submodule help clobber distclean clean install test libxdp $(SUBDIRS) + +diff --git a/configure b/configure +index c32790cc361d..4bdb66b8b761 100755 +--- a/configure ++++ b/configure +@@ -71,7 +71,7 @@ check_toolchain() + CLANG=$(find_tool clang "$CLANG") + LLC=$(find_tool llc "$LLC") + +- for TOOL in $PKG_CONFIG $CC $LD $OBJCOPY $CLANG $LLC $M4 $BPFTOOL; do ++ for TOOL in $PKG_CONFIG $CC $LD $OBJCOPY $CLANG $LLC $M4; do + if [ ! $(command -v ${TOOL} 2>/dev/null) ]; then + echo "*** ERROR: Cannot find tool ${TOOL}" ; + exit 1; +@@ -108,12 +108,12 @@ check_toolchain() + exit 1 + fi + +- if $BPFTOOL gen help 2>&1 | grep 'gen skeleton.*name' > /dev/null; then ++ if command -v $BPFTOOL &>/dev/null && $BPFTOOL gen help 2>&1 | grep 'gen skeleton.*name' > /dev/null; then + bpftool_version=$($BPFTOOL version | head -n 1) + echo "using $bpftool_version" + else +- echo "bpftool doesn't support skeleton generation" +- exit 1 ++ echo "bpftool not found or doesn't support skeleton generation; not building all tools" ++ BPFTOOL= + fi + + if [ -z "$ARCH_INCLUDES" ]; then +@@ -134,6 +134,7 @@ check_toolchain() + echo "EMACS:=${EMACS}" >>$CONFIG + echo "ARCH_INCLUDES:=$ARCH_INCLUDES" >> $CONFIG + echo "BPFTOOL:=${BPFTOOL}" >> $CONFIG ++ [ -n "$BPFTOOL" ] && echo "HAVE_FEATURES+=BPFTOOL" >>"$CONFIG" + } + + check_zlib() +diff --git a/lib/testing/test-tool.c b/lib/testing/test-tool.c +index 3dd5270af95f..95f76cb36573 100644 +--- a/lib/testing/test-tool.c ++++ b/lib/testing/test-tool.c +@@ -205,10 +205,14 @@ int do_probe(const void *cfg, __unused const char *pin_root_path) + + switch (opt->action) { + case PROBE_CPUMAP_PROGRAM: ++#ifdef HAVE_BPFTOOL + res = sample_probe_cpumap_compat(); ++#endif + break; + case PROBE_XDP_LOAD_BYTES: ++#ifdef HAVE_BPFTOOL + res = sample_probe_xdp_load_bytes(); ++#endif + break; + default: + return EXIT_FAILURE; +diff --git a/lib/util/util.mk b/lib/util/util.mk +index 2b6a2e08af3b..6c9ebaf00f77 100644 +--- a/lib/util/util.mk ++++ b/lib/util/util.mk +@@ -1,2 +1,11 @@ +-UTIL_OBJS := params.o logging.o util.o stats.o xpcapng.o xdp_sample.o +-UTIL_BPF_OBJS := xdp_sample.bpf.o xdp_load_bytes.bpf.o ++LIB_DIR ?= .. ++include $(LIB_DIR)/defines.mk ++ ++UTIL_OBJS := params.o logging.o util.o stats.o xpcapng.o ++UTIL_BPF_OBJS := ++ ++ifneq ($(BPFTOOL),) ++UTIL_OBJS += xdp_sample.o ++UTIL_BPF_OBJS += xdp_sample.bpf.o xdp_load_bytes.bpf.o ++endif ++ +-- +2.41.0 + diff --git a/SPECS/xdp-tools.spec b/SPECS/xdp-tools.spec index 55a9c32..97fd1cb 100644 --- a/SPECS/xdp-tools.spec +++ b/SPECS/xdp-tools.spec @@ -1,12 +1,13 @@ Name: xdp-tools -Version: 1.2.6 +Version: 1.4.0 Release: 1%{?dist} Summary: Utilities and example programs for use with XDP -%global _soversion 1.2.0 +%global _soversion 1.4.0 License: GPLv2 URL: https://github.com/xdp-project/%{name} Source0: https://github.com/xdp-project/%{name}/releases/download/v%{version}/xdp-tools-%{version}.tar.gz +Patch0: xdp-tools-1.4.0-configure-Don-t-fail-on-missing-bpftool.patch BuildRequires: libbpf-devel BuildRequires: elfutils-libelf-devel @@ -21,6 +22,10 @@ BuildRequires: m4 BuildRequires: emacs-nox BuildRequires: wireshark-cli +%ifnarch i686 +BuildRequires: bpftool +%endif + # Always keep xdp-tools and libxdp packages in sync Requires: libxdp = %{version}-%{release} @@ -89,6 +94,11 @@ make install V=1 %{_sbindir}/xdp-filter %{_sbindir}/xdp-loader %{_sbindir}/xdpdump +%ifnarch i686 +%{_sbindir}/xdp-bench +%{_sbindir}/xdp-monitor +%{_sbindir}/xdp-trafficgen +%endif %{_mandir}/man8/* %{_libdir}/bpf/xdpfilt_*.o %{_libdir}/bpf/xdpdump_*.o @@ -112,6 +122,22 @@ make install V=1 %{_libdir}/pkgconfig/libxdp.pc %changelog +* Thu Jul 6 2023 Toke Høiland-Jørgensen 1.4.0-1 +- Upstream version bump + +* Thu Feb 23 2023 Toke Høiland-Jørgensen 1.3.1-1 +- Upstream version bump + +* Thu Feb 9 2023 Toke Høiland-Jørgensen 1.3.0-2 +- Restore building on i686, by patching the build to exclude the bits that require bpftool + +* Tue Feb 7 2023 Toke Høiland-Jørgensen 1.3.0-1 +- Upstream version bump +- Don't build on i686 (because of missing bpftool) + +* Thu Feb 2 2023 Toke Høiland-Jørgensen 1.2.9-1 +- Upstream version bump + * Tue Aug 16 2022 Toke Høiland-Jørgensen 1.2.6-1 - Upstream version bump