bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bpf: Factor out inc/dec of active flag into helpers.

Browse source 
Factor out local_inc/dec_return(&c->active) into helpers.
No functional changes.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Hou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/bpf/20230706033447.54696-6-alexei.starovoitov@gmail.com
This commit is contained in:
Alexei Starovoitov 2023-07-05 20:34:38 -07:00 • committed by Daniel Borkmann
parent 05ae68656a
commit 18e027b1c7
1 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

30
kernel/bpf/memalloc.c
View file

@ -154,17 +154,15 @@ static struct mem_cgroup *get_memcg(const struct bpf_mem_cache *c)
#endif #endif
} }
static void add_obj_to_free_list(struct bpf_mem_cache *c, void *obj) static void inc_active(struct bpf_mem_cache *c, unsigned long *flags)
{ {
unsigned long flags;
if (IS_ENABLED(CONFIG_PREEMPT_RT)) if (IS_ENABLED(CONFIG_PREEMPT_RT))
/* In RT irq_work runs in per-cpu kthread, so disable /* In RT irq_work runs in per-cpu kthread, so disable
* interrupts to avoid preemption and interrupts and * interrupts to avoid preemption and interrupts and
* reduce the chance of bpf prog executing on this cpu * reduce the chance of bpf prog executing on this cpu
* when active counter is busy. * when active counter is busy.
*/ */
local_irq_save(flags); local_irq_save(*flags);
/* alloc_bulk runs from irq_work which will not preempt a bpf /* alloc_bulk runs from irq_work which will not preempt a bpf
* program that does unit_alloc/unit_free since IRQs are * program that does unit_alloc/unit_free since IRQs are
* disabled there. There is no race to increment 'active' * disabled there. There is no race to increment 'active'
@ -172,13 +170,25 @@ static void add_obj_to_free_list(struct bpf_mem_cache *c, void *obj)
* bpf prog preempted this loop. * bpf prog preempted this loop.
*/ */
WARN_ON_ONCE(local_inc_return(&c->active) != 1); WARN_ON_ONCE(local_inc_return(&c->active) != 1);
__llist_add(obj, &c->free_llist); }
c->free_cnt++;
static void dec_active(struct bpf_mem_cache *c, unsigned long flags)
{
local_dec(&c->active); local_dec(&c->active);
if (IS_ENABLED(CONFIG_PREEMPT_RT)) if (IS_ENABLED(CONFIG_PREEMPT_RT))
local_irq_restore(flags); local_irq_restore(flags);
} }
static void add_obj_to_free_list(struct bpf_mem_cache *c, void *obj)
{
unsigned long flags;
inc_active(c, &flags);
__llist_add(obj, &c->free_llist);
c->free_cnt++;
dec_active(c, flags);
}
/* Mostly runs from irq_work except __init phase. */ /* Mostly runs from irq_work except __init phase. */
static void alloc_bulk(struct bpf_mem_cache *c, int cnt, int node) static void alloc_bulk(struct bpf_mem_cache *c, int cnt, int node)
{ {
@ -300,17 +310,13 @@ static void free_bulk(struct bpf_mem_cache *c)
int cnt; int cnt;
do { do {
if (IS_ENABLED(CONFIG_PREEMPT_RT)) inc_active(c, &flags);
local_irq_save(flags);
WARN_ON_ONCE(local_inc_return(&c->active) != 1);
llnode = __llist_del_first(&c->free_llist); llnode = __llist_del_first(&c->free_llist);
if (llnode) if (llnode)
cnt = --c->free_cnt; cnt = --c->free_cnt;
else else
cnt = 0; cnt = 0;
local_dec(&c->active); dec_active(c, flags);
if (IS_ENABLED(CONFIG_PREEMPT_RT))
local_irq_restore(flags);
if (llnode) if (llnode)
enque_to_free(c, llnode); enque_to_free(c, llnode);
} while (cnt > (c->high_watermark + c->low_watermark) / 2); } while (cnt > (c->high_watermark + c->low_watermark) / 2);