deepin: bpf: Fix kabi in bpf_map_owner by using KABI_EXTEND

opsiff · opsiff · commit 708eddeba1c5 · 2025-12-10T18:23:55.000+08:00
deepin inclusion category: kabi When DEEPIN_KABI_RESERVE=y, struct bpf_map is kabi whitelist, commit bcb8170 ("bpf: Enforce expected_attach_type for tailcall compatibility") upstream introduce expected_attach_type in bpf_map_owner to enforce expected_attach_type for tailcall compatibility and backport to v6.6.112. As expected_attach_type use internal and bpf_map_owner used by pointer. We can use DEEPIN_KABI_EXTEND to fix it. Fixes: bcb8170 ("bpf: Enforce expected_attach_type for tailcall compatibility") Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
@@ -276,7 +276,7 @@ struct bpf_map_owner {
 	bool xdp_has_frags;
 	u64 storage_cookie[MAX_BPF_CGROUP_STORAGE_TYPE];
 	const struct btf_type *attach_func_proto;
-	enum bpf_attach_type expected_attach_type;
+	DEEPIN_KABI_EXTEND(enum bpf_attach_type expected_attach_type)
 };
 
 struct bpf_map {
