[PATCH bpf-next] bpf: Make symbol 'bpf_task_storage_busy' static

Subsystems: bpf [general] (safe dynamic programs and tools), the rest

STALE1978d LANDED

Landed in mainline as 4d0b93896ff8 on 2021-03-16.

2 messages, 2 authors, 2021-03-12 · open the first message on its own page

[PATCH bpf-next] bpf: Make symbol 'bpf_task_storage_busy' static

From: 'Wei Yongjun <hidden>
Date: 2021-03-11 13:07:25

From: Wei Yongjun <redacted>

The sparse tool complains as follows:

kernel/bpf/bpf_task_storage.c:23:1: warning:
 symbol '__pcpu_scope_bpf_task_storage_busy' was not declared. Should it be static?

This symbol is not used outside of bpf_task_storage.c, so this
commit marks it static.

Fixes: bc235cdb423a ("bpf: Prevent deadlock from recursive bpf_task_storage_[get|delete]")
Reported-by: Hulk Robot <redacted>
Signed-off-by: Wei Yongjun <redacted>
---
 kernel/bpf/bpf_task_storage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/bpf/bpf_task_storage.c b/kernel/bpf/bpf_task_storage.c
index fd3c74ef608e..3ce75758d394 100644
--- a/kernel/bpf/bpf_task_storage.c
+++ b/kernel/bpf/bpf_task_storage.c
@@ -20,7 +20,7 @@
 
 DEFINE_BPF_STORAGE_CACHE(task_cache);
 
-DEFINE_PER_CPU(int, bpf_task_storage_busy);
+static DEFINE_PER_CPU(int, bpf_task_storage_busy);
 
 static void bpf_task_storage_lock(void)
 {

Re: [PATCH bpf-next] bpf: Make symbol 'bpf_task_storage_busy' static

From: Song Liu <hidden>
Date: 2021-03-12 01:28:25

On Mar 11, 2021, at 5:15 AM, 'Wei Yongjun [off-list ref] wrote:

From: Wei Yongjun <redacted>

The sparse tool complains as follows:

kernel/bpf/bpf_task_storage.c:23:1: warning:
symbol '__pcpu_scope_bpf_task_storage_busy' was not declared. Should it be static?

This symbol is not used outside of bpf_task_storage.c, so this
commit marks it static.

Fixes: bc235cdb423a ("bpf: Prevent deadlock from recursive bpf_task_storage_[get|delete]")
Reported-by: Hulk Robot <redacted>
Signed-off-by: Wei Yongjun <redacted>
Acked-by: Song Liu <redacted>

Thanks for the fix!
quoted hunk
---
kernel/bpf/bpf_task_storage.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/bpf/bpf_task_storage.c b/kernel/bpf/bpf_task_storage.c
index fd3c74ef608e..3ce75758d394 100644
--- a/kernel/bpf/bpf_task_storage.c
+++ b/kernel/bpf/bpf_task_storage.c
@@ -20,7 +20,7 @@
DEFINE_BPF_STORAGE_CACHE(task_cache);

-DEFINE_PER_CPU(int, bpf_task_storage_busy);
+static DEFINE_PER_CPU(int, bpf_task_storage_busy);

static void bpf_task_storage_lock(void)
{

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help