Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1338410

[PATCH v2] bpf: grab rcu read lock for bpf_percpu_hash_update

Show all headers | View raw

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(-)

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 = {
-- 
1.7.10.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] bpf: grab rcu read lock for bpf_percpu_hash_update Sasha Levin <sasha.levin@oracle.com> - 2016-02-19 20:00 +0100
  Re: [PATCH v2] bpf: grab rcu read lock for bpf_percpu_hash_update Alexei Starovoitov <alexei.starovoitov@gmail.com> - 2016-02-19 20:00 +0100
  Re: [PATCH v2] bpf: grab rcu read lock for bpf_percpu_hash_update Daniel Borkmann <daniel@iogearbox.net> - 2016-02-19 20:10 +0100
  Re: [PATCH v2] bpf: grab rcu read lock for bpf_percpu_hash_update David Miller <davem@davemloft.net> - 2016-02-19 20:50 +0100

csiph-web