summaryrefslogtreecommitdiffstats
path: root/kernel/bpf/local_storage.c
diff options
context:
space:
mode:
authorAlexei Starovoitov2019-02-01 00:40:05 +0100
committerDaniel Borkmann2019-02-01 20:55:38 +0100
commite16d2f1ab96849b4b65e64b82550a7ecdbf405eb (patch)
treec5bb1bfee577712f7a0c1312716b2fb573560c74 /kernel/bpf/local_storage.c
parentbpf: introduce bpf_spin_lock (diff)
downloadkernel-qcow2-linux-e16d2f1ab96849b4b65e64b82550a7ecdbf405eb.tar.gz
kernel-qcow2-linux-e16d2f1ab96849b4b65e64b82550a7ecdbf405eb.tar.xz
kernel-qcow2-linux-e16d2f1ab96849b4b65e64b82550a7ecdbf405eb.zip
bpf: add support for bpf_spin_lock to cgroup local storage
Allow 'struct bpf_spin_lock' to reside inside cgroup local storage. Signed-off-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'kernel/bpf/local_storage.c')
-rw-r--r--kernel/bpf/local_storage.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/bpf/local_storage.c b/kernel/bpf/local_storage.c
index 07a34ef562a0..0295427f06e2 100644
--- a/kernel/bpf/local_storage.c
+++ b/kernel/bpf/local_storage.c
@@ -147,6 +147,7 @@ static int cgroup_storage_update_elem(struct bpf_map *map, void *_key,
return -ENOMEM;
memcpy(&new->data[0], value, map->value_size);
+ check_and_init_map_lock(map, new->data);
new = xchg(&storage->buf, new);
kfree_rcu(new, rcu);
@@ -483,6 +484,7 @@ struct bpf_cgroup_storage *bpf_cgroup_storage_alloc(struct bpf_prog *prog,
storage->buf = kmalloc_node(size, flags, map->numa_node);
if (!storage->buf)
goto enomem;
+ check_and_init_map_lock(map, storage->buf->data);
} else {
storage->percpu_buf = __alloc_percpu_gfp(size, 8, flags);
if (!storage->percpu_buf)