KVM: nVMX: Skip IPBP on nested VMCS switch
cover KVM: nVMX: Skip IPBP on nested VMCS switch
Or as Jim would say, "Really skip IPBP on nested VMCS switch" :-D
Patch 1 is the delta between kvm/queue and v3 of the original patch[*], i.e. I just cherry-picked v3 and fixed the conflicts.
Patch 2 applies the "no IPBP" logic to copy_vmcs02_to_vmcs12_rare().
Feel free to sqaush both of these to commit 7407a52f23732 ("KVM: nVMX:
Skip IBPB when switching between vmcs01 and vmcs02") if you so desire.
[*] https://lkml.kernel.org/r/[email protected]
Sean Christopherson (2):
KVM: nVMX: Refactor IBPB handling on VMCS switch to genericize code
KVM: nVMX: Skip IPBP when switching between vmcs01 and vmcs02, redux
arch/x86/kvm/vmx/nested.c | 13 +++---------- arch/x86/kvm/vmx/vmx.c | 19 ++++++++++++++----- arch/x86/kvm/vmx/vmx.h | 4 ++-- 3 files changed, 19 insertions(+), 17 deletions(-)
Signature · 1 line
2.26.0
PATCH 1/2 KVM: nVMX: Refactor IBPB handling on VMCS switch to genericize code
Refactor the IPBP handling to effectively move the WARN and comment in vmx_switch_vmcs() to vmx_vcpu_load_vmcs(). A future patch will give copy_vmcs02_to_vmcs12_rare() the same treatment.
--- arch/x86/kvm/vmx/nested.c | 9 +-------- arch/x86/kvm/vmx/vmx.c | 17 +++++++++++++---- arch/x86/kvm/vmx/vmx.h | 3 ++- 3 files changed, 16 insertions(+), 13 deletions(-)
arch/x86/kvm/vmx/nested.c +1 -8
@@ -302,15 +302,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs) cpu =get_cpu (); prev = vmx->loaded_vmcs; -WARN_ON_ONCE (prev->cpu != cpu || prev->vmcs !=per_cpu (current_vmcs, cpu)); vmx->loaded_vmcs = vmcs; - -/* -* This is the same guest from our point of view, so no -* indirect branch prediction barrier is needed. The L1 -* guest can protect itself with retpolines, IBPB or IBRS. -*/ -vmx_vcpu_load_vmcs (vcpu, cpu, false); +vmx_vcpu_load_vmcs (vcpu, cpu, prev);vmx_sync_vmcs_host_state (vmx, prev);put_cpu ();
arch/x86/kvm/vmx/vmx.c +13 -4
@@ -1311,10 +1311,12 @@ static void vmx_vcpu_pi_load(struct kvm_vcpu *vcpu, int cpu)pi_set_on (pi_desc); } -void vmx_vcpu_load_vmcs (struct kvm_vcpu *vcpu,int cpu,bool need_ibpb) +void vmx_vcpu_load_vmcs (struct kvm_vcpu *vcpu,int cpu, +struct loaded_vmcs *buddy) {struct vcpu_vmx *vmx =to_vmx (vcpu);bool already_loaded = vmx->loaded_vmcs->cpu == cpu; +struct vmcs *prev;if (!already_loaded) {loaded_vmcs_clear (vmx->loaded_vmcs);
@@ -1333,10 +1335,17 @@ void vmx_vcpu_load_vmcs(struct kvm_vcpu *vcpu, int cpu, bool need_ibpb)local_irq_enable (); } -if (per_cpu (current_vmcs, cpu) != vmx->loaded_vmcs->vmcs) { + prev =per_cpu (current_vmcs, cpu); +if (prev != vmx->loaded_vmcs->vmcs) {per_cpu (current_vmcs, cpu) = vmx->loaded_vmcs->vmcs;vmcs_load (vmx->loaded_vmcs->vmcs); -if (need_ibpb) + +/* +* No indirect branch prediction barrier needed when switching +* the active VMCS within a guest, e.g. on nested VM-Enter. +* The L1 VMM can protect itself with retpolines, IBPB or IBRS. +*/ +if (!buddy ||WARN_ON_ONCE (buddy->vmcs != prev))indirect_branch_prediction_barrier (); }
@@ -1378,7 +1387,7 @@ void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) {struct vcpu_vmx *vmx =to_vmx (vcpu); -vmx_vcpu_load_vmcs (vcpu, cpu, true); +vmx_vcpu_load_vmcs (vcpu, cpu,NULL );vmx_vcpu_pi_load (vcpu, cpu);
arch/x86/kvm/vmx/vmx.h +2 -1
@@ -320,7 +320,8 @@ struct kvm_vmx { };bool nested_vmx_allowed (struct kvm_vcpu *vcpu); -void vmx_vcpu_load_vmcs (struct kvm_vcpu *vcpu,int cpu,bool need_ibpb); +void vmx_vcpu_load_vmcs (struct kvm_vcpu *vcpu,int cpu, +struct loaded_vmcs *buddy);void vmx_vcpu_load (struct kvm_vcpu *vcpu,int cpu);int allocate_vpid (void );void free_vpid (int vpid);
Signature · 1 line
2.26.0
PATCH 2/2 KVM: nVMX: Skip IPBP when switching between vmcs01 and vmcs02, redux
In reply to Sean ChristophersonSkip the Indirect Branch Prediction Barrier that is triggered on a VMCS switch when temporarily loading vmcs02 to synchronize it to vmcs12, i.e. give copy_vmcs02_to_vmcs12_rare() the same treatment as vmx_switch_vmcs().
Make vmx_vcpu_load() static now that it's only referenced within vmx.c.
--- arch/x86/kvm/vmx/nested.c | 4 ++-- arch/x86/kvm/vmx/vmx.c | 2 +- arch/x86/kvm/vmx/vmx.h | 1 - 3 files changed, 3 insertions(+), 4 deletions(-)
arch/x86/kvm/vmx/nested.c +2 -2
@@ -3915,12 +3915,12 @@ static void copy_vmcs02_to_vmcs12_rare(struct kvm_vcpu *vcpu, cpu =get_cpu (); vmx->loaded_vmcs = &vmx->nested.vmcs02; -vmx_vcpu_load (&vmx->vcpu, cpu); +vmx_vcpu_load_vmcs (vcpu, cpu, &vmx->vmcs01);sync_vmcs02_to_vmcs12_rare (vcpu, vmcs12); vmx->loaded_vmcs = &vmx->vmcs01; -vmx_vcpu_load (&vmx->vcpu, cpu); +vmx_vcpu_load_vmcs (vcpu, cpu, &vmx->nested.vmcs02);put_cpu (); }
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -1383,7 +1383,7 @@ void vmx_vcpu_load_vmcs(struct kvm_vcpu *vcpu, int cpu,* Switches to specified vcpu, until a matching vcpu_put(), but assumes * vcpu mutex is already taken. */ -void vmx_vcpu_load (struct kvm_vcpu *vcpu,int cpu) +static void vmx_vcpu_load (struct kvm_vcpu *vcpu,int cpu) {struct vcpu_vmx *vmx =to_vmx (vcpu);
arch/x86/kvm/vmx/vmx.h +0 -1
@@ -322,7 +322,6 @@ struct kvm_vmx {bool nested_vmx_allowed (struct kvm_vcpu *vcpu);void vmx_vcpu_load_vmcs (struct kvm_vcpu *vcpu,int cpu,struct loaded_vmcs *buddy); -void vmx_vcpu_load (struct kvm_vcpu *vcpu,int cpu);int allocate_vpid (void );void free_vpid (int vpid);void vmx_set_constant_host_state (struct vcpu_vmx *vmx);
Signature · 1 line
2.26.0
Paolo Bonzini
maintainerQuoted 9 lines · Sean Christopherson
Or as Jim would say, "Really skip IPBP on nested VMCS switch" :-D
Patch 1 is the delta between kvm/queue and v3 of the original patch[*], i.e. I just cherry-picked v3 and fixed the conflicts.
Patch 2 applies the "no IPBP" logic to
copy_vmcs02_to_vmcs12_rare().Feel free to sqaush both of these to commit
7407a52f23732("KVM: nVMX:
Skip IBPB when switching between vmcs01 and vmcs02") if you so desire.
I squashed patch 1 and applied patch 2 separately. Thanks!
Paolo
Quoted 11 lines
[*] https://lkml.kernel.org/r/[email protected]
Sean Christopherson (2):
KVM: nVMX: Refactor IBPB handling on VMCS switch to genericize code
KVM: nVMX: Skip IPBP when switching between vmcs01 and vmcs02, reduxarch/x86/kvm/vmx/nested.c | 13 +++---------- arch/x86/kvm/vmx/vmx.c | 19 ++++++++++++++----- arch/x86/kvm/vmx/vmx.h | 4 ++-- 3 files changed, 19 insertions(+), 17 deletions(-)