From: Amery Hung <ameryhung@gmail.com>
Date: Thu, 25 Sep 2025 17:00:12 +0000 (-0700)
Subject: bpf: Emit struct bpf_xdp_sock type in vmlinux BTF
X-Git-Tag: v6.18-rc1~175^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc8712f2b5250825968e6b0c3d2709a4b9d5d570;p=thirdparty%2Flinux.git

bpf: Emit struct bpf_xdp_sock type in vmlinux BTF

Similar to other BPF UAPI struct, force emit BTF of struct bpf_xdp_sock
so that it is defined in vmlinux.h.

In a later patch, a selftest will use vmlinux.h to get the definition of
struct bpf_xdp_sock instead of bpf.h.

Signed-off-by: Amery Hung <ameryhung@gmail.com>
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Link: https://patch.msgid.link/20250925170013.1752561-1-ameryhung@gmail.com
---

diff --git a/net/core/filter.c b/net/core/filter.c
index b20d59bb19b8c..2af0a5f1d7489 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -7439,6 +7439,8 @@ u32 bpf_xdp_sock_convert_ctx_access(enum bpf_access_type type,
 				      offsetof(struct xdp_sock, FIELD)); \
 	} while (0)
 
+	BTF_TYPE_EMIT(struct bpf_xdp_sock);
+
 	switch (si->off) {
 	case offsetof(struct bpf_xdp_sock, queue_id):
 		BPF_XDP_SOCK_GET(queue_id);