xdp-tools: update to 1.5.8

Release Notes:
- https://github.com/xdp-project/xdp-tools/releases/tag/v1.5.8
- https://github.com/xdp-project/xdp-tools/releases/tag/v1.5.7
- https://github.com/xdp-project/xdp-tools/releases/tag/v1.5.6
- https://github.com/xdp-project/xdp-tools/releases/tag/v1.5.5
- https://github.com/xdp-project/xdp-tools/releases/tag/v1.5.4
- https://github.com/xdp-project/xdp-tools/releases/tag/v1.5.3
- https://github.com/xdp-project/xdp-tools/releases/tag/v1.5.2
- https://github.com/xdp-project/xdp-tools/releases/tag/v1.5.1
- https://github.com/xdp-project/xdp-tools/releases/tag/v1.5.0
- https://github.com/xdp-project/xdp-tools/releases/tag/v1.4.3

Remove upstreamed:
- 010-configure-respect-LDFLAGS.patch
- 020-libxdp-Use-__noinline__-reserved-attribute-for-XDP-d.patch
- 024-lib-allow-overwriting-W-flags-via-BPF_CFLAGS.patch
- 025-Add-BPF_LDFLAGS-to-allow-overwriting-llc-s-march-arg.patch

Remove unnecessary patch:
- 022-xdp-dump-add-missing-perf_event-include-for-bpf-and-.patch
  (The included headers were incorrect. Some musl toolchain headers
   appeared in the BPF bytecode generation path, which should not
   happen. This issue is resolved by overriding CFLAGS and LDFLAGS.)

Remove `PKG_FLAGS:=nonshared`. With this flag enabled, the package is
compiled separately for every target. Removing it limits compilation
to each CPU architecture instead, significantly reducing unnecessary
build overhead.

Add new tools:
- xdp-bench:
  XDP-bench is a benchmarking utility for exercising the different operation modes
  of XDP. It is intended to be a simple program demonstrating the various operating
  modes; these include dropping packets, hairpin forwarding (using the XDP_TX return
  code), and redirection using the various in-kernel packet redirection facilities.
- xdp-forward:
  xdp-forward is an XDP forwarding plane, which will accelerate
  packet forwarding using XDP. To use it, simply load it on
  the set of interfaces to accelerate forwarding between.
- xdp-monitor:
  XDP-monitor is a tool that monitors various XDP related statistics and
  events using BPF tracepoints infrastructure, trying to be as low overhead
  as possible.
- xdp-trafficgen:
  XDP-trafficgen is a packet generator utilising the XDP kernel subsystem
  to generate packets transmit them through a network interface.
  Packets are dynamically generated and transmitted in the kernel,
  allowing for high performance (millions of packets per second per core).

Co-Developed-by: Til Kaiser <mail@tk154.de>
Link: openwrt#20903
Signed-off-by: Nick Hainke <vincent@systemli.org>

Author: PolynomialDivision

package/network/utils/xdp-tools/Makefile

@@ -2,17 +2,16 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xdp-tools
 PKG_RELEASE:=1
-PKG_VERSION:=1.4.3
-PKG_HASH:=6e727e2c7c079dec86575c5d0e7aac7ecd582aabe04b3b176d7ef50e653b60c0
+PKG_VERSION:=1.5.8
+PKG_HASH:=e7b9717074c511fef34aab6e22b16af55fb33307505a5785d25a82b542e596ae
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/xdp-project/xdp-tools/tar.gz/v$(PKG_VERSION)?
 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_VERSION))
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 
-PKG_BUILD_DEPENDS:=bpf-headers
-PKG_FLAGS:=nonshared
+PKG_BUILD_DEPENDS:=bpf-headers bpftool/host
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/bpf.mk
@@ -43,6 +42,21 @@ define Package/xdp-tools/Default
   DEPENDS:=+libxdp
 endef
 
+
+define Package/xdp-bench
+$(call Package/xdp-tools/Default)
+  TITLE:=xdp-bench - an XDP benchmarking tool
+  DEPENDS+=@KERNEL_DEBUG_INFO_BTF @KERNEL_KPROBES
+endef
+
+define Package/xdp-bench/description
+XDP-bench is a benchmarking utility for exercising the different operation modes
+of XDP. It is intended to be a simple program demonstrating the various operating
+modes; these include dropping packets, hairpin forwarding (using the XDP_TX return
+code), and redirection using the various in-kernel packet redirection facilities.
+endef
+
+
 define Package/xdp-filter
 $(call Package/xdp-tools/Default)
   TITLE:=xdp-filter - a simple XDP-powered packet filter
@@ -56,6 +70,24 @@ tens of millions of packets per second on a single CPU core.
 endef
 
 
