bpftool: mark orphaned programs during prog show
Subsystems (6)
PATCH v3 1/2 bpftool: mark orphaned programs during prog show
Commit ef01f4e25c17 ("bpf: restore the ebpf program ID for BPF_AUDIT_UNLOAD and PERF_BPF_EVENT_PROG_UNLOAD") stopped removing program's id from idr when the offloaded/bound netdev goes away. I was supposed to take a look and check in [0], but apparently I did not.
Martin points out it might be useful to keep it that way for observability sake, but we at least need to mark those programs as unusable.
Mark those programs as 'orphaned' and keep printing the list when we encounter ENODEV.
0: unspec tag 0000000000000000
xlated 0B not jited memlock 4096B orphaned
[0]: https://lore.kernel.org/all/CAKH8qBtyR20ZWAc11z1-6pGb3Hd47AQUTbE_cfoktG59TqaJ7Q@mail.gmail.com/
v3:
* use two spaces for " orphaned" (Quentin)
--- tools/bpf/bpftool/prog.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
tools/bpf/bpftool/prog.c +9 -5
@@ -442,7 +442,7 @@ static void print_prog_header_json(struct bpf_prog_info *info, int fd)jsonw_uint_field (json_wtr,"recursion_misses" , info->recursion_misses); } -static void print_prog_json (struct bpf_prog_info *info,int fd) +static void print_prog_json (struct bpf_prog_info *info,int fd,bool orphaned) {char *memlock;
@@ -461,6 +461,7 @@ static void print_prog_json(struct bpf_prog_info *info, int fd)jsonw_uint_field (json_wtr,"uid" , info->created_by_uid); } +jsonw_bool_field (json_wtr,"orphaned" , orphaned);jsonw_uint_field (json_wtr,"bytes_xlated" , info->xlated_prog_len);if (info->jited_prog_len) {
@@ -527,7 +528,7 @@ static void print_prog_header_plain(struct bpf_prog_info *info, int fd)printf ("\n" ); } -static void print_prog_plain (struct bpf_prog_info *info,int fd) +static void print_prog_plain (struct bpf_prog_info *info,int fd,bool orphaned) {char *memlock;
@@ -554,6 +555,9 @@ static void print_prog_plain(struct bpf_prog_info *info, int fd)printf (" memlock %sB" , memlock);free (memlock); +if (orphaned) +printf (" orphaned" ); +if (info->nr_map_ids)show_prog_maps (fd, info->nr_map_ids);
@@ -581,15 +585,15 @@ static int show_prog(int fd)int err; err =bpf_prog_get_info_by_fd (fd, &info, &len); -if (err) { +if (err && err != -ENODEV ) {p_err ("can't get prog info: %s" ,strerror (errno));return -1 ; }if (json_output) -print_prog_json (&info, fd); +print_prog_json (&info, fd, err == -ENODEV );else -print_prog_plain (&info, fd); +print_prog_plain (&info, fd, err == -ENODEV );return 0 ; }
Signature · 1 line
2.43.0.rc1.413.gea7ed67945-goog
PATCH v3 2/2 selftests/bpf: update test_offload to use new orphaned property
- filter orphaned programs by default
- when trying to query orphaned program, don't expect bpftool failure
--- tools/testing/selftests/bpf/test_offload.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
tools/testing/selftests/bpf/test_offload.py +6 -9
@@ -169,12 +169,14 @@ netns = [] # net namespaces to be removed return tool("bpftool", args, {"json":"-p"}, JSON=JSON, ns=ns, fail=fail, include_stderr=include_stderr) -def bpftool_prog_list(expected=None, ns=""): +def bpftool_prog_list(expected=None, ns="", exclude_orphaned=True): _, progs = bpftool("prog show", JSON=True, ns=ns, fail=True) # Remove the base progs for p in base_progs: if p in progs: progs.remove(p) + if exclude_orphaned: + progs = [ p for p in progs if not p['orphaned'] ] if expected is not None: if len(progs) != expected: fail(True, "%d BPF programs loaded, expected %d" %
@@ -612,11 +614,9 @@ def bpftool_prog_load(sample, file_name, maps=[], prog_type="xdp", dev=None, def check_dev_info_removed(prog_file=None, map_file=None): bpftool_prog_list(expected=0) + bpftool_prog_list(expected=1, exclude_orphaned=False) ret, err = bpftool("prog show pin %s" % (prog_file), fail=False) - fail(ret == 0, "Showing prog with removed device did not fail") - fail(err["error"].find("No such device") == -1, - "Showing prog with removed device expected ENODEV, error is %s" % - (err["error"])) + fail(ret != 0, "failed to show prog with removed device") bpftool_map_list(expected=0) ret, err = bpftool("map show pin %s" % (map_file), fail=False)
@@ -1395,10 +1395,7 @@ netns = [] start_test("Test multi-dev ASIC cross-dev destruction - orphaned...") ret, out = bpftool("prog show %s" % (progB), fail=False) - fail(ret == 0, "got information about orphaned program") - fail("error" not in out, "no error reported for get info on orphaned") - fail(out["error"] != "can't get prog info: No such device", - "wrong error for get info on orphaned") + fail(ret != 0, "couldn't get information about orphaned program") print("%s: OK" % (os.path.basename(__file__)))
Signature · 1 line
2.43.0.rc1.413.gea7ed67945-goog
Quoted 16 lines · Stanislav Fomichev
Commit
ef01f4e25c17("bpf: restore the ebpf program ID forBPF_AUDIT_UNLOADandPERF_BPF_EVENT_PROG_UNLOAD") stopped removing program's id from idr when the offloaded/bound netdev goes away. I was supposed to take a look and check in [0], but apparently I did not.Martin points out it might be useful to keep it that way for observability sake, but we at least need to mark those programs as unusable.
Mark those programs as 'orphaned' and keep printing the list when we encounter ENODEV.
0: unspec tag 0000000000000000
xlated 0B not jited memlock 4096B orphaned
Quoted 8 lines
[0]: https://lore.kernel.org/all/CAKH8qBtyR20ZWAc11z1-6pGb3Hd47AQUTbE_cfoktG59TqaJ7Q@mail.gmail.com/
v3:
* use two spaces for " orphaned" (Quentin)Fixes ef01f4e25c17 ("bpf: restore the ebpf program ID for BPF_AUDIT_UNLOAD and PERF_BPF_EVENT_PROG_UNLOAD")Signed-off-by Stanislav Fomichev <[email protected]>
Thanks!
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Quoted 10 lines · On Mon, 27 Nov 2023 10:20:56 -0800 you wrote:
Commit
ef01f4e25c17("bpf: restore the ebpf program ID forBPF_AUDIT_UNLOADandPERF_BPF_EVENT_PROG_UNLOAD") stopped removing program's id from idr when the offloaded/bound netdev goes away. I was supposed to take a look and check in [0], but apparently I did not.Martin points out it might be useful to keep it that way for observability sake, but we at least need to mark those programs as unusable.
[...]
Here is the summary with links:
- [bpf-next,v3,1/2] bpftool: mark orphaned programs during prog show
https://git.kernel.org/bpf/bpf-next/c/876843ce1e48 - [bpf-next,v3,2/2] selftests/bpf: update test_offload to use new orphaned property https://git.kernel.org/bpf/bpf-next/c/cf9791631027
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html