diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-09-07 15:01:39 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-09-07 15:01:39 +0200 |
| commit | 7a9d7646307b7c872b8dbd7546579acd3b54223d (patch) | |
| tree | 9d03d6b28cf38661bbb0f53ab7ebe26f8a88c6f4 /xen/arch/x86/domain_build.c | |
| parent | e4975cd5325572c4521aec1b80eef660a98cc988 (diff) | |
| download | xen-7a9d7646307b7c872b8dbd7546579acd3b54223d.tar.gz xen-7a9d7646307b7c872b8dbd7546579acd3b54223d.tar.bz2 xen-7a9d7646307b7c872b8dbd7546579acd3b54223d.zip | |
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>
Diffstat (limited to 'xen/arch/x86/domain_build.c')
| -rw-r--r-- | xen/arch/x86/domain_build.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index b3c5d4cc72..d4c7bd6750 100644 --- 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", |