mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bpf: Call maybe_wait_bpf_programs() only once from generic_map_delete_batch()

Browse source 
As stated in the comment found in maybe_wait_bpf_programs(),
the synchronize_rcu() barrier is only needed before returning
to userspace, not after each deletion in the batch.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Stanislav Fomichev <sdf@google.com>
Link: https://lore.kernel.org/bpf/20220218181801.2971275-1-eric.dumazet@gmail.com
This commit is contained in:
Eric Dumazet 2022-02-18 10:18:01 -08:00 committed by Daniel Borkmann
parent 086d49058c
commit 9087c6ff8d
1 changed files with 2 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
kernel/bpf/syscall.c
View file

@ -1352,7 +1352,6 @@ int generic_map_delete_batch(struct bpf_map *map,
err = map->ops->map_delete_elem(map, key); err = map->ops->map_delete_elem(map, key);
rcu_read_unlock(); rcu_read_unlock();
bpf_enable_instrumentation(); bpf_enable_instrumentation();
maybe_wait_bpf_programs(map);
if (err) if (err)
break; break;
cond_resched(); cond_resched();
@ -1361,6 +1360,8 @@ int generic_map_delete_batch(struct bpf_map *map,
err = -EFAULT; err = -EFAULT;
kvfree(key); kvfree(key);
maybe_wait_bpf_programs(map);
return err; return err;
} }