+define Package/xdp-forward
+$(call Package/xdp-tools/Default)
+  TITLE:=xdp-forward - the XDP forwarding plane
+  DEPENDS+=@KERNEL_DEBUG_INFO_BTF
+endef
+
+define Package/xdp-forward/description
+xdp-forward is an XDP forwarding plane, which will accelerate
+packet forwarding using XDP. To use it, simply load it on
+the set of interfaces to accelerate forwarding between.
+
+The userspace component of xdp-forward will then configure and
+load XDP programs on those interfaces, and forward packets between
+them using XDP_REDIRECT, using the kernel routing table or
+netfilter flowtable to determine the destination for each packet.
+endef
+
+
 define Package/xdp-loader
 $(call Package/xdp-tools/Default)
   TITLE:=xdp-loader - an XDP program loader
@@ -67,6 +99,38 @@ multiple programs to the same interface. To achieve this it exposes the same
 load and unload semantics exposed by the libxdp library.
 endef
 
+
+define Package/xdp-monitor
+$(call Package/xdp-tools/Default)
+  TITLE:=xdp-monitor - a simple XDP tracepoint monitoring tool
+  DEPENDS+=@KERNEL_DEBUG_INFO_BTF @KERNEL_KPROBES
+endef
+
+define Package/xdp-monitor/description
+XDP-monitor is a tool that monitors various XDP related statistics and
+events using BPF tracepoints infrastructure, trying to be as low overhead
+as possible.
+endef
+
+
+define Package/xdp-trafficgen
+$(call Package/xdp-tools/Default)
+  TITLE:=xdp-trafficgen - an XDP-based packet generator
+  DEPENDS+=@KERNEL_DEBUG_INFO_BTF @KERNEL_KPROBES
+endef
+
+define Package/xdp-trafficgen/description
+XDP-trafficgen is a packet generator utilising the XDP kernel subsystem
+to generate packets transmit them through a network interface.
+Packets are dynamically generated and transmitted in the kernel,
+allowing for high performance (millions of packets per second per core).
+
+XDP-trafficgen supports generating UDP traffic with fixed or dynamic
+destination ports, and also has basic support for generating dummy
+TCP traffic on a single flow.
+endef
+
+
 define Package/xdpdump
 $(call Package/xdp-tools/Default)
   TITLE:=xdpdump - tool for capturing packets at the XDP layer
@@ -77,6 +141,7 @@ define Package/xdpdump/description
 xdpdump - a simple tcpdump like tool for capturing packets at the XDP layer
 endef
 
+
 TARGET_LDFLAGS += $(INTL_LDFLAGS)
 
 CONFIGURE_VARS += \
@@ -85,23 +150,17 @@ CONFIGURE_VARS += \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	CLANG="$(CLANG)" \
-	BPF_TARGET="$(BPF_ARCH)-linux-gnu" \
-	LLC="$(LLVM_LLC)" \
-	BPF_LDFLAGS="-march=$(BPF_TARGET) -mcpu=v3" \
-	BPFTOOL=""
+	BPFTOOL="$(STAGING_DIR_HOST)/usr/sbin/bpftool"
 
 ifneq ($(findstring s,$(OPENWRT_VERBOSE)),)
 	MAKE_FLAGS+=V=1
 endif
 
 MAKE_VARS += \
 	PREFIX=/usr \
-	RUNDIR=/tmp/run
-
-define Build/Configure
-	$(call Build/Configure/Default)
-	echo "BPF_CFLAGS += $(BPF_CFLAGS) -Wno-error -fno-stack-protector" >> $(PKG_BUILD_DIR)/config.mk
-endef
+	RUNDIR=/tmp/run \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)"
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/xdp
@@ -118,16 +177,36 @@ define Build/InstallDev
 		$(1)/usr/lib/pkgconfig/libxdp.pc
 endef
 
+define Package/xdp-bench/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xdp-bench $(1)/usr/sbin
+endef
+
 define Package/xdp-filter/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xdp-filter $(1)/usr/sbin
 endef
 
+define Package/xdp-forward/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xdp-forward $(1)/usr/sbin
+endef
+
 define Package/xdp-loader/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xdp-loader $(1)/usr/sbin
 endef
 
+define Package/xdp-monitor/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xdp-monitor $(1)/usr/sbin
+endef
+
+define Package/xdp-trafficgen/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xdp-trafficgen $(1)/usr/sbin
+endef
+
 define Package/xdpdump/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xdpdump $(1)/usr/sbin
@@ -140,6 +219,10 @@ define Package/libxdp/install
 endef
 
 $(eval $(call BuildPackage,libxdp))
+$(eval $(call BuildPackage,xdp-bench))
 $(eval $(call BuildPackage,xdp-filter))
+$(eval $(call BuildPackage,xdp-forward))
 $(eval $(call BuildPackage,xdp-loader))
+$(eval $(call BuildPackage,xdp-monitor))
+$(eval $(call BuildPackage,xdp-trafficgen))
 $(eval $(call BuildPackage,xdpdump))