bpf: Call maybe_wait_bpf_programs() only once for generic_map_update_batch()

Just like commit 9087c6ff8dfe ("bpf: Call maybe_wait_bpf_programs() only
once from generic_map_delete_batch()"), there is also no need to call
maybe_wait_bpf_programs() for each update in batched update, so only
call it once in generic_map_update_batch().

Signed-off-by: Hou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/r/20231208102355.2628918-3-houtao@huaweicloud.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 9ad3f527ab372e8a89b26a36713629f5e453f76d..07e671431987546165cd2dbf31803b38e9b6bdb1 100644 (file)
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -203,7 +203,6 @@ static int bpf_map_update_value(struct bpf_map *map, struct file *map_file,
                rcu_read_unlock();
        }
        bpf_enable_instrumentation();
-       maybe_wait_bpf_programs(map);
 
        return err;
 }
@@ -1577,6 +1576,7 @@ static int map_update_elem(union bpf_attr *attr, bpfptr_t uattr)
        }
 
        err = bpf_map_update_value(map, f.file, key, value, attr->flags);
+       maybe_wait_bpf_programs(map);
 
        kvfree(value);
 free_key:
@@ -1816,6 +1816,8 @@ int generic_map_update_batch(struct bpf_map *map, struct file *map_file,
 
        kvfree(value);
        kvfree(key);
+
+       maybe_wait_bpf_programs(map);
        return err;
 }