Revert "gfp: add __GFP_NOACCOUNT" (20b5c303) · Commits · 戴 / test

This reverts commit ("gfp: add __GFP_NOACCOUNT"). Black-list kmem accounting policy (aka __GFP_NOACCOUNT) turned out to be fragile and difficult to maintain, because there seem to be many more allocations that should not be accounted than those that should be. Besides, false accounting an allocation might result in much worse consequences than not accounting at all, namely increased memory consumption due to pinned dead kmem caches. So it was decided to switch to the white-list policy. This patch reverts bits introducing the black-list policy. The white-list policy will be introduced later in the series. Signed-off-by:

Vladimir Davydov <vdavydov@virtuozzo.com> Acked-by:

Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@kernel.org> Cc: Tejun Heo <tj@kernel.org> Cc: Greg Thelen <gthelen@google.com> Cc: Christoph Lameter <cl@linux.com> Cc: Pekka Enberg <penberg@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

include/linux/gfp.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ struct vm_area_struct;
		#define ___GFP_HARDWALL 0x20000u
		#define ___GFP_THISNODE 0x40000u
		#define ___GFP_ATOMIC 0x80000u
		#define ___GFP_NOACCOUNT 0x100000u
		#define ___GFP_NOTRACK 0x200000u
		#define ___GFP_DIRECT_RECLAIM 0x400000u
		#define ___GFP_OTHER_NODE 0x800000u
		@@ -104,7 +103,6 @@ struct vm_area_struct;
		#define __GFP_HIGH ((__force gfp_t)___GFP_HIGH)
		#define __GFP_MEMALLOC ((__force gfp_t)___GFP_MEMALLOC)
		#define __GFP_NOMEMALLOC ((__force gfp_t)___GFP_NOMEMALLOC)
		#define __GFP_NOACCOUNT ((__force gfp_t)___GFP_NOACCOUNT)

		/*
		* Reclaim modifiers

include/linux/memcontrol.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -773,8 +773,6 @@ static inline bool __memcg_kmem_bypass(gfp_t gfp)
		{
		if (!memcg_kmem_enabled())
		return true;
		if (gfp & __GFP_NOACCOUNT)
		return true;
		if (in_interrupt() \|\| (!current->mm) \|\| (current->flags & PF_KTHREAD))
		return true;
		return false;

mm/kmemleak.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -122,8 +122,7 @@
		#define BYTES_PER_POINTER sizeof(void *)

		/* GFP bitmask for kmemleak internal allocations */
		#define gfp_kmemleak_mask(gfp) (((gfp) & (GFP_KERNEL \| GFP_ATOMIC \| \
		__GFP_NOACCOUNT)) \| \
		#define gfp_kmemleak_mask(gfp) (((gfp) & (GFP_KERNEL \| GFP_ATOMIC)) \| \
		__GFP_NORETRY \| __GFP_NOMEMALLOC \| \
		__GFP_NOWARN)

Admin message