Commit 468ff43f authored by Juergen Gross's avatar Juergen Gross Committed by Greg Kroah-Hartman

xen: fix dom0 boot on huge systems

commit 01bd2ac2 upstream.

Commit f7c90c2a ("x86/xen: don't write ptes directly in 32-bit
PV guests") introduced a regression for booting dom0 on huge systems
with lots of RAM (in the TB range).

Reason is that on those hosts the p2m list needs to be moved early in
the boot process and this requires temporary page tables to be created.
Said commit modified xen_set_pte_init() to use a hypercall for writing
a PTE, but this requires the page table being in the direct mapped
area, which is not the case for the temporary page tables used in
xen_relocate_p2m().

As the page tables are completely written before being linked to the
actual address space instead of set_pte() a plain write to memory can
be used in xen_relocate_p2m().

Fixes: f7c90c2a ("x86/xen: don't write ptes directly in 32-bit PV guests")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarJan Beulich <jbeulich@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 24d50976
...@@ -2108,8 +2108,8 @@ void __init xen_relocate_p2m(void) ...@@ -2108,8 +2108,8 @@ void __init xen_relocate_p2m(void)
for (idx_pte = 0; for (idx_pte = 0;
idx_pte < min(n_pte, PTRS_PER_PTE); idx_pte < min(n_pte, PTRS_PER_PTE);
idx_pte++) { idx_pte++) {
set_pte(pt + idx_pte, pt[idx_pte] = pfn_pte(p2m_pfn,
pfn_pte(p2m_pfn, PAGE_KERNEL)); PAGE_KERNEL);
p2m_pfn++; p2m_pfn++;
} }
n_pte -= PTRS_PER_PTE; n_pte -= PTRS_PER_PTE;
...@@ -2117,8 +2117,7 @@ void __init xen_relocate_p2m(void) ...@@ -2117,8 +2117,7 @@ void __init xen_relocate_p2m(void)
make_lowmem_page_readonly(__va(pt_phys)); make_lowmem_page_readonly(__va(pt_phys));
pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE, pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE,
PFN_DOWN(pt_phys)); PFN_DOWN(pt_phys));
set_pmd(pmd + idx_pt, pmd[idx_pt] = __pmd(_PAGE_TABLE | pt_phys);
__pmd(_PAGE_TABLE | pt_phys));
pt_phys += PAGE_SIZE; pt_phys += PAGE_SIZE;
} }
n_pt -= PTRS_PER_PMD; n_pt -= PTRS_PER_PMD;
...@@ -2126,7 +2125,7 @@ void __init xen_relocate_p2m(void) ...@@ -2126,7 +2125,7 @@ void __init xen_relocate_p2m(void)
make_lowmem_page_readonly(__va(pmd_phys)); make_lowmem_page_readonly(__va(pmd_phys));
pin_pagetable_pfn(MMUEXT_PIN_L2_TABLE, pin_pagetable_pfn(MMUEXT_PIN_L2_TABLE,
PFN_DOWN(pmd_phys)); PFN_DOWN(pmd_phys));
set_pud(pud + idx_pmd, __pud(_PAGE_TABLE | pmd_phys)); pud[idx_pmd] = __pud(_PAGE_TABLE | pmd_phys);
pmd_phys += PAGE_SIZE; pmd_phys += PAGE_SIZE;
} }
n_pmd -= PTRS_PER_PUD; n_pmd -= PTRS_PER_PUD;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment