Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bpf: Factor out bpf_spin_lock into helpers.

Browse source 
[ Upstream commit c1b3fed319d32a721d4b9c17afaeb430444ff773 ]

Move ____bpf_spin_lock/unlock into helpers to make it more clear
that quadruple underscore bpf_spin_lock/unlock are irqsave/restore variants.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/bpf/20210715005417.78572-3-alexei.starovoitov@gmail.com
Stable-dep-of: 178c54666f9c ("bpf: Mark bpf_spin_{lock,unlock}() helpers with notrace correctly")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Alexei Starovoitov 2021-07-14 17:54:08 -07:00 • committed by Ksawlii
parent 74951b2b4e
commit 787ca72409
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kernel/bpf/helpers.c
View file

@ -278,13 +278,18 @@ static inline void __bpf_spin_unlock(struct bpf_spin_lock *lock)
static DEFINE_PER_CPU(unsigned long, irqsave_flags); static DEFINE_PER_CPU(unsigned long, irqsave_flags);
notrace BPF_CALL_1(bpf_spin_lock, struct bpf_spin_lock *, lock) static inline void __bpf_spin_lock_irqsave(struct bpf_spin_lock *lock)
{ {
unsigned long flags; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
__bpf_spin_lock(lock); __bpf_spin_lock(lock);
__this_cpu_write(irqsave_flags, flags); __this_cpu_write(irqsave_flags, flags);
}
notrace BPF_CALL_1(bpf_spin_lock, struct bpf_spin_lock *, lock)
{
__bpf_spin_lock_irqsave(lock);
return 0; return 0;
} }
@ -295,13 +300,18 @@ const struct bpf_func_proto bpf_spin_lock_proto = {
.arg1_type = ARG_PTR_TO_SPIN_LOCK, .arg1_type = ARG_PTR_TO_SPIN_LOCK,
}; };
notrace BPF_CALL_1(bpf_spin_unlock, struct bpf_spin_lock *, lock) static inline void __bpf_spin_unlock_irqrestore(struct bpf_spin_lock *lock)
{ {
unsigned long flags; unsigned long flags;
flags = __this_cpu_read(irqsave_flags); flags = __this_cpu_read(irqsave_flags);
__bpf_spin_unlock(lock); __bpf_spin_unlock(lock);
local_irq_restore(flags); local_irq_restore(flags);
}
notrace BPF_CALL_1(bpf_spin_unlock, struct bpf_spin_lock *, lock)
{
__bpf_spin_unlock_irqrestore(lock);
return 0; return 0;
} }
@ -322,9 +332,9 @@ void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,
else else
lock = dst + map->spin_lock_off; lock = dst + map->spin_lock_off;
preempt_disable(); preempt_disable();
____bpf_spin_lock(lock); __bpf_spin_lock_irqsave(lock);
copy_map_value(map, dst, src); copy_map_value(map, dst, src);
____bpf_spin_unlock(lock); __bpf_spin_unlock_irqrestore(lock);
preempt_enable(); preempt_enable();
} }