BPF List
 help / color / mirror / Atom feed
* [PATCH bpf-next v2] bpftool: Fix missing pids during link show
@ 2024-03-12  2:32 Yonghong Song
  2024-03-12 14:01 ` Quentin Monnet
  2024-03-14 20:40 ` patchwork-bot+netdevbpf
  0 siblings, 2 replies; 6+ messages in thread
From: Yonghong Song @ 2024-03-12  2:32 UTC (permalink / raw)
  To: bpf
  Cc: Alexei Starovoitov, Andrii Nakryiko, Daniel Borkmann, kernel-team,
	Martin KaFai Lau, Quentin Monnet

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

Hack 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)

Fixes: 44ba7b30e84f ("bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c")
Cc: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
---
 tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bpf/bpftool/skeleton/pid_iter.bpf.c b/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
index 26004f0c5a6a..1eb756f8d02e 100644
--- a/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
+++ b/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
@@ -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);
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH bpf-next v2] bpftool: Fix missing pids during link show
  2024-03-12  2:32 [PATCH bpf-next v2] bpftool: Fix missing pids during link show Yonghong Song
@ 2024-03-12 14:01 ` Quentin Monnet
  2024-03-12 15:24   ` Yonghong Song
  2024-03-14 20:40 ` patchwork-bot+netdevbpf
  1 sibling, 1 reply; 6+ messages in thread
From: Quentin Monnet @ 2024-03-12 14:01 UTC (permalink / raw)
  To: Yonghong Song, bpf
  Cc: Alexei Starovoitov, Andrii Nakryiko, Daniel Borkmann, kernel-team,
	Martin KaFai Lau

2024-03-12 02:32 UTC+0000 ~ Yonghong Song <yonghong.song@linux.dev>
> 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
> 
> Hack 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)
> 
> Fixes: 44ba7b30e84f ("bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c")
> Cc: Quentin Monnet <quentin@isovalent.com>
> Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
> ---
>  tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/bpf/bpftool/skeleton/pid_iter.bpf.c b/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
> index 26004f0c5a6a..1eb756f8d02e 100644
> --- a/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
> +++ b/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
> @@ -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:

Tested-by: Quentin Monnet <quentin@isovalent.com>
Reviewed-by: Quentin Monnet <quentin@isovalent.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH bpf-next v2] bpftool: Fix missing pids during link show
  2024-03-12 14:01 ` Quentin Monnet
@ 2024-03-12 15:24   ` Yonghong Song
  2024-03-12 23:11     ` Andrii Nakryiko
  0 siblings, 1 reply; 6+ messages in thread
From: Yonghong Song @ 2024-03-12 15:24 UTC (permalink / raw)
  To: Quentin Monnet, bpf
  Cc: Alexei Starovoitov, Andrii Nakryiko, Daniel Borkmann, kernel-team,
	Martin KaFai Lau


On 3/12/24 7:01 AM, Quentin Monnet wrote:
> 2024-03-12 02:32 UTC+0000 ~ Yonghong Song <yonghong.song@linux.dev>
>> 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
>>
>> Hack 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)
>>
>> Fixes: 44ba7b30e84f ("bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c")
>> Cc: Quentin Monnet <quentin@isovalent.com>
>> Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
>> ---
>>   tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/bpf/bpftool/skeleton/pid_iter.bpf.c b/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
>> index 26004f0c5a6a..1eb756f8d02e 100644
>> --- a/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
>> +++ b/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
>> @@ -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?

Will do. thanks.

