From b835e6a1619019eace151a6b6dc9734f20ee03f7 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 5 Feb 2019 13:25:05 +0000 Subject: [PATCH] x86_64/mm: properly map and unmap page tables in setup_compat_m2p_table Signed-off-by: Wei Liu --- xen/arch/x86/x86_64/mm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 61f68d619e..e0d31a419f 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -382,11 +382,13 @@ static int setup_compat_m2p_table(struct mem_hotadd_info *info) va = HIRO_COMPAT_MPT_VIRT_START + smap * sizeof(*compat_machine_to_phys_mapping); - l3_ro_mpt = l4e_to_l3e(idle_pg_table[l4_table_offset(va)]); + l3_ro_mpt = map_xen_pagetable_new( + l4e_get_mfn(idle_pg_table[l4_table_offset(va)])); ASSERT(l3e_get_flags(l3_ro_mpt[l3_table_offset(va)]) & _PAGE_PRESENT); - l2_ro_mpt = l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]); + l2_ro_mpt = map_xen_pagetable_new( + l3e_get_mfn(l3_ro_mpt[l3_table_offset(va)])); #define MFN(x) (((x) << L2_PAGETABLE_SHIFT) / sizeof(unsigned int)) #define CNT ((sizeof(*frame_table) & -sizeof(*frame_table)) / \ @@ -424,6 +426,9 @@ static int setup_compat_m2p_table(struct mem_hotadd_info *info) } #undef CNT #undef MFN + + unmap_xen_pagetable_new(l2_ro_mpt); + unmap_xen_pagetable_new(l3_ro_mpt); return err; } -- 2.39.5