lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, 64-bit: use p??_populate() to attach pages to pagetable

Browse Source 
Use the _populate() functions to attach new pages to a pagetable, to
make sure the right paravirt_ops calls get called.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: xen-devel <xen-devel@lists.xensource.com>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Jeremy Fitzhardinge
2008-06-25 00:19:02 -04:00
committed by Ingo Molnar
parent fc8b8a60ff
commit bb23e403e5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/mm/init_64.c
View File

@@ -167,7 +167,7 @@ set_pte_vaddr(unsigned long vaddr, pte_t new_pte)
pud = pud_offset(pgd, vaddr); pud = pud_offset(pgd, vaddr);
if (pud_none(*pud)) { if (pud_none(*pud)) {
pmd = (pmd_t *) spp_getpage(); pmd = (pmd_t *) spp_getpage();
set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE | _PAGE_USER)); pud_populate(&init_mm, pud, pmd);
if (pmd != pmd_offset(pud, 0)) { if (pmd != pmd_offset(pud, 0)) {
printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n", printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
pmd, pmd_offset(pud, 0)); pmd, pmd_offset(pud, 0));
@@ -177,7 +177,7 @@ set_pte_vaddr(unsigned long vaddr, pte_t new_pte)
pmd = pmd_offset(pud, vaddr); pmd = pmd_offset(pud, vaddr);
if (pmd_none(*pmd)) { if (pmd_none(*pmd)) {
pte = (pte_t *) spp_getpage(); pte = (pte_t *) spp_getpage();
set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE | _PAGE_USER)); pmd_populate_kernel(&init_mm, pmd, pte);
if (pte != pte_offset_kernel(pmd, 0)) { if (pte != pte_offset_kernel(pmd, 0)) {
printk(KERN_ERR "PAGETABLE BUG #02!\n"); printk(KERN_ERR "PAGETABLE BUG #02!\n");
return; return;
@@ -389,7 +389,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end)
pmd = alloc_low_page(&pmd_phys); pmd = alloc_low_page(&pmd_phys);
spin_lock(&init_mm.page_table_lock); spin_lock(&init_mm.page_table_lock);
set_pud(pud, __pud(pmd_phys | _KERNPG_TABLE)); pud_populate(&init_mm, pud, __va(pmd_phys));
last_map_addr = phys_pmd_init(pmd, addr, end); last_map_addr = phys_pmd_init(pmd, addr, end);
spin_unlock(&init_mm.page_table_lock); spin_unlock(&init_mm.page_table_lock);
@@ -592,7 +592,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, unsigned lon
next = end; next = end;
last_map_addr = phys_pud_init(pud, __pa(start), __pa(next)); last_map_addr = phys_pud_init(pud, __pa(start), __pa(next));
if (!after_bootmem) if (!after_bootmem)
set_pgd(pgd_offset_k(start), mk_kernel_pgd(pud_phys)); pgd_populate(&init_mm, pgd_offset_k(start),
__va(pud_phys));
unmap_low_page(pud); unmap_low_page(pud);
} }