17854f1c81
25833-32on64-bogus-pt_base-adjust.patch 25835-adjust-rcu-lock-domain.patch 25836-VT-d-S3-MSI-resume.patch 25850-tmem-xsa-15-1.patch 25851-tmem-xsa-15-2.patch 25852-tmem-xsa-15-3.patch 25853-tmem-xsa-15-4.patch 25854-tmem-xsa-15-5.patch 25855-tmem-xsa-15-6.patch 25856-tmem-xsa-15-7.patch 25857-tmem-xsa-15-8.patch 25858-tmem-xsa-15-9.patch 25859-tmem-missing-break.patch 25860-tmem-cleanup.patch 25861-x86-early-fixmap.patch 25862-sercon-non-com.patch 25863-sercon-ehci-dbgp.patch 25864-sercon-unused.patch 25866-sercon-ns16550-pci-irq.patch 25867-sercon-ns16550-parse.patch 25874-x86-EFI-chain-cfg.patch 25909-xenpm-consistent.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=201
62 lines
2.7 KiB
Diff
62 lines
2.7 KiB
Diff
# HG changeset patch
|
|
# User Jan Beulich <jbeulich@suse.com>
|
|
# Date 1347022899 -7200
|
|
# Node ID bb85bbccb1c9d802c92dd3fe00841368966ff623
|
|
# Parent e3b51948114ec1e2b2eece415b32e26ff857acde
|
|
x86/32-on-64: adjust Dom0 initial page table layout
|
|
|
|
Drop the unnecessary reservation of the L4 page for 32on64 Dom0, and
|
|
allocate its L3 first (to match behavior when running identical bit-
|
|
width hypervisor and Dom0 kernel).
|
|
|
|
Reported-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
|
|
|
--- a/xen/arch/x86/domain_build.c
|
|
+++ b/xen/arch/x86/domain_build.c
|
|
@@ -510,7 +510,7 @@ int __init construct_dom0(
|
|
#define NR(_l,_h,_s) \
|
|
(((((_h) + ((1UL<<(_s))-1)) & ~((1UL<<(_s))-1)) - \
|
|
((_l) & ~((1UL<<(_s))-1))) >> (_s))
|
|
- if ( (1 + /* # L4 */
|
|
+ if ( (!is_pv_32on64_domain(d) + /* # L4 */
|
|
NR(v_start, v_end, L4_PAGETABLE_SHIFT) + /* # L3 */
|
|
(!is_pv_32on64_domain(d) ?
|
|
NR(v_start, v_end, L3_PAGETABLE_SHIFT) : /* # L2 */
|
|
@@ -756,6 +756,8 @@ int __init construct_dom0(
|
|
panic("Not enough RAM for domain 0 PML4.\n");
|
|
page->u.inuse.type_info = PGT_l4_page_table|PGT_validated|1;
|
|
l4start = l4tab = page_to_virt(page);
|
|
+ maddr_to_page(mpt_alloc)->u.inuse.type_info = PGT_l3_page_table;
|
|
+ l3start = __va(mpt_alloc); mpt_alloc += PAGE_SIZE;
|
|
}
|
|
copy_page(l4tab, idle_pg_table);
|
|
l4tab[0] = l4e_empty(); /* zap trampoline mapping */
|
|
@@ -787,9 +789,13 @@ int __init construct_dom0(
|
|
l2tab += l2_table_offset(v_start);
|
|
if ( !((unsigned long)l3tab & (PAGE_SIZE-1)) )
|
|
{
|
|
- maddr_to_page(mpt_alloc)->u.inuse.type_info =
|
|
- PGT_l3_page_table;
|
|
- l3start = l3tab = __va(mpt_alloc); mpt_alloc += PAGE_SIZE;
|
|
+ if ( count || !l3start )
|
|
+ {
|
|
+ maddr_to_page(mpt_alloc)->u.inuse.type_info =
|
|
+ PGT_l3_page_table;
|
|
+ l3start = __va(mpt_alloc); mpt_alloc += PAGE_SIZE;
|
|
+ }
|
|
+ l3tab = l3start;
|
|
clear_page(l3tab);
|
|
if ( count == 0 )
|
|
l3tab += l3_table_offset(v_start);
|
|
@@ -938,7 +944,7 @@ int __init construct_dom0(
|
|
if ( !vinitrd_start && initrd_len )
|
|
si->flags |= SIF_MOD_START_PFN;
|
|
si->flags |= (xen_processor_pmbits << 8) & SIF_PM_MASK;
|
|
- si->pt_base = vpt_start + 2 * PAGE_SIZE * !!is_pv_32on64_domain(d);
|
|
+ si->pt_base = vpt_start;
|
|
si->nr_pt_frames = nr_pt_pages;
|
|
si->mfn_list = vphysmap_start;
|
|
snprintf(si->magic, sizeof(si->magic), "xen-3.0-x86_%d%s",
|