From 6db99177d9f87dbc9465395b301ef2340b42c7d5 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 5 Feb 2019 13:19:43 +0000 Subject: [PATCH] x86_64/mm: properly map and unmap page tables in destroy_m2p_mapping Signed-off-by: Wei Liu --- xen/arch/x86/x86_64/mm.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index cadbc2a6ee..61f68d619e 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -292,7 +292,8 @@ static void destroy_m2p_mapping(struct mem_hotadd_info *info) unsigned long i, va, rwva; unsigned long smap = info->spfn, emap = info->epfn; - l3_ro_mpt = l4e_to_l3e(idle_pg_table[l4_table_offset(RO_MPT_VIRT_START)]); + l3_ro_mpt = map_xen_pagetable_new( + l4e_get_mfn(idle_pg_table[l4_table_offset(RO_MPT_VIRT_START)])); /* * No need to clean m2p structure existing before the hotplug @@ -314,26 +315,35 @@ static void destroy_m2p_mapping(struct mem_hotadd_info *info) continue; } - 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)])); if (!(l2e_get_flags(l2_ro_mpt[l2_table_offset(va)]) & _PAGE_PRESENT)) { i = ( i & ~((1UL << (L2_PAGETABLE_SHIFT - 3)) - 1)) + (1UL << (L2_PAGETABLE_SHIFT - 3)) ; + unmap_xen_pagetable_new(l2_ro_mpt); continue; } pt_pfn = l2e_get_pfn(l2_ro_mpt[l2_table_offset(va)]); if ( hotadd_mem_valid(pt_pfn, info) ) { + l2_pgentry_t *l2t; + destroy_xen_mappings(rwva, rwva + (1UL << L2_PAGETABLE_SHIFT)); - l2_ro_mpt = l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]); - l2e_write(&l2_ro_mpt[l2_table_offset(va)], l2e_empty()); + l2t = map_xen_pagetable_new( + l3e_get_mfn(l3_ro_mpt[l3_table_offset(va)])); + l2e_write(&l2t[l2_table_offset(va)], l2e_empty()); + unmap_xen_pagetable_new(l2t); } i = ( i & ~((1UL << (L2_PAGETABLE_SHIFT - 3)) - 1)) + (1UL << (L2_PAGETABLE_SHIFT - 3)); + unmap_xen_pagetable_new(l2_ro_mpt); } + unmap_xen_pagetable_new(l3_ro_mpt); + destroy_compat_m2p_mapping(info); /* Brute-Force flush all TLB */ -- 2.39.5