Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbfb4798 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

memcg: collect kmem bypass conditions into __memcg_kmem_bypass() 



memcg_kmem_newpage_charge() and memcg_kmem_get_cache() are testing the
same series of conditions to decide whether to bypass kmem accounting.
Collect the tests into __memcg_kmem_bypass().

This is pure refactoring.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarVladimir Davydov <vdavydov@parallels.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b23afb93

include/linux/memcontrol.h

+22 −24
Original line number Diff line number Diff line
@@ -777,20 +777,7 @@ int memcg_charge_kmem(struct mem_cgroup *memcg, gfp_t gfp, 
		      unsigned long nr_pages);

void memcg_uncharge_kmem(struct mem_cgroup *memcg, unsigned long nr_pages);



/**

 * memcg_kmem_newpage_charge: verify if a new kmem allocation is allowed.

 * @gfp: the gfp allocation flags.

 * @memcg: a pointer to the memcg this was charged against.

 * @order: allocation order.

 *

 * returns true if the memcg where the current task belongs can hold this

 * allocation.

 *

 * We return true automatically if this allocation is not to be accounted to

 * any memcg.

 */

static inline bool

memcg_kmem_newpage_charge(gfp_t gfp, struct mem_cgroup **memcg, int order)

static inline bool __memcg_kmem_bypass(gfp_t gfp)

{

	if (!memcg_kmem_enabled())

		return true;
@@ -812,6 +799,26 @@ memcg_kmem_newpage_charge(gfp_t gfp, struct mem_cgroup **memcg, int order) 
	if (unlikely(fatal_signal_pending(current)))

		return true;



	return false;

}



/**

 * memcg_kmem_newpage_charge: verify if a new kmem allocation is allowed.

 * @gfp: the gfp allocation flags.

 * @memcg: a pointer to the memcg this was charged against.

 * @order: allocation order.

 *

 * returns true if the memcg where the current task belongs can hold this

 * allocation.

 *

 * We return true automatically if this allocation is not to be accounted to

 * any memcg.

 */

static inline bool

memcg_kmem_newpage_charge(gfp_t gfp, struct mem_cgroup **memcg, int order)

{

	if (__memcg_kmem_bypass(gfp))

		return true;

	return __memcg_kmem_newpage_charge(gfp, memcg, order);

}
@@ -854,17 +861,8 @@ memcg_kmem_commit_charge(struct page *page, struct mem_cgroup *memcg, int order) 
static __always_inline struct kmem_cache *

memcg_kmem_get_cache(struct kmem_cache *cachep, gfp_t gfp)

{

	if (!memcg_kmem_enabled())

		return cachep;

	if (gfp & __GFP_NOACCOUNT)

		return cachep;

	if (gfp & __GFP_NOFAIL)

	if (__memcg_kmem_bypass(gfp))

		return cachep;

	if (in_interrupt() || (!current->mm) || (current->flags & PF_KTHREAD))

		return cachep;

	if (unlikely(fatal_signal_pending(current)))

		return cachep;



	return __memcg_kmem_get_cache(cachep);

}