2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* linux/arch/x86_64/mm/init.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1995 Linus Torvalds
|
|
|
|
* Copyright (C) 2000 Pavel Machek <pavel@suse.cz>
|
|
|
|
* Copyright (C) 2002,2003 Andi Kleen <ak@suse.de>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/signal.h>
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/ptrace.h>
|
|
|
|
#include <linux/mman.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/swap.h>
|
|
|
|
#include <linux/smp.h>
|
|
|
|
#include <linux/init.h>
|
2008-05-12 13:43:36 +00:00
|
|
|
#include <linux/initrd.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <linux/pagemap.h>
|
|
|
|
#include <linux/bootmem.h>
|
|
|
|
#include <linux/proc_fs.h>
|
2005-11-05 16:25:53 +00:00
|
|
|
#include <linux/pci.h>
|
[PATCH] x86: tighten kernel image page access rights
On x86-64, kernel memory freed after init can be entirely unmapped instead
of just getting 'poisoned' by overwriting with a debug pattern.
On i386 and x86-64 (under CONFIG_DEBUG_RODATA), kernel text and bug table
can also be write-protected.
Compared to the first version, this one prevents re-creating deleted
mappings in the kernel image range on x86-64, if those got removed
previously. This, together with the original changes, prevents temporarily
having inconsistent mappings when cacheability attributes are being
changed on such pages (e.g. from AGP code). While on i386 such duplicate
mappings don't exist, the same change is done there, too, both for
consistency and because checking pte_present() before using various other
pte_XXX functions is a requirement anyway. At once, i386 code gets
adjusted to use pte_huge() instead of open coding this.
AK: split out cpa() changes
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
2007-05-02 17:27:10 +00:00
|
|
|
#include <linux/pfn.h>
|
2006-06-27 09:53:52 +00:00
|
|
|
#include <linux/poison.h>
|
2006-01-11 21:44:42 +00:00
|
|
|
#include <linux/dma-mapping.h>
|
2006-01-17 06:03:41 +00:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/memory_hotplug.h>
|
2007-05-02 17:27:11 +00:00
|
|
|
#include <linux/nmi.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
#include <asm/processor.h>
|
|
|
|
#include <asm/system.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <asm/pgtable.h>
|
|
|
|
#include <asm/pgalloc.h>
|
|
|
|
#include <asm/dma.h>
|
|
|
|
#include <asm/fixmap.h>
|
|
|
|
#include <asm/e820.h>
|
|
|
|
#include <asm/apic.h>
|
|
|
|
#include <asm/tlb.h>
|
|
|
|
#include <asm/mmu_context.h>
|
|
|
|
#include <asm/proto.h>
|
|
|
|
#include <asm/smp.h>
|
2005-11-05 16:25:53 +00:00
|
|
|
#include <asm/sections.h>
|
2008-01-30 12:30:17 +00:00
|
|
|
#include <asm/kdebug.h>
|
2008-01-30 12:30:17 +00:00
|
|
|
#include <asm/numa.h>
|
2008-02-12 20:12:01 +00:00
|
|
|
#include <asm/cacheflush.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-06-17 02:58:28 +00:00
|
|
|
/*
|
|
|
|
* end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
|
|
|
|
* The direct mapping extends to max_pfn_mapped, so that we can directly access
|
|
|
|
* apertures, ACPI and other tables without having to play with fixmaps.
|
|
|
|
*/
|
2008-07-11 03:38:26 +00:00
|
|
|
unsigned long max_low_pfn_mapped;
|
2008-06-17 02:58:28 +00:00
|
|
|
unsigned long max_pfn_mapped;
|
|
|
|
|
2005-11-05 16:25:53 +00:00
|
|
|
static unsigned long dma_reserve __initdata;
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
|
|
|
2008-04-17 15:40:45 +00:00
|
|
|
int direct_gbpages __meminitdata
|
|
|
|
#ifdef CONFIG_DIRECT_GBPAGES
|
|
|
|
= 1
|
|
|
|
#endif
|
|
|
|
;
|
|
|
|
|
|
|
|
static int __init parse_direct_gbpages_off(char *arg)
|
|
|
|
{
|
|
|
|
direct_gbpages = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
early_param("nogbpages", parse_direct_gbpages_off);
|
|
|
|
|
|
|
|
static int __init parse_direct_gbpages_on(char *arg)
|
|
|
|
{
|
|
|
|
direct_gbpages = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
early_param("gbpages", parse_direct_gbpages_on);
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* NOTE: pagetable_init alloc all the fixmap pagetables contiguous on the
|
|
|
|
* physical space so we can cache the place of the first one and move
|
|
|
|
* around without checking the pgd every time.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void show_mem(void)
|
|
|
|
{
|
2005-09-12 16:49:24 +00:00
|
|
|
long i, total = 0, reserved = 0;
|
|
|
|
long shared = 0, cached = 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
struct page *page;
|
2008-01-30 12:34:10 +00:00
|
|
|
pg_data_t *pgdat;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-09-12 16:49:24 +00:00
|
|
|
printk(KERN_INFO "Mem-info:\n");
|
2005-04-16 22:20:36 +00:00
|
|
|
show_free_areas();
|
2006-03-27 09:15:59 +00:00
|
|
|
for_each_online_pgdat(pgdat) {
|
2008-01-30 12:34:10 +00:00
|
|
|
for (i = 0; i < pgdat->node_spanned_pages; ++i) {
|
|
|
|
/*
|
|
|
|
* This loop can take a while with 256 GB and
|
|
|
|
* 4k pages so defer the NMI watchdog:
|
|
|
|
*/
|
|
|
|
if (unlikely(i % MAX_ORDER_NR_PAGES == 0))
|
2007-05-02 17:27:11 +00:00
|
|
|
touch_nmi_watchdog();
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2007-06-08 20:47:00 +00:00
|
|
|
if (!pfn_valid(pgdat->node_start_pfn + i))
|
|
|
|
continue;
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
page = pfn_to_page(pgdat->node_start_pfn + i);
|
|
|
|
total++;
|
2005-09-12 16:49:24 +00:00
|
|
|
if (PageReserved(page))
|
|
|
|
reserved++;
|
|
|
|
else if (PageSwapCache(page))
|
|
|
|
cached++;
|
|
|
|
else if (page_count(page))
|
|
|
|
shared += page_count(page) - 1;
|
2008-01-30 12:34:10 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2008-01-30 12:34:10 +00:00
|
|
|
printk(KERN_INFO "%lu pages of RAM\n", total);
|
|
|
|
printk(KERN_INFO "%lu reserved pages\n", reserved);
|
|
|
|
printk(KERN_INFO "%lu pages shared\n", shared);
|
|
|
|
printk(KERN_INFO "%lu pages swap cached\n", cached);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int after_bootmem;
|
|
|
|
|
2006-03-25 15:30:25 +00:00
|
|
|
static __init void *spp_getpage(void)
|
2008-01-30 12:34:10 +00:00
|
|
|
{
|
2005-04-16 22:20:36 +00:00
|
|
|
void *ptr;
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
if (after_bootmem)
|
2008-01-30 12:34:10 +00:00
|
|
|
ptr = (void *) get_zeroed_page(GFP_ATOMIC);
|
2005-04-16 22:20:36 +00:00
|
|
|
else
|
|
|
|
ptr = alloc_bootmem_pages(PAGE_SIZE);
|
2008-01-30 12:34:10 +00:00
|
|
|
|
|
|
|
if (!ptr || ((unsigned long)ptr & ~PAGE_MASK)) {
|
|
|
|
panic("set_pte_phys: cannot allocate page data %s\n",
|
|
|
|
after_bootmem ? "after bootmem" : "");
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-30 12:34:10 +00:00
|
|
|
pr_debug("spp_getpage %p\n", ptr);
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
return ptr;
|
2008-01-30 12:34:10 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-06-17 18:41:59 +00:00
|
|
|
void
|
2008-06-25 04:19:22 +00:00
|
|
|
set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
pud_t *pud;
|
|
|
|
pmd_t *pmd;
|
2008-06-17 18:41:59 +00:00
|
|
|
pte_t *pte;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-06-25 04:19:22 +00:00
|
|
|
pud = pud_page + pud_index(vaddr);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (pud_none(*pud)) {
|
2008-01-30 12:34:10 +00:00
|
|
|
pmd = (pmd_t *) spp_getpage();
|
2008-06-25 04:19:02 +00:00
|
|
|
pud_populate(&init_mm, pud, pmd);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (pmd != pmd_offset(pud, 0)) {
|
2008-01-30 12:34:10 +00:00
|
|
|
printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
|
2008-01-30 12:34:10 +00:00
|
|
|
pmd, pmd_offset(pud, 0));
|
2005-04-16 22:20:36 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pmd = pmd_offset(pud, vaddr);
|
|
|
|
if (pmd_none(*pmd)) {
|
|
|
|
pte = (pte_t *) spp_getpage();
|
2008-06-25 04:19:02 +00:00
|
|
|
pmd_populate_kernel(&init_mm, pmd, pte);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (pte != pte_offset_kernel(pmd, 0)) {
|
2008-01-30 12:34:10 +00:00
|
|
|
printk(KERN_ERR "PAGETABLE BUG #02!\n");
|
2005-04-16 22:20:36 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pte = pte_offset_kernel(pmd, vaddr);
|
2008-04-25 16:05:57 +00:00
|
|
|
if (!pte_none(*pte) && pte_val(new_pte) &&
|
2005-04-16 22:20:36 +00:00
|
|
|
pte_val(*pte) != (pte_val(new_pte) & __supported_pte_mask))
|
|
|
|
pte_ERROR(*pte);
|
|
|
|
set_pte(pte, new_pte);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* It's enough to flush this one mapping.
|
|
|
|
* (PGE mappings get flushed as well)
|
|
|
|
*/
|
|
|
|
__flush_tlb_one(vaddr);
|
|
|
|
}
|
|
|
|
|
2008-06-25 04:19:22 +00:00
|
|
|
void
|
|
|
|
set_pte_vaddr(unsigned long vaddr, pte_t pteval)
|
|
|
|
{
|
|
|
|
pgd_t *pgd;
|
|
|
|
pud_t *pud_page;
|
|
|
|
|
|
|
|
pr_debug("set_pte_vaddr %lx to %lx\n", vaddr, native_pte_val(pteval));
|
|
|
|
|
|
|
|
pgd = pgd_offset_k(vaddr);
|
|
|
|
if (pgd_none(*pgd)) {
|
|
|
|
printk(KERN_ERR
|
|
|
|
"PGD FIXMAP MISSING, it should be setup in head.S!\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
pud_page = (pud_t*)pgd_page_vaddr(*pgd);
|
|
|
|
set_pte_vaddr_pud(pud_page, vaddr, pteval);
|
|
|
|
}
|
|
|
|
|
2008-07-01 19:45:32 +00:00
|
|
|
/*
|
|
|
|
* Create large page table mappings for a range of physical addresses.
|
|
|
|
*/
|
|
|
|
static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
|
|
|
|
pgprot_t prot)
|
|
|
|
{
|
|
|
|
pgd_t *pgd;
|
|
|
|
pud_t *pud;
|
|
|
|
pmd_t *pmd;
|
|
|
|
|
|
|
|
BUG_ON((phys & ~PMD_MASK) || (size & ~PMD_MASK));
|
|
|
|
for (; size; phys += PMD_SIZE, size -= PMD_SIZE) {
|
|
|
|
pgd = pgd_offset_k((unsigned long)__va(phys));
|
|
|
|
if (pgd_none(*pgd)) {
|
|
|
|
pud = (pud_t *) spp_getpage();
|
|
|
|
set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
|
|
|
|
_PAGE_USER));
|
|
|
|
}
|
|
|
|
pud = pud_offset(pgd, (unsigned long)__va(phys));
|
|
|
|
if (pud_none(*pud)) {
|
|
|
|
pmd = (pmd_t *) spp_getpage();
|
|
|
|
set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
|
|
|
|
_PAGE_USER));
|
|
|
|
}
|
|
|
|
pmd = pmd_offset(pud, phys);
|
|
|
|
BUG_ON(!pmd_none(*pmd));
|
|
|
|
set_pmd(pmd, __pmd(phys | pgprot_val(prot)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void __init init_extra_mapping_wb(unsigned long phys, unsigned long size)
|
|
|
|
{
|
|
|
|
__init_extra_mapping(phys, size, PAGE_KERNEL_LARGE);
|
|
|
|
}
|
|
|
|
|
|
|
|
void __init init_extra_mapping_uc(unsigned long phys, unsigned long size)
|
|
|
|
{
|
|
|
|
__init_extra_mapping(phys, size, PAGE_KERNEL_LARGE_NOCACHE);
|
|
|
|
}
|
|
|
|
|
2008-02-15 16:29:12 +00:00
|
|
|
/*
|
2008-02-21 10:04:11 +00:00
|
|
|
* The head.S code sets up the kernel high mapping:
|
|
|
|
*
|
|
|
|
* from __START_KERNEL_map to __START_KERNEL_map + size (== _end-_text)
|
2008-02-15 16:29:12 +00:00
|
|
|
*
|
|
|
|
* phys_addr holds the negative offset to the kernel, which is added
|
|
|
|
* to the compile time generated pmds. This results in invalid pmds up
|
|
|
|
* to the point where we hit the physaddr 0 mapping.
|
|
|
|
*
|
|
|
|
* We limit the mappings to the region from _text to _end. _end is
|
|
|
|
* rounded up to the 2MB boundary. This catches the invalid pmds as
|
|
|
|
* well, as they are located before _text:
|
|
|
|
*/
|
|
|
|
void __init cleanup_highmap(void)
|
|
|
|
{
|
|
|
|
unsigned long vaddr = __START_KERNEL_map;
|
|
|
|
unsigned long end = round_up((unsigned long)_end, PMD_SIZE) - 1;
|
|
|
|
pmd_t *pmd = level2_kernel_pgt;
|
|
|
|
pmd_t *last_pmd = pmd + PTRS_PER_PMD;
|
|
|
|
|
|
|
|
for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) {
|
2008-05-28 18:36:07 +00:00
|
|
|
if (pmd_none(*pmd))
|
2008-02-15 16:29:12 +00:00
|
|
|
continue;
|
|
|
|
if (vaddr < (unsigned long) _text || vaddr > end)
|
|
|
|
set_pmd(pmd, __pmd(0));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-30 12:33:17 +00:00
|
|
|
static unsigned long __initdata table_start;
|
|
|
|
static unsigned long __meminitdata table_end;
|
2008-06-24 21:57:29 +00:00
|
|
|
static unsigned long __meminitdata table_top;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-05-02 17:27:06 +00:00
|
|
|
static __meminit void *alloc_low_page(unsigned long *phys)
|
2008-01-30 12:34:10 +00:00
|
|
|
{
|
2007-05-02 17:27:06 +00:00
|
|
|
unsigned long pfn = table_end++;
|
2005-04-16 22:20:36 +00:00
|
|
|
void *adr;
|
|
|
|
|
2006-01-17 06:03:41 +00:00
|
|
|
if (after_bootmem) {
|
|
|
|
adr = (void *)get_zeroed_page(GFP_ATOMIC);
|
|
|
|
*phys = __pa(adr);
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2006-01-17 06:03:41 +00:00
|
|
|
return adr;
|
|
|
|
}
|
|
|
|
|
2008-06-24 21:57:29 +00:00
|
|
|
if (pfn >= table_top)
|
2008-01-30 12:34:10 +00:00
|
|
|
panic("alloc_low_page: ran out of memory");
|
2007-05-02 17:27:06 +00:00
|
|
|
|
|
|
|
adr = early_ioremap(pfn * PAGE_SIZE, PAGE_SIZE);
|
2006-01-17 06:03:41 +00:00
|
|
|
memset(adr, 0, PAGE_SIZE);
|
2007-05-02 17:27:06 +00:00
|
|
|
*phys = pfn * PAGE_SIZE;
|
|
|
|
return adr;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-05-02 17:27:06 +00:00
|
|
|
static __meminit void unmap_low_page(void *adr)
|
2008-01-30 12:34:10 +00:00
|
|
|
{
|
2006-01-17 06:03:41 +00:00
|
|
|
if (after_bootmem)
|
|
|
|
return;
|
|
|
|
|
2007-05-02 17:27:06 +00:00
|
|
|
early_iounmap(adr, PAGE_SIZE);
|
2008-01-30 12:34:10 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-07-10 03:15:02 +00:00
|
|
|
static unsigned long __meminit
|
2008-06-25 04:19:19 +00:00
|
|
|
phys_pte_init(pte_t *pte_page, unsigned long addr, unsigned long end)
|
|
|
|
{
|
|
|
|
unsigned pages = 0;
|
2008-07-10 03:15:02 +00:00
|
|
|
unsigned long last_map_addr = end;
|
2008-06-25 04:19:19 +00:00
|
|
|
int i;
|
2008-07-10 03:15:02 +00:00
|
|
|
|
2008-06-25 04:19:19 +00:00
|
|
|
pte_t *pte = pte_page + pte_index(addr);
|
|
|
|
|
|
|
|
for(i = pte_index(addr); i < PTRS_PER_PTE; i++, addr += PAGE_SIZE, pte++) {
|
|
|
|
|
|
|
|
if (addr >= end) {
|
|
|
|
if (!after_bootmem) {
|
|
|
|
for(; i < PTRS_PER_PTE; i++, pte++)
|
|
|
|
set_pte(pte, __pte(0));
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pte_val(*pte))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (0)
|
|
|
|
printk(" pte=%p addr=%lx pte=%016lx\n",
|
|
|
|
pte, addr, pfn_pte(addr >> PAGE_SHIFT, PAGE_KERNEL).pte);
|
|
|
|
set_pte(pte, pfn_pte(addr >> PAGE_SHIFT, PAGE_KERNEL));
|
2008-07-10 03:15:02 +00:00
|
|
|
last_map_addr = (addr & PAGE_MASK) + PAGE_SIZE;
|
2008-06-25 04:19:19 +00:00
|
|
|
pages++;
|
|
|
|
}
|
|
|
|
update_page_count(PG_LEVEL_4K, pages);
|
2008-07-10 03:15:02 +00:00
|
|
|
|
|
|
|
return last_map_addr;
|
2008-06-25 04:19:19 +00:00
|
|
|
}
|
|
|
|
|
2008-07-10 03:15:02 +00:00
|
|
|
static unsigned long __meminit
|
2008-06-25 04:19:19 +00:00
|
|
|
phys_pte_update(pmd_t *pmd, unsigned long address, unsigned long end)
|
|
|
|
{
|
|
|
|
pte_t *pte = (pte_t *)pmd_page_vaddr(*pmd);
|
|
|
|
|
2008-07-10 03:15:02 +00:00
|
|
|
return phys_pte_init(pte, address, end);
|
2008-06-25 04:19:19 +00:00
|
|
|
}
|
|
|
|
|
2008-03-12 02:53:28 +00:00
|
|
|
static unsigned long __meminit
|
2008-07-08 08:41:05 +00:00
|
|
|
phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,
|
|
|
|
unsigned long page_size_mask)
|
2006-01-17 06:03:41 +00:00
|
|
|
{
|
2008-05-02 09:46:49 +00:00
|
|
|
unsigned long pages = 0;
|
2008-07-10 03:15:02 +00:00
|
|
|
unsigned long last_map_addr = end;
|
2008-05-02 09:46:49 +00:00
|
|
|
|
2006-09-26 08:52:36 +00:00
|
|
|
int i = pmd_index(address);
|
2006-01-17 06:03:41 +00:00
|
|
|
|
2006-09-26 08:52:36 +00:00
|
|
|
for (; i < PTRS_PER_PMD; i++, address += PMD_SIZE) {
|
2008-06-25 04:19:19 +00:00
|
|
|
unsigned long pte_phys;
|
2006-09-26 08:52:36 +00:00
|
|
|
pmd_t *pmd = pmd_page + pmd_index(address);
|
2008-06-25 04:19:19 +00:00
|
|
|
pte_t *pte;
|
2006-01-17 06:03:41 +00:00
|
|
|
|
2006-06-26 11:59:02 +00:00
|
|
|
if (address >= end) {
|
2008-01-30 12:34:10 +00:00
|
|
|
if (!after_bootmem) {
|
2006-06-26 11:59:02 +00:00
|
|
|
for (; i < PTRS_PER_PMD; i++, pmd++)
|
|
|
|
set_pmd(pmd, __pmd(0));
|
2008-01-30 12:34:10 +00:00
|
|
|
}
|
2006-01-17 06:03:41 +00:00
|
|
|
break;
|
|
|
|
}
|
2006-09-26 08:52:36 +00:00
|
|
|
|
2008-06-25 04:19:19 +00:00
|
|
|
if (pmd_val(*pmd)) {
|
2008-06-26 19:02:49 +00:00
|
|
|
if (!pmd_large(*pmd))
|
2008-07-10 03:15:02 +00:00
|
|
|
last_map_addr = phys_pte_update(pmd, address,
|
|
|
|
end);
|
2008-06-25 04:19:19 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2008-07-08 08:41:05 +00:00
|
|
|
if (page_size_mask & (1<<PG_LEVEL_2M)) {
|
2008-06-25 04:19:19 +00:00
|
|
|
pages++;
|
|
|
|
set_pte((pte_t *)pmd,
|
|
|
|
pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL_LARGE));
|
2008-07-10 03:15:02 +00:00
|
|
|
last_map_addr = (address & PMD_MASK) + PMD_SIZE;
|
2006-09-26 08:52:36 +00:00
|
|
|
continue;
|
2008-06-25 04:19:19 +00:00
|
|
|
}
|
2006-09-26 08:52:36 +00:00
|
|
|
|
2008-06-25 04:19:19 +00:00
|
|
|
pte = alloc_low_page(&pte_phys);
|
2008-07-10 03:15:02 +00:00
|
|
|
last_map_addr = phys_pte_init(pte, address, end);
|
2008-06-25 04:19:19 +00:00
|
|
|
unmap_low_page(pte);
|
|
|
|
|
|
|
|
pmd_populate_kernel(&init_mm, pmd, __va(pte_phys));
|
2006-01-17 06:03:41 +00:00
|
|
|
}
|
2008-05-02 09:46:49 +00:00
|
|
|
update_page_count(PG_LEVEL_2M, pages);
|
2008-07-10 03:15:02 +00:00
|
|
|
return last_map_addr;
|
2006-01-17 06:03:41 +00:00
|
|
|
}
|
|
|
|
|
2008-03-12 02:53:28 +00:00
|
|
|
static unsigned long __meminit
|
2008-07-08 08:41:05 +00:00
|
|
|
phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end,
|
|
|
|
unsigned long page_size_mask)
|
2006-01-17 06:03:41 +00:00
|
|
|
{
|
2008-01-30 12:34:10 +00:00
|
|
|
pmd_t *pmd = pmd_offset(pud, 0);
|
2008-03-12 02:53:28 +00:00
|
|
|
unsigned long last_map_addr;
|
|
|
|
|
2006-09-26 08:52:36 +00:00
|
|
|
spin_lock(&init_mm.page_table_lock);
|
2008-07-08 08:41:05 +00:00
|
|
|
last_map_addr = phys_pmd_init(pmd, address, end, page_size_mask);
|
2006-09-26 08:52:36 +00:00
|
|
|
spin_unlock(&init_mm.page_table_lock);
|
|
|
|
__flush_tlb_all();
|
2008-03-12 02:53:28 +00:00
|
|
|
return last_map_addr;
|
2006-01-17 06:03:41 +00:00
|
|
|
}
|
|
|
|
|
2008-03-12 02:53:28 +00:00
|
|
|
static unsigned long __meminit
|
2008-07-08 08:41:05 +00:00
|
|
|
phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
|
|
|
|
unsigned long page_size_mask)
|
2008-01-30 12:34:10 +00:00
|
|
|
{
|
2008-05-02 09:46:49 +00:00
|
|
|
unsigned long pages = 0;
|
2008-03-12 02:53:28 +00:00
|
|
|
unsigned long last_map_addr = end;
|
2006-09-26 08:52:36 +00:00
|
|
|
int i = pud_index(addr);
|
2006-01-17 06:03:41 +00:00
|
|
|
|
2008-01-30 12:34:10 +00:00
|
|
|
for (; i < PTRS_PER_PUD; i++, addr = (addr & PUD_MASK) + PUD_SIZE) {
|
2006-09-26 08:52:36 +00:00
|
|
|
unsigned long pmd_phys;
|
|
|
|
pud_t *pud = pud_page + pud_index(addr);
|
2005-04-16 22:20:36 +00:00
|
|
|
pmd_t *pmd;
|
|
|
|
|
2006-09-26 08:52:36 +00:00
|
|
|
if (addr >= end)
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
|
2008-01-30 12:34:10 +00:00
|
|
|
if (!after_bootmem &&
|
|
|
|
!e820_any_mapped(addr, addr+PUD_SIZE, 0)) {
|
|
|
|
set_pud(pud, __pud(0));
|
2005-04-16 22:20:36 +00:00
|
|
|
continue;
|
2008-01-30 12:34:10 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-09-26 08:52:36 +00:00
|
|
|
if (pud_val(*pud)) {
|
2008-04-17 15:40:45 +00:00
|
|
|
if (!pud_large(*pud))
|
2008-07-08 08:41:05 +00:00
|
|
|
last_map_addr = phys_pmd_update(pud, addr, end,
|
|
|
|
page_size_mask);
|
2008-04-17 15:40:45 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2008-07-08 08:41:05 +00:00
|
|
|
if (page_size_mask & (1<<PG_LEVEL_1G)) {
|
2008-05-02 09:46:49 +00:00
|
|
|
pages++;
|
2008-04-17 15:40:45 +00:00
|
|
|
set_pte((pte_t *)pud,
|
|
|
|
pfn_pte(addr >> PAGE_SHIFT, PAGE_KERNEL_LARGE));
|
2008-03-12 02:53:28 +00:00
|
|
|
last_map_addr = (addr & PUD_MASK) + PUD_SIZE;
|
2006-09-26 08:52:36 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2007-05-02 17:27:06 +00:00
|
|
|
pmd = alloc_low_page(&pmd_phys);
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2006-01-17 06:03:41 +00:00
|
|
|
spin_lock(&init_mm.page_table_lock);
|
2008-07-08 08:41:05 +00:00
|
|
|
last_map_addr = phys_pmd_init(pmd, addr, end, page_size_mask);
|
2008-06-25 04:19:19 +00:00
|
|
|
unmap_low_page(pmd);
|
|
|
|
pud_populate(&init_mm, pud, __va(pmd_phys));
|
2006-01-17 06:03:41 +00:00
|
|
|
spin_unlock(&init_mm.page_table_lock);
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2008-01-30 12:33:54 +00:00
|
|
|
__flush_tlb_all();
|
2008-05-02 09:46:49 +00:00
|
|
|
update_page_count(PG_LEVEL_1G, pages);
|
2008-03-12 02:53:28 +00:00
|
|
|
|
2008-06-24 21:56:20 +00:00
|
|
|
return last_map_addr;
|
2008-01-30 12:34:10 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-06-25 04:19:19 +00:00
|
|
|
static unsigned long __meminit
|
2008-07-08 08:41:05 +00:00
|
|
|
phys_pud_update(pgd_t *pgd, unsigned long addr, unsigned long end,
|
|
|
|
unsigned long page_size_mask)
|
2008-06-25 04:19:19 +00:00
|
|
|
{
|
|
|
|
pud_t *pud;
|
|
|
|
|
|
|
|
pud = (pud_t *)pgd_page_vaddr(*pgd);
|
|
|
|
|
2008-07-08 08:41:05 +00:00
|
|
|
return phys_pud_init(pud, addr, end, page_size_mask);
|
2008-06-25 04:19:19 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
static void __init find_early_table_space(unsigned long end)
|
|
|
|
{
|
2008-07-08 08:43:27 +00:00
|
|
|
unsigned long puds, pmds, ptes, tables, start;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
|
2008-04-17 15:40:45 +00:00
|
|
|
tables = round_up(puds * sizeof(pud_t), PAGE_SIZE);
|
2008-07-08 08:43:27 +00:00
|
|
|
if (direct_gbpages) {
|
|
|
|
unsigned long extra;
|
|
|
|
extra = end - ((end>>PUD_SHIFT) << PUD_SHIFT);
|
|
|
|
pmds = (extra + PMD_SIZE - 1) >> PMD_SHIFT;
|
|
|
|
} else
|
|
|
|
pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT;
|
|
|
|
tables += round_up(pmds * sizeof(pmd_t), PAGE_SIZE);
|
|
|
|
|
|
|
|
if (cpu_has_pse) {
|
|
|
|
unsigned long extra;
|
|
|
|
extra = end - ((end>>PMD_SHIFT) << PMD_SHIFT);
|
|
|
|
ptes = (extra + PAGE_SIZE - 1) >> PAGE_SHIFT;
|
|
|
|
} else
|
|
|
|
ptes = (end + PAGE_SIZE - 1) >> PAGE_SHIFT;
|
|
|
|
tables += round_up(ptes * sizeof(pte_t), PAGE_SIZE);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-30 12:34:10 +00:00
|
|
|
/*
|
|
|
|
* RED-PEN putting page tables only on node 0 could
|
|
|
|
* cause a hotspot and fill up ZONE_DMA. The page tables
|
|
|
|
* need roughly 0.5KB per GB.
|
|
|
|
*/
|
|
|
|
start = 0x8000;
|
2008-02-01 16:49:41 +00:00
|
|
|
table_start = find_e820_area(start, end, tables, PAGE_SIZE);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (table_start == -1UL)
|
|
|
|
panic("Cannot find space for the kernel page tables");
|
|
|
|
|
|
|
|
table_start >>= PAGE_SHIFT;
|
|
|
|
table_end = table_start;
|
2008-06-24 21:57:29 +00:00
|
|
|
table_top = table_start + (tables >> PAGE_SHIFT);
|
2006-01-17 06:03:41 +00:00
|
|
|
|
2008-06-24 21:57:29 +00:00
|
|
|
printk(KERN_DEBUG "kernel direct mapping tables up to %lx @ %lx-%lx\n",
|
|
|
|
end, table_start << PAGE_SHIFT, table_top << PAGE_SHIFT);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2008-04-17 15:40:45 +00:00
|
|
|
static void __init init_gbpages(void)
|
|
|
|
{
|
|
|
|
if (direct_gbpages && cpu_has_gbpages)
|
|
|
|
printk(KERN_INFO "Using GB pages for direct mapping\n");
|
|
|
|
else
|
|
|
|
direct_gbpages = 0;
|
|
|
|
}
|
|
|
|
|
2008-04-19 00:49:15 +00:00
|
|
|
#ifdef CONFIG_MEMTEST
|
2008-03-22 01:56:19 +00:00
|
|
|
|
|
|
|
static void __init memtest(unsigned long start_phys, unsigned long size,
|
|
|
|
unsigned pattern)
|
2008-03-21 06:58:33 +00:00
|
|
|
{
|
|
|
|
unsigned long i;
|
|
|
|
unsigned long *start;
|
|
|
|
unsigned long start_bad;
|
|
|
|
unsigned long last_bad;
|
|
|
|
unsigned long val;
|
|
|
|
unsigned long start_phys_aligned;
|
|
|
|
unsigned long count;
|
|
|
|
unsigned long incr;
|
|
|
|
|
|
|
|
switch (pattern) {
|
|
|
|
case 0:
|
|
|
|
val = 0UL;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
val = -1UL;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
val = 0x5555555555555555UL;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
val = 0xaaaaaaaaaaaaaaaaUL;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
incr = sizeof(unsigned long);
|
|
|
|
start_phys_aligned = ALIGN(start_phys, incr);
|
|
|
|
count = (size - (start_phys_aligned - start_phys))/incr;
|
|
|
|
start = __va(start_phys_aligned);
|
|
|
|
start_bad = 0;
|
|
|
|
last_bad = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
start[i] = val;
|
|
|
|
for (i = 0; i < count; i++, start++, start_phys_aligned += incr) {
|
|
|
|
if (*start != val) {
|
|
|
|
if (start_phys_aligned == last_bad + incr) {
|
|
|
|
last_bad += incr;
|
|
|
|
} else {
|
|
|
|
if (start_bad) {
|
2008-04-16 06:17:42 +00:00
|
|
|
printk(KERN_CONT "\n %016lx bad mem addr %016lx - %016lx reserved",
|
2008-03-21 06:58:33 +00:00
|
|
|
val, start_bad, last_bad + incr);
|
|
|
|
reserve_early(start_bad, last_bad - start_bad, "BAD RAM");
|
|
|
|
}
|
|
|
|
start_bad = last_bad = start_phys_aligned;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (start_bad) {
|
2008-04-16 06:17:42 +00:00
|
|
|
printk(KERN_CONT "\n %016lx bad mem addr %016lx - %016lx reserved",
|
2008-03-21 06:58:33 +00:00
|
|
|
val, start_bad, last_bad + incr);
|
|
|
|
reserve_early(start_bad, last_bad - start_bad, "BAD RAM");
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2008-04-19 00:49:15 +00:00
|
|
|
/* default is disabled */
|
|
|
|
static int memtest_pattern __initdata;
|
2008-03-22 01:56:19 +00:00
|
|
|
|
2008-03-21 06:58:33 +00:00
|
|
|
static int __init parse_memtest(char *arg)
|
|
|
|
{
|
|
|
|
if (arg)
|
2008-03-22 01:56:19 +00:00
|
|
|
memtest_pattern = simple_strtoul(arg, NULL, 0);
|
2008-03-21 06:58:33 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
early_param("memtest", parse_memtest);
|
|
|
|
|
|
|
|
static void __init early_memtest(unsigned long start, unsigned long end)
|
|
|
|
{
|
2008-07-03 08:14:10 +00:00
|
|
|
u64 t_start, t_size;
|
2008-03-21 06:58:33 +00:00
|
|
|
unsigned pattern;
|
|
|
|
|
2008-03-22 01:56:19 +00:00
|
|
|
if (!memtest_pattern)
|
|
|
|
return;
|
|
|
|
|
|
|
|
printk(KERN_INFO "early_memtest: pattern num %d", memtest_pattern);
|
2008-03-21 06:58:33 +00:00
|
|
|
for (pattern = 0; pattern < memtest_pattern; pattern++) {
|
|
|
|
t_start = start;
|
|
|
|
t_size = 0;
|
|
|
|
while (t_start < end) {
|
|
|
|
t_start = find_e820_area_size(t_start, &t_size, 1);
|
|
|
|
|
|
|
|
/* done ? */
|
|
|
|
if (t_start >= end)
|
|
|
|
break;
|
|
|
|
if (t_start + t_size > end)
|
|
|
|
t_size = end - t_start;
|
|
|
|
|
2008-07-03 08:14:10 +00:00
|
|
|
printk(KERN_CONT "\n %016llx - %016llx pattern %d",
|
|
|
|
(unsigned long long)t_start,
|
|
|
|
(unsigned long long)t_start + t_size, pattern);
|
2008-03-21 06:58:33 +00:00
|
|
|
|
|
|
|
memtest(t_start, t_size, pattern);
|
|
|
|
|
|
|
|
t_start += t_size;
|
|
|
|
}
|
|
|
|
}
|
2008-03-22 01:56:19 +00:00
|
|
|
printk(KERN_CONT "\n");
|
2008-03-21 06:58:33 +00:00
|
|
|
}
|
2008-03-22 01:56:19 +00:00
|
|
|
#else
|
|
|
|
static void __init early_memtest(unsigned long start, unsigned long end)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
2008-03-21 06:58:33 +00:00
|
|
|
|
2008-07-08 08:41:05 +00:00
|
|
|
static unsigned long __init kernel_physical_mapping_init(unsigned long start,
|
|
|
|
unsigned long end,
|
|
|
|
unsigned long page_size_mask)
|
2008-01-30 12:34:10 +00:00
|
|
|
{
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-07-08 08:41:05 +00:00
|
|
|
unsigned long next, last_map_addr = end;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
start = (unsigned long)__va(start);
|
|
|
|
end = (unsigned long)__va(end);
|
|
|
|
|
|
|
|
for (; start < end; start = next) {
|
2006-01-17 06:03:41 +00:00
|
|
|
pgd_t *pgd = pgd_offset_k(start);
|
2008-01-30 12:34:10 +00:00
|
|
|
unsigned long pud_phys;
|
2006-01-17 06:03:41 +00:00
|
|
|
pud_t *pud;
|
|
|
|
|
2008-06-25 04:19:19 +00:00
|
|
|
next = start + PGDIR_SIZE;
|
|
|
|
if (next > end)
|
|
|
|
next = end;
|
|
|
|
|
|
|
|
if (pgd_val(*pgd)) {
|
2008-07-08 08:41:05 +00:00
|
|
|
last_map_addr = phys_pud_update(pgd, __pa(start),
|
|
|
|
__pa(end), page_size_mask);
|
2008-06-25 04:19:19 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2006-01-17 06:03:41 +00:00
|
|
|
if (after_bootmem)
|
2006-06-26 11:57:56 +00:00
|
|
|
pud = pud_offset(pgd, start & PGDIR_MASK);
|
2006-01-17 06:03:41 +00:00
|
|
|
else
|
2007-05-02 17:27:06 +00:00
|
|
|
pud = alloc_low_page(&pud_phys);
|
2006-01-17 06:03:41 +00:00
|
|
|
|
2008-07-08 08:41:05 +00:00
|
|
|
last_map_addr = phys_pud_init(pud, __pa(start), __pa(next),
|
|
|
|
page_size_mask);
|
2008-06-25 04:19:19 +00:00
|
|
|
unmap_low_page(pud);
|
2008-07-01 23:46:33 +00:00
|
|
|
pgd_populate(&init_mm, pgd_offset_k(start),
|
|
|
|
__va(pud_phys));
|
2008-01-30 12:34:10 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-07-08 08:41:05 +00:00
|
|
|
return last_map_addr;
|
|
|
|
}
|
2008-07-10 03:15:02 +00:00
|
|
|
|
|
|
|
struct map_range {
|
|
|
|
unsigned long start;
|
|
|
|
unsigned long end;
|
|
|
|
unsigned page_size_mask;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define NR_RANGE_MR 5
|
|
|
|
|
|
|
|
static int save_mr(struct map_range *mr, int nr_range,
|
|
|
|
unsigned long start_pfn, unsigned long end_pfn,
|
|
|
|
unsigned long page_size_mask)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (start_pfn < end_pfn) {
|
|
|
|
if (nr_range >= NR_RANGE_MR)
|
|
|
|
panic("run out of range for init_memory_mapping\n");
|
|
|
|
mr[nr_range].start = start_pfn<<PAGE_SHIFT;
|
|
|
|
mr[nr_range].end = end_pfn<<PAGE_SHIFT;
|
|
|
|
mr[nr_range].page_size_mask = page_size_mask;
|
|
|
|
nr_range++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nr_range;
|
|
|
|
}
|
|
|
|
|
2008-07-08 08:41:05 +00:00
|
|
|
/*
|
|
|
|
* Setup the direct mapping of the physical memory at PAGE_OFFSET.
|
|
|
|
* This runs before bootmem is initialized and gets pages directly from
|
|
|
|
* the physical memory. To access them they are temporarily mapped.
|
|
|
|
*/
|
|
|
|
unsigned long __init_refok init_memory_mapping(unsigned long start,
|
|
|
|
unsigned long end)
|
|
|
|
{
|
2008-07-10 03:15:02 +00:00
|
|
|
unsigned long last_map_addr = 0;
|
2008-07-08 08:41:05 +00:00
|
|
|
unsigned long page_size_mask = 0;
|
2008-07-08 08:43:27 +00:00
|
|
|
unsigned long start_pfn, end_pfn;
|
2008-07-08 08:41:05 +00:00
|
|
|
|
2008-07-10 03:15:02 +00:00
|
|
|
struct map_range mr[NR_RANGE_MR];
|
|
|
|
int nr_range, i;
|
|
|
|
|
2008-07-08 08:41:05 +00:00
|
|
|
printk(KERN_INFO "init_memory_mapping\n");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find space for the kernel direct mapping tables.
|
|
|
|
*
|
|
|
|
* Later we should allocate these tables in the local node of the
|
|
|
|
* memory mapped. Unfortunately this is done currently before the
|
|
|
|
* nodes are discovered.
|
|
|
|
*/
|
2008-07-10 03:15:02 +00:00
|
|
|
if (!after_bootmem)
|
2008-07-08 08:41:05 +00:00
|
|
|
init_gbpages();
|
|
|
|
|
|
|
|
if (direct_gbpages)
|
|
|
|
page_size_mask |= 1 << PG_LEVEL_1G;
|
|
|
|
if (cpu_has_pse)
|
|
|
|
page_size_mask |= 1 << PG_LEVEL_2M;
|
|
|
|
|
2008-07-10 03:15:02 +00:00
|
|
|
memset(mr, 0, sizeof(mr));
|
|
|
|
nr_range = 0;
|
|
|
|
|
|
|
|
/* head if not big page alignment ?*/
|
2008-07-08 08:43:27 +00:00
|
|
|
start_pfn = start >> PAGE_SHIFT;
|
|
|
|
end_pfn = ((start + (PMD_SIZE - 1)) >> PMD_SHIFT)
|
|
|
|
<< (PMD_SHIFT - PAGE_SHIFT);
|
2008-07-10 03:15:02 +00:00
|
|
|
nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0);
|
2008-07-08 08:43:27 +00:00
|
|
|
|
|
|
|
/* big page (2M) range*/
|
|
|
|
start_pfn = ((start + (PMD_SIZE - 1))>>PMD_SHIFT)
|
|
|
|
<< (PMD_SHIFT - PAGE_SHIFT);
|
|
|
|
end_pfn = ((start + (PUD_SIZE - 1))>>PUD_SHIFT)
|
|
|
|
<< (PUD_SHIFT - PAGE_SHIFT);
|
|
|
|
if (end_pfn > ((end>>PUD_SHIFT)<<(PUD_SHIFT - PAGE_SHIFT)))
|
|
|
|
end_pfn = ((end>>PUD_SHIFT)<<(PUD_SHIFT - PAGE_SHIFT));
|
2008-07-10 03:15:02 +00:00
|
|
|
nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
|
|
|
|
page_size_mask & (1<<PG_LEVEL_2M));
|
2008-07-08 08:43:27 +00:00
|
|
|
|
|
|
|
/* big page (1G) range */
|
|
|
|
start_pfn = end_pfn;
|
|
|
|
end_pfn = (end>>PUD_SHIFT) << (PUD_SHIFT - PAGE_SHIFT);
|
2008-07-10 03:15:02 +00:00
|
|
|
nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
|
|
|
|
page_size_mask &
|
|
|
|
((1<<PG_LEVEL_2M)|(1<<PG_LEVEL_1G)));
|
2008-07-08 08:43:27 +00:00
|
|
|
|
|
|
|
/* tail is not big page (1G) alignment */
|
|
|
|
start_pfn = end_pfn;
|
|
|
|
end_pfn = (end>>PMD_SHIFT) << (PMD_SHIFT - PAGE_SHIFT);
|
2008-07-10 03:15:02 +00:00
|
|
|
nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
|
|
|
|
page_size_mask & (1<<PG_LEVEL_2M));
|
|
|
|
|
2008-07-08 08:43:27 +00:00
|
|
|
/* tail is not big page (2M) alignment */
|
|
|
|
start_pfn = end_pfn;
|
|
|
|
end_pfn = end>>PAGE_SHIFT;
|
2008-07-10 03:15:02 +00:00
|
|
|
nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0);
|
|
|
|
|
|
|
|
for (i = 0; i < nr_range; i++)
|
|
|
|
printk(KERN_DEBUG " %010lx - %010lx page %s\n",
|
|
|
|
mr[i].start, mr[i].end,
|
|
|
|
(mr[i].page_size_mask & (1<<PG_LEVEL_1G))?"1G":(
|
|
|
|
(mr[i].page_size_mask & (1<<PG_LEVEL_2M))?"2M":"4k"));
|
|
|
|
|
|
|
|
if (!after_bootmem)
|
|
|
|
find_early_table_space(end);
|
|
|
|
|
|
|
|
for (i = 0; i < nr_range; i++)
|
2008-07-08 08:43:27 +00:00
|
|
|
last_map_addr = kernel_physical_mapping_init(
|
2008-07-10 03:15:02 +00:00
|
|
|
mr[i].start, mr[i].end,
|
|
|
|
mr[i].page_size_mask);
|
2008-07-08 08:41:05 +00:00
|
|
|
|
2006-01-17 06:03:41 +00:00
|
|
|
if (!after_bootmem)
|
2007-07-22 09:12:29 +00:00
|
|
|
mmu_cr4_features = read_cr4();
|
2005-04-16 22:20:36 +00:00
|
|
|
__flush_tlb_all();
|
2008-01-30 12:33:17 +00:00
|
|
|
|
2008-07-08 08:41:05 +00:00
|
|
|
if (!after_bootmem && table_end > table_start)
|
2008-02-01 16:49:41 +00:00
|
|
|
reserve_early(table_start << PAGE_SHIFT,
|
|
|
|
table_end << PAGE_SHIFT, "PGTABLE");
|
2008-03-21 06:58:33 +00:00
|
|
|
|
2008-07-08 08:41:05 +00:00
|
|
|
printk(KERN_INFO "last_map_addr: %lx end: %lx\n",
|
|
|
|
last_map_addr, end);
|
|
|
|
|
2008-03-21 06:58:33 +00:00
|
|
|
if (!after_bootmem)
|
2008-07-08 08:41:05 +00:00
|
|
|
early_memtest(start, end);
|
2008-03-12 02:53:28 +00:00
|
|
|
|
2008-06-24 21:56:20 +00:00
|
|
|
return last_map_addr >> PAGE_SHIFT;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-06-23 07:08:06 +00:00
|
|
|
#ifndef CONFIG_NUMA
|
2008-06-22 09:44:49 +00:00
|
|
|
void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn)
|
|
|
|
{
|
|
|
|
unsigned long bootmap_size, bootmap;
|
|
|
|
|
|
|
|
bootmap_size = bootmem_bootmap_pages(end_pfn)<<PAGE_SHIFT;
|
|
|
|
bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT, bootmap_size,
|
|
|
|
PAGE_SIZE);
|
|
|
|
if (bootmap == -1L)
|
|
|
|
panic("Cannot find bootmem map of size %ld\n", bootmap_size);
|
2008-06-23 10:06:14 +00:00
|
|
|
/* don't touch min_low_pfn */
|
|
|
|
bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap >> PAGE_SHIFT,
|
|
|
|
0, end_pfn);
|
2008-06-22 09:44:49 +00:00
|
|
|
e820_register_active_regions(0, start_pfn, end_pfn);
|
|
|
|
free_bootmem_with_active_regions(0, end_pfn);
|
|
|
|
early_res_to_bootmem(0, end_pfn<<PAGE_SHIFT);
|
|
|
|
reserve_bootmem(bootmap, bootmap_size, BOOTMEM_DEFAULT);
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
void __init paging_init(void)
|
|
|
|
{
|
2006-10-11 08:20:39 +00:00
|
|
|
unsigned long max_zone_pfns[MAX_NR_ZONES];
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2006-10-11 08:20:39 +00:00
|
|
|
memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
|
|
|
|
max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN;
|
|
|
|
max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
|
2008-06-25 05:14:09 +00:00
|
|
|
max_zone_pfns[ZONE_NORMAL] = max_pfn;
|
2006-10-11 08:20:39 +00:00
|
|
|
|
2008-06-25 05:14:09 +00:00
|
|
|
memory_present(0, 0, max_pfn);
|
2006-01-17 06:03:41 +00:00
|
|
|
sparse_init();
|
2006-09-27 08:49:52 +00:00
|
|
|
free_area_init_nodes(max_zone_pfns);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-01-17 06:03:41 +00:00
|
|
|
/*
|
|
|
|
* Memory hotplug specific functions
|
|
|
|
*/
|
2006-06-27 09:53:30 +00:00
|
|
|
#ifdef CONFIG_MEMORY_HOTPLUG
|
2006-04-07 17:49:15 +00:00
|
|
|
/*
|
|
|
|
* Memory is added always to NORMAL zone. This means you will never get
|
|
|
|
* additional DMA/DMA32 memory.
|
|
|
|
*/
|
2006-06-27 09:53:30 +00:00
|
|
|
int arch_add_memory(int nid, u64 start, u64 size)
|
2006-01-17 06:03:41 +00:00
|
|
|
{
|
2006-06-27 09:53:30 +00:00
|
|
|
struct pglist_data *pgdat = NODE_DATA(nid);
|
2006-09-26 06:31:09 +00:00
|
|
|
struct zone *zone = pgdat->node_zones + ZONE_NORMAL;
|
2008-03-12 02:53:28 +00:00
|
|
|
unsigned long last_mapped_pfn, start_pfn = start >> PAGE_SHIFT;
|
2006-01-17 06:03:41 +00:00
|
|
|
unsigned long nr_pages = size >> PAGE_SHIFT;
|
|
|
|
int ret;
|
|
|
|
|
2008-03-12 02:53:28 +00:00
|
|
|
last_mapped_pfn = init_memory_mapping(start, start + size-1);
|
|
|
|
if (last_mapped_pfn > max_pfn_mapped)
|
|
|
|
max_pfn_mapped = last_mapped_pfn;
|
2006-10-01 06:27:09 +00:00
|
|
|
|
2006-01-17 06:03:41 +00:00
|
|
|
ret = __add_pages(zone, start_pfn, nr_pages);
|
2008-01-30 12:34:10 +00:00
|
|
|
WARN_ON(1);
|
2006-01-17 06:03:41 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2006-06-27 09:53:30 +00:00
|
|
|
EXPORT_SYMBOL_GPL(arch_add_memory);
|
2006-01-17 06:03:41 +00:00
|
|
|
|
2006-11-19 06:19:40 +00:00
|
|
|
#if !defined(CONFIG_ACPI_NUMA) && defined(CONFIG_NUMA)
|
2006-10-01 06:27:06 +00:00
|
|
|
int memory_add_physaddr_to_nid(u64 start)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2006-10-01 06:27:07 +00:00
|
|
|
EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
|
2006-10-01 06:27:06 +00:00
|
|
|
#endif
|
|
|
|
|
2006-10-01 06:27:09 +00:00
|
|
|
#endif /* CONFIG_MEMORY_HOTPLUG */
|
|
|
|
|
2008-04-24 21:40:47 +00:00
|
|
|
/*
|
|
|
|
* devmem_is_allowed() checks to see if /dev/mem access to a certain address
|
|
|
|
* is valid. The argument is a physical page number.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* On x86, access has to be given to the first megabyte of ram because that area
|
|
|
|
* contains bios code and data regions used by X and dosemu and similar apps.
|
|
|
|
* Access has to be given to non-kernel-ram areas as well, these contain the PCI
|
|
|
|
* mmio resources as well as potential bios/acpi data regions.
|
|
|
|
*/
|
|
|
|
int devmem_is_allowed(unsigned long pagenr)
|
|
|
|
{
|
|
|
|
if (pagenr <= 256)
|
|
|
|
return 1;
|
|
|
|
if (!page_is_ram(pagenr))
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-01-30 12:34:10 +00:00
|
|
|
static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel,
|
|
|
|
kcore_modules, kcore_vsyscall;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
void __init mem_init(void)
|
|
|
|
{
|
2005-09-12 16:49:24 +00:00
|
|
|
long codesize, reservedpages, datasize, initsize;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-06-26 11:58:11 +00:00
|
|
|
pci_iommu_alloc();
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-30 12:32:36 +00:00
|
|
|
/* clear_bss() already clear the empty_zero_page */
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
reservedpages = 0;
|
|
|
|
|
|
|
|
/* this will put all low memory onto the freelists */
|
2005-06-23 07:08:06 +00:00
|
|
|
#ifdef CONFIG_NUMA
|
2005-09-12 16:49:24 +00:00
|
|
|
totalram_pages = numa_free_all_bootmem();
|
2005-04-16 22:20:36 +00:00
|
|
|
#else
|
2005-09-12 16:49:24 +00:00
|
|
|
totalram_pages = free_all_bootmem();
|
2005-04-16 22:20:36 +00:00
|
|
|
#endif
|
2008-06-25 05:14:09 +00:00
|
|
|
reservedpages = max_pfn - totalram_pages -
|
|
|
|
absent_pages_in_range(0, max_pfn);
|
2005-04-16 22:20:36 +00:00
|
|
|
after_bootmem = 1;
|
|
|
|
|
|
|
|
codesize = (unsigned long) &_etext - (unsigned long) &_text;
|
|
|
|
datasize = (unsigned long) &_edata - (unsigned long) &_etext;
|
|
|
|
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
|
|
|
|
|
|
|
|
/* Register memory areas for /proc/kcore */
|
2008-01-30 12:34:10 +00:00
|
|
|
kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT);
|
|
|
|
kclist_add(&kcore_vmalloc, (void *)VMALLOC_START,
|
2005-04-16 22:20:36 +00:00
|
|
|
VMALLOC_END-VMALLOC_START);
|
|
|
|
kclist_add(&kcore_kernel, &_stext, _end - _stext);
|
|
|
|
kclist_add(&kcore_modules, (void *)MODULES_VADDR, MODULES_LEN);
|
2008-01-30 12:34:10 +00:00
|
|
|
kclist_add(&kcore_vsyscall, (void *)VSYSCALL_START,
|
2005-04-16 22:20:36 +00:00
|
|
|
VSYSCALL_END - VSYSCALL_START);
|
|
|
|
|
2008-01-30 12:34:10 +00:00
|
|
|
printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
|
2008-01-30 12:34:10 +00:00
|
|
|
"%ldk reserved, %ldk data, %ldk init)\n",
|
2005-04-16 22:20:36 +00:00
|
|
|
(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
|
2008-06-25 05:14:09 +00:00
|
|
|
max_pfn << (PAGE_SHIFT-10),
|
2005-04-16 22:20:36 +00:00
|
|
|
codesize >> 10,
|
|
|
|
reservedpages << (PAGE_SHIFT-10),
|
|
|
|
datasize >> 10,
|
|
|
|
initsize >> 10);
|
2008-02-09 22:24:09 +00:00
|
|
|
|
|
|
|
cpa_init();
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-06-26 11:56:16 +00:00
|
|
|
void free_init_pages(char *what, unsigned long begin, unsigned long end)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-02-09 22:24:09 +00:00
|
|
|
unsigned long addr = begin;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-02-09 22:24:09 +00:00
|
|
|
if (addr >= end)
|
2006-06-26 11:56:16 +00:00
|
|
|
return;
|
|
|
|
|
2008-01-30 12:34:09 +00:00
|
|
|
/*
|
|
|
|
* If debugging page accesses then do not free this memory but
|
|
|
|
* mark them not present - any buggy init-section access will
|
|
|
|
* create a kernel page fault:
|
|
|
|
*/
|
|
|
|
#ifdef CONFIG_DEBUG_PAGEALLOC
|
|
|
|
printk(KERN_INFO "debug: unmapping init memory %08lx..%08lx\n",
|
|
|
|
begin, PAGE_ALIGN(end));
|
|
|
|
set_memory_np(begin, (end - begin) >> PAGE_SHIFT);
|
|
|
|
#else
|
[PATCH] x86: tighten kernel image page access rights
On x86-64, kernel memory freed after init can be entirely unmapped instead
of just getting 'poisoned' by overwriting with a debug pattern.
On i386 and x86-64 (under CONFIG_DEBUG_RODATA), kernel text and bug table
can also be write-protected.
Compared to the first version, this one prevents re-creating deleted
mappings in the kernel image range on x86-64, if those got removed
previously. This, together with the original changes, prevents temporarily
having inconsistent mappings when cacheability attributes are being
changed on such pages (e.g. from AGP code). While on i386 such duplicate
mappings don't exist, the same change is done there, too, both for
consistency and because checking pte_present() before using various other
pte_XXX functions is a requirement anyway. At once, i386 code gets
adjusted to use pte_huge() instead of open coding this.
AK: split out cpa() changes
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
2007-05-02 17:27:10 +00:00
|
|
|
printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2008-02-09 22:24:09 +00:00
|
|
|
for (; addr < end; addr += PAGE_SIZE) {
|
Revert "[PATCH] x86: __pa and __pa_symbol address space separation"
This was broken. It adds complexity, for no good reason. Rather than
separate __pa() and __pa_symbol(), we should deprecate __pa_symbol(),
and preferably __pa() too - and just use "virt_to_phys()" instead, which
is more readable and has nicer semantics.
However, right now, just undo the separation, and make __pa_symbol() be
the exact same as __pa(). That fixes the bugs this patch introduced,
and we can do the fairly obvious cleanups later.
Do the new __phys_addr() function (which is now the actual workhorse for
the unified __pa()/__pa_symbol()) as a real external function, that way
all the potential issues with compile/link-time optimizations of
constant symbol addresses go away, and we can also, if we choose to, add
more sanity-checking of the argument.
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-07 15:44:24 +00:00
|
|
|
ClearPageReserved(virt_to_page(addr));
|
|
|
|
init_page_count(virt_to_page(addr));
|
|
|
|
memset((void *)(addr & ~(PAGE_SIZE-1)),
|
|
|
|
POISON_FREE_INITMEM, PAGE_SIZE);
|
|
|
|
free_page(addr);
|
2005-04-16 22:20:36 +00:00
|
|
|
totalram_pages++;
|
|
|
|
}
|
2008-01-30 12:34:09 +00:00
|
|
|
#endif
|
2006-06-26 11:56:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void free_initmem(void)
|
|
|
|
{
|
|
|
|
free_init_pages("unused kernel memory",
|
Revert "[PATCH] x86: __pa and __pa_symbol address space separation"
This was broken. It adds complexity, for no good reason. Rather than
separate __pa() and __pa_symbol(), we should deprecate __pa_symbol(),
and preferably __pa() too - and just use "virt_to_phys()" instead, which
is more readable and has nicer semantics.
However, right now, just undo the separation, and make __pa_symbol() be
the exact same as __pa(). That fixes the bugs this patch introduced,
and we can do the fairly obvious cleanups later.
Do the new __phys_addr() function (which is now the actual workhorse for
the unified __pa()/__pa_symbol()) as a real external function, that way
all the potential issues with compile/link-time optimizations of
constant symbol addresses go away, and we can also, if we choose to, add
more sanity-checking of the argument.
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-07 15:44:24 +00:00
|
|
|
(unsigned long)(&__init_begin),
|
|
|
|
(unsigned long)(&__init_end));
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-01-06 08:12:04 +00:00
|
|
|
#ifdef CONFIG_DEBUG_RODATA
|
2008-01-30 12:34:08 +00:00
|
|
|
const int rodata_test_data = 0xC3;
|
|
|
|
EXPORT_SYMBOL_GPL(rodata_test_data);
|
2006-01-06 08:12:04 +00:00
|
|
|
|
|
|
|
void mark_rodata_ro(void)
|
|
|
|
{
|
2008-02-02 20:42:20 +00:00
|
|
|
unsigned long start = PFN_ALIGN(_stext), end = PFN_ALIGN(__end_rodata);
|
2006-01-06 08:12:04 +00:00
|
|
|
|
[PATCH] x86: tighten kernel image page access rights
On x86-64, kernel memory freed after init can be entirely unmapped instead
of just getting 'poisoned' by overwriting with a debug pattern.
On i386 and x86-64 (under CONFIG_DEBUG_RODATA), kernel text and bug table
can also be write-protected.
Compared to the first version, this one prevents re-creating deleted
mappings in the kernel image range on x86-64, if those got removed
previously. This, together with the original changes, prevents temporarily
having inconsistent mappings when cacheability attributes are being
changed on such pages (e.g. from AGP code). While on i386 such duplicate
mappings don't exist, the same change is done there, too, both for
consistency and because checking pte_present() before using various other
pte_XXX functions is a requirement anyway. At once, i386 code gets
adjusted to use pte_huge() instead of open coding this.
AK: split out cpa() changes
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
2007-05-02 17:27:10 +00:00
|
|
|
printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
|
Revert "[PATCH] x86: __pa and __pa_symbol address space separation"
This was broken. It adds complexity, for no good reason. Rather than
separate __pa() and __pa_symbol(), we should deprecate __pa_symbol(),
and preferably __pa() too - and just use "virt_to_phys()" instead, which
is more readable and has nicer semantics.
However, right now, just undo the separation, and make __pa_symbol() be
the exact same as __pa(). That fixes the bugs this patch introduced,
and we can do the fairly obvious cleanups later.
Do the new __phys_addr() function (which is now the actual workhorse for
the unified __pa()/__pa_symbol()) as a real external function, that way
all the potential issues with compile/link-time optimizations of
constant symbol addresses go away, and we can also, if we choose to, add
more sanity-checking of the argument.
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-07 15:44:24 +00:00
|
|
|
(end - start) >> 10);
|
2008-02-06 21:39:45 +00:00
|
|
|
set_memory_ro(start, (end - start) >> PAGE_SHIFT);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The rodata section (but not the kernel text!) should also be
|
|
|
|
* not-executable.
|
|
|
|
*/
|
|
|
|
start = ((unsigned long)__start_rodata + PAGE_SIZE - 1) & PAGE_MASK;
|
|
|
|
set_memory_nx(start, (end - start) >> PAGE_SHIFT);
|
2006-01-06 08:12:04 +00:00
|
|
|
|
2008-01-30 12:34:09 +00:00
|
|
|
rodata_test();
|
|
|
|
|
2008-01-30 12:33:42 +00:00
|
|
|
#ifdef CONFIG_CPA_DEBUG
|
2008-01-30 12:34:10 +00:00
|
|
|
printk(KERN_INFO "Testing CPA: undo %lx-%lx\n", start, end);
|
2008-01-30 12:34:06 +00:00
|
|
|
set_memory_rw(start, (end-start) >> PAGE_SHIFT);
|
2008-01-30 12:33:42 +00:00
|
|
|
|
2008-01-30 12:34:10 +00:00
|
|
|
printk(KERN_INFO "Testing CPA: again\n");
|
2008-01-30 12:34:06 +00:00
|
|
|
set_memory_ro(start, (end-start) >> PAGE_SHIFT);
|
2008-01-30 12:33:42 +00:00
|
|
|
#endif
|
2006-01-06 08:12:04 +00:00
|
|
|
}
|
2008-02-02 20:42:20 +00:00
|
|
|
|
2006-01-06 08:12:04 +00:00
|
|
|
#endif
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
|
|
void free_initrd_mem(unsigned long start, unsigned long end)
|
|
|
|
{
|
Revert "[PATCH] x86: __pa and __pa_symbol address space separation"
This was broken. It adds complexity, for no good reason. Rather than
separate __pa() and __pa_symbol(), we should deprecate __pa_symbol(),
and preferably __pa() too - and just use "virt_to_phys()" instead, which
is more readable and has nicer semantics.
However, right now, just undo the separation, and make __pa_symbol() be
the exact same as __pa(). That fixes the bugs this patch introduced,
and we can do the fairly obvious cleanups later.
Do the new __phys_addr() function (which is now the actual workhorse for
the unified __pa()/__pa_symbol()) as a real external function, that way
all the potential issues with compile/link-time optimizations of
constant symbol addresses go away, and we can also, if we choose to, add
more sanity-checking of the argument.
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-07 15:44:24 +00:00
|
|
|
free_init_pages("initrd memory", start, end);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-06-13 09:00:56 +00:00
|
|
|
int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
|
|
|
|
int flags)
|
2008-01-30 12:34:10 +00:00
|
|
|
{
|
2005-06-23 07:08:06 +00:00
|
|
|
#ifdef CONFIG_NUMA
|
2008-03-18 19:50:21 +00:00
|
|
|
int nid, next_nid;
|
2008-06-23 21:02:36 +00:00
|
|
|
int ret;
|
2006-11-14 15:57:46 +00:00
|
|
|
#endif
|
|
|
|
unsigned long pfn = phys >> PAGE_SHIFT;
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2008-06-25 05:14:09 +00:00
|
|
|
if (pfn >= max_pfn) {
|
2008-01-30 12:34:10 +00:00
|
|
|
/*
|
|
|
|
* This can happen with kdump kernels when accessing
|
|
|
|
* firmware tables:
|
|
|
|
*/
|
2008-03-21 20:27:10 +00:00
|
|
|
if (pfn < max_pfn_mapped)
|
2008-06-08 13:46:30 +00:00
|
|
|
return -EFAULT;
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2008-06-23 21:02:36 +00:00
|
|
|
printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %lu\n",
|
2006-11-14 15:57:46 +00:00
|
|
|
phys, len);
|
2008-06-08 13:46:30 +00:00
|
|
|
return -EFAULT;
|
2006-11-14 15:57:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Should check here against the e820 map to avoid double free */
|
|
|
|
#ifdef CONFIG_NUMA
|
2008-03-18 19:50:21 +00:00
|
|
|
nid = phys_to_nid(phys);
|
|
|
|
next_nid = phys_to_nid(phys + len - 1);
|
|
|
|
if (nid == next_nid)
|
2008-06-08 13:46:30 +00:00
|
|
|
ret = reserve_bootmem_node(NODE_DATA(nid), phys, len, flags);
|
2008-03-18 19:50:21 +00:00
|
|
|
else
|
2008-06-08 13:46:30 +00:00
|
|
|
ret = reserve_bootmem(phys, len, flags);
|
|
|
|
|
|
|
|
if (ret != 0)
|
|
|
|
return ret;
|
|
|
|
|
2008-01-30 12:34:10 +00:00
|
|
|
#else
|
2008-02-07 08:15:17 +00:00
|
|
|
reserve_bootmem(phys, len, BOOTMEM_DEFAULT);
|
2005-04-16 22:20:36 +00:00
|
|
|
#endif
|
2008-03-18 19:50:21 +00:00
|
|
|
|
2006-09-27 08:49:56 +00:00
|
|
|
if (phys+len <= MAX_DMA_PFN*PAGE_SIZE) {
|
2005-11-05 16:25:53 +00:00
|
|
|
dma_reserve += len / PAGE_SIZE;
|
2006-09-27 08:49:56 +00:00
|
|
|
set_dma_reserve(dma_reserve);
|
|
|
|
}
|
2008-06-08 13:46:30 +00:00
|
|
|
|
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2008-01-30 12:34:10 +00:00
|
|
|
int kern_addr_valid(unsigned long addr)
|
|
|
|
{
|
2005-04-16 22:20:36 +00:00
|
|
|
unsigned long above = ((long)addr) >> __VIRTUAL_MASK_SHIFT;
|
2008-01-30 12:34:10 +00:00
|
|
|
pgd_t *pgd;
|
|
|
|
pud_t *pud;
|
|
|
|
pmd_t *pmd;
|
|
|
|
pte_t *pte;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (above != 0 && above != -1UL)
|
2008-01-30 12:34:10 +00:00
|
|
|
return 0;
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
pgd = pgd_offset_k(addr);
|
|
|
|
if (pgd_none(*pgd))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
pud = pud_offset(pgd, addr);
|
|
|
|
if (pud_none(*pud))
|
2008-01-30 12:34:10 +00:00
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
pmd = pmd_offset(pud, addr);
|
|
|
|
if (pmd_none(*pmd))
|
|
|
|
return 0;
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
if (pmd_large(*pmd))
|
|
|
|
return pfn_valid(pmd_pfn(*pmd));
|
|
|
|
|
|
|
|
pte = pte_offset_kernel(pmd, addr);
|
|
|
|
if (pte_none(*pte))
|
|
|
|
return 0;
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
return pfn_valid(pte_pfn(*pte));
|
|
|
|
}
|
|
|
|
|
2008-01-30 12:34:10 +00:00
|
|
|
/*
|
|
|
|
* A pseudo VMA to allow ptrace access for the vsyscall page. This only
|
|
|
|
* covers the 64bit vsyscall page now. 32bit has a real VMA now and does
|
|
|
|
* not need special handling anymore:
|
|
|
|
*/
|
2005-04-16 22:20:36 +00:00
|
|
|
static struct vm_area_struct gate_vma = {
|
2008-01-30 12:34:10 +00:00
|
|
|
.vm_start = VSYSCALL_START,
|
|
|
|
.vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
|
|
|
|
.vm_page_prot = PAGE_READONLY_EXEC,
|
|
|
|
.vm_flags = VM_READ | VM_EXEC
|
2005-04-16 22:20:36 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_IA32_EMULATION
|
2005-04-16 22:24:55 +00:00
|
|
|
if (test_tsk_thread_flag(tsk, TIF_IA32))
|
|
|
|
return NULL;
|
2005-04-16 22:20:36 +00:00
|
|
|
#endif
|
|
|
|
return &gate_vma;
|
|
|
|
}
|
|
|
|
|
|
|
|
int in_gate_area(struct task_struct *task, unsigned long addr)
|
|
|
|
{
|
|
|
|
struct vm_area_struct *vma = get_gate_vma(task);
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2005-04-16 22:24:55 +00:00
|
|
|
if (!vma)
|
|
|
|
return 0;
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
return (addr >= vma->vm_start) && (addr < vma->vm_end);
|
|
|
|
}
|
|
|
|
|
2008-01-30 12:34:10 +00:00
|
|
|
/*
|
|
|
|
* Use this when you have no reliable task/vma, typically from interrupt
|
|
|
|
* context. It is less reliable than using the task's vma and may give
|
|
|
|
* false positives:
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
|
|
|
int in_gate_area_no_task(unsigned long addr)
|
|
|
|
{
|
2005-04-16 22:24:55 +00:00
|
|
|
return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2007-06-01 07:46:28 +00:00
|
|
|
|
2007-07-21 15:10:01 +00:00
|
|
|
const char *arch_vma_name(struct vm_area_struct *vma)
|
|
|
|
{
|
|
|
|
if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
|
|
|
|
return "[vdso]";
|
|
|
|
if (vma == &gate_vma)
|
|
|
|
return "[vsyscall]";
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-10-16 08:24:15 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_SPARSEMEM_VMEMMAP
|
|
|
|
/*
|
|
|
|
* Initialise the sparsemem vmemmap using huge-pages at the PMD level.
|
|
|
|
*/
|
2008-04-12 08:19:24 +00:00
|
|
|
static long __meminitdata addr_start, addr_end;
|
|
|
|
static void __meminitdata *p_start, *p_end;
|
|
|
|
static int __meminitdata node_start;
|
|
|
|
|
2008-01-30 12:34:10 +00:00
|
|
|
int __meminit
|
|
|
|
vmemmap_populate(struct page *start_page, unsigned long size, int node)
|
2007-10-16 08:24:15 +00:00
|
|
|
{
|
|
|
|
unsigned long addr = (unsigned long)start_page;
|
|
|
|
unsigned long end = (unsigned long)(start_page + size);
|
|
|
|
unsigned long next;
|
|
|
|
pgd_t *pgd;
|
|
|
|
pud_t *pud;
|
|
|
|
pmd_t *pmd;
|
|
|
|
|
|
|
|
for (; addr < end; addr = next) {
|
2008-06-25 04:19:20 +00:00
|
|
|
void *p = NULL;
|
2007-10-16 08:24:15 +00:00
|
|
|
|
|
|
|
pgd = vmemmap_pgd_populate(addr, node);
|
|
|
|
if (!pgd)
|
|
|
|
return -ENOMEM;
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2007-10-16 08:24:15 +00:00
|
|
|
pud = vmemmap_pud_populate(pgd, addr, node);
|
|
|
|
if (!pud)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2008-06-25 04:19:20 +00:00
|
|
|
if (!cpu_has_pse) {
|
|
|
|
next = (addr + PAGE_SIZE) & PAGE_MASK;
|
|
|
|
pmd = vmemmap_pmd_populate(pud, addr, node);
|
|
|
|
|
|
|
|
if (!pmd)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
p = vmemmap_pte_populate(pmd, addr, node);
|
2008-01-30 12:34:10 +00:00
|
|
|
|
2007-10-16 08:24:15 +00:00
|
|
|
if (!p)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2008-06-25 04:19:20 +00:00
|
|
|
addr_end = addr + PAGE_SIZE;
|
|
|
|
p_end = p + PAGE_SIZE;
|
2008-01-30 12:34:10 +00:00
|
|
|
} else {
|
2008-06-25 04:19:20 +00:00
|
|
|
next = pmd_addr_end(addr, end);
|
|
|
|
|
|
|
|
pmd = pmd_offset(pud, addr);
|
|
|
|
if (pmd_none(*pmd)) {
|
|
|
|
pte_t entry;
|
|
|
|
|
|
|
|
p = vmemmap_alloc_block(PMD_SIZE, node);
|
|
|
|
if (!p)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
entry = pfn_pte(__pa(p) >> PAGE_SHIFT,
|
|
|
|
PAGE_KERNEL_LARGE);
|
|
|
|
set_pmd(pmd, __pmd(pte_val(entry)));
|
|
|
|
|
|
|
|
/* check to see if we have contiguous blocks */
|
|
|
|
if (p_end != p || node_start != node) {
|
|
|
|
if (p_start)
|
|
|
|
printk(KERN_DEBUG " [%lx-%lx] PMD -> [%p-%p] on node %d\n",
|
|
|
|
addr_start, addr_end-1, p_start, p_end-1, node_start);
|
|
|
|
addr_start = addr;
|
|
|
|
node_start = node;
|
|
|
|
p_start = p;
|
|
|
|
}
|
2008-07-03 19:29:34 +00:00
|
|
|
|
|
|
|
addr_end = addr + PMD_SIZE;
|
|
|
|
p_end = p + PMD_SIZE;
|
2008-06-25 04:19:20 +00:00
|
|
|
} else
|
|
|
|
vmemmap_verify((pte_t *)pmd, node, addr, next);
|
2008-01-30 12:34:10 +00:00
|
|
|
}
|
2008-06-25 04:19:20 +00:00
|
|
|
|
2007-10-16 08:24:15 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2008-04-12 08:19:24 +00:00
|
|
|
|
|
|
|
void __meminit vmemmap_populate_print_last(void)
|
|
|
|
{
|
|
|
|
if (p_start) {
|
|
|
|
printk(KERN_DEBUG " [%lx-%lx] PMD -> [%p-%p] on node %d\n",
|
|
|
|
addr_start, addr_end-1, p_start, p_end-1, node_start);
|
|
|
|
p_start = NULL;
|
|
|
|
p_end = NULL;
|
|
|
|
node_start = 0;
|
|
|
|
}
|
|
|
|
}
|
2007-10-16 08:24:15 +00:00
|
|
|
#endif
|