OSDN Git Service

x86/kvm/mmu: reset MMU context when 32-bit guest switches PAE
authorVitaly Kuznetsov <vkuznets@redhat.com>
Tue, 30 Apr 2019 17:33:26 +0000 (19:33 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 30 Apr 2019 19:03:58 +0000 (21:03 +0200)
commit0699c64a4be6e4a6137240379a1f82c752e663d8
treec818489a4808cc5d5d2fa0be94a163649ca46b1d
parent8764ed55c9705e426d889ff16c26f398bba70b9b
x86/kvm/mmu: reset MMU context when 32-bit guest switches PAE

Commit 47c42e6b4192 ("KVM: x86: fix handling of role.cr4_pae and rename it
to 'gpte_size'") introduced a regression: 32-bit PAE guests stopped
working. The issue appears to be: when guest switches (enables) PAE we need
to re-initialize MMU context (set context->root_level, do
reset_rsvds_bits_mask(), ...) but init_kvm_tdp_mmu() doesn't do that
because we threw away is_pae(vcpu) flag from mmu role. Restore it to
kvm_mmu_extended_role (as we now don't need it in base role) to fix
the issue.

Fixes: 47c42e6b4192 ("KVM: x86: fix handling of role.cr4_pae and rename it to 'gpte_size'")
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/mmu.c