History

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

Alexey Dobriyan committed 7 years ago

Commit b9726c21 parent d342a0b12 files · +14 −16Browse files

Unified · Split

12 files
  1. arch/arm64/mm/numa.c +1 −1
  2. arch/powerpc/mm/numa.c +1 −1
  3. arch/x86/kernel/setup_percpu.c +1 −1
  4. arch/x86/mm/numa.c +2 −2
  5. include/linux/nodemask.h +2 −2
  6. mm/list_lru.c +1 −2
  7. mm/memcontrol.c +1 −1
  8. mm/page_alloc.c +1 −1
  9. mm/slab.c +1 −2
  10. mm/slub.c +1 −1
  11. mm/swapfile.c +1 −1
  12. mm/vmscan.c +1 −1
arch/arm64/mm/numa.c+1−1
@@ -120,7 +120,7 @@ static void __init setup_node_to_cpumask_map(void) · 119 unmodified lines
120 }120 }
121 121
122 /* cpumask_of_node() will now work */122 /* cpumask_of_node() will now work */
123 pr_debug("Node to cpumask map for %d nodes\n", nr_node_ids);123 pr_debug("Node to cpumask map for %u nodes\n", nr_node_ids);
124}124}
125 125
126/*126/*
arch/powerpc/mm/numa.c+1−1
@@ -84,7 +84,7 @@ static void __init setup_node_to_cpumask_map(void) · 83 unmodified lines
84 alloc_bootmem_cpumask_var(&node_to_cpumask_map[node]);84 alloc_bootmem_cpumask_var(&node_to_cpumask_map[node]);
85 85
86 /* cpumask_of_node() will now work */86 /* cpumask_of_node() will now work */
87 dbg("Node to cpumask map for %d nodes\n", nr_node_ids);87 dbg("Node to cpumask map for %u nodes\n", nr_node_ids);
88}88}
89 89
90static int __init fake_numa_create_new_node(unsigned long end_pfn,90static int __init fake_numa_create_new_node(unsigned long end_pfn,
arch/x86/kernel/setup_percpu.c+1−1
@@ -171,7 +171,7 @@ void __init setup_per_cpu_areas(void) · 170 unmodified lines
171 unsigned long delta;171 unsigned long delta;
172 int rc;172 int rc;
173 173
174 pr_info("NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%u nr_node_ids:%d\n",174 pr_info("NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%u nr_node_ids:%u\n",
175 NR_CPUS, nr_cpumask_bits, nr_cpu_ids, nr_node_ids);175 NR_CPUS, nr_cpumask_bits, nr_cpu_ids, nr_node_ids);
176 176
177 /*177 /*
arch/x86/mm/numa.c+2−2
@@ -123,7 +123,7 @@ void __init setup_node_to_cpumask_map(void) · 122 unmodified lines
123 alloc_bootmem_cpumask_var(&node_to_cpumask_map[node]);123 alloc_bootmem_cpumask_var(&node_to_cpumask_map[node]);
124 124
125 /* cpumask_of_node() will now work */125 /* cpumask_of_node() will now work */
126 pr_debug("Node to cpumask map for %d nodes\n", nr_node_ids);126 pr_debug("Node to cpumask map for %u nodes\n", nr_node_ids);
127}127}
128 128
129static int __init numa_add_memblk_to(int nid, u64 start, u64 end,129static int __init numa_add_memblk_to(int nid, u64 start, u64 end,
@@ -866,7 +866,7 @@ const struct cpumask *cpumask_of_node(int node) · 736 unmodified lines
866{866{
867 if (node >= nr_node_ids) {867 if (node >= nr_node_ids) {
868 printk(KERN_WARNING868 printk(KERN_WARNING
869 "cpumask_of_node(%d): node > nr_node_ids(%d)\n",869 "cpumask_of_node(%d): node > nr_node_ids(%u)\n",
870 node, nr_node_ids);870 node, nr_node_ids);
871 dump_stack();871 dump_stack();
872 return cpu_none_mask;872 return cpu_none_mask;
include/linux/nodemask.h+2−2
@@ -444,7 +444,7 @@ static inline int next_memory_node(int nid) · 443 unmodified lines
444 return next_node(nid, node_states[N_MEMORY]);444 return next_node(nid, node_states[N_MEMORY]);
445}445}
446 446
447extern int nr_node_ids;447extern unsigned int nr_node_ids;
448extern int nr_online_nodes;448extern int nr_online_nodes;
449 449
450static inline void node_set_online(int nid)450static inline void node_set_online(int nid)
@@ -485,7 +485,7 @@ static inline int num_node_state(enum node_states state) · 34 unmodified lines
485#define first_online_node 0485#define first_online_node 0
486#define first_memory_node 0486#define first_memory_node 0
487#define next_online_node(nid) (MAX_NUMNODES)487#define next_online_node(nid) (MAX_NUMNODES)
488#define nr_node_ids 1488#define nr_node_ids 1U
489#define nr_online_nodes 1489#define nr_online_nodes 1
490 490
491#define node_set_online(node) node_set_state((node), N_ONLINE)491#define node_set_online(node) node_set_state((node), N_ONLINE)
mm/list_lru.c+1−2
@@ -601,7 +601,6 @@ int __list_lru_init(struct list_lru *lru, bool memcg_aware, · 600 unmodified lines
601 struct lock_class_key *key, struct shrinker *shrinker)601 struct lock_class_key *key, struct shrinker *shrinker)
602{602{
603 int i;603 int i;
604 size_t size = sizeof(*lru->node) * nr_node_ids;
605 int err = -ENOMEM;604 int err = -ENOMEM;
606 605
607#ifdef CONFIG_MEMCG_KMEM606#ifdef CONFIG_MEMCG_KMEM
@@ -612,7 +611,7 @@ int __list_lru_init(struct list_lru *lru, bool memcg_aware, · 4 unmodified lines
612#endif611#endif
613 memcg_get_cache_ids();612 memcg_get_cache_ids();
614 613
615 lru->node = kzalloc(size, GFP_KERNEL);614 lru->node = kcalloc(nr_node_ids, sizeof(*lru->node), GFP_KERNEL);
616 if (!lru->node)615 if (!lru->node)
617 goto out;616 goto out;
618 617
mm/memcontrol.c+1−1
@@ -4429,7 +4429,7 @@ static void mem_cgroup_free(struct mem_cgroup *memcg) · 4428 unmodified lines
4429static struct mem_cgroup *mem_cgroup_alloc(void)4429static struct mem_cgroup *mem_cgroup_alloc(void)
4430{4430{
4431 struct mem_cgroup *memcg;4431 struct mem_cgroup *memcg;
4432 size_t size;4432 unsigned int size;
4433 int node;4433 int node;
4434 4434
4435 size = sizeof(struct mem_cgroup);4435 size = sizeof(struct mem_cgroup);
mm/page_alloc.c+1−1
@@ -289,7 +289,7 @@ EXPORT_SYMBOL(movable_zone); · 288 unmodified lines
289#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */289#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
290 290
291#if MAX_NUMNODES > 1291#if MAX_NUMNODES > 1
292int nr_node_ids __read_mostly = MAX_NUMNODES;292unsigned int nr_node_ids __read_mostly = MAX_NUMNODES;
293int nr_online_nodes __read_mostly = 1;293int nr_online_nodes __read_mostly = 1;
294EXPORT_SYMBOL(nr_node_ids);294EXPORT_SYMBOL(nr_node_ids);
295EXPORT_SYMBOL(nr_online_nodes);295EXPORT_SYMBOL(nr_online_nodes);
mm/slab.c+1−2
@@ -677,12 +677,11 @@ static struct alien_cache *__alloc_alien_cache(int node, int entries, · 676 unmodified lines
677static struct alien_cache **alloc_alien_cache(int node, int limit, gfp_t gfp)677static struct alien_cache **alloc_alien_cache(int node, int limit, gfp_t gfp)
678{678{
679 struct alien_cache **alc_ptr;679 struct alien_cache **alc_ptr;
680 size_t memsize = sizeof(void *) * nr_node_ids;
681 int i;680 int i;
682 681
683 if (limit > 1)682 if (limit > 1)
684 limit = 12;683 limit = 12;
685 alc_ptr = kzalloc_node(memsize, gfp, node);684 alc_ptr = kcalloc_node(nr_node_ids, sizeof(void *), gfp, node);
686 if (!alc_ptr)685 if (!alc_ptr)
687 return NULL;686 return NULL;
688 687
mm/slub.c+1−1
@@ -4262,7 +4262,7 @@ void __init kmem_cache_init(void) · 4261 unmodified lines
4262 cpuhp_setup_state_nocalls(CPUHP_SLUB_DEAD, "slub:dead", NULL,4262 cpuhp_setup_state_nocalls(CPUHP_SLUB_DEAD, "slub:dead", NULL,
4263 slub_cpu_dead);4263 slub_cpu_dead);
4264 4264
4265 pr_info("SLUB: HWalign=%d, Order=%u-%u, MinObjects=%u, CPUs=%u, Nodes=%d\n",4265 pr_info("SLUB: HWalign=%d, Order=%u-%u, MinObjects=%u, CPUs=%u, Nodes=%u\n",
4266 cache_line_size(),4266 cache_line_size(),
4267 slub_min_order, slub_max_order, slub_min_objects,4267 slub_min_order, slub_max_order, slub_min_objects,
4268 nr_cpu_ids, nr_node_ids);4268 nr_cpu_ids, nr_node_ids);
mm/swapfile.c+1−1
@@ -2713,7 +2713,7 @@ static struct swap_info_struct *alloc_swap_info(void) · 2712 unmodified lines
2713 struct swap_info_struct *p;2713 struct swap_info_struct *p;
2714 unsigned int type;2714 unsigned int type;
2715 int i;2715 int i;
2716 int size = sizeof(*p) + nr_node_ids * sizeof(struct plist_node);2716 unsigned int size = sizeof(*p) + nr_node_ids * sizeof(struct plist_node);
2717 2717
2718 p = kvzalloc(size, GFP_KERNEL);2718 p = kvzalloc(size, GFP_KERNEL);
2719 if (!p)2719 if (!p)
mm/vmscan.c+1−1
@@ -374,7 +374,7 @@ unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone · 373 unmodified lines
374 */374 */
375int prealloc_shrinker(struct shrinker *shrinker)375int prealloc_shrinker(struct shrinker *shrinker)
376{376{
377 size_t size = sizeof(*shrinker->nr_deferred);377 unsigned int size = sizeof(*shrinker->nr_deferred);
378 378
379 if (shrinker->flags & SHRINKER_NUMA_AWARE)379 if (shrinker->flags & SHRINKER_NUMA_AWARE)
380 size *= nr_node_ids;380 size *= nr_node_ids;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t