| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <87zhc465ln.fsf@vitty.brq.redhat.com>
Date: Wed, 25 Mar 2020 12:23:16 +0100
From: Vitaly Kuznetsov <vkuznets@...hat.com>
To: Sean Christopherson <sean.j.christopherson@...el.com>,
Paolo Bonzini <pbonzini@...hat.com>
Cc: Wanpeng Li <wanpengli@...cent.com>,
Jim Mattson <jmattson@...gle.com>,
Joerg Roedel <joro@...tes.org>, kvm@...r.kernel.org,
linux-kernel@...r.kernel.org, Ben Gardon <bgardon@...gle.com>,
Junaid Shahid <junaids@...gle.com>,
Liran Alon <liran.alon@...cle.com>,
Boris Ostrovsky <boris.ostrovsky@...cle.com>,
John Haxby <john.haxby@...cle.com>,
Miaohe Lin <linmiaohe@...wei.com>,
Tom Lendacky <thomas.lendacky@....com>
Subject: Re: [PATCH v3 16/37] KVM: x86: Drop @invalidate_gpa param from kvm_x86_ops' tlb_flush()
Sean Christopherson <sean.j.christopherson@...el.com> writes:
> Drop @invalidate_gpa from ->tlb_flush() and kvm_vcpu_flush_tlb() now
> that all callers pass %true for said param, or ignore the param (SVM has
> an internal call to svm_flush_tlb() in svm_flush_tlb_guest that somewhat
> arbitrarily passes %false).
>
> Remove __vmx_flush_tlb() as it is no longer used.
>
> No functional change intended.
>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@...el.com>
> ---
> arch/x86/include/asm/kvm_host.h | 2 +-
> arch/x86/kvm/mmu/mmu.c | 2 +-
> arch/x86/kvm/svm.c | 10 ++++----
> arch/x86/kvm/vmx/vmx.c | 4 ++--
> arch/x86/kvm/vmx/vmx.h | 42 ++++++++++-----------------------
> arch/x86/kvm/x86.c | 6 ++---
> 6 files changed, 24 insertions(+), 42 deletions(-)
>
> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> index c08f4c0bf4d1..a5dfab4642d6 100644
> --- a/arch/x86/include/asm/kvm_host.h
> +++ b/arch/x86/include/asm/kvm_host.h
> @@ -1105,7 +1105,7 @@ struct kvm_x86_ops {
> unsigned long (*get_rflags)(struct kvm_vcpu *vcpu);
> void (*set_rflags)(struct kvm_vcpu *vcpu, unsigned long rflags);
>
> - void (*tlb_flush)(struct kvm_vcpu *vcpu, bool invalidate_gpa);
> + void (*tlb_flush)(struct kvm_vcpu *vcpu);
> int (*tlb_remote_flush)(struct kvm *kvm);
> int (*tlb_remote_flush_with_range)(struct kvm *kvm,
> struct kvm_tlb_range *range);
> diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
> index 5ae620881bbc..a87b8f9f3b1f 100644
> --- a/arch/x86/kvm/mmu/mmu.c
> +++ b/arch/x86/kvm/mmu/mmu.c
> @@ -5177,7 +5177,7 @@ int kvm_mmu_load(struct kvm_vcpu *vcpu)
> if (r)
> goto out;
> kvm_mmu_load_pgd(vcpu);
> - kvm_x86_ops->tlb_flush(vcpu, true);
> + kvm_x86_ops->tlb_flush(vcpu);
> out:
> return r;
> }
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index 396f42753489..62fa45dcb6a4 100644
> --- a/arch/x86/kvm/svm.c
> +++ b/arch/x86/kvm/svm.c
> @@ -385,7 +385,7 @@ module_param(dump_invalid_vmcb, bool, 0644);
> static u8 rsm_ins_bytes[] = "\x0f\xaa";
>
> static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0);
> -static void svm_flush_tlb(struct kvm_vcpu *vcpu, bool invalidate_gpa);
> +static void svm_flush_tlb(struct kvm_vcpu *vcpu);
> static void svm_complete_interrupts(struct vcpu_svm *svm);
> static void svm_toggle_avic_for_irq_window(struct kvm_vcpu *vcpu, bool activate);
> static inline void avic_post_state_restore(struct kvm_vcpu *vcpu);
> @@ -2692,7 +2692,7 @@ static int svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
> return 1;
>
> if (npt_enabled && ((old_cr4 ^ cr4) & X86_CR4_PGE))
> - svm_flush_tlb(vcpu, true);
> + svm_flush_tlb(vcpu);
>
> vcpu->arch.cr4 = cr4;
> if (!npt_enabled)
> @@ -3630,7 +3630,7 @@ static void enter_svm_guest_mode(struct vcpu_svm *svm, u64 vmcb_gpa,
> svm->nested.intercept_exceptions = nested_vmcb->control.intercept_exceptions;
> svm->nested.intercept = nested_vmcb->control.intercept;
>
> - svm_flush_tlb(&svm->vcpu, true);
> + svm_flush_tlb(&svm->vcpu);
> svm->vmcb->control.int_ctl = nested_vmcb->control.int_ctl | V_INTR_MASKING_MASK;
> if (nested_vmcb->control.int_ctl & V_INTR_MASKING_MASK)
> svm->vcpu.arch.hflags |= HF_VINTR_MASK;
> @@ -5626,7 +5626,7 @@ static int svm_set_identity_map_addr(struct kvm *kvm, u64 ident_addr)
> return 0;
> }
>
> -static void svm_flush_tlb(struct kvm_vcpu *vcpu, bool invalidate_gpa)
> +static void svm_flush_tlb(struct kvm_vcpu *vcpu)
> {
> struct vcpu_svm *svm = to_svm(vcpu);
>
> @@ -5645,7 +5645,7 @@ static void svm_flush_tlb_gva(struct kvm_vcpu *vcpu, gva_t gva)
>
> static void svm_flush_tlb_guest(struct kvm_vcpu *vcpu)
> {
> - svm_flush_tlb(vcpu, false);
> + svm_flush_tlb(vcpu);
> }
>
> static void svm_prepare_guest_switch(struct kvm_vcpu *vcpu)
> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> index 43c0d4706f9a..477bdbc52ed0 100644
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@ -6079,7 +6079,7 @@ void vmx_set_virtual_apic_mode(struct kvm_vcpu *vcpu)
> if (flexpriority_enabled) {
> sec_exec_control |=
> SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES;
> - vmx_flush_tlb(vcpu, true);
> + vmx_flush_tlb(vcpu);
> }
> break;
> case LAPIC_MODE_X2APIC:
> @@ -6097,7 +6097,7 @@ static void vmx_set_apic_access_page_addr(struct kvm_vcpu *vcpu, hpa_t hpa)
> {
> if (!is_guest_mode(vcpu)) {
> vmcs_write64(APIC_ACCESS_ADDR, hpa);
> - vmx_flush_tlb(vcpu, true);
> + vmx_flush_tlb(vcpu);
> }
> }
>
> diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
> index 3770ae111e6a..bab5d62ad964 100644
> --- a/arch/x86/kvm/vmx/vmx.h
> +++ b/arch/x86/kvm/vmx/vmx.h
> @@ -503,46 +503,28 @@ static inline struct vmcs *alloc_vmcs(bool shadow)
>
> u64 construct_eptp(struct kvm_vcpu *vcpu, unsigned long root_hpa);
>
> -static inline void __vmx_flush_tlb(struct kvm_vcpu *vcpu, int vpid,
> - bool invalidate_gpa)
> -{
> - if (enable_ept && (invalidate_gpa || !enable_vpid)) {
> - if (!VALID_PAGE(vcpu->arch.mmu->root_hpa))
> - return;
> - ept_sync_context(construct_eptp(vcpu,
> - vcpu->arch.mmu->root_hpa));
> - } else {
> - vpid_sync_context(vpid);
> - }
> -}
> -
> -static inline void vmx_flush_tlb(struct kvm_vcpu *vcpu, bool invalidate_gpa)
> +static inline void vmx_flush_tlb(struct kvm_vcpu *vcpu)
> {
> struct vcpu_vmx *vmx = to_vmx(vcpu);
>
> /*
> - * Flush all EPTP/VPID contexts if the TLB flush _may_ have been
> - * invoked via kvm_flush_remote_tlbs(), which always passes %true for
> - * @invalidate_gpa. Flushing remote TLBs requires all contexts to be
> - * flushed, not just the active context.
> + * Flush all EPTP/VPID contexts, as the TLB flush _may_ have been
> + * invoked via kvm_flush_remote_tlbs(). Flushing remote TLBs requires
> + * all contexts to be flushed, not just the active context.
> *
> * Note, this also ensures a deferred TLB flush with VPID enabled and
> * EPT disabled invalidates the "correct" VPID, by nuking both L1 and
> * L2's VPIDs.
> */
> - if (invalidate_gpa) {
> - if (enable_ept) {
> - ept_sync_global();
> - } else if (enable_vpid) {
> - if (cpu_has_vmx_invvpid_global()) {
> - vpid_sync_vcpu_global();
> - } else {
> - vpid_sync_vcpu_single(vmx->vpid);
> - vpid_sync_vcpu_single(vmx->nested.vpid02);
> - }
> + if (enable_ept) {
> + ept_sync_global();
> + } else if (enable_vpid) {
> + if (cpu_has_vmx_invvpid_global()) {
> + vpid_sync_vcpu_global();
> + } else {
> + vpid_sync_vcpu_single(vmx->vpid);
> + vpid_sync_vcpu_single(vmx->nested.vpid02);
> }
> - } else {
> - __vmx_flush_tlb(vcpu, vmx->vpid, false);
> }
> }
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 0b90ec2c93cf..84cbd7ca1e18 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -2696,10 +2696,10 @@ static void kvmclock_reset(struct kvm_vcpu *vcpu)
> vcpu->arch.time = 0;
> }
>
> -static void kvm_vcpu_flush_tlb(struct kvm_vcpu *vcpu, bool invalidate_gpa)
> +static void kvm_vcpu_flush_tlb(struct kvm_vcpu *vcpu)
> {
> ++vcpu->stat.tlb_flush;
> - kvm_x86_ops->tlb_flush(vcpu, invalidate_gpa);
> + kvm_x86_ops->tlb_flush(vcpu);
> }
>
> static void record_steal_time(struct kvm_vcpu *vcpu)
> @@ -8223,7 +8223,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
> if (kvm_check_request(KVM_REQ_LOAD_MMU_PGD, vcpu))
> kvm_mmu_load_pgd(vcpu);
> if (kvm_check_request(KVM_REQ_TLB_FLUSH, vcpu))
> - kvm_vcpu_flush_tlb(vcpu, true);
> + kvm_vcpu_flush_tlb(vcpu);
> if (kvm_check_request(KVM_REQ_REPORT_TPR_ACCESS, vcpu)) {
> vcpu->run->exit_reason = KVM_EXIT_TPR_ACCESS;
> r = 0;
Reviewed-by: Vitaly Kuznetsov <vkuznets@...hat.com>
--
Vitaly
Powered by blists - more mailing lists