Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 9b819d204cf602eab1a53a9ec4b8d2ca51e02a1d

Authored by Christoph Lameter
Committed by Linus Torvalds
1 parent 056c62418c
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] Add __GFP_THISNODE to avoid fallback to other nodes and ignore cpuset/me… 

…mory policy restrictions

Add a new gfp flag __GFP_THISNODE to avoid fallback to other nodes.  This
flag is essential if a kernel component requires memory to be located on a
certain node.  It will be needed for alloc_pages_node() to force allocation
on the indicated node and for alloc_pages() to force allocation on the
current node.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 4 changed files with 7 additions and 3 deletions Side-by-side Diff

... ... @@ -45,6 +45,7 @@
45 45 #define __GFP_ZERO ((__force gfp_t)0x8000u)/* Return zeroed page on success */
46 46 #define __GFP_NOMEMALLOC ((__force gfp_t)0x10000u) /* Don't use emergency reserves */
47 47 #define __GFP_HARDWALL ((__force gfp_t)0x20000u) /* Enforce hardwall cpuset memory allocs */
  48 +#define __GFP_THISNODE ((__force gfp_t)0x40000u)/* No fallback, no policies */
48 49  
49 50 #define __GFP_BITS_SHIFT 20 /* Room for 20 __GFP_FOO bits */
50 51 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
... ... @@ -53,7 +54,7 @@
53 54 #define GFP_LEVEL_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS| \
54 55 __GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| \
55 56 __GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP| \
56   - __GFP_NOMEMALLOC|__GFP_HARDWALL)
  57 + __GFP_NOMEMALLOC|__GFP_HARDWALL|__GFP_THISNODE)
57 58  
58 59 /* This equals 0, but use constants in case they ever change */
59 60 #define GFP_NOWAIT (GFP_ATOMIC & ~__GFP_HIGH)
... ... @@ -2316,7 +2316,7 @@
2316 2316 const struct cpuset *cs; /* current cpuset ancestors */
2317 2317 int allowed; /* is allocation in zone z allowed? */
2318 2318  
2319   - if (in_interrupt())
  2319 + if (in_interrupt() || (gfp_mask & __GFP_THISNODE))
2320 2320 return 1;
2321 2321 node = z->zone_pgdat->node_id;
2322 2322 might_sleep_if(!(gfp_mask & __GFP_HARDWALL));
... ... @@ -1290,7 +1290,7 @@
1290 1290  
1291 1291 if ((gfp & __GFP_WAIT) && !in_interrupt())
1292 1292 cpuset_update_task_memory_state();
1293   - if (!pol || in_interrupt())
  1293 + if (!pol || in_interrupt() || (gfp & __GFP_THISNODE))
1294 1294 pol = &default_policy;
1295 1295 if (pol->policy == MPOL_INTERLEAVE)
1296 1296 return alloc_page_interleave(gfp, order, interleave_nodes(pol));
... ... @@ -893,6 +893,9 @@
893 893 * See also cpuset_zone_allowed() comment in kernel/cpuset.c.
894 894 */
895 895 do {
  896 + if (unlikely((gfp_mask & __GFP_THISNODE) &&
  897 + (*z)->zone_pgdat != zonelist->zones[0]->zone_pgdat))
  898 + break;
896 899 if ((alloc_flags & ALLOC_CPUSET) &&
897 900 !cpuset_zone_allowed(*z, gfp_mask))
898 901 continue;