Commit 7f822c24 authored Nov 05, 2015 by Tejun Heo Committed by Linus Torvalds Nov 05, 2015

memcg: drop unnecessary cold-path tests from __memcg_kmem_bypass()



__memcg_kmem_bypass() decides whether a kmem allocation should be bypassed
to the root memcg.  Some conditions that it tests are valid criteria
regarding who should be held accountable; however, there are a couple
unnecessary tests for cold paths - __GFP_FAIL and fatal_signal_pending().

The previous patch updated try_charge() to handle both __GFP_FAIL and
dying tasks correctly and the only thing these two tests are doing is
making accounting less accurate and sprinkling tests for cold path
conditions in the hot paths.  There's nothing meaningful gained by these
extra tests.

This patch removes the two unnecessary tests from __memcg_kmem_bypass().

Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Vladimir Davydov <vdavydov@parallels.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 10d53c74

include/linux/memcontrol.h

+0 −14

Original line number	Diff line number	Diff line
		@@ -781,24 +781,10 @@ static inline bool __memcg_kmem_bypass(gfp_t gfp)
		{
		if (!memcg_kmem_enabled())
		return true;

		if (gfp & __GFP_NOACCOUNT)
		return true;
		/*
		* __GFP_NOFAIL allocations will move on even if charging is not
		* possible. Therefore we don't even try, and have this allocation
		* unaccounted. We could in theory charge it forcibly, but we hope
		* those allocations are rare, and won't be worth the trouble.
		*/
		if (gfp & __GFP_NOFAIL)
		return true;
		if (in_interrupt() \|\| (!current->mm) \|\| (current->flags & PF_KTHREAD))
		return true;

		/* If the test is dying, just let it go. */
		if (unlikely(fatal_signal_pending(current)))
		return true;

		return false;
		}

Admin message