On Fri, 9 Sept 2022 at 10:13, Dave Marchevsky <davemarchevsky@xxxxxx> wrote:
>
> On 9/4/22 4:41 PM, Kumar Kartikeya Dwivedi wrote:
> > Global variables reside in maps accessible using direct_value_addr
> > callbacks, so giving each load instruction's rewrite a unique reg->id
> > disallows us from holding locks which are global.
> >
> > This is not great, so refactor the active_spin_lock into two separate
> > fields, active_spin_lock_ptr and active_spin_lock_id, which is generic
> > enough to allow it for global variables, map lookups, and local kptr
> > registers at the same time.
> >
> > Held vs non-held is indicated by active_spin_lock_ptr, which stores the
> > reg->map_ptr or reg->btf pointer of the register used for locking spin
> > lock. But the active_spin_lock_id also needs to be compared to ensure
> > whether bpf_spin_unlock is for the same register.
> >
> > Next, pseudo load instructions are not given a unique reg->id, as they
> > are doing lookup for the same map value (max_entries is never greater
> > than 1).
> >
>
> For libbpf-style "internal maps" - like .bss.private further in this series -
> all the SEC(".bss.private") vars are globbed together into one map_value. e.g.
>
> struct bpf_spin_lock lock1 SEC(".bss.private");
> struct bpf_spin_lock lock2 SEC(".bss.private");
> ...
> spin_lock(&lock1);
> ...
> spin_lock(&lock2);
>
> will result in same map but different offsets for the direct read (and different
> aux->map_off set in resolve_pseudo_ldimm64 for use in check_ld_imm). Seems like
> this patch would assign both same (active_spin_lock_ptr, active_spin_lock_id).
>
That won't be a problem. Two spin locks in a map value or datasec are
already rejected on BPF_MAP_CREATE,
so there is no bug. See idx >= info_cnt check in
btf_find_struct_field, btf_find_datasec_var.
I can include offset as the third part of the tuple. The problem then
is figuring out which lock protects which bpf_list_head. We need
another __guarded_by annotation and force users to use that to
eliminate the ambiguity. So for now I just put it in the commit log
and left it for the future.
But it does seem like it's going to be needed at least for the global
case, which should probably do it from the get go.
How does the above idea sound to you?
> > Essentially, we consider that the tuple of (active_spin_lock_ptr,
> > active_spin_lock_id) will always be unique for any kind of argument to
> > bpf_spin_{lock,unlock}.
> >
> > Note that this can be extended in the future to also remember offset
> > used for locking, so that we can introduce multiple bpf_spin_lock fields
> > in the same allocation.
> >
>
> In light of the above the "multiple spin locks in same map_value"
> is probably needed for the common case, probably similar enough to
> "same allocation" logic.
>
Yes, it would be the same idea. Only need to remember an additional
field, the 'offset'.
{ptr, id} already distinguishes between allocations. Offset allows to
distinguish locks within the same allocation or {ptr, id}.
> > Signed-off-by: Kumar Kartikeya Dwivedi <memxor@xxxxxxxxx>
> > ---
> > include/linux/bpf_verifier.h | 3 ++-
> > kernel/bpf/verifier.c | 39 +++++++++++++++++++++++++-----------
> > 2 files changed, 29 insertions(+), 13 deletions(-)
> >
> > diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h
> > index 2a9dcefca3b6..00c21ad6f61c 100644
> > --- a/include/linux/bpf_verifier.h
> > +++ b/include/linux/bpf_verifier.h
> > @@ -348,7 +348,8 @@ struct bpf_verifier_state {
> > u32 branches;
> > u32 insn_idx;
> > u32 curframe;
> > - u32 active_spin_lock;
> > + void *active_spin_lock_ptr;
> > + u32 active_spin_lock_id;
>
> It would be good to make this "(lock_ptr, lock_id) is identifier for lock"
> concept more concrete by grouping these fields in a struct w/ type enum + union,
> or something similar. Will make it more obvious that they should be used / set
> together.
>
> But if you'd prefer to keep it as two fields, active_spin_lock_ptr is a
> confusing name. In the future with no context as to what that field is, I'd
> assume that it holds a pointer to a spin_lock instead of a "spin lock identity
> pointer".
>
That's a good point.
I'm thinking
struct active_lock {
void *id_ptr;
u32 offset;
u32 reg_id;
};
How does that look?
> > bool speculative;
> >
> > /* first and last insn idx of this verifier state */
> > diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> > index b1754fd69f7d..ed19e4036b0a 100644
> > --- a/kernel/bpf/verifier.c
> > +++ b/kernel/bpf/verifier.c
> > @@ -1202,7 +1202,8 @@ static int copy_verifier_state(struct bpf_verifier_state *dst_state,
> > }
> > dst_state->speculative = src->speculative;
> > dst_state->curframe = src->curframe;
> > - dst_state->active_spin_lock = src->active_spin_lock;
> > + dst_state->active_spin_lock_ptr = src->active_spin_lock_ptr;
> > + dst_state->active_spin_lock_id = src->active_spin_lock_id;
> > dst_state->branches = src->branches;
> > dst_state->parent = src->parent;
> > dst_state->first_insn_idx = src->first_insn_idx;
> > @@ -5504,22 +5505,35 @@ static int process_spin_lock(struct bpf_verifier_env *env, int regno,
> > return -EINVAL;
> > }
> > if (is_lock) {
> > - if (cur->active_spin_lock) {
> > + if (cur->active_spin_lock_ptr) {
> > verbose(env,
> > "Locking two bpf_spin_locks are not allowed\n");
> > return -EINVAL;
> > }
> > - cur->active_spin_lock = reg->id;
> > + if (map)
> > + cur->active_spin_lock_ptr = map;
> > + else
> > + cur->active_spin_lock_ptr = btf;
> > + cur->active_spin_lock_id = reg->id;
> > } else {
> > - if (!cur->active_spin_lock) {
> > + void *ptr;
> > +
> > + if (map)
> > + ptr = map;
> > + else
> > + ptr = btf;
> > +
> > + if (!cur->active_spin_lock_ptr) {
> > verbose(env, "bpf_spin_unlock without taking a lock\n");
> > return -EINVAL;
> > }
> > - if (cur->active_spin_lock != reg->id) {
> > + if (cur->active_spin_lock_ptr != ptr ||
> > + cur->active_spin_lock_id != reg->id) {
> > verbose(env, "bpf_spin_unlock of different lock\n");
> > return -EINVAL;
> > }
> > - cur->active_spin_lock = 0;
> > + cur->active_spin_lock_ptr = NULL;
> > + cur->active_spin_lock_id = 0;
> > }
> > return 0;
> > }
> > @@ -11207,8 +11221,8 @@ static int check_ld_imm(struct bpf_verifier_env *env, struct bpf_insn *insn)
> > insn->src_reg == BPF_PSEUDO_MAP_IDX_VALUE) {
> > dst_reg->type = PTR_TO_MAP_VALUE;
> > dst_reg->off = aux->map_off;
>
> Here's where check_ld_imm uses aux->map_off.
>
> > - if (map_value_has_spin_lock(map))
> > - dst_reg->id = ++env->id_gen;
> > + WARN_ON_ONCE(map->max_entries != 1);
> > + /* We want reg->id to be same (0) as map_value is not distinct */
> > } else if (insn->src_reg == BPF_PSEUDO_MAP_FD ||
> > insn->src_reg == BPF_PSEUDO_MAP_IDX) {
> > dst_reg->type = CONST_PTR_TO_MAP;
> > @@ -11286,7 +11300,7 @@ static int check_ld_abs(struct bpf_verifier_env *env, struct bpf_insn *insn)
> > return err;
> > }
> >
> > - if (env->cur_state->active_spin_lock) {
> > + if (env->cur_state->active_spin_lock_ptr) {
> > verbose(env, "BPF_LD_[ABS|IND] cannot be used inside bpf_spin_lock-ed region\n");
> > return -EINVAL;
> > }
> > @@ -12566,7 +12580,8 @@ static bool states_equal(struct bpf_verifier_env *env,
> > if (old->speculative && !cur->speculative)
> > return false;
> >
> > - if (old->active_spin_lock != cur->active_spin_lock)
> > + if (old->active_spin_lock_ptr != cur->active_spin_lock_ptr ||
> > + old->active_spin_lock_id != cur->active_spin_lock_id)
> > return false;
> >
> > /* for states to be equal callsites have to be the same
> > @@ -13213,7 +13228,7 @@ static int do_check(struct bpf_verifier_env *env)
> > return -EINVAL;
> > }
> >
> > - if (env->cur_state->active_spin_lock &&
> > + if (env->cur_state->active_spin_lock_ptr &&
> > (insn->src_reg == BPF_PSEUDO_CALL ||
> > insn->imm != BPF_FUNC_spin_unlock)) {
> > verbose(env, "function calls are not allowed while holding a lock\n");
> > @@ -13250,7 +13265,7 @@ static int do_check(struct bpf_verifier_env *env)
> > return -EINVAL;
> > }
> >
> > - if (env->cur_state->active_spin_lock) {
> > + if (env->cur_state->active_spin_lock_ptr) {
> > verbose(env, "bpf_spin_unlock is missing\n");
> > return -EINVAL;
> > }
