!19 [sync] PR-10: xdp-bench: Add correct logging message for XDP_PASS

From: @openeuler-sync-bot 
Reviewed-by: @bitcoffee 
Signed-off-by: @bitcoffee

backport-xdp-bench-Add-correct-logging-message-for-XDP_PASS.patch

@@ -0,0 +1,25 @@
+From 11ef232c878b8499498106d5ede49d7d1bf0fc9d Mon Sep 17 00:00:00 2001
+From: Nimrod Oren <noren@nvidia.com>
+Date: Mon, 4 Mar 2024 17:11:16 +0200
+Subject: [PATCH] xdp-bench: Add correct logging message for XDP_PASS
+
+---
+ xdp-bench/xdp_basic.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xdp-bench/xdp_basic.c b/xdp-bench/xdp_basic.c
+index bdb8a0b..f808966 100644
+--- a/xdp-bench/xdp_basic.c
++++ b/xdp-bench/xdp_basic.c
+@@ -137,7 +137,7 @@ static int do_basic(const struct basic_opts *opt, enum xdp_action action)
+ 	ret = EXIT_FAIL;
+ 
+ 	pr_info("%s packets on %s (ifindex %d; driver %s)\n",
+-		action == XDP_DROP ? "Dropping" : "Hairpinning (XDP_TX)",
++		action == XDP_DROP ? "Dropping" : action == XDP_TX ? "Hairpinning (XDP_TX)" : "Passing",
+ 		opt->iface_in.ifname, opt->iface_in.ifindex, get_driver_name(opt->iface_in.ifindex));
+ 
+ 	ret = sample_run(opt->interval, NULL, NULL);
+-- 
+2.27.0
+

xdp-tools.spec

@@ -1,12 +1,20 @@
+# since strip in binutils fails to strip bpf objects in this package
+# use eu-strip of elfutils instead
+%global __strip /usr/bin/eu-strip
+# eu-strip cannot strip static libs
+# use strip for static libs
+%global __brp_strip_static_archive %{_rpmconfigdir}/brp-strip-static-archive /usr/bin/strip
+
 Name:             xdp-tools
-Version:          1.0.1
+Version:          1.4.1
-Release:          1%{?dist}
+Release:          2
 Summary:          Utilities and example programs for use with XDP
-%global _soversion 1.0.0
+%global _soversion 1.4.0
 
 License:          GPLv2
 URL:              https://github.com/xdp-project/%{name}
 Source0:          https://github.com/xdp-project/%{name}/archive/v%{version}.tar.gz
+Patch01:          backport-xdp-bench-Add-correct-logging-message-for-XDP_PASS.patch
 
 BuildRequires:    libbpf-devel
 BuildRequires:    elfutils-libelf-devel
@@ -20,6 +28,7 @@ BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    emacs-nox
 BuildRequires:    wireshark-cli
+BuildRequires:    elfutils
 
 # Always keep xdp-tools and libxdp packages in sync
 Requires:         libxdp = %{version}-%{release}
@@ -82,8 +91,6 @@ export MANDIR='%{_mandir}'
 export DATADIR='%{_datadir}'
 export HDRDIR='%{_includedir}/xdp'
 make install V=1
-strip %{buildroot}%{_libdir}/{libxdp.so,libxdp.so.1.0.0}
-strip %{buildroot}%{_sbindir}/{xdpdump,xdp-loader,xdp-filter}
 
 %files
 %{_sbindir}/xdp-filter
@@ -99,6 +106,7 @@ strip %{buildroot}%{_sbindir}/{xdpdump,xdp-loader,xdp-filter}
 %{_libdir}/libxdp.so.1
 %{_libdir}/libxdp.so.%{_soversion}
 %{_libdir}/bpf/xdp-dispatcher.o
+%{_libdir}/bpf/xsk_def_xdp_prog*.o
 %{_mandir}/man3/*
 
 %files -n libxdp-static
@@ -110,6 +118,18 @@ strip %{buildroot}%{_sbindir}/{xdpdump,xdp-loader,xdp-filter}
 %{_libdir}/pkgconfig/libxdp.pc
 
 %changelog
+* Sat May 11 2024 baiguo <baiguo@kylinos.cn> 1.4.1-2
+- xdp-bench: Add correct logging message for XDP_PASS 
+
+* Fri Dec 22 2023 Ouuleilei <wangliu@iscas.ac.cn> 1.4.1-1
+- upgrade to 1.4.1
+
+* Mon Oct 10 2022 LemmyHuang <huangliming5@huawei.com> 1.0.1-3
+- correct release number format
+
+* Wed Apr 20 2022 Di Wang <wangdi@kylinos.cn> 1.0.1-2
+- workaround for stripping failure of bpf objects by binutils
+
 * Fri Sep 10 2021 Pengju Jiang <jiangpengju2@huawei.com> 1.0.1-1
 - solve the strip problem of dark conversion compilation
 

xdp-tools.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo: xdp-project/xdp-tools
+tag_prefix: ^v
+seperator: "."