bpftool: Fix missing pids during link show
Yonghong Song
reviewerPATCH v2 1/1 bpftool: Fix missing pids during link show
Current 'bpftool link' command does not show pids, e.g.,
$ tools/build/bpftool/bpftool link
...
4: tracing prog 23
prog_type lsm attach_type lsm_mac
target_obj_id 1 target_btf_id 31320Hack the following change to enable normal libbpf debug output,
--- a/tools/bpf/bpftool/pids.c
+++ b/tools/bpf/bpftool/pids.c
@@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type)
/* we don't want output polluted with libbpf errors if bpf_iter is not
* supported
*/
- default_print = libbpf_set_print(libbpf_print_none);
+ /* default_print = libbpf_set_print(libbpf_print_none); */
err = pid_iter_bpf__load(skel); - libbpf_set_print(default_print);
+ /* libbpf_set_print(default_print); */
Rerun the above bpftool command:
$ tools/build/bpftool/bpftool link libbpf: prog 'iter': BPF program load failed: Permission denied libbpf: prog 'iter': -- BEGIN PROG LOAD LOG -- 0: R1=ctx() R10=fp0 ; struct task_struct *task = ctx->task; @ pid_iter.bpf.c:69 0: (79) r6 = *(u64 *)(r1 +8) ; R1=ctx() R6_w=ptr_or_null_task_struct(id=1) ; struct file *file = ctx->file; @ pid_iter.bpf.c:68 ... ; struct bpf_link *link = (struct bpf_link *) file->private_data; @ pid_iter.bpf.c:103 80: (79) r3 = *(u64 *)(r8 +432) ; R3_w=scalar() R8=ptr_file() ; if (link->type == bpf_core_enum_value(enum bpf_link_type___local, @ pid_iter.bpf.c:105 81: (61) r1 = *(u32 *)(r3 +12) R3 invalid mem access 'scalar' processed 39 insns (limit 1000000) max_states_per_insn 0 total_states 3 peak_states 3 mark_read 2 -- END PROG LOAD LOG -- libbpf: prog 'iter': failed to load: -13 ...
The 'file->private_data' returns a 'void' type and this caused subsequent 'link->type' (insn #81) failed in verification.
To fix the issue, restore the previous BPF_CORE_READ so old kernels can also work. With this patch, the 'bpftool link' runs successfully with 'pids'.
$ tools/build/bpftool/bpftool link
...
4: tracing prog 23
prog_type lsm attach_type lsm_mac
target_obj_id 1 target_btf_id 31320
pids systemd(1)--- tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/skeleton/pid_iter.bpf.c +1 -1
@@ -102,7 +102,7 @@ int iter(struct bpf_iter__task_file *ctx) BPF_LINK_TYPE_PERF_EVENT___local)) {struct bpf_link *link = (struct bpf_link *) file->private_data; - if (link->type == bpf_core_enum_value(enum bpf_link_type___local, + if (BPF_CORE_READ(link, type) == bpf_core_enum_value(enum bpf_link_type___local, BPF_LINK_TYPE_PERF_EVENT___local)) { e.has_bpf_cookie = true; e.bpf_cookie =get_bpf_cookie (link);
Signature · 1 line
2.43.0
2024-03-12 02:32 UTC+0000 ~ Yonghong Song <[email protected]>
Quoted 63 lines
Current 'bpftool link' command does not show pids, e.g.,
$ tools/build/bpftool/bpftool link ... 4: tracing prog 23 prog_type lsm attach_type lsm_mac target_obj_id 1 target_btf_id 31320Hack the following change to enable normal libbpf debug output,
---a/tools/bpf/bpftool/pids.c
+++b/tools/bpf/bpftool/pids.c
@@ -121,9 +121,9 @@ intbuild_obj_refs_table(struct hashmap **map, enum bpf_obj_type type)/* we don't want output polluted with libbpf errors if bpf_iter is not * supported */ - default_print = libbpf_set_print(libbpf_print_none); + /* default_print = libbpf_set_print(libbpf_print_none); */ err = pid_iter_bpf__load(skel);-
libbpf_set_print(default_print);
+ /*libbpf_set_print(default_print); */Rerun the above bpftool command:
$ tools/build/bpftool/bpftool link libbpf: prog 'iter': BPF program load failed: Permission denied libbpf: prog 'iter': -- BEGIN PROG LOAD LOG -- 0: R1=ctx() R10=fp0 ; struct task_struct *task = ctx->task; @ pid_iter.bpf.c:69 0: (79) r6 = *(u64 *)(r1 +8) ; R1=ctx() R6_w=ptr_or_null_task_struct(id=1) ; struct file *file = ctx->file; @ pid_iter.bpf.c:68 ... ; struct bpf_link *link = (struct bpf_link *) file->private_data; @ pid_iter.bpf.c:103 80: (79) r3 = *(u64 *)(r8 +432) ; R3_w=scalar() R8=ptr_file() ; if (link->type == bpf_core_enum_value(enum bpf_link_type___local, @ pid_iter.bpf.c:105 81: (61) r1 = *(u32 *)(r3 +12) R3 invalid mem access 'scalar' processed 39 insns (limit 1000000) max_states_per_insn 0 total_states 3 peak_states 3 mark_read 2 -- END PROG LOAD LOG -- libbpf: prog 'iter': failed to load: -13 ...The '
file->private_data' returns a 'void' type and this caused subsequent 'link->type' (insn #81) failed in verification.To fix the issue, restore the previous
BPF_CORE_READso old kernels can also work. With this patch, the 'bpftool link' runs successfully with 'pids'.$ tools/build/bpftool/bpftool link ... 4: tracing prog 23 prog_type lsm attach_type lsm_mac target_obj_id 1 target_btf_id 31320 pids systemd(1)Fixes 44ba7b30e84f ("bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c")Cc Quentin Monnet <[email protected]>Signed-off-by Yonghong Song <[email protected]>--- tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/bpf/bpftool/skeleton/pid_iter.bpf.c +0
-0
tools/bpf/bpftool/skeleton/pid_iter.bpf.c int iter(struct bpf_iter__task_file *ctx) · line 106
Quoted 6 lines
tools/bpf/bpftool/skeleton/pid_iter.bpf.c +1
-1@@ -102,7 +102,7 @@ int iter(struct bpf_iter__task_file *ctx) BPF_LINK_TYPE_PERF_EVENT___local)) {struct bpf_link *link = (struct bpf_link *) file->private_data; - if (link->type == bpf_core_enum_value(enum bpf_link_type___local, + if (BPF_CORE_READ(link, type) == bpf_core_enum_value(enum bpf_link_type___local, BPF_LINK_TYPE_PERF_EVENT___local)) {
Looks good, thank you! Could you please just realign the BPF_LINK_TYPE_PERF_EVENT___local argument on the next line properly?
With that:
Yonghong Song
reviewerQuoted 67 lines · Quentin Monnet
2024-03-12 02:32 UTC+0000 ~ Yonghong Song <[email protected]>
Quoted 66 lines
Current 'bpftool link' command does not show pids, e.g.,
$ tools/build/bpftool/bpftool link ... 4: tracing prog 23 prog_type lsm attach_type lsm_mac target_obj_id 1 target_btf_id 31320Hack the following change to enable normal libbpf debug output,
---a/tools/bpf/bpftool/pids.c
+++b/tools/bpf/bpftool/pids.c
@@ -121,9 +121,9 @@ intbuild_obj_refs_table(struct hashmap **map, enum bpf_obj_type type)/* we don't want output polluted with libbpf errors if bpf_iter is not * supported */ - default_print = libbpf_set_print(libbpf_print_none); + /* default_print = libbpf_set_print(libbpf_print_none); */ err = pid_iter_bpf__load(skel);-
libbpf_set_print(default_print);
+ /*libbpf_set_print(default_print); */Rerun the above bpftool command:
$ tools/build/bpftool/bpftool link libbpf: prog 'iter': BPF program load failed: Permission denied libbpf: prog 'iter': -- BEGIN PROG LOAD LOG -- 0: R1=ctx() R10=fp0 ; struct task_struct *task = ctx->task; @ pid_iter.bpf.c:69 0: (79) r6 = *(u64 *)(r1 +8) ; R1=ctx() R6_w=ptr_or_null_task_struct(id=1) ; struct file *file = ctx->file; @ pid_iter.bpf.c:68 ... ; struct bpf_link *link = (struct bpf_link *) file->private_data; @ pid_iter.bpf.c:103 80: (79) r3 = *(u64 *)(r8 +432) ; R3_w=scalar() R8=ptr_file() ; if (link->type == bpf_core_enum_value(enum bpf_link_type___local, @ pid_iter.bpf.c:105 81: (61) r1 = *(u32 *)(r3 +12) R3 invalid mem access 'scalar' processed 39 insns (limit 1000000) max_states_per_insn 0 total_states 3 peak_states 3 mark_read 2 -- END PROG LOAD LOG -- libbpf: prog 'iter': failed to load: -13 ...The '
file->private_data' returns a 'void' type and this caused subsequent 'link->type' (insn #81) failed in verification.To fix the issue, restore the previous
BPF_CORE_READso old kernels can also work. With this patch, the 'bpftool link' runs successfully with 'pids'.$ tools/build/bpftool/bpftool link ... 4: tracing prog 23 prog_type lsm attach_type lsm_mac target_obj_id 1 target_btf_id 31320 pids systemd(1)Fixes 44ba7b30e84f ("bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c")Cc Quentin Monnet <[email protected]>Signed-off-by Yonghong Song <[email protected]>--- tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/bpf/bpftool/skeleton/pid_iter.bpf.c +0
-0@@ -102,7 +102,7 @@ int iter(struct bpf_iter__task_file *ctx) BPF_LINK_TYPE_PERF_EVENT___local)) {struct bpf_link *link = (struct bpf_link *) file->private_data;
Quoted 5 lines
tools/bpf/bpftool/skeleton/pid_iter.bpf.c int iter(struct bpf_iter__task_file *ctx) · line 106
Quoted 3 lines
tools/bpf/bpftool/skeleton/pid_iter.bpf.c +1
-1- if (link->type == bpf_core_enum_value(enum bpf_link_type___local, + if (BPF_CORE_READ(link, type) == bpf_core_enum_value(enum bpf_link_type___local, BPF_LINK_TYPE_PERF_EVENT___local)) {Looks good, thank you! Could you please just realign the
BPF_LINK_TYPE_PERF_EVENT___localargument on the next line properly?
Will do. thanks.
Quoted 5 lines
With that:
Tested-by Quentin Monnet <[email protected]>Reviewed-by Quentin Monnet <[email protected]>
Quoted 70 lines · Yonghong Song
Quoted 67 lines · Quentin Monnet
2024-03-12 02:32 UTC+0000 ~ Yonghong Song <[email protected]>
Quoted 66 lines
Current 'bpftool link' command does not show pids, e.g.,
$ tools/build/bpftool/bpftool link ... 4: tracing prog 23 prog_type lsm attach_type lsm_mac target_obj_id 1 target_btf_id 31320Hack the following change to enable normal libbpf debug output,
---a/tools/bpf/bpftool/pids.c
+++b/tools/bpf/bpftool/pids.c
@@ -121,9 +121,9 @@ intbuild_obj_refs_table(struct hashmap **map, enum bpf_obj_type type)/* we don't want output polluted with libbpf errors if bpf_iter is not * supported */ - default_print = libbpf_set_print(libbpf_print_none); + /* default_print = libbpf_set_print(libbpf_print_none); */ err = pid_iter_bpf__load(skel);-
libbpf_set_print(default_print);
+ /*libbpf_set_print(default_print); */Rerun the above bpftool command:
$ tools/build/bpftool/bpftool link libbpf: prog 'iter': BPF program load failed: Permission denied libbpf: prog 'iter': -- BEGIN PROG LOAD LOG -- 0: R1=ctx() R10=fp0 ; struct task_struct *task = ctx->task; @ pid_iter.bpf.c:69 0: (79) r6 = *(u64 *)(r1 +8) ; R1=ctx() R6_w=ptr_or_null_task_struct(id=1) ; struct file *file = ctx->file; @ pid_iter.bpf.c:68 ... ; struct bpf_link *link = (struct bpf_link *) file->private_data; @ pid_iter.bpf.c:103 80: (79) r3 = *(u64 *)(r8 +432) ; R3_w=scalar() R8=ptr_file() ; if (link->type == bpf_core_enum_value(enum bpf_link_type___local, @ pid_iter.bpf.c:105 81: (61) r1 = *(u32 *)(r3 +12) R3 invalid mem access 'scalar' processed 39 insns (limit 1000000) max_states_per_insn 0 total_states 3 peak_states 3 mark_read 2 -- END PROG LOAD LOG -- libbpf: prog 'iter': failed to load: -13 ...The '
file->private_data' returns a 'void' type and this caused subsequent 'link->type' (insn #81) failed in verification.To fix the issue, restore the previous
BPF_CORE_READso old kernels can also work. With this patch, the 'bpftool link' runs successfully with 'pids'.$ tools/build/bpftool/bpftool link ... 4: tracing prog 23 prog_type lsm attach_type lsm_mac target_obj_id 1 target_btf_id 31320 pids systemd(1)Fixes 44ba7b30e84f ("bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c")Cc Quentin Monnet <[email protected]>Signed-off-by Yonghong Song <[email protected]>--- tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/bpf/bpftool/skeleton/pid_iter.bpf.c +0
-0@@ -102,7 +102,7 @@ int iter(struct bpf_iter__task_file *ctx) BPF_LINK_TYPE_PERF_EVENT___local)) {struct bpf_link *link = (struct bpf_link *) file->private_data;
Quoted 8 lines
Quoted 5 lines
tools/bpf/bpftool/skeleton/pid_iter.bpf.c int iter(struct bpf_iter__task_file *ctx) · line 106
Quoted 3 lines
tools/bpf/bpftool/skeleton/pid_iter.bpf.c +1
-1- if (link->type == bpf_core_enum_value(enum bpf_link_type___local, + if (BPF_CORE_READ(link, type) == bpf_core_enum_value(enum bpf_link_type___local, BPF_LINK_TYPE_PERF_EVENT___local)) {Looks good, thank you! Could you please just realign the
BPF_LINK_TYPE_PERF_EVENT___localargument on the next line properly?Will do. thanks.
We can fix it up while applying, so don't send another revision. We are waiting for trees to converge, so applying patches will be delayed a bit.
Quoted 5 lines
Quoted 5 lines
With that:
Tested-by Quentin Monnet <[email protected]>Reviewed-by Quentin Monnet <[email protected]>
Yonghong Song
reviewerQuoted 75 lines · Andrii Nakryiko
Quoted 74 lines · Yonghong Song
Quoted 72 lines · Quentin Monnet
2024-03-12 02:32 UTC+0000 ~ Yonghong Song <[email protected]>
Quoted 63 lines
Current 'bpftool link' command does not show pids, e.g.,
$ tools/build/bpftool/bpftool link ... 4: tracing prog 23 prog_type lsm attach_type lsm_mac target_obj_id 1 target_btf_id 31320Hack the following change to enable normal libbpf debug output,
--- a/tools/bpf/bpftool/pids.c +++ b/tools/bpf/bpftool/pids.c @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) /* we don't want output polluted with libbpf errors if bpf_iter is not * supported */ - default_print = libbpf_set_print(libbpf_print_none); + /* default_print = libbpf_set_print(libbpf_print_none); */ err = pid_iter_bpf__load(skel); - libbpf_set_print(default_print); + /* libbpf_set_print(default_print); */Rerun the above bpftool command:
$ tools/build/bpftool/bpftool link libbpf: prog 'iter': BPF program load failed: Permission denied libbpf: prog 'iter': -- BEGIN PROG LOAD LOG -- 0: R1=ctx() R10=fp0 ; struct task_struct *task = ctx->task; @ pid_iter.bpf.c:69 0: (79) r6 = *(u64 *)(r1 +8) ; R1=ctx() R6_w=ptr_or_null_task_struct(id=1) ; struct file *file = ctx->file; @ pid_iter.bpf.c:68 ... ; struct bpf_link *link = (struct bpf_link *) file->private_data; @ pid_iter.bpf.c:103 80: (79) r3 = *(u64 *)(r8 +432) ; R3_w=scalar() R8=ptr_file() ; if (link->type == bpf_core_enum_value(enum bpf_link_type___local, @ pid_iter.bpf.c:105 81: (61) r1 = *(u32 *)(r3 +12) R3 invalid mem access 'scalar' processed 39 insns (limit 1000000) max_states_per_insn 0 total_states 3 peak_states 3 mark_read 2 -- END PROG LOAD LOG -- libbpf: prog 'iter': failed to load: -13 ...The '
file->private_data' returns a 'void' type and this caused subsequent 'link->type' (insn #81) failed in verification.To fix the issue, restore the previous
BPF_CORE_READso old kernels can also work. With this patch, the 'bpftool link' runs successfully with 'pids'.$ tools/build/bpftool/bpftool link ... 4: tracing prog 23 prog_type lsm attach_type lsm_mac target_obj_id 1 target_btf_id 31320 pids systemd(1)Fixes 44ba7b30e84f ("bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c")Cc Quentin Monnet <[email protected]>Signed-off-by Yonghong Song <[email protected]>--- tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/bpf/bpftool/skeleton/pid_iter.bpf.c +0
-0tools/bpf/bpftool/skeleton/pid_iter.bpf.c int iter(struct bpf_iter__task_file *ctx) · line 106
Quoted 6 lines
tools/bpf/bpftool/skeleton/pid_iter.bpf.c +1
-1@@ -102,7 +102,7 @@ int iter(struct bpf_iter__task_file *ctx) BPF_LINK_TYPE_PERF_EVENT___local)) {struct bpf_link *link = (struct bpf_link *) file->private_data; - if (link->type == bpf_core_enum_value(enum bpf_link_type___local, + if (BPF_CORE_READ(link, type) == bpf_core_enum_value(enum bpf_link_type___local, BPF_LINK_TYPE_PERF_EVENT___local)) {Looks good, thank you! Could you please just realign the
BPF_LINK_TYPE_PERF_EVENT___localargument on the next line properly?
Quoted 5 lines
Quoted 2 lines
Will do. thanks.
We can fix it up while applying, so don't send another revision. We are waiting for trees to converge, so applying patches will be delayed a bit.
Thanks!
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
With that:
Tested-by Quentin Monnet <[email protected]>Reviewed-by Quentin Monnet <[email protected]>
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 8 lines · On Mon, 11 Mar 2024 19:32:49 -0700 you wrote:
Current 'bpftool link' command does not show pids, e.g.,
$ tools/build/bpftool/bpftool link ... 4: tracing prog 23 prog_type lsm attach_type lsm_mac target_obj_id 1 target_btf_id 31320[...]
Here is the summary with links:
- [bpf-next,v2] bpftool: Fix missing pids during link show
https://git.kernel.org/bpf/bpf-next/c/fe879bb42f8a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html