Commit 9fc8e802 authored by Yonghong Song's avatar Yonghong Song Committed by Alexei Starovoitov
Browse files

bpf: Add objcg to bpf_mem_alloc 



The objcg is a bpf_mem_alloc level property since all bpf_mem_cache's
are with the same objcg. This patch made such a property explicit.
The next patch will use this property to save and restore objcg
for percpu unit allocator.

Acked-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarYonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/r/20231222031739.1288590-1-yonghong.song@linux.dev


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 9beda16c

include/linux/bpf_mem_alloc.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ struct bpf_mem_caches; 
struct bpf_mem_alloc {

	struct bpf_mem_caches __percpu *caches;

	struct bpf_mem_cache __percpu *cache;

	struct obj_cgroup *objcg;

	bool percpu;

	struct work_struct work;

};

kernel/bpf/memalloc.c

+6 −5
Original line number Diff line number Diff line
@@ -523,6 +523,7 @@ int bpf_mem_alloc_init(struct bpf_mem_alloc *ma, int size, bool percpu) 
		if (memcg_bpf_enabled())

			objcg = get_obj_cgroup_from_current();

#endif

		ma->objcg = objcg;

		for_each_possible_cpu(cpu) {

			c = per_cpu_ptr(pc, cpu);

			c->unit_size = unit_size;
@@ -542,6 +543,7 @@ int bpf_mem_alloc_init(struct bpf_mem_alloc *ma, int size, bool percpu) 
#ifdef CONFIG_MEMCG_KMEM

	objcg = get_obj_cgroup_from_current();

#endif

	ma->objcg = objcg;

	for_each_possible_cpu(cpu) {

		cc = per_cpu_ptr(pcc, cpu);

		for (i = 0; i < NUM_CACHES; i++) {
@@ -691,9 +693,8 @@ void bpf_mem_alloc_destroy(struct bpf_mem_alloc *ma) 
			rcu_in_progress += atomic_read(&c->call_rcu_ttrace_in_progress);

			rcu_in_progress += atomic_read(&c->call_rcu_in_progress);

		}

		/* objcg is the same across cpus */

		if (c->objcg)

			obj_cgroup_put(c->objcg);

		if (ma->objcg)

			obj_cgroup_put(ma->objcg);

		destroy_mem_alloc(ma, rcu_in_progress);

	}

	if (ma->caches) {
@@ -709,8 +710,8 @@ void bpf_mem_alloc_destroy(struct bpf_mem_alloc *ma) 
				rcu_in_progress += atomic_read(&c->call_rcu_in_progress);

			}

		}

		if (c->objcg)

			obj_cgroup_put(c->objcg);

		if (ma->objcg)

			obj_cgroup_put(ma->objcg);

		destroy_mem_alloc(ma, rcu_in_progress);

	}

}