bpf: grab rcu read lock for bpf_percpu_hash_update

Started by Sasha Levin on Feb 19, 2016 · 2 messages from 2 authors · Last reply Feb 19, 2016

Subsystems (3)

Maintainers (6)

Show 2 more
STALE3911d

open the first message on its own page

  1. [PATCH] bpf: grab rcu read lock for bpf_percpu_hash_update
    Related patches
Message details and related content
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 <redacted>
---
 kernel/bpf/syscall.c |    2 ++
 1 file changed, 2 insertions(+)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index c95a753..94324b8 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -348,7 +348,9 @@ static int map_update_elem(union bpf_attr *attr)
 		goto free_value;
 
 	if (map->map_type == BPF_MAP_TYPE_PERCPU_HASH) {
+		rcu_read_lock();
 		err = bpf_percpu_hash_update(map, key, value, attr->flags);
+		rcu_read_unlock();
 	} else if (map->map_type == BPF_MAP_TYPE_PERCPU_ARRAY) {
 		err = bpf_percpu_array_update(map, key, value, attr->flags);
 	} else {
-- 
1.7.10.4
Message details and related content
On Thu, Feb 18, 2016 at 09:56:22PM -0500, Sasha Levin wrote:
quoted hunk
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 <redacted>
---
 kernel/bpf/syscall.c |    2 ++
 1 file changed, 2 insertions(+)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index c95a753..94324b8 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -348,7 +348,9 @@ static int map_update_elem(union bpf_attr *attr)
 		goto free_value;
 
 	if (map->map_type == BPF_MAP_TYPE_PERCPU_HASH) {
+		rcu_read_lock();
 		err = bpf_percpu_hash_update(map, key, value, attr->flags);
+		rcu_read_unlock();
good catch. thanks, but could you add rcu_read_lock/unlock
inside bpf_percpu_hash_update() instead... to match what
bpf_percpu_hash_copy/bpf_percpu_array_update/bpf_percpu_array_copy are doing.
Otherwise it's inconsistent.
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help