Просмотр исходного кода

xdp-tools: add patch to fix stddef.h build issue

Add a patch that avoids including <stddef.h> in BPF headers, fixing
build failures on OpenWrt toolchains where the header is unavailable:

  In file included from xdpfilt_dny_udp.c:10:
  In file included from ./xdpfilt_prog.h:24:
  ../lib/../headers/xdp/parsing_helpers.h:18:10: fatal error: 'stddef.h' file not found
    18 | #include <stddef.h>
        |          ^~~~~~~~~~
  1 error generated.
  make[5]: *** [../lib/common.mk:111: xdpfilt_dny_udp.o] Error 1
  make[4]: *** [Makefile:40: xdp-filter] Error 2

Link: https://github.com/openwrt/openwrt/pull/21972
Signed-off-by: Nick Hainke <[email protected]>
Nick Hainke 2 дней назад
Родитель
Сommit
c752525511

+ 64 - 0
package/network/utils/xdp-tools/patches/0001-xdp-avoid-stddef.h-and-size_t-in-BPF-headers.patch

@@ -0,0 +1,64 @@
+From a90c30902e6dc4d220738248dd7785e51bb19904 Mon Sep 17 00:00:00 2001
+From: Nick Hainke <[email protected]>
+Date: Tue, 10 Feb 2026 19:59:42 +0100
+Subject: [PATCH] xdp: avoid stddef.h and size_t in BPF headers
+
+Remove <stddef.h> includes that break BPF builds on some toolchains.
+Replace size_t in xdp_sample_shared.h with unsigned long long to keep
+structs usable without stddef definitions.
+
+Signed-off-by: Nick Hainke <[email protected]>
+---
+ headers/xdp/parsing_helpers.h       |  1 -
+ headers/xdp/xdp_sample_common.bpf.h |  1 -
+ headers/xdp/xdp_sample_shared.h     | 16 +++++++---------
+ 3 files changed, 7 insertions(+), 11 deletions(-)
+
+--- a/headers/xdp/parsing_helpers.h
++++ b/headers/xdp/parsing_helpers.h
+@@ -15,7 +15,6 @@
+ #ifndef __PARSING_HELPERS_H
+ #define __PARSING_HELPERS_H
+ 
+-#include <stddef.h>
+ #include <linux/if_ether.h>
+ #include <linux/if_packet.h>
+ #include <linux/ip.h>
+--- a/headers/xdp/xdp_sample_common.bpf.h
++++ b/headers/xdp/xdp_sample_common.bpf.h
+@@ -6,7 +6,6 @@
+ #include "xdp_sample.bpf.h"
+ 
+ #include <bpf/vmlinux.h>
+-#include <stddef.h>
+ #include <stdbool.h>
+ #include <bpf/bpf_tracing.h>
+ #include <bpf/bpf_core_read.h>
+--- a/headers/xdp/xdp_sample_shared.h
++++ b/headers/xdp/xdp_sample_shared.h
+@@ -2,18 +2,16 @@
+ #ifndef _XDP_SAMPLE_SHARED_H
+ #define _XDP_SAMPLE_SHARED_H
+ 
+-#include <stddef.h>
+-
+ struct datarec {
+-	size_t processed;
+-	size_t dropped;
+-	size_t issue;
++	unsigned long long processed;
++	unsigned long long dropped;
++	unsigned long long issue;
+ 	union {
+-		size_t xdp_pass;
+-		size_t info;
++		unsigned long long xdp_pass;
++		unsigned long long info;
+ 	};
+-	size_t xdp_drop;
+-	size_t xdp_redirect;
++	unsigned long long xdp_drop;
++	unsigned long long xdp_redirect;
+ } __attribute__((aligned(64)));
+ 
+ #endif