From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Sean Christopherson <sean.j.christopherson@intel.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 01/10] KVM: VMX: Use vpid_sync_context() directly when possible
Date: Thu, 20 Feb 2020 12:43:47 -0800 [thread overview]
Message-ID: <20200220204356.8837-2-sean.j.christopherson@intel.com> (raw)
In-Reply-To: <20200220204356.8837-1-sean.j.christopherson@intel.com>
Use vpid_sync_context() directly for flows that run if and only if
enable_vpid=1, or more specifically, nested VMX flows that are gated by
vmx->nested.msrs.secondary_ctls_high.SECONDARY_EXEC_ENABLE_VPID being
set, which is allowed if and only if enable_vpid=1. Because these flows
call __vmx_flush_tlb() with @invalidate_gpa=false, the if-statement that
decides between INVEPT and INVVPID will always go down the INVVPID path,
i.e. call vpid_sync_context() because
"enable_ept && (invalidate_gpa || !enable_vpid)" always evaluates false.
This helps pave the way toward removing @invalidate_gpa and @vpid from
__vmx_flush_tlb() and its callers.
No functional change intended.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
arch/x86/kvm/vmx/nested.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index 657c2eda357c..19ac4083667f 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -2466,7 +2466,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,
if (nested_cpu_has_vpid(vmcs12) && nested_has_guest_tlb_tag(vcpu)) {
if (vmcs12->virtual_processor_id != vmx->nested.last_vpid) {
vmx->nested.last_vpid = vmcs12->virtual_processor_id;
- __vmx_flush_tlb(vcpu, nested_get_vpid02(vcpu), false);
+ vpid_sync_context(nested_get_vpid02(vcpu));
}
} else {
/*
@@ -5154,17 +5154,17 @@ static int handle_invvpid(struct kvm_vcpu *vcpu)
__invvpid(VMX_VPID_EXTENT_INDIVIDUAL_ADDR,
vpid02, operand.gla);
} else
- __vmx_flush_tlb(vcpu, vpid02, false);
+ vpid_sync_context(vpid02);
break;
case VMX_VPID_EXTENT_SINGLE_CONTEXT:
case VMX_VPID_EXTENT_SINGLE_NON_GLOBAL:
if (!operand.vpid)
return nested_vmx_failValid(vcpu,
VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID);
- __vmx_flush_tlb(vcpu, vpid02, false);
+ vpid_sync_context(vpid02);
break;
case VMX_VPID_EXTENT_ALL_CONTEXT:
- __vmx_flush_tlb(vcpu, vpid02, false);
+ vpid_sync_context(vpid02);
break;
default:
WARN_ON_ONCE(1);
--
2.24.1
next prev parent reply other threads:[~2020-02-20 20:44 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-20 20:43 [PATCH 00/10] KVM: x86: Clean up VMX's TLB flushing code Sean Christopherson
2020-02-20 20:43 ` Sean Christopherson [this message]
2020-02-21 13:17 ` [PATCH 01/10] KVM: VMX: Use vpid_sync_context() directly when possible Vitaly Kuznetsov
2020-02-21 15:36 ` Sean Christopherson
2020-02-21 17:26 ` Paolo Bonzini
2020-02-20 20:43 ` [PATCH 02/10] KVM: VMX: Move vpid_sync_vcpu_addr() down a few lines Sean Christopherson
2020-02-21 13:19 ` Vitaly Kuznetsov
2020-02-20 20:43 ` [PATCH 03/10] KVM: VMX: Handle INVVPID fallback logic in vpid_sync_vcpu_addr() Sean Christopherson
2020-02-21 13:26 ` Vitaly Kuznetsov
2020-02-20 20:43 ` [PATCH 04/10] KVM: VMX: Fold vpid_sync_vcpu_{single,global}() into vpid_sync_context() Sean Christopherson
2020-02-21 13:39 ` Vitaly Kuznetsov
2020-02-21 15:32 ` Sean Christopherson
2020-02-21 17:28 ` Paolo Bonzini
2020-02-20 20:43 ` [PATCH 05/10] KVM: nVMX: Use vpid_sync_vcpu_addr() to emulate INVVPID with address Sean Christopherson
2020-02-21 13:43 ` Vitaly Kuznetsov
2020-02-20 20:43 ` [PATCH 06/10] KVM: x86: Move "flush guest's TLB" logic to separate kvm_x86_ops hook Sean Christopherson
[not found] ` <87tv3krqta.fsf@vitty.brq.redhat.com>
2020-02-21 17:31 ` Paolo Bonzini
2020-02-21 17:32 ` Paolo Bonzini
2020-02-20 20:43 ` [PATCH 07/10] KVM: VMX: Clean up vmx_flush_tlb_gva() Sean Christopherson
2020-02-21 13:54 ` Vitaly Kuznetsov
2020-02-20 20:43 ` [PATCH 08/10] KVM: x86: Drop @invalidate_gpa param from kvm_x86_ops' tlb_flush() Sean Christopherson
2020-02-21 13:56 ` Vitaly Kuznetsov
2020-02-20 20:43 ` [PATCH 09/10] KVM: VMX: Drop @invalidate_gpa from __vmx_flush_tlb() Sean Christopherson
2020-02-20 20:43 ` [PATCH 10/10] KVM: VMX: Fold __vmx_flush_tlb() into vmx_flush_tlb() Sean Christopherson
2020-02-21 13:20 ` [PATCH 00/10] KVM: x86: Clean up VMX's TLB flushing code Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2020-02-21 6:35 [PATCH 01/10] KVM: VMX: Use vpid_sync_context() directly when possible linmiaohe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200220204356.8837-2-sean.j.christopherson@intel.com \
--to=sean.j.christopherson@intel.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.