| Message ID | 1455907990-22250-1-git-send-email-sasha.levin@oracle.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, Feb 19, 2016 at 01:53:10PM -0500, Sasha Levin wrote: > bpf_percpu_hash_update() expects rcu lock to be held and warns if it's not, > which pointed out a missing rcu read lock. > > Fixes: 15a07b338 ("bpf: add lookup/update support for per-cpu hash and array maps") > Signed-off-by: Sasha Levin <sasha.levin@oracle.com> thank you. Acked-by: Alexei Starovoitov <ast@kernel.org>
On 02/19/2016 07:53 PM, Sasha Levin wrote: > bpf_percpu_hash_update() expects rcu lock to be held and warns if it's not, > which pointed out a missing rcu read lock. > > Fixes: 15a07b338 ("bpf: add lookup/update support for per-cpu hash and array maps") > Signed-off-by: Sasha Levin <sasha.levin@oracle.com> LGTM, patch is against net-next tree. Acked-by: Daniel Borkmann <daniel@iogearbox.net>
From: Sasha Levin <sasha.levin@oracle.com> Date: Fri, 19 Feb 2016 13:53:10 -0500 > bpf_percpu_hash_update() expects rcu lock to be held and warns if it's not, > which pointed out a missing rcu read lock. > > Fixes: 15a07b338 ("bpf: add lookup/update support for per-cpu hash and array maps") > Signed-off-by: Sasha Levin <sasha.levin@oracle.com> Applied, thanks.
diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index fd5db8f..a68e951 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -619,7 +619,13 @@ out: int bpf_percpu_hash_update(struct bpf_map *map, void *key, void *value, u64 map_flags) { - return __htab_percpu_map_update_elem(map, key, value, map_flags, true); + int ret; + + rcu_read_lock(); + ret = __htab_percpu_map_update_elem(map, key, value, map_flags, true); + rcu_read_unlock(); + + return ret; } static const struct bpf_map_ops htab_percpu_ops = {
bpf_percpu_hash_update() expects rcu lock to be held and warns if it's not, which pointed out a missing rcu read lock. Fixes: 15a07b338 ("bpf: add lookup/update support for per-cpu hash and array maps") Signed-off-by: Sasha Levin <sasha.levin@oracle.com> --- kernel/bpf/hashtab.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)