diff options
| author | KP Singh <kpsingh@kernel.org> | 2022-04-18 15:51:58 +0000 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2022-04-19 17:55:45 -0700 |
| commit | dcf456c9a095a6e71f53d6f6f004133ee851ee70 (patch) | |
| tree | 9050bc91c5fb6751e8ab4a6076837645ef34dd19 /kernel/bpf/bpf_task_storage.c | |
| parent | 0e5aefa334dba7fc07ee4ef52ae622f957fc865b (diff) | |
| download | linux-dcf456c9a095a6e71f53d6f6f004133ee851ee70.tar.gz linux-dcf456c9a095a6e71f53d6f6f004133ee851ee70.tar.bz2 linux-dcf456c9a095a6e71f53d6f6f004133ee851ee70.zip | |
bpf: Fix usage of trace RCU in local storage.
bpf_{sk,task,inode}_storage_free() do not need to use
call_rcu_tasks_trace as no BPF program should be accessing the owner
as it's being destroyed. The only other reader at this point is
bpf_local_storage_map_free() which uses normal RCU.
The only path that needs trace RCU are:
* bpf_local_storage_{delete,update} helpers
* map_{delete,update}_elem() syscalls
Fixes: 0fe4b381a59e ("bpf: Allow bpf_local_storage to be used by sleepable programs")
Signed-off-by: KP Singh <kpsingh@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20220418155158.2865678-1-kpsingh@kernel.org
Diffstat (limited to 'kernel/bpf/bpf_task_storage.c')
| -rw-r--r-- | kernel/bpf/bpf_task_storage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/bpf/bpf_task_storage.c b/kernel/bpf/bpf_task_storage.c index 6638a0ecc3d2..57904263a710 100644 --- a/kernel/bpf/bpf_task_storage.c +++ b/kernel/bpf/bpf_task_storage.c @@ -102,7 +102,7 @@ void bpf_task_storage_free(struct task_struct *task) */ bpf_selem_unlink_map(selem); free_task_storage = bpf_selem_unlink_storage_nolock( - local_storage, selem, false); + local_storage, selem, false, false); } raw_spin_unlock_irqrestore(&local_storage->lock, flags); bpf_task_storage_unlock(); @@ -192,7 +192,7 @@ static int task_storage_delete(struct task_struct *task, struct bpf_map *map) if (!sdata) return -ENOENT; - bpf_selem_unlink(SELEM(sdata)); + bpf_selem_unlink(SELEM(sdata), true); return 0; } |