From: Alexei Starovoitov <ast@kernel•org>
To: <davem@davemloft•net>
Cc: <daniel@iogearbox•net>, <jakub.kicinski@netronome•com>,
<netdev@vger•kernel.org>, <kernel-team@fb•com>
Subject: [PATCH v4 bpf-next 2/9] bpf: add support for bpf_spin_lock to cgroup local storage
Date: Wed, 23 Jan 2019 20:13:56 -0800 [thread overview]
Message-ID: <20190124041403.2100609-3-ast@kernel.org> (raw)
In-Reply-To: <20190124041403.2100609-1-ast@kernel.org>
Allow 'struct bpf_spin_lock' to reside inside cgroup local storage.
Signed-off-by: Alexei Starovoitov <ast@kernel•org>
---
kernel/bpf/local_storage.c | 2 ++
kernel/bpf/syscall.c | 3 ++-
kernel/bpf/verifier.c | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
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)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index ebf0a673cb83..b29e6dc44650 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -482,7 +482,8 @@ static int map_check_btf(struct bpf_map *map, const struct btf *btf,
if (map_value_has_spin_lock(map)) {
if (map->map_type != BPF_MAP_TYPE_HASH &&
- map->map_type != BPF_MAP_TYPE_ARRAY)
+ map->map_type != BPF_MAP_TYPE_ARRAY &&
+ map->map_type != BPF_MAP_TYPE_CGROUP_STORAGE)
return -ENOTSUPP;
if (map->spin_lock_off + sizeof(struct bpf_spin_lock) >
map->value_size) {
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index f372904fa691..bfd6bebca911 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -3089,6 +3089,8 @@ static int check_helper_call(struct bpf_verifier_env *env, int func_id, int insn
regs[BPF_REG_0].map_ptr = meta.map_ptr;
if (fn->ret_type == RET_PTR_TO_MAP_VALUE) {
regs[BPF_REG_0].type = PTR_TO_MAP_VALUE;
+ if (map_value_has_spin_lock(meta.map_ptr))
+ regs[BPF_REG_0].id = ++env->id_gen;
} else {
regs[BPF_REG_0].type = PTR_TO_MAP_VALUE_OR_NULL;
regs[BPF_REG_0].id = ++env->id_gen;
--
2.17.1
next prev parent reply other threads:[~2019-01-24 4:14 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 4:13 [PATCH v4 bpf-next 0/9] introduce bpf_spin_lock Alexei Starovoitov
2019-01-24 4:13 ` [PATCH v4 bpf-next 1/9] bpf: " Alexei Starovoitov
2019-01-24 18:01 ` Peter Zijlstra
2019-01-24 18:56 ` Peter Zijlstra
2019-01-24 23:42 ` Paul E. McKenney
2019-01-25 0:05 ` Alexei Starovoitov
2019-01-25 1:22 ` Paul E. McKenney
2019-01-25 1:46 ` Jann Horn
2019-01-25 2:38 ` Alexei Starovoitov
2019-01-25 4:27 ` Alexei Starovoitov
2019-01-25 4:31 ` Paul E. McKenney
2019-01-25 4:47 ` Alexei Starovoitov
2019-01-25 16:02 ` Paul E. McKenney
2019-01-25 4:11 ` Paul E. McKenney
2019-01-25 16:18 ` Jann Horn
2019-01-25 22:51 ` Paul E. McKenney
2019-01-25 23:44 ` Alexei Starovoitov
2019-01-26 0:43 ` Jann Horn
2019-01-26 0:59 ` Jann Horn
2019-01-24 23:58 ` Alexei Starovoitov
2019-01-25 0:18 ` Jann Horn
2019-01-25 2:49 ` Alexei Starovoitov
2019-01-25 2:29 ` Eric Dumazet
2019-01-25 2:34 ` Alexei Starovoitov
2019-01-25 2:44 ` Eric Dumazet
2019-01-25 2:57 ` Alexei Starovoitov
2019-01-25 8:38 ` Peter Zijlstra
2019-01-25 9:10 ` Peter Zijlstra
2019-01-25 23:42 ` Alexei Starovoitov
2019-01-28 8:24 ` Peter Zijlstra
2019-01-28 8:31 ` Peter Zijlstra
2019-01-28 8:35 ` Peter Zijlstra
2019-01-28 20:49 ` Alexei Starovoitov
2019-01-28 8:43 ` Peter Zijlstra
2019-01-28 21:37 ` Alexei Starovoitov
2019-01-29 8:59 ` Peter Zijlstra
2019-01-30 2:20 ` Alexei Starovoitov
2019-01-25 9:59 ` Peter Zijlstra
2019-01-25 10:09 ` Peter Zijlstra
2019-01-25 10:23 ` Peter Zijlstra
2019-01-26 0:17 ` bpf memory model. Was: " Alexei Starovoitov
2019-01-28 9:24 ` Peter Zijlstra
2019-01-28 21:56 ` Alexei Starovoitov
2019-01-29 9:16 ` Peter Zijlstra
2019-01-30 2:32 ` Alexei Starovoitov
2019-01-30 8:58 ` Peter Zijlstra
2019-01-30 19:36 ` Alexei Starovoitov
2019-01-30 18:11 ` Will Deacon
2019-01-30 18:36 ` Paul E. McKenney
2019-01-30 19:51 ` Alexei Starovoitov
2019-01-30 21:05 ` Paul E. McKenney
2019-01-30 22:57 ` Alexei Starovoitov
2019-01-31 14:01 ` Paul E. McKenney
2019-01-31 18:47 ` Alexei Starovoitov
2019-02-01 14:05 ` Paul E. McKenney
2019-01-30 19:50 ` Alexei Starovoitov
2019-01-24 4:13 ` Alexei Starovoitov [this message]
2019-01-24 4:13 ` [PATCH v4 bpf-next 3/9] tools/bpf: sync include/uapi/linux/bpf.h Alexei Starovoitov
2019-01-24 4:13 ` [PATCH v4 bpf-next 4/9] selftests/bpf: add bpf_spin_lock tests Alexei Starovoitov
2019-01-24 4:13 ` [PATCH v4 bpf-next 5/9] selftests/bpf: add bpf_spin_lock C test Alexei Starovoitov
2019-01-24 4:14 ` [PATCH v4 bpf-next 6/9] bpf: introduce BPF_F_LOCK flag Alexei Starovoitov
2019-01-24 4:14 ` [PATCH v4 bpf-next 7/9] tools/bpf: sync uapi/bpf.h Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190124041403.2100609-3-ast@kernel.org \
--to=ast@kernel$(echo .)org \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=jakub.kicinski@netronome$(echo .)com \
--cc=kernel-team@fb$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox