Commit 98fa15f3 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Linus Torvalds
Browse files

mm: replace all open encodings for NUMA_NO_NODE 

Patch series "Replace all open encodings for NUMA_NO_NODE", v3.

All these places for replacement were found by running the following
grep patterns on the entire kernel code.  Please let me know if this
might have missed some instances.  This might also have replaced some
false positives.  I will appreciate suggestions, inputs and review.

1. git grep "nid == -1"
2. git grep "node == -1"
3. git grep "nid = -1"
4. git grep "node = -1"

This patch (of 2):

At present there are multiple places where invalid node number is
encoded as -1.  Even though implicitly understood it is always better to
have macros in there.  Replace these open encodings for an invalid node
number with the global macro NUMA_NO_NODE.  This helps remove NUMA
related assumptions like 'invalid node' from various places redirecting
them to a common definition.

Link: http://lkml.kernel.org/r/1545127933-10711-2-git-send-email-anshuman.khandual@arm.com


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>	[ixgbe]
Acked-by: Jens Axboe <axboe@kernel.dk>			[mtip32xx]
Acked-by: Vinod Koul <vkoul@kernel.org>			[dmaengine.c]
Acked-by: Michael Ellerman <mpe@ellerman.id.au>		[powerpc]
Acked-by: Doug Ledford <dledford@redhat.com>		[drivers/infiniband]
Cc: Joseph Qi <jiangqi903@gmail.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6ade2032

arch/alpha/include/asm/topology.h

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


#include <linux/smp.h>

#include <linux/threads.h>

#include <linux/numa.h>

#include <asm/machvec.h>



#ifdef CONFIG_NUMA
@@ -29,7 +30,7 @@ static const struct cpumask *cpumask_of_node(int node) 
{

	int cpu;



	if (node == -1)

	if (node == NUMA_NO_NODE)

		return cpu_all_mask;



	cpumask_clear(&node_to_cpumask_map[node]);

arch/ia64/kernel/numa.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ void __init build_cpu_to_node_map(void) 
		cpumask_clear(&node_to_cpu_mask[node]);



	for_each_possible_early_cpu(cpu) {

		node = -1;

		node = NUMA_NO_NODE;

		for (i = 0; i < NR_CPUS; ++i)

			if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {

				node = node_cpuid[i].nid;

arch/ia64/mm/discontig.c

+3 −3
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ void __init setup_per_cpu_areas(void) 
	 * CPUs are put into groups according to node.  Walk cpu_map

	 * and create new groups at node boundaries.

	 */

	prev_node = -1;

	prev_node = NUMA_NO_NODE;

	ai->nr_groups = 0;

	for (unit = 0; unit < nr_units; unit++) {

		cpu = cpu_map[unit];
@@ -435,7 +435,7 @@ static void __init *memory_less_node_alloc(int nid, unsigned long pernodesize) 
{

	void *ptr = NULL;

	u8 best = 0xff;

	int bestnode = -1, node, anynode = 0;

	int bestnode = NUMA_NO_NODE, node, anynode = 0;



	for_each_online_node(node) {

		if (node_isset(node, memory_less_mask))
@@ -447,7 +447,7 @@ static void __init *memory_less_node_alloc(int nid, unsigned long pernodesize) 
		anynode = node;

	}



	if (bestnode == -1)

	if (bestnode == NUMA_NO_NODE)

		bestnode = anynode;



	ptr = memblock_alloc_try_nid(pernodesize, PERCPU_PAGE_SIZE,

arch/powerpc/include/asm/pci-bridge.h

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/pci.h>

#include <linux/list.h>

#include <linux/ioport.h>

#include <linux/numa.h>



struct device_node;
@@ -265,7 +266,7 @@ extern int pcibios_map_io_space(struct pci_bus *bus); 
#ifdef CONFIG_NUMA

#define PHB_SET_NODE(PHB, NODE)		((PHB)->node = (NODE))

#else

#define PHB_SET_NODE(PHB, NODE)		((PHB)->node = -1)

#define PHB_SET_NODE(PHB, NODE)		((PHB)->node = NUMA_NO_NODE)

#endif



#endif	/* CONFIG_PPC64 */

arch/powerpc/kernel/paca.c

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/export.h>

#include <linux/memblock.h>

#include <linux/sched/task.h>

#include <linux/numa.h>



#include <asm/lppaca.h>

#include <asm/paca.h>
@@ -36,7 +37,7 @@ static void *__init alloc_paca_data(unsigned long size, unsigned long align, 
	 * which will put its paca in the right place.

	 */

	if (cpu == boot_cpuid) {

		nid = -1;

		nid = NUMA_NO_NODE;

		memblock_set_bottom_up(true);

	} else {

		nid = early_cpu_to_node(cpu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE