Skip to content

Commit

Permalink
sync: Pull latest bpftool changes from kernel
Browse files Browse the repository at this point in the history
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 <quentin@isovalent.com>
  • Loading branch information
qmonnet committed Jan 29, 2024
1 parent 1554ad5 commit a04db04
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion BPF-CHECKPOINT-COMMIT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7c5e046bdcb2513f9decb3765d8bf92d604279cf
0a5bd0ffe790511d802e7f40898429a89e2487df
2 changes: 1 addition & 1 deletion CHECKPOINT-COMMIT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
98e20e5e13d2811898921f999288be7151a11954
c8632acf193beac64bbdaebef013368c480bf74f

0 comments on commit a04db04

Please sign in to comment.