Commit a561ce00 authored Oct 09, 2014 by Joonsoo Kim Committed by Linus Torvalds Oct 09, 2014

slub: fall back to node_to_mem_node() node if allocating on memoryless node



Update the SLUB code to search for partial slabs on the nearest node with
memory in the presence of memoryless nodes.  Additionally, do not consider
it to be an ALLOC_NODE_MISMATCH (and deactivate the slab) when a
memoryless-node specified allocation goes off-node.

Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Han Pingtian <hanpt@linux.vnet.ibm.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Anton Blanchard <anton@samba.org>
Cc: Christoph Lameter <cl@linux.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ad2c8144

mm/slub.c

+18 −6

Original line number	Diff line number	Diff line
		@@ -1699,7 +1699,12 @@ static void get_partial(struct kmem_cache s, gfp_t flags, int node,
		struct kmem_cache_cpu *c)
		{
		void *object;
		int searchnode = (node == NUMA_NO_NODE) ? numa_mem_id() : node;
		int searchnode = node;

		if (node == NUMA_NO_NODE)
		searchnode = numa_mem_id();
		else if (!node_present_pages(node))
		searchnode = node_to_mem_node(node);

		object = get_partial_node(s, get_node(s, searchnode), c, flags);
		if (object \|\| node != NUMA_NO_NODE)
		@@ -2280,12 +2285,19 @@ static void __slab_alloc(struct kmem_cache s, gfp_t gfpflags, int node,
		redo:

		if (unlikely(!node_match(page, node))) {
		int searchnode = node;

		if (node != NUMA_NO_NODE && !node_present_pages(node))
		searchnode = node_to_mem_node(node);

		if (unlikely(!node_match(page, searchnode))) {
		stat(s, ALLOC_NODE_MISMATCH);
		deactivate_slab(s, page, c->freelist);
		c->page = NULL;
		c->freelist = NULL;
		goto new_slab;
		}
		}

		/*
		* By rights, we should be searching for a slab page that was

Admin message