diff options
| author |  Lai Jiangshan <laijs@linux.alibaba.com>
| 2021-09-19 10:42:45 +0800 |
|---|---|---|
| committer |  Paolo Bonzini <pbonzini@redhat.com>
| 2021-10-22 05:19:29 -0400 |
| commit | 552617382c197949ff965a3559da8952bf3c1fa5 (patch) | |
| tree | 9e6875b20efc5eec3f3c9b925d2415f0736d2d17 /arch/x86/kvm/x86.c | |
| parent | KVM: selftests: set CPUID before setting sregs in vcpu creation (diff) | |
| download | linux-552617382c197949ff965a3559da8952bf3c1fa5.tar.gz linux-552617382c197949ff965a3559da8952bf3c1fa5.tar.bz2 linux-552617382c197949ff965a3559da8952bf3c1fa5.zip | |
KVM: X86: Don't reset mmu context when X86_CR4_PCIDE 1->0
X86_CR4_PCIDE doesn't participate in kvm_mmu_role, so the mmu context
doesn't need to be reset. It is only required to flush all the guest
tlb.
Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
Reviewed-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20210919024246.89230-2-jiangshanlai@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ac386c085dd0..c37694ccc015 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1022,9 +1022,10 @@ EXPORT_SYMBOL_GPL(kvm_is_valid_cr4); void kvm_post_set_cr4(struct kvm_vcpu *vcpu, unsigned long old_cr4, unsigned long cr4) { - if (((cr4 ^ old_cr4) & KVM_MMU_CR4_ROLE_BITS) || - (!(cr4 & X86_CR4_PCIDE) && (old_cr4 & X86_CR4_PCIDE))) + if ((cr4 ^ old_cr4) & KVM_MMU_CR4_ROLE_BITS) kvm_mmu_reset_context(vcpu); + else if (!(cr4 & X86_CR4_PCIDE) && (old_cr4 & X86_CR4_PCIDE)) + kvm_make_request(KVM_REQ_TLB_FLUSH_GUEST, vcpu); } EXPORT_SYMBOL_GPL(kvm_post_set_cr4); |