b263295dbf
Use sparsemem as the only memory model for UP, SMP and NUMA. Measurements
indicate that DISCONTIGMEM has a higher overhead than sparsemem. And
FLATMEMs benefits are minimal. So I think its best to simply standardize
on sparsemem.
Results of page allocator tests (test can be had via git from slab git
tree branch tests)
Measurements in cycle counts. 1000 allocations were performed and then the
average cycle count was calculated.
Order FlatMem Discontig SparseMem
0 639 665 641
1 567 647 593
2 679 774 692
3 763 967 781
4 961 1501 962
5 1356 2344 1392
6 2224 3982 2336
7 4869 7225 5074
8 12500 14048 12732
9 27926 28223 28165
10 58578 58714 58682
(Note that FlatMem is an SMP config and the rest NUMA configurations)
Memory use:
SMP Sparsemem
-------------
Kernel size:
text data bss dec hex filename
3849268 397739 1264856 5511863 541ab7 vmlinux
total used free shared buffers cached
Mem: 8242252 41164 8201088 0 352 11512
-/+ buffers/cache: 29300 8212952
Swap: 9775512 0 9775512
SMP Flatmem
-----------
Kernel size:
text data bss dec hex filename
3844612 397739 1264536 5506887 540747 vmlinux
So 4.5k growth in text size vs. FLATMEM.
total used free shared buffers cached
Mem: 8244052 40544 8203508 0 352 11484
-/+ buffers/cache: 28708 8215344
2k growth in overall memory use after boot.
NUMA discontig:
text data bss dec hex filename
3888124 470659 1276504 5635287 55fcd7 vmlinux
total used free shared buffers cached
Mem: 8256256 56908 8199348 0 352 11496
-/+ buffers/cache: 45060 8211196
Swap: 9775512 0 9775512
NUMA sparse:
text data bss dec hex filename
3896428 470659 1276824 5643911 561e87 vmlinux
8k text growth. Given that we fully inline virt_to_page and friends now
that is rather good.
total used free shared buffers cached
Mem: 8264720 57240 8207480 0 352 11516
-/+ buffers/cache: 45372 8219348
Swap: 9775512 0 9775512
The total available memory is increased by 8k.
This patch makes sparsemem the default and removes discontig and
flatmem support from x86.
[ akpm@linux-foundation.org: allnoconfig build fix ]
Acked-by: Andi Kleen <ak@suse.de>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
142 lines
4.2 KiB
C
142 lines
4.2 KiB
C
#ifndef _X86_64_PAGE_H
|
|
#define _X86_64_PAGE_H
|
|
|
|
#include <linux/const.h>
|
|
|
|
/* PAGE_SHIFT determines the page size */
|
|
#define PAGE_SHIFT 12
|
|
#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
|
|
#define PAGE_MASK (~(PAGE_SIZE-1))
|
|
#define PHYSICAL_PAGE_MASK (~(PAGE_SIZE-1) & __PHYSICAL_MASK)
|
|
|
|
#define THREAD_ORDER 1
|
|
#define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER)
|
|
#define CURRENT_MASK (~(THREAD_SIZE-1))
|
|
|
|
#define EXCEPTION_STACK_ORDER 0
|
|
#define EXCEPTION_STKSZ (PAGE_SIZE << EXCEPTION_STACK_ORDER)
|
|
|
|
#define DEBUG_STACK_ORDER (EXCEPTION_STACK_ORDER + 1)
|
|
#define DEBUG_STKSZ (PAGE_SIZE << DEBUG_STACK_ORDER)
|
|
|
|
#define IRQSTACK_ORDER 2
|
|
#define IRQSTACKSIZE (PAGE_SIZE << IRQSTACK_ORDER)
|
|
|
|
#define STACKFAULT_STACK 1
|
|
#define DOUBLEFAULT_STACK 2
|
|
#define NMI_STACK 3
|
|
#define DEBUG_STACK 4
|
|
#define MCE_STACK 5
|
|
#define N_EXCEPTION_STACKS 5 /* hw limit: 7 */
|
|
|
|
#define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
|
|
#define LARGE_PAGE_SIZE (_AC(1,UL) << PMD_SHIFT)
|
|
|
|
#define HPAGE_SHIFT PMD_SHIFT
|
|
#define HPAGE_SIZE (_AC(1,UL) << HPAGE_SHIFT)
|
|
#define HPAGE_MASK (~(HPAGE_SIZE - 1))
|
|
#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
|
|
|
|
#ifdef __KERNEL__
|
|
#ifndef __ASSEMBLY__
|
|
|
|
extern unsigned long end_pfn;
|
|
extern unsigned long end_pfn_map;
|
|
|
|
void clear_page(void *);
|
|
void copy_page(void *, void *);
|
|
|
|
#define clear_user_page(page, vaddr, pg) clear_page(page)
|
|
#define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
|
|
|
|
#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
|
|
alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
|
|
#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
|
|
/*
|
|
* These are used to make use of C type-checking..
|
|
*/
|
|
typedef struct { unsigned long pte; } pte_t;
|
|
typedef struct { unsigned long pmd; } pmd_t;
|
|
typedef struct { unsigned long pud; } pud_t;
|
|
typedef struct { unsigned long pgd; } pgd_t;
|
|
#define PTE_MASK PHYSICAL_PAGE_MASK
|
|
|
|
typedef struct { unsigned long pgprot; } pgprot_t;
|
|
|
|
extern unsigned long phys_base;
|
|
|
|
#define pte_val(x) ((x).pte)
|
|
#define pmd_val(x) ((x).pmd)
|
|
#define pud_val(x) ((x).pud)
|
|
#define pgd_val(x) ((x).pgd)
|
|
#define pgprot_val(x) ((x).pgprot)
|
|
|
|
#define __pte(x) ((pte_t) { (x) } )
|
|
#define __pmd(x) ((pmd_t) { (x) } )
|
|
#define __pud(x) ((pud_t) { (x) } )
|
|
#define __pgd(x) ((pgd_t) { (x) } )
|
|
#define __pgprot(x) ((pgprot_t) { (x) } )
|
|
|
|
#endif /* !__ASSEMBLY__ */
|
|
|
|
#define __PHYSICAL_START CONFIG_PHYSICAL_START
|
|
#define __KERNEL_ALIGN 0x200000
|
|
|
|
/*
|
|
* Make sure kernel is aligned to 2MB address. Catching it at compile
|
|
* time is better. Change your config file and compile the kernel
|
|
* for a 2MB aligned address (CONFIG_PHYSICAL_START)
|
|
*/
|
|
#if (CONFIG_PHYSICAL_START % __KERNEL_ALIGN) != 0
|
|
#error "CONFIG_PHYSICAL_START must be a multiple of 2MB"
|
|
#endif
|
|
|
|
#define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START)
|
|
#define __START_KERNEL_map _AC(0xffffffff80000000, UL)
|
|
#define __PAGE_OFFSET _AC(0xffff810000000000, UL)
|
|
|
|
/* to align the pointer to the (next) page boundary */
|
|
#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
|
|
|
|
/* See Documentation/x86_64/mm.txt for a description of the memory map. */
|
|
#define __PHYSICAL_MASK_SHIFT 46
|
|
#define __PHYSICAL_MASK ((_AC(1,UL) << __PHYSICAL_MASK_SHIFT) - 1)
|
|
#define __VIRTUAL_MASK_SHIFT 48
|
|
#define __VIRTUAL_MASK ((_AC(1,UL) << __VIRTUAL_MASK_SHIFT) - 1)
|
|
|
|
#define KERNEL_TEXT_SIZE (40*1024*1024)
|
|
#define KERNEL_TEXT_START _AC(0xffffffff80000000, UL)
|
|
#define PAGE_OFFSET __PAGE_OFFSET
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#include <asm/bug.h>
|
|
|
|
extern unsigned long __phys_addr(unsigned long);
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#define __pa(x) __phys_addr((unsigned long)(x))
|
|
#define __pa_symbol(x) __phys_addr((unsigned long)(x))
|
|
|
|
#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
|
|
#define __boot_va(x) __va(x)
|
|
#define __boot_pa(x) __pa(x)
|
|
|
|
#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
|
|
#define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
|
|
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
|
|
|
|
#define VM_DATA_DEFAULT_FLAGS \
|
|
(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
|
|
VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
|
|
|
|
#define __HAVE_ARCH_GATE_AREA 1
|
|
#define vmemmap ((struct page *)VMEMMAP_START)
|
|
|
|
#include <asm-generic/memory_model.h>
|
|
#include <asm-generic/page.h>
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _X86_64_PAGE_H */
|