bpf: fix compiler warning with CONFIG_MODULES=n
Subsystems (6)
PATCH 1/1 bpf: fix compiler warning with CONFIG_MODULES=n
With CONFIG_MODULES=n, the following compiler warning occurs:
/data/users/yhs/work/net-next/kernel/trace/bpf_trace.c:605:13: warning:
‘do_bpf_send_signal’ defined but not used [-Wunused-function]
static void do_bpf_send_signal(struct irq_work *entry)
The __init function send_signal_irq_work_init(), which calls do_bpf_send_signal(), is defined under CONFIG_MODULES. Hence, when CONFIG_MODULES=n, nobody calls static function do_bpf_send_signal(), hence the warning.
The init function send_signal_irq_work_init() should work without CONFIG_MODULES. Moving it out of CONFIG_MODULES
code section fixed the compiler warning, and also make bpf_send_signal() helper work without CONFIG_MODULES.
--- kernel/trace/bpf_trace.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
kernel/trace/bpf_trace.c +14 -13
@@ -1431,6 +1431,20 @@ int bpf_get_perf_event_info(const struct perf_event *event, u32 *prog_id,return err; } +static int __init send_signal_irq_work_init (void ) +{ +int cpu; +struct send_signal_irq_work *work; + +for_each_possible_cpu (cpu) { + work =per_cpu_ptr (&send_signal_work, cpu); +init_irq_work (&work->irq_work, do_bpf_send_signal); + } +return 0 ; +} + +subsys_initcall (send_signal_irq_work_init); +#ifdef CONFIG_MODULES static int bpf_event_notify (struct notifier_block *nb,unsigned long op,void *module)
@@ -1478,18 +1492,5 @@ static int __init bpf_event_init(void) return 0; } -static int __init send_signal_irq_work_init (void ) -{ -int cpu; -struct send_signal_irq_work *work; - -for_each_possible_cpu (cpu) { - work =per_cpu_ptr (&send_signal_work, cpu); -init_irq_work (&work->irq_work, do_bpf_send_signal); - } -return 0 ; -} -fs_initcall (bpf_event_init); -subsys_initcall (send_signal_irq_work_init);#endif /* CONFIG_MODULES */
Signature · 1 line
2.17.1
Quoted 14 lines · Yonghong Song
With
CONFIG_MODULES=n, the following compiler warning occurs:
/data/users/yhs/work/net-next/kernel/trace/bpf_trace.c:605:13: warning:
‘do_bpf_send_signal’ defined but not used [-Wunused-function]
static voiddo_bpf_send_signal(struct irq_work *entry)The
__initfunctionsend_signal_irq_work_init(), which callsdo_bpf_send_signal(), is defined underCONFIG_MODULES. Hence, whenCONFIG_MODULES=n, nobody calls static functiondo_bpf_send_signal(), hence the warning.
Quoted 8 lines
The init function
send_signal_irq_work_init()should work withoutCONFIG_MODULES. Moving it out ofCONFIG_MODULES
code section fixed the compiler warning, and also makebpf_send_signal()helper work withoutCONFIG_MODULES.Fixes 8b401f9ed244 ("bpf: implement bpf_send_signal() helper")Reported-By Arnd Bergmann <[email protected]>Signed-off-by Yonghong Song <[email protected]>
Thanks for the fix!
Quoted 51 lines
---
kernel/trace/bpf_trace.c| 27 ++++++++++++++-------------1 file changed, 14 insertions(+), 13 deletions(-)kernel/trace/bpf_trace.c +14
-13@@ -1431,6 +1431,20 @@ int bpf_get_perf_event_info(const struct perf_event *event, u32 *prog_id,return err; } +static int __init send_signal_irq_work_init (void ) +{ +int cpu; +struct send_signal_irq_work *work; + +for_each_possible_cpu (cpu) { + work =per_cpu_ptr (&send_signal_work, cpu); +init_irq_work (&work->irq_work, do_bpf_send_signal); + } +return 0 ; +} + +subsys_initcall (send_signal_irq_work_init); +#ifdef CONFIG_MODULES static int bpf_event_notify (struct notifier_block *nb,unsigned long op,void *module)@@ -1478,18 +1492,5 @@ static int __init bpf_event_init(void) return 0; } -static int __init send_signal_irq_work_init (void ) -{ -int cpu; -struct send_signal_irq_work *work; - -for_each_possible_cpu (cpu) { - work =per_cpu_ptr (&send_signal_work, cpu); -init_irq_work (&work->irq_work, do_bpf_send_signal); - } -return 0 ; -} -fs_initcall (bpf_event_init); -subsys_initcall (send_signal_irq_work_init);#endif /* CONFIG_MODULES */ Signature · 1 line
2.17.1
Quoted 10 lines · Yonghong Song
With
CONFIG_MODULES=n, the following compiler warning occurs:
/data/users/yhs/work/net-next/kernel/trace/bpf_trace.c:605:13: warning:
‘do_bpf_send_signal’ defined but not used [-Wunused-function]
static voiddo_bpf_send_signal(struct irq_work *entry)The
__initfunctionsend_signal_irq_work_init(), which callsdo_bpf_send_signal(), is defined underCONFIG_MODULES. Hence, whenCONFIG_MODULES=n, nobody calls static functiondo_bpf_send_signal(), hence the warning.
Quoted 8 lines
The init function
send_signal_irq_work_init()should work withoutCONFIG_MODULES. Moving it out ofCONFIG_MODULES
code section fixed the compiler warning, and also makebpf_send_signal()helper work withoutCONFIG_MODULES.Fixes 8b401f9ed244 ("bpf: implement bpf_send_signal() helper")Reported-By Arnd Bergmann <[email protected]>Signed-off-by Yonghong Song <[email protected]>
Applied, thanks!