KVM: x86: Add kvm_x86_ops hook to short circuit emulation
PATCH 1/1 KVM: x86: Add kvm_x86_ops hook to short circuit emulation
Replace the existing kvm_x86_ops.need_emulation_on_page_fault() with a more generic is_emulatable(), and unconditionally call the new function in x86_emulate_instruction().
KVM will use the generic hook to support multiple security related technologies that prevent emulation in one way or another. Similar to the existing AMD #NPF case where emulation of the current instruction is not possible due to lack of information, AMD's SEV-ES and Intel's SGX and TDX will introduce scenarios where emulation is impossible due to the guest's register state being inaccessible. And again similar to the existing #NPF case, emulation can be initiated by kvm_mmu_page_fault(), i.e. outside of the control of vendor-specific code.
While the cause and architecturally visible behavior of the various cases are different, e.g. SGX will inject a #UD, AMD #NPF is a clean resume or complete shutdown, and SEV-ES and TDX "return" an error, the impact on the common emulation code is identical: KVM must stop emulation immediately and resume the guest.
Query is_emulatable() in handle_ud() as well so that the force_emulation_prefix code doesn't incorrectly modify RIP before calling emulate_instruction() in the absurdly unlikely scenario that KVM encounters forced emulation in conjunction with "do not emulate".
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/mmu/mmu.c | 12 ------------ arch/x86/kvm/svm/svm.c | 31 ++++++++++++++++++------------- arch/x86/kvm/vmx/vmx.c | 12 ++++++------ arch/x86/kvm/x86.c | 9 ++++++++- 5 files changed, 33 insertions(+), 33 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1221,7 +1221,7 @@ struct kvm_x86_ops {int (*get_msr_feature)(struct kvm_msr_entry *entry); -bool (*need_emulation_on_page_fault)(struct kvm_vcpu *vcpu); +bool (*is_emulatable)(struct kvm_vcpu *vcpu,void *insn,int insn_len);bool (*apic_init_signal_blocked)(struct kvm_vcpu *vcpu);int (*enable_direct_tlbflush)(struct kvm_vcpu *vcpu);
arch/x86/kvm/mmu/mmu.c +0 -12
@@ -5485,18 +5485,6 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 error_code,if (!mmio_info_in_cache (vcpu, cr2_or_gpa, direct) && !is_guest_mode (vcpu)) emulation_type |=EMULTYPE_ALLOW_RETRY_PF ; emulate: -/* -* On AMD platforms, under certain conditions insn_len may be zero on #NPF. -* This can happen if a guest gets a page-fault on data access but the HW -* table walker is not able to read the instruction page (e.g instruction -* page is not present in memory). In those cases we simply restart the -* guest, with the exception of AMD Erratum 1096 which is unrecoverable. -*/ -if (unlikely (insn && !insn_len)) { -if (!kvm_x86_ops.need_emulation_on_page_fault (vcpu)) -return 1 ; - } -return x86_emulate_instruction (vcpu, cr2_or_gpa, emulation_type, insn, insn_len); }
arch/x86/kvm/svm/svm.c +18 -13
@@ -3933,19 +3933,10 @@ static void enable_smi_window(struct kvm_vcpu *vcpu) } } -static bool svm_need_emulation_on_page_fault (struct kvm_vcpu *vcpu) +static bool svm_is_emulatable (struct kvm_vcpu *vcpu,void *insn,int insn_len) { -unsigned long cr4 =kvm_read_cr4 (vcpu); -bool smep = cr4 &X86_CR4_SMEP ; -bool smap = cr4 &X86_CR4_SMAP ; -bool is_user =svm_get_cpl (vcpu) ==3 ; - -/* -* If RIP is invalid, go ahead with emulation which will cause an -* internal error exit. -*/ -if (!kvm_vcpu_gfn_to_memslot (vcpu,kvm_rip_read (vcpu) >>PAGE_SHIFT )) -return true; +bool smep, smap, is_user; +unsigned long cr4;/* * Detect and workaround Errata 1096 Fam_17h_00_0Fh.
@@ -3987,6 +3978,20 @@ static bool svm_need_emulation_on_page_fault(struct kvm_vcpu *vcpu)* instruction pointer so we will not able to workaround it. Lets * print the error and request to kill the guest. */ +if (likely (!insn || insn_len)) +return true; + +/* +* If RIP is invalid, go ahead with emulation which will cause an +* internal error exit. +*/ +if (!kvm_vcpu_gfn_to_memslot (vcpu,kvm_rip_read (vcpu) >>PAGE_SHIFT )) +return true; + + cr4 =kvm_read_cr4 (vcpu); + smep = cr4 &X86_CR4_SMEP ; + smap = cr4 &X86_CR4_SMAP ; + is_user =svm_get_cpl (vcpu) ==3 ;if (smap && (!smep || is_user)) {if (!sev_guest (vcpu->kvm))return true;
@@ -4148,7 +4153,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .mem_enc_reg_region = svm_register_enc_region, .mem_enc_unreg_region = svm_unregister_enc_region, - .need_emulation_on_page_fault = svm_need_emulation_on_page_fault, + .is_emulatable = svm_is_emulatable, .apic_init_signal_blocked = svm_apic_init_signal_blocked, };
arch/x86/kvm/vmx/vmx.c +6 -6
@@ -1561,6 +1561,11 @@ static int vmx_rtit_ctl_check(struct kvm_vcpu *vcpu, u64 data)return 0 ; } +static bool vmx_is_emulatable (struct kvm_vcpu *vcpu,void *insn,int insn_len) +{ +return true; +} +static int skip_emulated_instruction (struct kvm_vcpu *vcpu) {unsigned long rip, orig_rip;
@@ -7843,11 +7848,6 @@ static void enable_smi_window(struct kvm_vcpu *vcpu)/* RSM will cause a vmexit anyway. */ } -static bool vmx_need_emulation_on_page_fault (struct kvm_vcpu *vcpu) -{ -return false; -} -static bool vmx_apic_init_signal_blocked (struct kvm_vcpu *vcpu) {return to_vmx (vcpu)->nested.vmxon;
@@ -8002,7 +8002,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { .pre_leave_smm = vmx_pre_leave_smm, .enable_smi_window = enable_smi_window, - .need_emulation_on_page_fault = vmx_need_emulation_on_page_fault, + .is_emulatable = vmx_is_emulatable, .apic_init_signal_blocked = vmx_apic_init_signal_blocked, .migrate_timers = vmx_migrate_timers, };
arch/x86/kvm/x86.c +8 -1
@@ -5707,6 +5707,9 @@ int handle_ud(struct kvm_vcpu *vcpu)char sig[5 ];/* ud2; .ascii "kvm" */ struct x86_exception e; +if (unlikely (!kvm_x86_ops.is_emulatable (vcpu,NULL ,0 ))) +return 1 ; + if (force_emulation_prefix && kvm_read_guest_virt(vcpu, kvm_get_linear_rip(vcpu), sig, sizeof(sig), &e) == 0 &&
@@ -6912,7 +6915,10 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,int r;struct x86_emulate_ctxt *ctxt = vcpu->arch.emulate_ctxt;bool writeback = true; -bool write_fault_to_spt = vcpu->arch.write_fault_to_shadow_pgtable; +bool write_fault_to_spt; + +if (unlikely (!kvm_x86_ops.is_emulatable (vcpu, insn, insn_len))) +return 1 ; vcpu->arch.l1tf_flush_l1d = true;
@@ -6920,6 +6926,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,* Clear write_fault_to_shadow_pgtable here to ensure it is * never reused. */ + write_fault_to_spt = vcpu->arch.write_fault_to_shadow_pgtable; vcpu->arch.write_fault_to_shadow_pgtable = false;kvm_clear_exception_queue (vcpu);
Signature · 1 line
2.28.0
Quoted 170 lines · Sean Christopherson
Replace the existing
kvm_x86_ops.need_emulation_on_page_fault()with a more genericis_emulatable(), and unconditionally call the new function inx86_emulate_instruction().KVM will use the generic hook to support multiple security related technologies that prevent emulation in one way or another. Similar to the existing AMD #NPF case where emulation of the current instruction is not possible due to lack of information, AMD's SEV-ES and Intel's SGX and TDX will introduce scenarios where emulation is impossible due to the guest's register state being inaccessible. And again similar to the existing #NPF case, emulation can be initiated by
kvm_mmu_page_fault(), i.e. outside of the control of vendor-specific code.While the cause and architecturally visible behavior of the various cases are different, e.g. SGX will inject a #UD, AMD #NPF is a clean resume or complete shutdown, and SEV-ES and TDX "return" an error, the impact on the common emulation code is identical: KVM must stop emulation immediately and resume the guest.
Query
is_emulatable()inhandle_ud()as well so that theforce_emulation_prefixcode doesn't incorrectly modify RIP before callingemulate_instruction()in the absurdly unlikely scenario that KVM encounters forced emulation in conjunction with "do not emulate".Cc Tom Lendacky <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/mmu/mmu.c | 12 ------------ arch/x86/kvm/svm/svm.c | 31 ++++++++++++++++++------------- arch/x86/kvm/vmx/vmx.c | 12 ++++++------ arch/x86/kvm/x86.c | 9 ++++++++- 5 files changed, 33 insertions(+), 33 deletions(-)arch/x86/include/asm/kvm_host.h +1
-1@@ -1221,7 +1221,7 @@ struct kvm_x86_ops {int (*get_msr_feature)(struct kvm_msr_entry *entry); -bool (*need_emulation_on_page_fault)(struct kvm_vcpu *vcpu); +bool (*is_emulatable)(struct kvm_vcpu *vcpu,void *insn,int insn_len);bool (*apic_init_signal_blocked)(struct kvm_vcpu *vcpu);int (*enable_direct_tlbflush)(struct kvm_vcpu *vcpu);arch/x86/kvm/mmu/mmu.c +0
-12@@ -5485,18 +5485,6 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 error_code,if (!mmio_info_in_cache (vcpu, cr2_or_gpa, direct) && !is_guest_mode (vcpu)) emulation_type |=EMULTYPE_ALLOW_RETRY_PF ; emulate: -/* -* On AMD platforms, under certain conditions insn_len may be zero on #NPF. -* This can happen if a guest gets a page-fault on data access but the HW -* table walker is not able to read the instruction page (e.g instruction -* page is not present in memory). In those cases we simply restart the -* guest, with the exception of AMD Erratum 1096 which is unrecoverable. -*/ -if (unlikely (insn && !insn_len)) { -if (!kvm_x86_ops.need_emulation_on_page_fault (vcpu)) -return 1 ; - } -return x86_emulate_instruction (vcpu, cr2_or_gpa, emulation_type, insn, insn_len); }arch/x86/kvm/svm/svm.c +18
-13@@ -3933,19 +3933,10 @@ static void enable_smi_window(struct kvm_vcpu *vcpu) } } -static bool svm_need_emulation_on_page_fault (struct kvm_vcpu *vcpu) +static bool svm_is_emulatable (struct kvm_vcpu *vcpu,void *insn,int insn_len) { -unsigned long cr4 =kvm_read_cr4 (vcpu); -bool smep = cr4 &X86_CR4_SMEP ; -bool smap = cr4 &X86_CR4_SMAP ; -bool is_user =svm_get_cpl (vcpu) ==3 ; - -/* -* If RIP is invalid, go ahead with emulation which will cause an -* internal error exit. -*/ -if (!kvm_vcpu_gfn_to_memslot (vcpu,kvm_rip_read (vcpu) >>PAGE_SHIFT )) -return true; +bool smep, smap, is_user; +unsigned long cr4;/* * Detect and workaround Errata 1096 Fam_17h_00_0Fh. @@ -3987,6 +3978,20 @@ static bool svm_need_emulation_on_page_fault(struct kvm_vcpu *vcpu)* instruction pointer so we will not able to workaround it. Lets * print the error and request to kill the guest. */ +if (likely (!insn || insn_len)) +return true; + +/* +* If RIP is invalid, go ahead with emulation which will cause an +* internal error exit. +*/ +if (!kvm_vcpu_gfn_to_memslot (vcpu,kvm_rip_read (vcpu) >>PAGE_SHIFT )) +return true; + + cr4 =kvm_read_cr4 (vcpu); + smep = cr4 &X86_CR4_SMEP ; + smap = cr4 &X86_CR4_SMAP ; + is_user =svm_get_cpl (vcpu) ==3 ;if (smap && (!smep || is_user)) {if (!sev_guest (vcpu->kvm))return true;@@ -4148,7 +4153,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .mem_enc_reg_region = svm_register_enc_region, .mem_enc_unreg_region = svm_unregister_enc_region, - .need_emulation_on_page_fault = svm_need_emulation_on_page_fault, + .is_emulatable = svm_is_emulatable, .apic_init_signal_blocked = svm_apic_init_signal_blocked, };arch/x86/kvm/vmx/vmx.c +6
-6@@ -1561,6 +1561,11 @@ static int vmx_rtit_ctl_check(struct kvm_vcpu *vcpu, u64 data)return 0 ; } +static bool vmx_is_emulatable (struct kvm_vcpu *vcpu,void *insn,int insn_len) +{ +return true; +} +static int skip_emulated_instruction (struct kvm_vcpu *vcpu) {unsigned long rip, orig_rip;@@ -7843,11 +7848,6 @@ static void enable_smi_window(struct kvm_vcpu *vcpu)/* RSM will cause a vmexit anyway. */ } -static bool vmx_need_emulation_on_page_fault (struct kvm_vcpu *vcpu) -{ -return false; -} -static bool vmx_apic_init_signal_blocked (struct kvm_vcpu *vcpu) {return to_vmx (vcpu)->nested.vmxon;@@ -8002,7 +8002,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { .pre_leave_smm = vmx_pre_leave_smm, .enable_smi_window = enable_smi_window, - .need_emulation_on_page_fault = vmx_need_emulation_on_page_fault, + .is_emulatable = vmx_is_emulatable, .apic_init_signal_blocked = vmx_apic_init_signal_blocked, .migrate_timers = vmx_migrate_timers, };arch/x86/kvm/x86.c +0
-0
arch/x86/kvm/x86.c int handle_ud(struct kvm_vcpu *vcpu) · line 5712
Quoted 6 lines
arch/x86/kvm/x86.c +3
-0@@ -5707,6 +5707,9 @@ int handle_ud(struct kvm_vcpu *vcpu)char sig[5 ];/* ud2; .ascii "kvm" */ struct x86_exception e; +if (unlikely (!kvm_x86_ops.is_emulatable (vcpu,NULL ,0 ))) +return 1 ; +
Both VMX and SVM scenarios always fail this check.
Wanpeng
Quoted 26 lines · Wanpeng Li
Quoted 24 lines · Sean Christopherson
Replace the existing
kvm_x86_ops.need_emulation_on_page_fault()with a more genericis_emulatable(), and unconditionally call the new function inx86_emulate_instruction().KVM will use the generic hook to support multiple security related technologies that prevent emulation in one way or another. Similar to the existing AMD #NPF case where emulation of the current instruction is not possible due to lack of information, AMD's SEV-ES and Intel's SGX and TDX will introduce scenarios where emulation is impossible due to the guest's register state being inaccessible. And again similar to the existing #NPF case, emulation can be initiated by
kvm_mmu_page_fault(), i.e. outside of the control of vendor-specific code.While the cause and architecturally visible behavior of the various cases are different, e.g. SGX will inject a #UD, AMD #NPF is a clean resume or complete shutdown, and SEV-ES and TDX "return" an error, the impact on the common emulation code is identical: KVM must stop emulation immediately and resume the guest.
Query
is_emulatable()inhandle_ud()as well so that theforce_emulation_prefixcode doesn't incorrectly modify RIP before callingemulate_instruction()in the absurdly unlikely scenario that KVM encounters forced emulation in conjunction with "do not emulate".
...
Quoted 8 lines
Quoted 8 lines
arch/x86/kvm/x86.c +0
-0@@ -5707,6 +5707,9 @@ int handle_ud(struct kvm_vcpu *vcpu)char sig[5 ];/* ud2; .ascii "kvm" */ struct x86_exception e;
Quoted 5 lines
arch/x86/kvm/x86.c int handle_ud(struct kvm_vcpu *vcpu) · line 5712
Quoted 3 lines
arch/x86/kvm/x86.c +3
-0+if (unlikely (!kvm_x86_ops.is_emulatable (vcpu,NULL ,0 ))) +return 1 ; +Both VMX and SVM scenarios always fail this check.
Ah, right. This patch was extracted from my SGX series, in which case there would be a follow-up patch to add a VMX scenario where is_emulated() could return false.
The intent of posting the patch standalone is so that SGX, SEV-ES, and/or TDX have "ready to go" support in upstream, i.e. can change only the VMX/SVM implementation of is_emulated(). I'm a-ok dropping the handle_ud() change, or even the whole patch, until one of the above three is actually ready for inclusion.
Paolo Bonzini
maintainerQuoted 6 lines · Sean Christopherson
The intent of posting the patch standalone is so that SGX, SEV-ES, and/or TDX have "ready to go" support in upstream, i.e. can change only the VMX/SVM implementation of
is_emulated(). I'm a-ok dropping thehandle_ud()change, or even the whole patch, until one of the above three is actually ready for inclusion.
I think it's fine with the "can" in the name. Hopefully one of the three will go in soon...
Paolo
Quoted 10 lines · Paolo Bonzini
Quoted 6 lines · Sean Christopherson
The intent of posting the patch standalone is so that SGX, SEV-ES, and/or TDX have "ready to go" support in upstream, i.e. can change only the VMX/SVM implementation of
is_emulated(). I'm a-ok dropping thehandle_ud()change, or even the whole patch, until one of the above three is actually ready for inclusion.I think it's fine with the "can" in the name. Hopefully one of the three will go in soon...
FWIW, the changelog still references is_emulated(). Probably not worth rewriting history though.
Paolo Bonzini
maintainerQuoted 19 lines · Sean Christopherson
Replace the existing
kvm_x86_ops.need_emulation_on_page_fault()with a more genericis_emulatable(), and unconditionally call the new function inx86_emulate_instruction().KVM will use the generic hook to support multiple security related technologies that prevent emulation in one way or another. Similar to the existing AMD #NPF case where emulation of the current instruction is not possible due to lack of information, AMD's SEV-ES and Intel's SGX and TDX will introduce scenarios where emulation is impossible due to the guest's register state being inaccessible. And again similar to the existing #NPF case, emulation can be initiated by
kvm_mmu_page_fault(), i.e. outside of the control of vendor-specific code.While the cause and architecturally visible behavior of the various cases are different, e.g. SGX will inject a #UD, AMD #NPF is a clean resume or complete shutdown, and SEV-ES and TDX "return" an error, the impact on the common emulation code is identical: KVM must stop emulation immediately and resume the guest.
Quoted 4 lines
Query
is_emulatable()inhandle_ud()as well so that theforce_emulation_prefixcode doesn't incorrectly modify RIP before callingemulate_instruction()in the absurdly unlikely scenario that KVM encounters forced emulation in conjunction with "do not emulate".
Ahah, I love those adverb + adjective pairs (my favorite is
https://patchwork.kernel.org/cover/10710751/ which unfortunately was in the cover letter and thus was not immortalized in linux.git).
"is_emulatable" is not very grammatical, so I'd rather call it "can_emulate_instruction" instead. Either way, it's an improvement over "need". Queued, thanks.
Paolo