hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/IDC9YK -------------------------------- bpf: Fix kabi for __u32 :32 and __u64 cookie in struct bpf_link_info. Fixes: f8073bb041a0 ("bpf: Add cookie to perf_event bpf_link_info records") Signed-off-by: Zicheng Qu <quzicheng@huawei.com> --- include/uapi/linux/bpf.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 9825ad32b8b1..96f8e4e683ff 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -6565,7 +6565,9 @@ struct bpf_link_info { __aligned_u64 file_name; /* in/out */ __u32 name_len; __u32 offset; /* offset from file_name */ +#if !defined(__GENKSYMS__) __u64 cookie; +#endif } uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */ struct { __aligned_u64 func_name; /* in/out */ @@ -6574,20 +6576,24 @@ struct bpf_link_info { __u64 addr; #if !defined(__GENKSYMS__) __u64 missed; -#endif __u64 cookie; +#endif } kprobe; /* BPF_PERF_EVENT_KPROBE, BPF_PERF_EVENT_KRETPROBE */ struct { __aligned_u64 tp_name; /* in/out */ __u32 name_len; +#if !defined(__GENKSYMS__) __u32 :32; __u64 cookie; +#endif } tracepoint; /* BPF_PERF_EVENT_TRACEPOINT */ struct { __u64 config; __u32 type; +#if !defined(__GENKSYMS__) __u32 :32; __u64 cookie; +#endif } event; /* BPF_PERF_EVENT_EVENT */ struct { __u64:64; -- 2.34.1