From a04db04c6a25b3b1fc7909066f2970e68e2579d5 Mon Sep 17 00:00:00 2001 From: Quentin Monnet Date: Mon, 29 Jan 2024 09:52:51 +0000 Subject: [PATCH] sync: Pull latest bpftool changes from kernel Syncing latest bpftool commits from kernel repository. Baseline bpf-next commit: 98e20e5e13d2811898921f999288be7151a11954 Checkpoint bpf-next commit: c8632acf193beac64bbdaebef013368c480bf74f Baseline bpf commit: 7c5e046bdcb2513f9decb3765d8bf92d604279cf Checkpoint bpf commit: 0a5bd0ffe790511d802e7f40898429a89e2487df Andrii Nakryiko (4): bpf: Introduce BPF token object bpf: Add BPF token support to BPF_MAP_CREATE command bpf: Add BPF token support to BPF_BTF_LOAD command bpf: Add BPF token support to BPF_PROG_LOAD command Daniel Borkmann (1): bpf: Sync uapi bpf.h header for the tooling infra Jiri Olsa (5): bpf: Add cookie to perf_event bpf_link_info records bpf: Store cookies in kprobe_multi bpf_link_info data bpftool: Fix wrong free call in do_show_link bpftool: Display cookie for perf event link probes bpftool: Display cookie for kprobe multi link Kui-Feng Lee (2): bpf: pass btf object id in bpf_map_info. bpf: pass attached BTF to the bpf_struct_ops subsystem Tiezhu Yang (1): bpftool: Silence build warning about calloc() include/uapi/linux/bpf.h | 79 +++++++++++++++++++++++++++++++-- src/link.c | 94 +++++++++++++++++++++++++++++++++------- src/prog.c | 2 +- 3 files changed, 154 insertions(+), 21 deletions(-) Signed-off-by: Quentin Monnet --- BPF-CHECKPOINT-COMMIT | 2 +- CHECKPOINT-COMMIT | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BPF-CHECKPOINT-COMMIT b/BPF-CHECKPOINT-COMMIT index 3f9a42b0..f659d574 100644 --- a/BPF-CHECKPOINT-COMMIT +++ b/BPF-CHECKPOINT-COMMIT @@ -1 +1 @@ -7c5e046bdcb2513f9decb3765d8bf92d604279cf +0a5bd0ffe790511d802e7f40898429a89e2487df diff --git a/CHECKPOINT-COMMIT b/CHECKPOINT-COMMIT index dff64b72..91196c01 100644 --- a/CHECKPOINT-COMMIT +++ b/CHECKPOINT-COMMIT @@ -1 +1 @@ -98e20e5e13d2811898921f999288be7151a11954 +c8632acf193beac64bbdaebef013368c480bf74f