MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-07 09:55:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "bpf: Add cookie to perf_event bpf_link_info records"

Browse Source 
This reverts commit cfd63c3a45 which is
commit d5c16492c6 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I169607e7cf9c925abb4a29e7973e4068ac224f8e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2024-12-02 10:34:00 +00:00
parent 8780507bc3
commit f49214e442
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/uapi/linux/bpf.h
View File

@ -6566,7 +6566,6 @@ struct bpf_link_info {
__aligned_u64 file_name; /* in/out */ __aligned_u64 file_name; /* in/out */
__u32 name_len; __u32 name_len;
__u32 offset; /* offset from file_name */ __u32 offset; /* offset from file_name */
__u64 cookie;
} uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */ } uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */
struct { struct {
__aligned_u64 func_name; /* in/out */ __aligned_u64 func_name; /* in/out */
@ -6574,19 +6573,14 @@ struct bpf_link_info {
__u32 offset; /* offset from func_name */ __u32 offset; /* offset from func_name */
__u64 addr; __u64 addr;
__u64 missed; __u64 missed;
__u64 cookie;
} kprobe; /* BPF_PERF_EVENT_KPROBE, BPF_PERF_EVENT_KRETPROBE */ } kprobe; /* BPF_PERF_EVENT_KPROBE, BPF_PERF_EVENT_KRETPROBE */
struct { struct {
__aligned_u64 tp_name; /* in/out */ __aligned_u64 tp_name; /* in/out */
__u32 name_len; __u32 name_len;
__u32 :32;
__u64 cookie;
} tracepoint; /* BPF_PERF_EVENT_TRACEPOINT */ } tracepoint; /* BPF_PERF_EVENT_TRACEPOINT */
struct { struct {
__u64 config; __u64 config;
__u32 type; __u32 type;
__u32 :32;
__u64 cookie;
} event; /* BPF_PERF_EVENT_EVENT */ } event; /* BPF_PERF_EVENT_EVENT */
}; };
} perf_event; } perf_event;

4
kernel/bpf/syscall.c
View File

@ -3498,7 +3498,6 @@ static int bpf_perf_link_fill_kprobe(const struct perf_event *event,
if (!kallsyms_show_value(current_cred())) if (!kallsyms_show_value(current_cred()))
addr = 0; addr = 0;
info->perf_event.kprobe.addr = addr; info->perf_event.kprobe.addr = addr;
info->perf_event.kprobe.cookie = event->bpf_cookie;
return 0; return 0;
} }
#endif #endif
@ -3524,7 +3523,6 @@ static int bpf_perf_link_fill_uprobe(const struct perf_event *event,
else else
info->perf_event.type = BPF_PERF_EVENT_UPROBE; info->perf_event.type = BPF_PERF_EVENT_UPROBE;
info->perf_event.uprobe.offset = offset; info->perf_event.uprobe.offset = offset;
info->perf_event.uprobe.cookie = event->bpf_cookie;
return 0; return 0;
} }
#endif #endif
@ -3552,7 +3550,6 @@ static int bpf_perf_link_fill_tracepoint(const struct perf_event *event,
uname = u64_to_user_ptr(info->perf_event.tracepoint.tp_name); uname = u64_to_user_ptr(info->perf_event.tracepoint.tp_name);
ulen = info->perf_event.tracepoint.name_len; ulen = info->perf_event.tracepoint.name_len;
info->perf_event.type = BPF_PERF_EVENT_TRACEPOINT; info->perf_event.type = BPF_PERF_EVENT_TRACEPOINT;
info->perf_event.tracepoint.cookie = event->bpf_cookie;
return bpf_perf_link_fill_common(event, uname, ulen, NULL, NULL, NULL, NULL); return bpf_perf_link_fill_common(event, uname, ulen, NULL, NULL, NULL, NULL);
} }
@ -3561,7 +3558,6 @@ static int bpf_perf_link_fill_perf_event(const struct perf_event *event,
{ {
info->perf_event.event.type = event->attr.type; info->perf_event.event.type = event->attr.type;
info->perf_event.event.config = event->attr.config; info->perf_event.event.config = event->attr.config;
info->perf_event.event.cookie = event->bpf_cookie;
info->perf_event.type = BPF_PERF_EVENT_EVENT; info->perf_event.type = BPF_PERF_EVENT_EVENT;
return 0; return 0;
} }

6
tools/include/uapi/linux/bpf.h
View File

@ -6559,7 +6559,6 @@ struct bpf_link_info {
__aligned_u64 file_name; /* in/out */ __aligned_u64 file_name; /* in/out */
__u32 name_len; __u32 name_len;
__u32 offset; /* offset from file_name */ __u32 offset; /* offset from file_name */
__u64 cookie;
} uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */ } uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */
struct { struct {
__aligned_u64 func_name; /* in/out */ __aligned_u64 func_name; /* in/out */
@ -6567,19 +6566,14 @@ struct bpf_link_info {
__u32 offset; /* offset from func_name */ __u32 offset; /* offset from func_name */
__u64 addr; __u64 addr;
__u64 missed; __u64 missed;
__u64 cookie;
} kprobe; /* BPF_PERF_EVENT_KPROBE, BPF_PERF_EVENT_KRETPROBE */ } kprobe; /* BPF_PERF_EVENT_KPROBE, BPF_PERF_EVENT_KRETPROBE */
struct { struct {
__aligned_u64 tp_name; /* in/out */ __aligned_u64 tp_name; /* in/out */
__u32 name_len; __u32 name_len;
__u32 :32;
__u64 cookie;
} tracepoint; /* BPF_PERF_EVENT_TRACEPOINT */ } tracepoint; /* BPF_PERF_EVENT_TRACEPOINT */
struct { struct {
__u64 config; __u64 config;
__u32 type; __u32 type;
__u32 :32;
__u64 cookie;
} event; /* BPF_PERF_EVENT_EVENT */ } event; /* BPF_PERF_EVENT_EVENT */
}; };
} perf_event; } perf_event;