[bpf-next] bpf: Define bpf_token_show_fdinfo with CONFIG_PROC_FS

Commit Message

Tao Chen March 17, 2025, 3:51 p.m. UTC

Protect bpf_token_show_fdinfo with CONFIG_PROC_FS check, otherwise
it will compile error if CONFIG_PROC_FS is not set.

Fixes: 35f96de04127 ("bpf: Introduce BPF token object")
Signed-off-by: Tao Chen <[e-mail]>
---
 kernel/bpf/token.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Song Liu March 17, 2025, 6:01 p.m. UTC | #1

On Mon, Mar 17, 2025 at 8:52 AM Tao Chen <[e-mail]> wrote:
>
> Protect bpf_token_show_fdinfo with CONFIG_PROC_FS check, otherwise
> it will compile error if CONFIG_PROC_FS is not set.

On bpt-next/master, I don't see compile error with

CONFIG_BPF_SYSCALL=y
...
# CONFIG_PROC_FS is not set

Are you testing with a different tree/branch?

Thanks,
Song

>
> Fixes: 35f96de04127 ("bpf: Introduce BPF token object")
> Signed-off-by: Tao Chen <[e-mail]>
> ---
>  kernel/bpf/token.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/kernel/bpf/token.c b/kernel/bpf/token.c
> index 26057aa13..4396eefde 100644
> --- a/kernel/bpf/token.c
> +++ b/kernel/bpf/token.c
> @@ -105,7 +105,9 @@ static const struct inode_operations bpf_token_iops = { };
>
>  static const struct file_operations bpf_token_fops = {
>         .release        = bpf_token_release,
> +#ifdef CONFIG_PROC_FS
>         .show_fdinfo    = bpf_token_show_fdinfo,
> +#endif
>  };
>
>  int bpf_token_create(union bpf_attr *attr)
> --
> 2.43.0
>
>

Tao Chen March 18, 2025, 5 a.m. UTC | #2

在 2025/3/18 02:01, Song Liu 写道:
> On Mon, Mar 17, 2025 at 8:52 AM Tao Chen <[e-mail]> wrote:
>>
>> Protect bpf_token_show_fdinfo with CONFIG_PROC_FS check, otherwise
>> it will compile error if CONFIG_PROC_FS is not set.
> 
> On bpt-next/master, I don't see compile error with
> 
> CONFIG_BPF_SYSCALL=y
> ...
> # CONFIG_PROC_FS is not set
> 
> Are you testing with a different tree/branch?
> 
> Thanks,
> Song
> 
>>
>> Fixes: 35f96de04127 ("bpf: Introduce BPF token object")
>> Signed-off-by: Tao Chen <[e-mail]>
>> ---
>>   kernel/bpf/token.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/kernel/bpf/token.c b/kernel/bpf/token.c
>> index 26057aa13..4396eefde 100644
>> --- a/kernel/bpf/token.c
>> +++ b/kernel/bpf/token.c
>> @@ -105,7 +105,9 @@ static const struct inode_operations bpf_token_iops = { };
>>
>>   static const struct file_operations bpf_token_fops = {
>>          .release        = bpf_token_release,
>> +#ifdef CONFIG_PROC_FS
>>          .show_fdinfo    = bpf_token_show_fdinfo,
>> +#endif
>>   };
>>
>>   int bpf_token_create(union bpf_attr *attr)
>> --
>> 2.43.0
>>
>>

Hi Song,

I try it, it seems that i had some misunderstandings before about 
CONFIG_PROC_FS, and the description in the changelog is not quite 
correct. Please ignore this patch, and i will resend it. Just to follow 
the pattern used with other *_show_fdinfo functions and only define 
bpf_token_show_fdinfo when CONFIG_PROC_FS is set. Thank you for your 
reminder.

Patch

diff --git a/kernel/bpf/token.c b/kernel/bpf/token.c
index 26057aa13..4396eefde 100644
--- a/kernel/bpf/token.c
+++ b/kernel/bpf/token.c
@@ -105,7 +105,9 @@  static const struct inode_operations bpf_token_iops = { };
 
 static const struct file_operations bpf_token_fops = {
 	.release	= bpf_token_release,
+#ifdef CONFIG_PROC_FS
 	.show_fdinfo	= bpf_token_show_fdinfo,
+#endif
 };
 
 int bpf_token_create(union bpf_attr *attr)