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:   4ca13d1002f37c10038ff4ed3cfdc70dbe049d60
Checkpoint bpf-next commit: 2ddade322925641ee2a75f13665c51f2e74d7791
Baseline bpf commit:        a6f6a95f25803500079513780d11a911ce551d76
Checkpoint bpf commit:      71b547f561247897a0a14f3082730156c0533fed

Andrii Nakryiko (1):
  bpf: Add log_true_size output field to return necessary log buffer
    size

Dave Marchevsky (1):
  bpf: Introduce opaque bpf_refcount struct and add btf_record plumbing

Herbert Xu (1):
  macvlan: Add netlink attribute for broadcast cutoff

Quentin Monnet (7):
  bpftool: Fix documentation about line info display for prog dumps
  bpftool: Fix bug for long instructions in program CFG dumps
  bpftool: Support inline annotations when dumping the CFG of a program
  bpftool: Return an error on prog dumps if both CFG and JSON are
    required
  bpftool: Support "opcodes", "linum", "visual" simultaneously
  bpftool: Support printing opcodes and source file references in CFG
  bpftool: Clean up _bpftool_once_attr() calls in bash completion

Wei Yongjun (1):
  bpftool: Set program type only if it differs from the desired one

 bash-completion/bpftool      | 42 +++++++++---------
 docs/bpftool-prog.rst        | 18 ++++----
 include/uapi/linux/bpf.h     | 16 ++++++-
 include/uapi/linux/if_link.h |  1 +
 src/btf_dumper.c             | 83 ++++++++++++++++++++++++++++++++++++
 src/cfg.c                    | 29 +++++++------
 src/cfg.h                    |  5 ++-
 src/main.h                   |  2 +
 src/prog.c                   | 81 ++++++++++++++++++-----------------
 src/xlated_dumper.c          | 54 +++++++++++++++++++++--
 src/xlated_dumper.h          |  3 +-
 11 files changed, 244 insertions(+), 90 deletions(-)

Signed-off-by: Quentin Monnet <[email protected]>
  • Loading branch information
@qmonnet
qmonnet committed Apr 25, 2023
1 parent cf2eed7 commit 19ff056
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
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a6f6a95f25803500079513780d11a911ce551d76
71b547f561247897a0a14f3082730156c0533fed
2 changes: 1 addition & 1 deletion CHECKPOINT-COMMIT
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4ca13d1002f37c10038ff4ed3cfdc70dbe049d60
2ddade322925641ee2a75f13665c51f2e74d7791

0 comments on commit 19ff056

Please sign in to comment.