[patch 13/14] mm: cleanup zone_pcp

13/14

--
SUSE Labs, Novell Inc.

Use zone_pcp everywhere even though NUMA code "knows" the internal
details of the zone. Stop other people trying to copy, and it looks
nicer.

Also, only print the pagesets of online cpus in zoneinfo.

Index: linux-2.6/mm/page_alloc.c
===================================================================
--- linux-2.6.orig/mm/page_alloc.c
+++ linux-2.6/mm/page_alloc.c
@@ -544,7 +544,7 @@ void drain_remote_pages(void)
 
 		local_irq_save(flags);
 		if (zone->zone_pgdat->node_id != numa_node_id()) {
-			pset = zone->pageset[smp_processor_id()];
+			pset = zone_pcp(zone, smp_processor_id());
 			if (pset->count)
 				pset->count -= free_pages_bulk(zone,
 						pset->count, &pset->list, 0);
@@ -1822,9 +1822,9 @@ static int __devinit process_zones(int c
 	for_each_zone(zone) {
 		unsigned long size, batch;
 
-		zone->pageset[cpu] = kmalloc_node(sizeof(struct per_cpu_pageset),
+		zone_pcp(zone, cpu) = kmalloc_node(sizeof(struct per_cpu_pageset),
 					 GFP_KERNEL, cpu_to_node(cpu));
-		if (!zone->pageset[cpu])
+		if (!zone_pcp(zone, cpu))
 			goto bad;
 
 		batch = zone_batchsize(zone);
@@ -1832,7 +1832,7 @@ static int __devinit process_zones(int c
 			size = batch * 32;
 		else
 			size = batch * 4;
-		setup_pageset(zone->pageset[cpu], size, batch);
+		setup_pageset(zone_pcp(zone, cpu), size, batch);
 	}
 
 	return 0;
@@ -1840,8 +1840,8 @@ bad:
 	for_each_zone(dzone) {
 		if (dzone == zone)
 			break;
-		kfree(dzone->pageset[cpu]);
-		dzone->pageset[cpu] = NULL;
+		kfree(zone_pcp(dzone, cpu));
+		zone_pcp(dzone, cpu) = NULL;
 	}
 	return -ENOMEM;
 }
@@ -1929,8 +1929,8 @@ static __devinit void zone_pcp_init(stru
 	for (cpu = 0; cpu < NR_CPUS; cpu++) {
 #ifdef CONFIG_NUMA
 		/* Early boot. Slab allocator not functional yet */
-		zone->pageset[cpu] = &boot_pageset[cpu];
 		setup_pageset(&boot_pageset[cpu], 0, 0);
+		zone_pcp(zone, cpu) = &boot_pageset[cpu];
 #else
 		setup_pageset(zone_pcp(zone, cpu), batch * 32, batch);
 #endif
@@ -2172,7 +2172,7 @@ static int zoneinfo_show(struct seq_file
 		seq_printf(m,
 			   ")"
 			   "\n  pagesets");
-		for (i = 0; i < ARRAY_SIZE(zone->pageset); i++) {
+		for_each_online_cpu(i) {
 			struct per_cpu_pageset *pset;
 
 			pset = zone_pcp(zone, i);

---

• Follow-Ups:
  • [patch 14/14] mm: page_alloc cleanups
    • From: Nick Piggin <[email protected]>

• References:
  • [rfc][patch 0/14] mm: performance improvements
    • From: Nick Piggin <[email protected]>
  • [patch 1/14] mm: opt rmqueue
    • From: Nick Piggin <[email protected]>
  • [patch 2/14] mm: pte prefetch
    • From: Nick Piggin <[email protected]>
  • [patch 3/14] mm: release opt
    • From: Nick Piggin <[email protected]>
  • [patch 4/14] mm: rmap opt
    • From: Nick Piggin <[email protected]>
  • [patch 5/14] mm: set_page_refs opt
    • From: Nick Piggin <[email protected]>
  • [patch 6/14] mm: microopt conditions
    • From: Nick Piggin <[email protected]>
  • [patch 7/14] mm: remove bad_range
    • From: Nick Piggin <[email protected]>
  • [patch 8/14] mm: remove pcp_low
    • From: Nick Piggin <[email protected]>
  • [patch 9/14] mm: page_state opt
    • From: Nick Piggin <[email protected]>
  • [patch 10/14] mm: single pcp list
    • From: Nick Piggin <[email protected]>
  • [patch 11/14] mm: increase pcp size
    • From: Nick Piggin <[email protected]>
  • [patch 12/14] mm: variable pcp size
    • From: Nick Piggin <[email protected]>

• Prev by Date: Re: [PATCH] tpm: Fix lack of driver_unregister in init failcases
• Next by Date: [patch 12/14] mm: variable pcp size
• Previous by thread: [patch 12/14] mm: variable pcp size
• Next by thread: [patch 14/14] mm: page_alloc cleanups
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]