VMX: more nested fixes
v2 cover VMX: more nested fixes
This is hopefully the last fix for VMX nested migration
that finally allows my stress test of migration with a nested guest to pass.
In a nutshell after an optimization that was done in commit 7952d769c29ca, some of vmcs02 fields which can be modified by the L2 freely while it runs (like GSBASE and such) were not copied back to vmcs12 unless:
1. L1 tries to vmread them (update done on intercept)
2. vmclear or vmldptr on other vmcs are done.
3. nested state is read and nested guest is running.
What wasn't done was to sync these 'rare' fields when L1 is running but still has a loaded vmcs12 which might have some stale fields, if that vmcs was used to enter a guest already due to that optimization.
Plus I added two minor patches to improve VMX tracepoints a bit. There is still a large room for improvement.
Best regards,
Maxim Levitsky
Maxim Levitsky (3):
KVM: nVMX: Always call sync_vmcs02_to_vmcs12_rare on migration
KVM: nVMX: add kvm_nested_vmlaunch_resume tracepoint
KVM: VMX: read idt_vectoring_info a bit earlier
arch/x86/kvm/trace.h | 30 ++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/nested.c | 19 ++++++++++++++----- arch/x86/kvm/vmx/vmx.c | 3 ++- arch/x86/kvm/x86.c | 1 + 4 files changed, 47 insertions(+), 6 deletions(-)
Signature · 1 line
2.26.2
PATCH v2 1/3 KVM: nVMX: Always call sync_vmcs02_to_vmcs12_rare on migration
Even when we are outside the nested guest, some vmcs02 fields are not in sync vs vmcs12.
However during the migration, the vmcs12 has to be up to date to be able to load it later after the migration.
To fix that, call that function.
--- arch/x86/kvm/vmx/nested.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
arch/x86/kvm/vmx/nested.c +8 -5
@@ -6077,11 +6077,14 @@ static int vmx_get_nested_state(struct kvm_vcpu *vcpu,if (is_guest_mode (vcpu)) {sync_vmcs02_to_vmcs12 (vcpu, vmcs12);sync_vmcs02_to_vmcs12_rare (vcpu, vmcs12); - }else if (!vmx->nested.need_vmcs12_to_shadow_sync) { -if (vmx->nested.hv_evmcs) -copy_enlightened_to_vmcs12 (vmx); -else if (enable_shadow_vmcs) -copy_shadow_to_vmcs12 (vmx); + }else { +copy_vmcs02_to_vmcs12_rare (vcpu,get_vmcs12 (vcpu)); +if (!vmx->nested.need_vmcs12_to_shadow_sync) { +if (vmx->nested.hv_evmcs) +copy_enlightened_to_vmcs12 (vmx); +else if (enable_shadow_vmcs) +copy_shadow_to_vmcs12 (vmx); + } }BUILD_BUG_ON (sizeof (user_vmx_nested_state->vmcs12) <VMCS12_SIZE );
Signature · 1 line
2.26.2
Re: [PATCH v2 1/3] KVM: nVMX: Always call sync_vmcs02_to_vmcs12_rare on migration
Subject is confusing, and technically wrong. Confusing because there is no call to sync_vmcs02_to_vmcs12_rare(). Technically wrong because sync_...() won't be called if need_sync_vmcs02_to_vmcs12_rare==false.
Maybe something like?
KVM: nVMX: Sync unsync'd vmcs02 state to vmcs12 on migration
Quoted 2 lines · Maxim Levitsky
Even when we are outside the nested guest, some vmcs02 fields are not in sync vs vmcs12.
s/are not/may not be
It'd be helpful to provide more details in the changelog, e.g. for those not in the loop, it's not obvious that KVM intentionally keeps those fields unsync'd, even across nested VM-Exit.
Quoted 4 lines
However during the migration, the vmcs12 has to be up to date to be able to load it later after the migration.
To fix that, call that function.
s/that function/copy_vmcs02_to_vmcs12_rare(). Characters are cheap, and it's jarring to have to jump back all the way back to the subject. And, as mentioned above, this doesn't actually call sync_ directly.
For the code,
Quoted 35 lines
Fixes 7952d769c29ca ("KVM: nVMX: Sync rarely accessed guest fields only when needed")Signed-off-by Maxim Levitsky <[email protected]>--- arch/x86/kvm/vmx/nested.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)arch/x86/kvm/vmx/nested.c +8
-5@@ -6077,11 +6077,14 @@ static int vmx_get_nested_state(struct kvm_vcpu *vcpu,if (is_guest_mode (vcpu)) {sync_vmcs02_to_vmcs12 (vcpu, vmcs12);sync_vmcs02_to_vmcs12_rare (vcpu, vmcs12); - }else if (!vmx->nested.need_vmcs12_to_shadow_sync) { -if (vmx->nested.hv_evmcs) -copy_enlightened_to_vmcs12 (vmx); -else if (enable_shadow_vmcs) -copy_shadow_to_vmcs12 (vmx); + }else { +copy_vmcs02_to_vmcs12_rare (vcpu,get_vmcs12 (vcpu)); +if (!vmx->nested.need_vmcs12_to_shadow_sync) { +if (vmx->nested.hv_evmcs) +copy_enlightened_to_vmcs12 (vmx); +else if (enable_shadow_vmcs) +copy_shadow_to_vmcs12 (vmx); + } }BUILD_BUG_ON (sizeof (user_vmx_nested_state->vmcs12) <VMCS12_SIZE );Signature · 1 line
2.26.2
Paolo Bonzini
maintainerRe: [PATCH v2 1/3] KVM: nVMX: Always call sync_vmcs02_to_vmcs12_rare on migration
Quoted 1 line · Sean Christopherson
Reviewed-by Sean Christopherson<[email protected]>
New commit message:
KVM: nVMX: Sync unsync'd vmcs02 state to vmcs12 on migration
Even when we are outside the nested guest, some vmcs02 fields may not be in sync vs vmcs12. This is intentional, even across nested VM-exit, because the sync can be delayed until the nested hypervisor performs a VMCLEAR or a VMREAD/VMWRITE that affects those rarely accessed fields.
However, during KVM_GET_NESTED_STATE, the vmcs12 has to be up to date to be able to restore it. To fix that, call copy_vmcs02_to_vmcs12_rare() before the vmcs12 contents are copied to userspace.
Paolo
PATCH v2 2/3 KVM: nVMX: add kvm_nested_vmlaunch_resume tracepoint
In reply to Maxim LevitskyThis is very helpful for debugging nested VMX issues.
--- arch/x86/kvm/trace.h | 30 ++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/nested.c | 6 ++++++ arch/x86/kvm/x86.c | 1 + 3 files changed, 37 insertions(+)
arch/x86/kvm/trace.h +30 -0
@@ -554,6 +554,36 @@ TRACE_EVENT(kvm_nested_vmrun, __entry->npt ? "on" : "off") ); + +/* +* Tracepoint for nested VMLAUNCH/VMRESUME +*/ +TRACE_EVENT (kvm_nested_vmlaunch_resume, + TP_PROTO(__u64 rip, __u64 vmcs, __u64 nested_rip, + __u32 entry_intr_info), +TP_ARGS (rip, vmcs, nested_rip, entry_intr_info), + +TP_STRUCT__entry ( + __field( __u64, rip ) + __field( __u64, vmcs ) + __field( __u64, nested_rip ) +__field ( __u32, entry_intr_info ) + ), + +TP_fast_assign ( + __entry->rip = rip; + __entry->vmcs = vmcs; + __entry->nested_rip = nested_rip; + __entry->entry_intr_info = entry_intr_info; + ), + +TP_printk ("rip: 0x%016llx vmcs: 0x%016llx nrip: 0x%016llx " +"entry_intr_info: 0x%08x" , + __entry->rip, __entry->vmcs, __entry->nested_rip, + __entry->entry_intr_info) +); + + TRACE_EVENT(kvm_nested_intercepts, TP_PROTO(__u16 cr_read, __u16 cr_write, __u32 exceptions, __u32 intercept1, __u32 intercept2, __u32 intercept3),
arch/x86/kvm/vmx/nested.c +6 -0
@@ -3327,6 +3327,12 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, !(vmcs12->vm_entry_controls & VM_ENTRY_LOAD_BNDCFGS)) vmx->nested.vmcs01_guest_bndcfgs = vmcs_read64(GUEST_BNDCFGS); +trace_kvm_nested_vmlaunch_resume (kvm_rip_read (vcpu), + vmx->nested.current_vmptr, + vmcs12->guest_rip, + vmcs12->vm_entry_intr_info_field); + +/* * Overwrite vmcs01.GUEST_CR3 with L1's CR3 if EPT is disabled *and* * nested early checks are disabled. In the event of a "late" VM-Fail,
arch/x86/kvm/x86.c +1 -0
@@ -11562,6 +11562,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_inj_virq);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_page_fault);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_msr);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_cr); +EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmlaunch_resume);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmrun);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmexit);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmexit_inject);
Signature · 1 line
2.26.2
Sean Christopherson
maintainerRe: [PATCH v2 2/3] KVM: nVMX: add kvm_nested_vmlaunch_resume tracepoint
Quoted 14 lines · Maxim Levitsky
This is very helpful for debugging nested VMX issues.
Signed-off-by Maxim Levitsky <[email protected]>--- arch/x86/kvm/trace.h | 30 ++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/nested.c | 6 ++++++ arch/x86/kvm/x86.c | 1 + 3 files changed, 37 insertions(+)arch/x86/kvm/trace.h +0
-0
arch/x86/kvm/trace.h TRACE_EVENT(kvm_nested_vmrun, · line 559
Quoted 6 lines
arch/x86/kvm/trace.h +3
-0@@ -554,6 +554,36 @@ TRACE_EVENT(kvm_nested_vmrun, __entry->npt ? "on" : "off") ); + +/* +* Tracepoint for nested VMLAUNCH/VMRESUME
VM-Enter, as below.
arch/x86/kvm/trace.h TRACE_EVENT(kvm_nested_vmrun, · line 561
Quoted 2 lines
arch/x86/kvm/trace.h +2
-0+*/ +TRACE_EVENT(kvm_nested_vmlaunch_resume,
s/vmlaunc_resume/vmenter, both for consistency with other code and so that it can sanely be reused by SVM. IMO, trace_kvm_entry is wrong :-).
Quoted 33 lines
arch/x86/kvm/trace.h +25
-0+ TP_PROTO(__u64 rip, __u64 vmcs, __u64 nested_rip, + __u32 entry_intr_info), +TP_ARGS (rip, vmcs, nested_rip, entry_intr_info), + +TP_STRUCT__entry ( + __field( __u64, rip ) +__field (__u64 ,vmcs ) +__field ( __u64, nested_rip ) +__field ( __u32, entry_intr_info ) + ), + +TP_fast_assign ( + __entry->rip = rip; + __entry->vmcs = vmcs; + __entry->nested_rip = nested_rip; + __entry->entry_intr_info = entry_intr_info; + ), + +TP_printk ("rip: 0x%016llx vmcs: 0x%016llx nrip: 0x%016llx " +"entry_intr_info: 0x%08x" , + __entry->rip, __entry->vmcs, __entry->nested_rip, + __entry->entry_intr_info) +); + + TRACE_EVENT(kvm_nested_intercepts, TP_PROTO(__u16 cr_read, __u16 cr_write, __u32 exceptions, __u32 intercept1, __u32 intercept2, __u32 intercept3),arch/x86/kvm/vmx/nested.c +0
-0
arch/x86/kvm/vmx/nested.c enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, · line 3330
Quoted 4 lines
arch/x86/kvm/vmx/nested.c +1
-0@@ -3327,6 +3327,12 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, !(vmcs12->vm_entry_controls & VM_ENTRY_LOAD_BNDCFGS)) vmx->nested.vmcs01_guest_bndcfgs = vmcs_read64(GUEST_BNDCFGS); + trace_kvm_nested_vmlaunch_resume(kvm_rip_read(vcpu),
Hmm, won't this RIP be wrong for the migration case? I.e. it'll be L2, not L1 as is the case for the "true" nested VM-Enter path.
arch/x86/kvm/vmx/nested.c enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, · line 3333
Quoted 3 lines
arch/x86/kvm/vmx/nested.c +3
-0+ vmx->nested.current_vmptr, + vmcs12->guest_rip, + vmcs12->vm_entry_intr_info_field);
The placement is a bit funky. I assume you put it here so that calls from vmx_set_nested_state() also get traced. But, that also means vmx_pre_leave_smm() will get traced, and it also creates some weirdness where some nested VM-Enters that VM-Fail will get traced, but others will not.
Tracing vmx_pre_leave_smm() isn't necessarily bad, but it could be confusing, especially if the debugger looks up the RIP and sees RSM. Ditto for the migration case.
Not sure what would be a good answer.
Quoted 20 lines
arch/x86/kvm/vmx/nested.c +2
-0+ +/* * Overwrite vmcs01.GUEST_CR3 with L1's CR3 if EPT is disabled *and* * nested early checks are disabled. In the event of a "late" VM-Fail, arch/x86/kvm/x86.c +1
-0@@ -11562,6 +11562,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_inj_virq);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_page_fault);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_msr);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_cr); +EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmlaunch_resume);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmrun);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmexit);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmexit_inject);Signature · 1 line
2.26.2
Paolo Bonzini
maintainerRe: [PATCH v2 2/3] KVM: nVMX: add kvm_nested_vmlaunch_resume tracepoint
Quoted 3 lines · Sean Christopherson
arch/x86/kvm/vmx/nested.c enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, · line 3330
Quoted 1 line
arch/x86/kvm/vmx/nested.c +1
-0+ trace_kvm_nested_vmlaunch_resume(kvm_rip_read(vcpu),Hmm, won't this RIP be wrong for the migration case? I.e. it'll be L2, not L1 as is the case for the "true" nested VM-Enter path.
It will be the previous RIP---might as well be 0xfffffff0 depending on what userspace does. I don't think you can do much better than that, using vmcs12->host_rip would be confusing in the SMM case.
Quoted 11 lines
arch/x86/kvm/vmx/nested.c enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, · line 3333
Quoted 3 lines
arch/x86/kvm/vmx/nested.c +3
-0+ vmx->nested.current_vmptr, + vmcs12->guest_rip, + vmcs12->vm_entry_intr_info_field);The placement is a bit funky. I assume you put it here so that calls from
vmx_set_nested_state()also get traced. But, that also meansvmx_pre_leave_smm()will get traced, and it also creates some weirdness where some nested VM-Enters that VM-Fail will get traced, but others will not.Tracing
vmx_pre_leave_smm()isn't necessarily bad, but it could be confusing, especially if the debugger looks up the RIP and sees RSM. Ditto for the migration case.
Actually tracing vmx_pre_leave_smm() is good, and pointing to RSM makes sense so I'm not worried about that.
Paolo
Sean Christopherson
maintainerRe: [PATCH v2 2/3] KVM: nVMX: add kvm_nested_vmlaunch_resume tracepoint
Quoted 17 lines · Paolo Bonzini
Quoted 3 lines · Sean Christopherson
arch/x86/kvm/vmx/nested.c enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, · line 3330
Quoted 1 line
arch/x86/kvm/vmx/nested.c +1
-0+ trace_kvm_nested_vmlaunch_resume(kvm_rip_read(vcpu),Hmm, won't this RIP be wrong for the migration case? I.e. it'll be L2, not L1 as is the case for the "true" nested VM-Enter path.
It will be the previous RIP---might as well be
0xfffffff0depending on what userspace does. I don't think you can do much better than that, usingvmcs12->host_ripwould be confusing in the SMM case.Quoted 8 lines
arch/x86/kvm/vmx/nested.c enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, · line 3333
Quoted 3 lines
arch/x86/kvm/vmx/nested.c +3
-0+ vmx->nested.current_vmptr, + vmcs12->guest_rip, + vmcs12->vm_entry_intr_info_field);The placement is a bit funky. I assume you put it here so that calls from
vmx_set_nested_state()also get traced. But, that also meansvmx_pre_leave_smm()will get traced, and it also creates some weirdness where some nested VM-Enters that VM-Fail will get traced, but others will not.
Quoted 6 lines
Quoted 3 lines
Tracing
vmx_pre_leave_smm()isn't necessarily bad, but it could be confusing, especially if the debugger looks up the RIP and sees RSM. Ditto for the migration case.Actually tracing
vmx_pre_leave_smm()is good, and pointing to RSM makes sense so I'm not worried about that.
Ideally there would something in the tracepoint to differentiate the various cases. Not that the RSM/migration cases will pop up often, but I think it's an easily solved problem that could avoid confusion.
What if we captured vmx->nested.smm.guest_mode and from_vmentry, and explicitly record what triggered the entry?
TP_printk("from: %s rip: 0x%016llx vmcs: 0x%016llx nrip: 0x%016llx intr_info: 0x%08x",
__entry->vmenter ? "VM-Enter" : __entry->smm ? "RSM" : "SET_STATE",
__entry->rip, __entry->vmcs, __entry->nested_rip,
__entry->entry_intr_infoSide topic, can we have an "official" ruling on whether KVM tracepoints should use colons and/or commas? And probably same question for whether or not to prepend zeros. E.g. kvm_entry has "vcpu %u, rip 0x%lx" versus "rip: 0x%016llx
vmcs: 0x%016llx". It bugs me that we're so inconsistent.
Re: [PATCH v2 2/3] KVM: nVMX: add kvm_nested_vmlaunch_resume tracepoint
Quoted 29 lines · Sean Christopherson
Quoted 17 lines · Paolo Bonzini
Quoted 3 lines · Sean Christopherson
arch/x86/kvm/vmx/nested.c enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, · line 3330
Quoted 1 line
arch/x86/kvm/vmx/nested.c +1
-0+ trace_kvm_nested_vmlaunch_resume(kvm_rip_read(vcpu),Hmm, won't this RIP be wrong for the migration case? I.e. it'll be L2, not L1 as is the case for the "true" nested VM-Enter path.
It will be the previous RIP---might as well be
0xfffffff0depending on what userspace does. I don't think you can do much better than that, usingvmcs12->host_ripwould be confusing in the SMM case.Quoted 8 lines
arch/x86/kvm/vmx/nested.c enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, · line 3333
Quoted 3 lines
arch/x86/kvm/vmx/nested.c +3
-0+ vmx->nested.current_vmptr, + vmcs12->guest_rip, + vmcs12->vm_entry_intr_info_field);The placement is a bit funky. I assume you put it here so that calls from
vmx_set_nested_state()also get traced. But, that also meansvmx_pre_leave_smm()will get traced, and it also creates some weirdness where some nested VM-Enters that VM-Fail will get traced, but others will not.Quoted 6 lines
Quoted 3 lines
Tracing
vmx_pre_leave_smm()isn't necessarily bad, but it could be confusing, especially if the debugger looks up the RIP and sees RSM. Ditto for the migration case.Actually tracing
vmx_pre_leave_smm()is good, and pointing to RSM makes sense so I'm not worried about that.Ideally there would something in the tracepoint to differentiate the various cases. Not that the RSM/migration cases will pop up often, but I think it's an easily solved problem that could avoid confusion.
Quoted 7 lines
What if we captured
vmx->nested.smm.guest_modeandfrom_vmentry, and explicitly record what triggered the entry?TP_printk("from: %s rip: 0x%016llx vmcs: 0x%016llx nrip: 0x%016llx intr_info: 0x%08x", __entry->vmenter ? "VM-Enter" : __entry->smm ? "RSM" : "SET_STATE", __entry->rip, __entry->vmcs, __entry->nested_rip, __entry->entry_intr_info
I think that this is a good idea, but should be done in a separate patch.
Quoted 6 lines
Side topic, can we have an "official" ruling on whether KVM tracepoints should use colons and/or commas? And probably same question for whether or not to prepend zeros. E.g.
kvm_entryhas "vcpu %u, rip 0x%lx" versus "rip: 0x%016llx
vmcs: 0x%016llx". It bugs me that we're so inconsistent.
As I said the kvm tracing has a lot of things that can be imporoved,
and as it is often the only way to figure out complex bugs as these I had to deal with recently, I will do more improvements in this area as time permits.
Best regards,
Maxim Levitsky
Re: [PATCH v2 2/3] KVM: nVMX: add kvm_nested_vmlaunch_resume tracepoint
In reply to Paolo BonziniQuoted 4 lines · Paolo Bonzini
Quoted 3 lines · Sean Christopherson
arch/x86/kvm/vmx/nested.c enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, · line 3330
Quoted 1 line
arch/x86/kvm/vmx/nested.c +1
-0+ trace_kvm_nested_vmlaunch_resume(kvm_rip_read(vcpu),Hmm, won't this RIP be wrong for the migration case? I.e. it'll be L2, not L1 as is the case for the "true" nested VM-Enter path.
Actually in this case, the initial RIP of 0x000000000000fff0 will be printed which isn't that bad.
A tracepoint in nested state load function would be very nice to add to mark this explicitly. I'll do this later.
Quoted 13 lines
It will be the previous RIP---might as well be
0xfffffff0depending on what userspace does. I don't think you can do much better than that, usingvmcs12->host_ripwould be confusing in the SMM case.Quoted 8 lines
arch/x86/kvm/vmx/nested.c enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, · line 3333
Quoted 3 lines
arch/x86/kvm/vmx/nested.c +3
-0+ vmx->nested.current_vmptr, + vmcs12->guest_rip, + vmcs12->vm_entry_intr_info_field);The placement is a bit funky. I assume you put it here so that calls from
vmx_set_nested_state()also get traced. But, that also meansvmx_pre_leave_smm()will get traced, and it also creates some weirdness where some nested VM-Enters that VM-Fail will get traced, but others will not.
Quoted 9 lines
Quoted 3 lines
Tracing
vmx_pre_leave_smm()isn't necessarily bad, but it could be confusing, especially if the debugger looks up the RIP and sees RSM. Ditto for the migration case.Actually tracing
vmx_pre_leave_smm()is good, and pointing to RSM makes sense so I'm not worried about that.Paolo
I agree with that and indeed this was my intention.
In fact I will change the svm's tracepoint to behave the same way in the next patch series (I'll move it to enter_svm_guest_mode).
(When I wrote this patch I somehow thought that this is what SVM already does).
Best regards,
Maxim Levitsky
Re: [PATCH v2 2/3] KVM: nVMX: add kvm_nested_vmlaunch_resume tracepoint
In reply to Sean ChristophersonQuoted 18 lines · Sean Christopherson
Quoted 17 lines · Maxim Levitsky
This is very helpful for debugging nested VMX issues.
Signed-off-by Maxim Levitsky <[email protected]>--- arch/x86/kvm/trace.h | 30 ++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/nested.c | 6 ++++++ arch/x86/kvm/x86.c | 1 + 3 files changed, 37 insertions(+)arch/x86/kvm/trace.h +0
-0@@ -554,6 +554,36 @@ TRACE_EVENT(kvm_nested_vmrun, __entry->npt ? "on" : "off") );
Quoted 5 lines
arch/x86/kvm/trace.h TRACE_EVENT(kvm_nested_vmrun, · line 559
Quoted 3 lines
arch/x86/kvm/trace.h +3
-0+ +/* +* Tracepoint for nested VMLAUNCH/VMRESUME VM-Enter, as below.
Will do
Quoted 6 lines
arch/x86/kvm/trace.h TRACE_EVENT(kvm_nested_vmrun, · line 561
Quoted 3 lines
arch/x86/kvm/trace.h +2
-0+*/ +TRACE_EVENT(kvm_nested_vmlaunch_resume,s/vmlaunc_resume/vmenter, both for consistency with other code and so that it can sanely be reused by SVM. IMO,
trace_kvm_entryis wrong :-).
SVM already has trace_kvm_nested_vmrun and it contains some SVM specific stuff that doesn't exist on VMX and vise versa.
So I do want to keep these trace points separate.
Quoted 78 lines
Quoted 34 lines
arch/x86/kvm/trace.h +25
-0+ TP_PROTO(__u64 rip, __u64 vmcs, __u64 nested_rip, + __u32 entry_intr_info), +TP_ARGS (rip, vmcs, nested_rip, entry_intr_info), + +TP_STRUCT__entry ( + __field( __u64, rip ) +__field (__u64 ,vmcs ) +__field ( __u64, nested_rip ) +__field ( __u32, entry_intr_info ) + ), + +TP_fast_assign ( + __entry->rip = rip; + __entry->vmcs = vmcs; + __entry->nested_rip = nested_rip; + __entry->entry_intr_info = entry_intr_info; + ), + +TP_printk ("rip: 0x%016llx vmcs: 0x%016llx nrip: 0x%016llx " +"entry_intr_info: 0x%08x" , + __entry->rip, __entry->vmcs, __entry->nested_rip, + __entry->entry_intr_info) +); + + TRACE_EVENT(kvm_nested_intercepts, TP_PROTO(__u16 cr_read, __u16 cr_write, __u32 exceptions, __u32 intercept1, __u32 intercept2, __u32 intercept3),arch/x86/kvm/vmx/nested.c +0
-0arch/x86/kvm/vmx/nested.c enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, · line 3330
Quoted 4 lines
arch/x86/kvm/vmx/nested.c +1
-0@@ -3327,6 +3327,12 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, !(vmcs12->vm_entry_controls & VM_ENTRY_LOAD_BNDCFGS)) vmx->nested.vmcs01_guest_bndcfgs = vmcs_read64(GUEST_BNDCFGS); + trace_kvm_nested_vmlaunch_resume(kvm_rip_read(vcpu),Hmm, won't this RIP be wrong for the migration case? I.e. it'll be L2, not L1 as is the case for the "true" nested VM-Enter path.
arch/x86/kvm/vmx/nested.c enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, · line 3333
Quoted 3 lines
arch/x86/kvm/vmx/nested.c +3
-0+ vmx->nested.current_vmptr, + vmcs12->guest_rip, + vmcs12->vm_entry_intr_info_field);The placement is a bit funky. I assume you put it here so that calls from
vmx_set_nested_state()also get traced. But, that also meansvmx_pre_leave_smm()will get traced, and it also creates some weirdness where some nested VM-Enters that VM-Fail will get traced, but others will not.Tracing
vmx_pre_leave_smm()isn't necessarily bad, but it could be confusing, especially if the debugger looks up the RIP and sees RSM. Ditto for the migration case.Not sure what would be a good answer.
Quoted 20 lines
arch/x86/kvm/vmx/nested.c +2
-0+ +/* * Overwrite vmcs01.GUEST_CR3 with L1's CR3 if EPT is disabled *and* * nested early checks are disabled. In the event of a "late" VM-Fail, arch/x86/kvm/x86.c +1
-0@@ -11562,6 +11562,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_inj_virq);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_page_fault);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_msr);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_cr); +EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmlaunch_resume);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmrun);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmexit);EXPORT_TRACEPOINT_SYMBOL_GPL (kvm_nested_vmexit_inject);Signature · 1 line
2.26.2
PATCH v2 3/3 KVM: VMX: read idt_vectoring_info a bit earlier
In reply to Maxim LevitskyThis allows it to be printed correctly by the trace print that follows.
--- arch/x86/kvm/vmx/vmx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/vmx/vmx.c +2 -1
@@ -6771,6 +6771,8 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu) } vmx->exit_reason =vmcs_read32 (VM_EXIT_REASON ); + vmx->idt_vectoring_info =vmcs_read32 (IDT_VECTORING_INFO_FIELD ); +if (unlikely ((u16 )vmx->exit_reason ==EXIT_REASON_MCE_DURING_VMENTRY ))kvm_machine_check ();
@@ -6780,7 +6782,6 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)return EXIT_FASTPATH_NONE ; vmx->loaded_vmcs->launched =1 ; - vmx->idt_vectoring_info =vmcs_read32 (IDT_VECTORING_INFO_FIELD );vmx_recover_nmi_blocking (vmx);vmx_complete_interrupts (vmx);
Signature · 1 line
2.26.2
Sean Christopherson
maintainerRe: [PATCH v2 3/3] KVM: VMX: read idt_vectoring_info a bit earlier
Quoted 1 line · Maxim Levitsky
This allows it to be printed correctly by the trace print
It'd be helpful to explicitly say which tracepoint, and explain that the value is read by vmx_get_exit_info(). It's far from obvious how this gets consumed.
Quoted 2 lines
that follows.
Quoted 10 lines
Signed-off-by Maxim Levitsky <[email protected]>--- arch/x86/kvm/vmx/vmx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/x86/kvm/vmx/vmx.c +0
-0
arch/x86/kvm/vmx/vmx.c static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu) · line 6774
Quoted 4 lines
arch/x86/kvm/vmx/vmx.c +1
-0@@ -6771,6 +6771,8 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu) } vmx->exit_reason =vmcs_read32 (VM_EXIT_REASON ); + vmx->idt_vectoring_info =vmcs_read32 (IDT_VECTORING_INFO_FIELD );
Hrm, it probably makes sense to either do the VMREAD conditionally, or to zero idt_vectoring_info in the vmx->fail path. I don't care about the cycles on VM-Exit consistency checks, just that this would hide that the field is valid if and only if VM-Enter fully succeeded. A third option would be to add a comment saying that it's unnecessary if VM-Enter failed, but faster in the common case to just do the VMREAD.
arch/x86/kvm/vmx/vmx.c +3 -1
@@ -6774,13 +6774,15 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)if (unlikely ((u16 )vmx->exit_reason ==EXIT_REASON_MCE_DURING_VMENTRY ))kvm_machine_check (); +if (likely (!(vmx->exit_reason &VMX_EXIT_REASONS_FAILED_VMENTRY ))) + vmx->idt_vectoring_info =vmcs_read32 (IDT_VECTORING_INFO_FIELD ); +trace_kvm_exit (vmx->exit_reason, vcpu,KVM_ISA_VMX );if (unlikely (vmx->exit_reason &VMX_EXIT_REASONS_FAILED_VMENTRY ))return EXIT_FASTPATH_NONE ; vmx->loaded_vmcs->launched =1 ; - vmx->idt_vectoring_info =vmcs_read32 (IDT_VECTORING_INFO_FIELD );vmx_recover_nmi_blocking (vmx);vmx_complete_interrupts (vmx);
Quoted 15 lines
arch/x86/kvm/vmx/vmx.c +1
-1+if (unlikely ((u16 )vmx->exit_reason ==EXIT_REASON_MCE_DURING_VMENTRY ))kvm_machine_check ();@@ -6780,7 +6782,6 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)return EXIT_FASTPATH_NONE ; vmx->loaded_vmcs->launched =1 ; - vmx->idt_vectoring_info =vmcs_read32 (IDT_VECTORING_INFO_FIELD );vmx_recover_nmi_blocking (vmx);vmx_complete_interrupts (vmx);Signature · 1 line
2.26.2
Re: [PATCH v2 3/3] KVM: VMX: read idt_vectoring_info a bit earlier
Quoted 23 lines · Sean Christopherson
Quoted 1 line · Maxim Levitsky
This allows it to be printed correctly by the trace print
It'd be helpful to explicitly say which tracepoint, and explain that the value is read by
vmx_get_exit_info(). It's far from obvious how this gets consumed.Quoted 2 lines
that follows.
Fixes dcf068da7eb2 ("KVM: VMX: Introduce generic fastpath handler")Quoted 12 lines
Signed-off-by Maxim Levitsky <[email protected]>--- arch/x86/kvm/vmx/vmx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/x86/kvm/vmx/vmx.c +0
-0@@ -6771,6 +6771,8 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu) }
Quoted 9 lines
arch/x86/kvm/vmx/vmx.c static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu) · line 6774
Quoted 2 lines
arch/x86/kvm/vmx/vmx.c +1
-0vmx->exit_reason =vmcs_read32 (VM_EXIT_REASON ); + vmx->idt_vectoring_info =vmcs_read32 (IDT_VECTORING_INFO_FIELD );Hrm, it probably makes sense to either do the VMREAD conditionally, or to zero
idt_vectoring_infoin thevmx->failpath. I don't care about the cycles on VM-Exit consistency checks, just that this would hide that the field is valid if and only if VM-Enter fully succeeded. A third option would be to add a comment saying that it's unnecessary if VM-Enter failed, but faster in the common case to just do the VMREAD.
Allright, I will add this.
Best regards,
Maxim Levitsky
Quoted 39 lines
arch/x86/kvm/vmx/vmx.c +3
-1@@ -6774,13 +6774,15 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)if (unlikely ((u16 )vmx->exit_reason ==EXIT_REASON_MCE_DURING_VMENTRY ))kvm_machine_check (); +if (likely (!(vmx->exit_reason &VMX_EXIT_REASONS_FAILED_VMENTRY ))) + vmx->idt_vectoring_info =vmcs_read32 (IDT_VECTORING_INFO_FIELD ); +trace_kvm_exit (vmx->exit_reason, vcpu,KVM_ISA_VMX );if (unlikely (vmx->exit_reason &VMX_EXIT_REASONS_FAILED_VMENTRY ))return EXIT_FASTPATH_NONE ; vmx->loaded_vmcs->launched =1 ; - vmx->idt_vectoring_info =vmcs_read32 (IDT_VECTORING_INFO_FIELD );vmx_recover_nmi_blocking (vmx);vmx_complete_interrupts (vmx);Quoted 17 lines
arch/x86/kvm/vmx/vmx.c +1
-1+if (unlikely ((u16 )vmx->exit_reason ==EXIT_REASON_MCE_DURING_VMENTRY ))kvm_machine_check ();@@ -6780,7 +6782,6 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)return EXIT_FASTPATH_NONE ; vmx->loaded_vmcs->launched =1 ; - vmx->idt_vectoring_info =vmcs_read32 (IDT_VECTORING_INFO_FIELD );vmx_recover_nmi_blocking (vmx);vmx_complete_interrupts (vmx);Signature · 1 line
2.26.2
Paolo Bonzini
maintainerQuoted 26 lines · Maxim Levitsky
This is hopefully the last fix for VMX nested migration
that finally allows my stress test of migration with a nested guest to pass.In a nutshell after an optimization that was done in commit
7952d769c29ca, some of vmcs02 fields which can be modified by the L2 freely while it runs (like GSBASE and such) were not copied back to vmcs12 unless:1. L1 tries to vmread them (update done on intercept)
2. vmclear or vmldptr on other vmcs are done.
3. nested state is read and nested guest is running.What wasn't done was to sync these 'rare' fields when L1 is running but still has a loaded vmcs12 which might have some stale fields, if that vmcs was used to enter a guest already due to that optimization.
Plus I added two minor patches to improve VMX tracepoints a bit. There is still a large room for improvement.
Best regards,
Maxim LevitskyMaxim Levitsky (3):
KVM: nVMX: Always callsync_vmcs02_to_vmcs12_rareon migration
KVM: nVMX: addkvm_nested_vmlaunch_resumetracepoint
KVM: VMX: readidt_vectoring_infoa bit earlier
Quoted 6 lines
arch/x86/kvm/trace.h | 30 ++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/nested.c | 19 ++++++++++++++----- arch/x86/kvm/vmx/vmx.c | 3 ++- arch/x86/kvm/x86.c | 1 + 4 files changed, 47 insertions(+), 6 deletions(-)
I committed patch 1 since I need to send it out to Linus quite soonish, but please adjust and resend the others based on Sean's review.
Paolo