Commit b9726c26 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

numa: make "nr_node_ids" unsigned int 

Number of NUMA nodes can't be negative.

This saves a few bytes on x86_64:

	add/remove: 0/0 grow/shrink: 4/21 up/down: 27/-265 (-238)
	Function                                     old     new   delta
	hv_synic_alloc.cold                           88     110     +22
	prealloc_shrinker                            260     262      +2
	bootstrap                                    249     251      +2
	sched_init_numa                             1566    1567      +1
	show_slab_objects                            778     777      -1
	s_show                                      1201    1200      -1
	kmem_cache_init                              346     345      -1
	__alloc_workqueue_key                       1146    1145      -1
	mem_cgroup_css_alloc                        1614    1612      -2
	__do_sys_swapon                             4702    4699      -3
	__list_lru_init                              655     651      -4
	nic_probe                                   2379    2374      -5
	store_user_store                             118     111      -7
	red_zone_store                               106      99      -7
	poison_store                                 106      99      -7
	wq_numa_init                                 348     338     -10
	__kmem_cache_empty                            75      65     -10
	task_numa_free                               186     173     -13
	merge_across_nodes_store                     351     336     -15
	irq_create_affinity_masks                   1261    1246     -15
	do_numa_crng_init                            343     321     -22
	task_numa_fault                             4760    4737     -23
	swapfile_init                                179     156     -23
	hv_synic_alloc                               536     492     -44
	apply_wqattrs_prepare                        746     695     -51

Link: http://lkml.kernel.org/r/20190201223029.GA15820@avx2


Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d342a0b3

arch/arm64/mm/numa.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void __init setup_node_to_cpumask_map(void) 
	}



	/* cpumask_of_node() will now work */

	pr_debug("Node to cpumask map for %d nodes\n", nr_node_ids);

	pr_debug("Node to cpumask map for %u nodes\n", nr_node_ids);

}



/*

arch/powerpc/mm/numa.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static void __init setup_node_to_cpumask_map(void) 
		alloc_bootmem_cpumask_var(&node_to_cpumask_map[node]);



	/* cpumask_of_node() will now work */

	dbg("Node to cpumask map for %d nodes\n", nr_node_ids);

	dbg("Node to cpumask map for %u nodes\n", nr_node_ids);

}



static int __init fake_numa_create_new_node(unsigned long end_pfn,

arch/x86/kernel/setup_percpu.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ void __init setup_per_cpu_areas(void) 
	unsigned long delta;

	int rc;



	pr_info("NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%u nr_node_ids:%d\n",

	pr_info("NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%u nr_node_ids:%u\n",

		NR_CPUS, nr_cpumask_bits, nr_cpu_ids, nr_node_ids);



	/*

arch/x86/mm/numa.c

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ void __init setup_node_to_cpumask_map(void) 
		alloc_bootmem_cpumask_var(&node_to_cpumask_map[node]);



	/* cpumask_of_node() will now work */

	pr_debug("Node to cpumask map for %d nodes\n", nr_node_ids);

	pr_debug("Node to cpumask map for %u nodes\n", nr_node_ids);

}



static int __init numa_add_memblk_to(int nid, u64 start, u64 end,
@@ -866,7 +866,7 @@ const struct cpumask *cpumask_of_node(int node) 
{

	if (node >= nr_node_ids) {

		printk(KERN_WARNING

			"cpumask_of_node(%d): node > nr_node_ids(%d)\n",

			"cpumask_of_node(%d): node > nr_node_ids(%u)\n",

			node, nr_node_ids);

		dump_stack();

		return cpu_none_mask;

include/linux/nodemask.h

+2 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ static inline int next_memory_node(int nid) 
	return next_node(nid, node_states[N_MEMORY]);

}



extern int nr_node_ids;

extern unsigned int nr_node_ids;

extern int nr_online_nodes;



static inline void node_set_online(int nid)
@@ -485,7 +485,7 @@ static inline int num_node_state(enum node_states state) 
#define first_online_node	0

#define first_memory_node	0

#define next_online_node(nid)	(MAX_NUMNODES)

#define nr_node_ids		1

#define nr_node_ids		1U

#define nr_online_nodes		1



#define node_set_online(node)	   node_set_state((node), N_ONLINE)

CRA Git | Maintained and supported by SUSTech CRA and CCSE