From db2af23d15077605f286d8ef86c8f5d9c1b8302a Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 20 Feb 2019 17:07:17 +0100 Subject: [PATCH] x86/shadow: don't pass wrong L4 MFN to guest_walk_tables() 64-bit PV guest user mode runs on a different L4 table. Make sure - the accessed bit gets set in the correct table (and in log-dirty mode the correct page gets marked dirty) during guest walks, - the correct table gets audited by sh_audit_gw(), - correct info gets logged by print_gw(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: George Dunlap Release-acked-by: Juergen Gross --- xen/arch/x86/mm/shadow/multi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 7e9cbc69be..8fa0326a91 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -180,7 +180,10 @@ sh_walk_guest_tables(struct vcpu *v, unsigned long va, walk_t *gw, INVALID_MFN, v->arch.paging.shadow.gl3e #else /* 32 or 64 */ - pagetable_get_mfn(v->arch.guest_table), + (((v->arch.flags & TF_kernel_mode) || + is_pv_32bit_vcpu(v)) + ? pagetable_get_mfn(v->arch.guest_table) + : pagetable_get_mfn(v->arch.guest_table_user)), v->arch.paging.shadow.guest_vtable #endif ); -- 2.30.2