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:   750011e239a50873251c16207b0fe78eabf8577e
Checkpoint bpf-next commit: 98e20e5e13d2811898921f999288be7151a11954
Baseline bpf commit:        bc4fbf022c68967cb49b2b820b465cf90de974b8
Checkpoint bpf commit:      7c5e046bdcb2513f9decb3765d8bf92d604279cf

Andrii Nakryiko (6):
  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
  bpf: rename MAX_BPF_LINK_TYPE into __MAX_BPF_LINK_TYPE for consistency
  Revert BPF token-related functionality

Jamal Hadi Salim (5):
  net/sched: Remove uapi support for rsvp classifier
  net/sched: Remove uapi support for tcindex classifier
  net/sched: Remove uapi support for dsmark qdisc
  net/sched: Remove uapi support for ATM qdisc
  net/sched: Remove uapi support for CBQ qdisc

Jiri Olsa (2):
  bpf: Add link_info support for uprobe multi link
  bpftool: Add support to display uprobe_multi links

Quentin Deslandes (1):
  bpfilter: remove bpfilter

Stanislav Fomichev (1):
  bpftool: mark orphaned programs during prog show

 include/uapi/linux/bpf.h       |  14 ++++-
 include/uapi/linux/pkt_cls.h   |  47 --------------
 include/uapi/linux/pkt_sched.h | 109 ---------------------------------
 src/feature.c                  |   4 --
 src/link.c                     | 105 ++++++++++++++++++++++++++++++-
 src/prog.c                     |  14 +++--
 6 files changed, 125 insertions(+), 168 deletions(-)

Signed-off-by: Quentin Monnet <[email protected]>
  • Loading branch information
qmonnet committed Jan 5, 2024
1 parent e725e62 commit b0e69ac
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 @@
bc4fbf022c68967cb49b2b820b465cf90de974b8
7c5e046bdcb2513f9decb3765d8bf92d604279cf
2 changes: 1 addition & 1 deletion CHECKPOINT-COMMIT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
750011e239a50873251c16207b0fe78eabf8577e
98e20e5e13d2811898921f999288be7151a11954

0 comments on commit b0e69ac

Please sign in to comment.