diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-02-28 16:37:34 -0500 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-03-10 13:17:53 -0500 |
| commit | 76c567fbba50c3da2f4d40e2e551bab26cfd4381 (patch) | |
| tree | 6e3c92a266d0ec255e1930adf5ba5268cd71dee9 /arch/tile/kernel/setup.c | |
| parent | 09c17eab075ceeafb53935d858c575b6776394d1 (diff) | |
arch/tile: support 4KB page size as well as 64KB
The Tilera architecture traditionally supports 64KB page sizes
to improve TLB utilization and improve performance when the
hardware is being used primarily to run a single application.
For more generic server scenarios, it can be beneficial to run
with 4KB page sizes, so this commit allows that to be specified
(by modifying the arch/tile/include/hv/pagesize.h header).
As part of this change, we also re-worked the PTE management
slightly so that PTE writes all go through a __set_pte() function
where we can do some additional validation. The set_pte_order()
function was eliminated since the "order" argument wasn't being used.
One bug uncovered was in the PCI DMA code, which wasn't properly
flushing the specified range. This was benign with 64KB pages,
but with 4KB pages we were getting some larger flushes wrong.
The per-cpu memory reservation code also needed updating to
conform with the newer percpu stuff; before it always chose 64KB,
and that was always correct, but with 4KB granularity we now have
to pay closer attention and reserve the amount of memory that will
be requested when the percpu code starts allocating.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/kernel/setup.c')
| -rw-r--r-- | arch/tile/kernel/setup.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c index f18573643ed1..3696b1832566 100644 --- a/arch/tile/kernel/setup.c +++ b/arch/tile/kernel/setup.c | |||
| @@ -59,6 +59,8 @@ unsigned long __initdata node_memmap_pfn[MAX_NUMNODES]; | |||
| 59 | unsigned long __initdata node_percpu_pfn[MAX_NUMNODES]; | 59 | unsigned long __initdata node_percpu_pfn[MAX_NUMNODES]; |
| 60 | unsigned long __initdata node_free_pfn[MAX_NUMNODES]; | 60 | unsigned long __initdata node_free_pfn[MAX_NUMNODES]; |
| 61 | 61 | ||
| 62 | static unsigned long __initdata node_percpu[MAX_NUMNODES]; | ||
| 63 | |||
| 62 | #ifdef CONFIG_HIGHMEM | 64 | #ifdef CONFIG_HIGHMEM |
| 63 | /* Page frame index of end of lowmem on each controller. */ | 65 | /* Page frame index of end of lowmem on each controller. */ |
| 64 | unsigned long __cpuinitdata node_lowmem_end_pfn[MAX_NUMNODES]; | 66 | unsigned long __cpuinitdata node_lowmem_end_pfn[MAX_NUMNODES]; |
| @@ -554,7 +556,6 @@ static void __init setup_bootmem_allocator(void) | |||
| 554 | reserve_bootmem(crashk_res.start, | 556 | reserve_bootmem(crashk_res.start, |
| 555 | crashk_res.end - crashk_res.start + 1, 0); | 557 | crashk_res.end - crashk_res.start + 1, 0); |
| 556 | #endif | 558 | #endif |
| 557 | |||
| 558 | } | 559 | } |
| 559 | 560 | ||
| 560 | void *__init alloc_remap(int nid, unsigned long size) | 561 | void *__init alloc_remap(int nid, unsigned long size) |
| @@ -568,11 +569,13 @@ void *__init alloc_remap(int nid, unsigned long size) | |||
| 568 | 569 | ||
| 569 | static int __init percpu_size(void) | 570 | static int __init percpu_size(void) |
| 570 | { | 571 | { |
| 571 | int size = ALIGN(__per_cpu_end - __per_cpu_start, PAGE_SIZE); | 572 | int size = __per_cpu_end - __per_cpu_start; |
| 572 | #ifdef CONFIG_MODULES | 573 | size += PERCPU_MODULE_RESERVE; |
| 573 | if (size < PERCPU_ENOUGH_ROOM) | 574 | size += PERCPU_DYNAMIC_EARLY_SIZE; |
| 574 | size = PERCPU_ENOUGH_ROOM; | 575 | if (size < PCPU_MIN_UNIT_SIZE) |
| 575 | #endif | 576 | size = PCPU_MIN_UNIT_SIZE; |
| 577 | size = roundup(size, PAGE_SIZE); | ||
| 578 | |||
| 576 | /* In several places we assume the per-cpu data fits on a huge page. */ | 579 | /* In several places we assume the per-cpu data fits on a huge page. */ |
| 577 | BUG_ON(kdata_huge && size > HPAGE_SIZE); | 580 | BUG_ON(kdata_huge && size > HPAGE_SIZE); |
| 578 | return size; | 581 | return size; |
| @@ -589,7 +592,6 @@ static inline unsigned long alloc_bootmem_pfn(int size, unsigned long goal) | |||
| 589 | static void __init zone_sizes_init(void) | 592 | static void __init zone_sizes_init(void) |
| 590 | { | 593 | { |
| 591 | unsigned long zones_size[MAX_NR_ZONES] = { 0 }; | 594 | unsigned long zones_size[MAX_NR_ZONES] = { 0 }; |
| 592 | unsigned long node_percpu[MAX_NUMNODES] = { 0 }; | ||
| 593 | int size = percpu_size(); | 595 | int size = percpu_size(); |
| 594 | int num_cpus = smp_height * smp_width; | 596 | int num_cpus = smp_height * smp_width; |
| 595 | int i; | 597 | int i; |
| @@ -674,7 +676,7 @@ static void __init zone_sizes_init(void) | |||
| 674 | NODE_DATA(i)->bdata = NODE_DATA(0)->bdata; | 676 | NODE_DATA(i)->bdata = NODE_DATA(0)->bdata; |
| 675 | 677 | ||
| 676 | free_area_init_node(i, zones_size, start, NULL); | 678 | free_area_init_node(i, zones_size, start, NULL); |
| 677 | printk(KERN_DEBUG " DMA zone: %ld per-cpu pages\n", | 679 | printk(KERN_DEBUG " Normal zone: %ld per-cpu pages\n", |
| 678 | PFN_UP(node_percpu[i])); | 680 | PFN_UP(node_percpu[i])); |
| 679 | 681 | ||
| 680 | /* Track the type of memory on each node */ | 682 | /* Track the type of memory on each node */ |
| @@ -1312,6 +1314,8 @@ static void *__init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align) | |||
| 1312 | 1314 | ||
| 1313 | BUG_ON(size % PAGE_SIZE != 0); | 1315 | BUG_ON(size % PAGE_SIZE != 0); |
| 1314 | pfn_offset[nid] += size / PAGE_SIZE; | 1316 | pfn_offset[nid] += size / PAGE_SIZE; |
| 1317 | BUG_ON(node_percpu[nid] < size); | ||
| 1318 | node_percpu[nid] -= size; | ||
| 1315 | if (percpu_pfn[cpu] == 0) | 1319 | if (percpu_pfn[cpu] == 0) |
| 1316 | percpu_pfn[cpu] = pfn; | 1320 | percpu_pfn[cpu] = pfn; |
| 1317 | return pfn_to_kaddr(pfn); | 1321 | return pfn_to_kaddr(pfn); |