Commit 9087c6ff authored by Eric Dumazet's avatar Eric Dumazet Committed by Daniel Borkmann

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

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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reviewed-by: default avatarStanislav Fomichev <sdf@google.com>
Link: https://lore.kernel.org/bpf/20220218181801.2971275-1-eric.dumazet@gmail.com
parent 086d4905
...@@ -1352,7 +1352,6 @@ int generic_map_delete_batch(struct bpf_map *map, ...@@ -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, ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment