Commit 667c7901 authored Apr 01, 2020 by Vlastimil Babka Committed by Linus Torvalds Apr 02, 2020

revert "topology: add support for node_to_mem_node() to determine the fallback node"



This reverts commit ad2c8144.

The function node_to_mem_node() was introduced by that commit for use in SLUB
on systems with memoryless nodes, but it turned out to be unreliable on some
architectures/configurations and a simpler solution exists than fixing it up.

Thus commit 0715e6c5 ("mm, slub: prevent kmalloc_node crashes and
memory leaks") removed the only user of node_to_mem_node() and we can
revert the commit that introduced the function.

Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Bharata B Rao <bharata@linux.ibm.com>
Cc: Christopher Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Kirill Tkhai <ktkhai@virtuozzo.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Nathan Lynch <nathanl@linux.ibm.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: PUVICHAKRAVARTHY RAMACHANDRAN <puvichakravarthy@in.ibm.com>
Cc: Sachin Sant <sachinp@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20200320115533.9604-2-vbabka@suse.cz


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3202fa62

include/linux/topology.h

+0 −17

Original line number	Diff line number	Diff line
		@@ -130,20 +130,11 @@ static inline int numa_node_id(void)
		* Use the accessor functions set_numa_mem(), numa_mem_id() and cpu_to_mem().
		*/
		DECLARE_PER_CPU(int, _numa_mem_);
		extern int _node_numa_mem_[MAX_NUMNODES];

		#ifndef set_numa_mem
		static inline void set_numa_mem(int node)
		{
		this_cpu_write(_numa_mem_, node);
		_node_numa_mem_[numa_node_id()] = node;
		}
		#endif

		#ifndef node_to_mem_node
		static inline int node_to_mem_node(int node)
		{
		return _node_numa_mem_[node];
		}
		#endif

		@@ -166,7 +157,6 @@ static inline int cpu_to_mem(int cpu)
		static inline void set_cpu_numa_mem(int cpu, int node)
		{
		per_cpu(_numa_mem_, cpu) = node;
		_node_numa_mem_[cpu_to_node(cpu)] = node;
		}
		#endif

		@@ -180,13 +170,6 @@ static inline int numa_mem_id(void)
		}
		#endif

		#ifndef node_to_mem_node
		static inline int node_to_mem_node(int node)
		{
		return node;
		}
		#endif

		#ifndef cpu_to_mem
		static inline int cpu_to_mem(int cpu)
		{

mm/page_alloc.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,6 @@ DEFINE_STATIC_KEY_TRUE(vm_numa_stat_key);
		*/
		DEFINE_PER_CPU(int, _numa_mem_); /* Kernel "local memory" node */
		EXPORT_PER_CPU_SYMBOL(_numa_mem_);
		int _node_numa_mem_[MAX_NUMNODES];
		#endif

		/* work_structs for global per-cpu drains */

Admin message