diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index da0f3b081076..9c629b54d362 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -3054,8 +3054,18 @@ static void destroy_kvm_mmu(struct kvm_vcpu *vcpu)
 
 int kvm_mmu_reset_context(struct kvm_vcpu *vcpu)
 {
+	int r;
+
 	destroy_kvm_mmu(vcpu);
-	return init_kvm_mmu(vcpu);
+	r = init_kvm_mmu(vcpu);
+
+	if (r)
+		goto err;
+
+	kvm_mmu_sync_roots(vcpu);
+	kvm_mmu_flush_tlb(vcpu);
+err:
+	return r;
 }
 EXPORT_SYMBOL_GPL(kvm_mmu_reset_context);