Commit f1286fae authored by Muchun Song's avatar Muchun Song Committed by Linus Torvalds
Browse files

mm: memcontrol: inline __memcg_kmem_{un}charge() into obj_cgroup_{un}charge_pages() 

There is only one user of __memcg_kmem_charge(), so manually inline
__memcg_kmem_charge() to obj_cgroup_charge_pages().  Similarly manually
inline __memcg_kmem_uncharge() into obj_cgroup_uncharge_pages() and call
obj_cgroup_uncharge_pages() in obj_cgroup_release().

This is just code cleanup without any functionality changes.

Link: https://lkml.kernel.org/r/20210319163821.20704-7-songmuchun@bytedance.com


Signed-off-by: default avatarMuchun Song <songmuchun@bytedance.com>
Reviewed-by: default avatarShakeel Butt <shakeelb@google.com>
Acked-by: default avatarRoman Gushchin <guro@fb.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Xiongchun Duan <duanxiongchun@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b4e0b68f

mm/memcontrol.c

+25 −38
Original line number Diff line number Diff line
@@ -255,9 +255,7 @@ struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr) 
#ifdef CONFIG_MEMCG_KMEM

extern spinlock_t css_set_lock;



static int __memcg_kmem_charge(struct mem_cgroup *memcg, gfp_t gfp,

			       unsigned int nr_pages);

static void __memcg_kmem_uncharge(struct mem_cgroup *memcg,

static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg,

				      unsigned int nr_pages);



static void obj_cgroup_release(struct percpu_ref *ref)
@@ -295,7 +293,7 @@ static void obj_cgroup_release(struct percpu_ref *ref) 
	spin_lock_irqsave(&css_set_lock, flags);

	memcg = obj_cgroup_memcg(objcg);

	if (nr_pages)

		__memcg_kmem_uncharge(memcg, nr_pages);

		obj_cgroup_uncharge_pages(objcg, nr_pages);

	list_del(&objcg->list);

	mem_cgroup_put(memcg);

	spin_unlock_irqrestore(&css_set_lock, flags);
@@ -3015,46 +3013,45 @@ static void memcg_free_cache_id(int id) 
	ida_simple_remove(&memcg_cache_ida, id);

}



/*

 * obj_cgroup_uncharge_pages: uncharge a number of kernel pages from a objcg

 * @objcg: object cgroup to uncharge

 * @nr_pages: number of pages to uncharge

 */

static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg,

				      unsigned int nr_pages)

{

	struct mem_cgroup *memcg;



	memcg = get_mem_cgroup_from_objcg(objcg);

	__memcg_kmem_uncharge(memcg, nr_pages);

	css_put(&memcg->css);

}



static int obj_cgroup_charge_pages(struct obj_cgroup *objcg, gfp_t gfp,

				   unsigned int nr_pages)

{

	struct mem_cgroup *memcg;

	int ret;

	if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))

		page_counter_uncharge(&memcg->kmem, nr_pages);

	refill_stock(memcg, nr_pages);



	memcg = get_mem_cgroup_from_objcg(objcg);

	ret = __memcg_kmem_charge(memcg, gfp, nr_pages);

	css_put(&memcg->css);



	return ret;

}



/**

 * __memcg_kmem_charge: charge a number of kernel pages to a memcg

 * @memcg: memory cgroup to charge

/*

 * obj_cgroup_charge_pages: charge a number of kernel pages to a objcg

 * @objcg: object cgroup to charge

 * @gfp: reclaim mode

 * @nr_pages: number of pages to charge

 *

 * Returns 0 on success, an error code on failure.

 */

static int __memcg_kmem_charge(struct mem_cgroup *memcg, gfp_t gfp,

static int obj_cgroup_charge_pages(struct obj_cgroup *objcg, gfp_t gfp,

				   unsigned int nr_pages)

{

	struct page_counter *counter;

	struct mem_cgroup *memcg;

	int ret;



	memcg = get_mem_cgroup_from_objcg(objcg);



	ret = try_charge(memcg, gfp, nr_pages);

	if (ret)

		return ret;

		goto out;



	if (!cgroup_subsys_on_dfl(memory_cgrp_subsys) &&

	    !page_counter_try_charge(&memcg->kmem, nr_pages, &counter)) {
@@ -3066,25 +3063,15 @@ static int __memcg_kmem_charge(struct mem_cgroup *memcg, gfp_t gfp, 
		 */

		if (gfp & __GFP_NOFAIL) {

			page_counter_charge(&memcg->kmem, nr_pages);

			return 0;

			goto out;

		}

		cancel_charge(memcg, nr_pages);

		return -ENOMEM;

	}

	return 0;

		ret = -ENOMEM;

	}

out:

	css_put(&memcg->css);



/**

 * __memcg_kmem_uncharge: uncharge a number of kernel pages from a memcg

 * @memcg: memcg to uncharge

 * @nr_pages: number of pages to uncharge

 */

static void __memcg_kmem_uncharge(struct mem_cgroup *memcg, unsigned int nr_pages)

{

	if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))

		page_counter_uncharge(&memcg->kmem, nr_pages);



	refill_stock(memcg, nr_pages);

	return ret;

}



/**