Commit f027f151 authored by Roman Gushchin's avatar Roman Gushchin Committed by Liu Shixin
Browse files

percpu: scoped objcg protection 

mainline inclusion
from mainline-v6.7-rc1
commit c63b835d0eafc956c43b8c6605708240ac52b8cd
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8YU7J

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c63b835d0eafc956c43b8c6605708240ac52b8cd

--------------------------------

Similar to slab and kmem, switch to a scope-based protection of the objcg
pointer to avoid.

Link: https://lkml.kernel.org/r/20231019225346.1822282-6-roman.gushchin@linux.dev


Signed-off-by: default avatarRoman Gushchin (Cruise) <roman.gushchin@linux.dev>
Tested-by: default avatarNaresh Kamboju <naresh.kamboju@linaro.org>
Acked-by: default avatarShakeel Butt <shakeelb@google.com>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: David Rientjes <rientjes@google.com>
Cc: Dennis Zhou <dennis@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent 7f450613

mm/percpu.c

+3 −5
Original line number Diff line number Diff line
@@ -1628,14 +1628,12 @@ static bool pcpu_memcg_pre_alloc_hook(size_t size, gfp_t gfp, 
	if (!memcg_kmem_online() || !(gfp & __GFP_ACCOUNT))

		return true;



	objcg = get_obj_cgroup_from_current();

	objcg = current_obj_cgroup();

	if (!objcg)

		return true;



	if (obj_cgroup_charge(objcg, gfp, pcpu_obj_full_size(size))) {

		obj_cgroup_put(objcg);

	if (obj_cgroup_charge(objcg, gfp, pcpu_obj_full_size(size)))

		return false;

	}



	*objcgp = objcg;

	return true;
@@ -1649,6 +1647,7 @@ static void pcpu_memcg_post_alloc_hook(struct obj_cgroup *objcg, 
		return;



	if (likely(chunk && chunk->obj_cgroups)) {

		obj_cgroup_get(objcg);

		chunk->obj_cgroups[off >> PCPU_MIN_ALLOC_SHIFT] = objcg;



		rcu_read_lock();
@@ -1657,7 +1656,6 @@ static void pcpu_memcg_post_alloc_hook(struct obj_cgroup *objcg, 
		rcu_read_unlock();

	} else {

		obj_cgroup_uncharge(objcg, pcpu_obj_full_size(size));

		obj_cgroup_put(objcg);

	}

}