Merge branch 'tools-bpf-bpftool-fix-vmlinux-btf-state-cleanup'

Browse source

Yichong Chen says:

====================
tools/bpf/bpftool: Fix vmlinux BTF state cleanup

This series fixes stale vmlinux BTF state in bpftool batch mode.

Patch 1 resets the map command cached vmlinux BTF pointer when the
command releases it, and avoids freeing the cached object from the
map lookup path.

Patch 2 resets the struct_ops command cached vmlinux BTF pointer and
dependent cached map info state after each struct_ops command.

Changes in v4:
- Add Emil's Reviewed-by tag to patch 1.
- Inline the struct_ops cleanup instead of adding a helper.

Changes in v3:
- Add Fixes tags to both patches.

Changes in v2:
- Fold the map lookup path fix into patch 1.
- Update patch 1 subject and commit message to cover map commands
  rather than only map dump.
====================

Link: https://patch.msgid.link/12A35C14DA710D2E+20260624025055.1574875-1-chenyichong@uniontech.com
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>

...

This commit is contained in:

Andrii Nakryiko 2026-07-01 11:17:43 -07:00

parent a954c9e316 f7f540e197

commit f29997a6d9

2 changed files with 13 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

tools/bpf/bpftool/map.c

View file

4

tools/bpf/bpftool/struct_ops.c

View file