>
> With that:
>
> Tested-by: Quentin Monnet <quentin@isovalent.com>
> Reviewed-by: Quentin Monnet <quentin@isovalent.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH bpf-next v2] bpftool: Fix missing pids during link show
  2024-03-12 15:24   ` Yonghong Song
@ 2024-03-12 23:11     ` Andrii Nakryiko
  2024-03-13  5:01       ` Yonghong Song
  0 siblings, 1 reply; 6+ messages in thread
From: Andrii Nakryiko @ 2024-03-12 23:11 UTC (permalink / raw)
  To: Yonghong Song
  Cc: Quentin Monnet, bpf, Alexei Starovoitov, Andrii Nakryiko,
	Daniel Borkmann, kernel-team, Martin KaFai Lau

On Tue, Mar 12, 2024 at 8:24 AM Yonghong Song <yonghong.song@linux.dev> wrote:
>
>
> On 3/12/24 7:01 AM, Quentin Monnet wrote:
> > 2024-03-12 02:32 UTC+0000 ~ Yonghong Song <yonghong.song@linux.dev>
> >> 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
> >>
> >> Hack 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)
> >>
> >> Fixes: 44ba7b30e84f ("bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c")
> >> Cc: Quentin Monnet <quentin@isovalent.com>
> >> Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
> >> ---
> >>   tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/tools/bpf/bpftool/skeleton/pid_iter.bpf.c b/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
> >> index 26004f0c5a6a..1eb756f8d02e 100644
> >> --- a/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
> >> +++ b/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
> >> @@ -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?
>
> 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.

> >
> > With that:
> >
> > Tested-by: Quentin Monnet <quentin@isovalent.com>
> > Reviewed-by: Quentin Monnet <quentin@isovalent.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH bpf-next v2] bpftool: Fix missing pids during link show
  2024-03-12 23:11     ` Andrii Nakryiko
@ 2024-03-13  5:01       ` Yonghong Song
  0 siblings, 0 replies; 6+ messages in thread
From: Yonghong Song @ 2024-03-13  5:01 UTC (permalink / raw)
  To: Andrii Nakryiko
  Cc: Quentin Monnet, bpf, Alexei Starovoitov, Andrii Nakryiko,
	Daniel Borkmann, kernel-team, Martin KaFai Lau


On 3/12/24 4:11 PM, Andrii Nakryiko wrote:
> On Tue, Mar 12, 2024 at 8:24 AM Yonghong Song <yonghong.song@linux.dev> wrote:
>>
>> On 3/12/24 7:01 AM, Quentin Monnet wrote:
>>> 2024-03-12 02:32 UTC+0000 ~ Yonghong Song <yonghong.song@linux.dev>
>>>> 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
>>>>
>>>> Hack 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)
>>>>
>>>> Fixes: 44ba7b30e84f ("bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c")
>>>> Cc: Quentin Monnet <quentin@isovalent.com>
>>>> Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
>>>> ---
>>>>    tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 2 +-
>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/tools/bpf/bpftool/skeleton/pid_iter.bpf.c b/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
>>>> index 26004f0c5a6a..1eb756f8d02e 100644
>>>> --- a/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
>>>> +++ b/tools/bpf/bpftool/skeleton/pid_iter.bpf.c
>>>> @@ -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?
>> 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!

>
>>> With that:
>>>
>>> Tested-by: Quentin Monnet <quentin@isovalent.com>
>>> Reviewed-by: Quentin Monnet <quentin@isovalent.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH bpf-next v2] bpftool: Fix missing pids during link show
  2024-03-12  2:32 [PATCH bpf-next v2] bpftool: Fix missing pids during link show Yonghong Song
  2024-03-12 14:01 ` Quentin Monnet
@ 2024-03-14 20:40 ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-03-14 20:40 UTC (permalink / raw)
  To: Yonghong Song; +Cc: bpf, ast, andrii, daniel, kernel-team, martin.lau, quentin

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:

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!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-03-14 20:40 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-12  2:32 [PATCH bpf-next v2] bpftool: Fix missing pids during link show Yonghong Song
2024-03-12 14:01 ` Quentin Monnet
2024-03-12 15:24   ` Yonghong Song
2024-03-12 23:11     ` Andrii Nakryiko
2024-03-13  5:01       ` Yonghong Song
2024-03-14 20:40 ` patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox