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

Commit b37f1dd0 authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

mm: introduce __GFP_MEMALLOC to allow access to emergency reserves 



__GFP_MEMALLOC will allow the allocation to disregard the watermarks, much
like PF_MEMALLOC.  It allows one to pass along the memalloc state in
object related allocation flags as opposed to task related flags, such as
sk->sk_allocation.  This removes the need for ALLOC_PFMEMALLOC as callers
using __GFP_MEMALLOC can get the ALLOC_NO_WATERMARK flag which is now
enough to identify allocations related to page reclaim.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
Cc: David Miller <davem@davemloft.net>
Cc: Neil Brown <neilb@suse.de>
Cc: Mike Christie <michaelc@cs.wisc.edu>
Cc: Eric B Munson <emunson@mgebm.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Christoph Lameter <cl@linux.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5091b74a

include/linux/gfp.h

+8 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct vm_area_struct; 
#define ___GFP_REPEAT		0x400u

#define ___GFP_NOFAIL		0x800u

#define ___GFP_NORETRY		0x1000u

#define ___GFP_MEMALLOC		0x2000u

#define ___GFP_COMP		0x4000u

#define ___GFP_ZERO		0x8000u

#define ___GFP_NOMEMALLOC	0x10000u
@@ -76,9 +77,14 @@ struct vm_area_struct; 
#define __GFP_REPEAT	((__force gfp_t)___GFP_REPEAT)	/* See above */

#define __GFP_NOFAIL	((__force gfp_t)___GFP_NOFAIL)	/* See above */

#define __GFP_NORETRY	((__force gfp_t)___GFP_NORETRY) /* See above */

#define __GFP_MEMALLOC	((__force gfp_t)___GFP_MEMALLOC)/* Allow access to emergency reserves */

#define __GFP_COMP	((__force gfp_t)___GFP_COMP)	/* Add compound page metadata */

#define __GFP_ZERO	((__force gfp_t)___GFP_ZERO)	/* Return zeroed page on success */

#define __GFP_NOMEMALLOC ((__force gfp_t)___GFP_NOMEMALLOC) /* Don't use emergency reserves */

#define __GFP_NOMEMALLOC ((__force gfp_t)___GFP_NOMEMALLOC) /* Don't use emergency reserves.

							 * This takes precedence over the

							 * __GFP_MEMALLOC flag if both are

							 * set

							 */

#define __GFP_HARDWALL   ((__force gfp_t)___GFP_HARDWALL) /* Enforce hardwall cpuset memory allocs */

#define __GFP_THISNODE	((__force gfp_t)___GFP_THISNODE)/* No fallback, no policies */

#define __GFP_RECLAIMABLE ((__force gfp_t)___GFP_RECLAIMABLE) /* Page is reclaimable */
@@ -129,7 +135,7 @@ struct vm_area_struct; 
/* Control page allocator reclaim behavior */

#define GFP_RECLAIM_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS|\

			__GFP_NOWARN|__GFP_REPEAT|__GFP_NOFAIL|\

			__GFP_NORETRY|__GFP_NOMEMALLOC)

			__GFP_NORETRY|__GFP_MEMALLOC|__GFP_NOMEMALLOC)



/* Control slab gfp mask during early boot */

#define GFP_BOOT_MASK (__GFP_BITS_MASK & ~(__GFP_WAIT|__GFP_IO|__GFP_FS))

include/linux/mm_types.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct page { 
			pgoff_t index;		/* Our offset within mapping. */

			void *freelist;		/* slub/slob first free object */

			bool pfmemalloc;	/* If set by the page allocator,

						 * ALLOC_PFMEMALLOC was set

						 * ALLOC_NO_WATERMARKS was set

						 * and the low watermark was not

						 * met implying that the system

						 * is under some pressure. The

include/trace/events/gfpflags.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
	{(unsigned long)__GFP_COMP,		"GFP_COMP"},		\

	{(unsigned long)__GFP_ZERO,		"GFP_ZERO"},		\

	{(unsigned long)__GFP_NOMEMALLOC,	"GFP_NOMEMALLOC"},	\

	{(unsigned long)__GFP_MEMALLOC,		"GFP_MEMALLOC"},	\

	{(unsigned long)__GFP_HARDWALL,		"GFP_HARDWALL"},	\

	{(unsigned long)__GFP_THISNODE,		"GFP_THISNODE"},	\

	{(unsigned long)__GFP_RECLAIMABLE,	"GFP_RECLAIMABLE"},	\

mm/page_alloc.c

+10 −12
Original line number Diff line number Diff line
@@ -1513,7 +1513,6 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, 
#define ALLOC_HARDER		0x10 /* try to alloc harder */

#define ALLOC_HIGH		0x20 /* __GFP_HIGH set */

#define ALLOC_CPUSET		0x40 /* check for correct cpuset */

#define ALLOC_PFMEMALLOC	0x80 /* Caller has PF_MEMALLOC set */



#ifdef CONFIG_FAIL_PAGE_ALLOC
@@ -2294,11 +2293,10 @@ gfp_to_alloc_flags(gfp_t gfp_mask) 
	} else if (unlikely(rt_task(current)) && !in_interrupt())

		alloc_flags |= ALLOC_HARDER;



	if ((current->flags & PF_MEMALLOC) ||

			unlikely(test_thread_flag(TIF_MEMDIE))) {

		alloc_flags |= ALLOC_PFMEMALLOC;



		if (likely(!(gfp_mask & __GFP_NOMEMALLOC)) && !in_interrupt())

	if (likely(!(gfp_mask & __GFP_NOMEMALLOC))) {

		if (gfp_mask & __GFP_MEMALLOC)

			alloc_flags |= ALLOC_NO_WATERMARKS;

		else if (likely(!(gfp_mask & __GFP_NOMEMALLOC)) && !in_interrupt())

			alloc_flags |= ALLOC_NO_WATERMARKS;

	}
@@ -2307,7 +2305,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask) 


bool gfp_pfmemalloc_allowed(gfp_t gfp_mask)

{

	return !!(gfp_to_alloc_flags(gfp_mask) & ALLOC_PFMEMALLOC);

	return !!(gfp_to_alloc_flags(gfp_mask) & ALLOC_NO_WATERMARKS);

}



static inline struct page *
@@ -2498,12 +2496,12 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, 
	return page;

got_pg:

	/*

	 * page->pfmemalloc is set when the caller had PFMEMALLOC set or is

	 * been OOM killed. The expectation is that the caller is taking

	 * steps that will free more memory. The caller should avoid the

	 * page being used for !PFMEMALLOC purposes.

	 * page->pfmemalloc is set when the caller had PFMEMALLOC set, is

	 * been OOM killed or specified __GFP_MEMALLOC. The expectation is

	 * that the caller is taking steps that will free more memory. The

	 * caller should avoid the page being used for !PFMEMALLOC purposes.

	 */

	page->pfmemalloc = !!(alloc_flags & ALLOC_PFMEMALLOC);

	page->pfmemalloc = !!(alloc_flags & ALLOC_NO_WATERMARKS);



	if (kmemcheck_enabled)

		kmemcheck_pagealloc_alloc(page, order, gfp_mask);

mm/slab.c

+1 −1
Original line number Diff line number Diff line
@@ -1884,7 +1884,7 @@ static void *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, int nodeid) 
		return NULL;

	}



	/* Record if ALLOC_PFMEMALLOC was set when allocating the slab */

	/* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */

	if (unlikely(page->pfmemalloc))

		pfmemalloc_active = true;