SVM: correct CPUID event processing
PATCH 1/1 SVM: correct CPUID event processing
hvm_monitor_cpuid() expects the input registers, not two of the outputs.
However, once having made the necessary adjustment, the SVM and VMX functions are so similar that they should be folded (thus avoiding further similar asymmetries to get introduced). Use the best of both worlds by e.g. using "curr" consistently. This then being the only caller of hvm_check_cpuid_faulting(), fold in that function as well.
xen/arch/x86/hvm/hvm.c +19 -5
@@ -3349,14 +3349,28 @@ unsigned long copy_from_user_hvm(void *treturn rc ? len :0 ;/* fake a copy_from_user() return code */ } -bool hvm_check_cpuid_faulting (struct vcpu *v) +int hvm_vmexit_cpuid (struct cpu_user_regs *regs,unsigned int inst_len) { -const struct vcpu_msrs *msrs = v->arch.msrs; +struct vcpu *curr = current; +unsigned int leaf = regs->eax, subleaf = regs->ecx; +struct cpuid_leaf res; -if ( !msrs->misc_features_enables.cpuid_faulting ) -return false; +if ( curr->arch.msrs->misc_features_enables.cpuid_faulting && +hvm_get_cpl (curr) >0 ) + { +hvm_inject_hw_exception (TRAP_gp_fault,0 ); +return 1 ;/* Don't advance the guest IP! */ + } -return hvm_get_cpl (v) >0 ; +guest_cpuid (curr, leaf, subleaf, &res); +HVMTRACE_6D (CPUID , leaf, subleaf, res.a, res.b, res.c, res.d); + + regs->rax = res.a; + regs->rbx = res.b; + regs->rcx = res.c; + regs->rdx = res.d; + +return hvm_monitor_cpuid (inst_len, leaf, subleaf); }static uint64_t _hvm_rdtsc_intercept (void )
xen/arch/x86/hvm/svm/svm.c +1 -23
@@ -1784,28 +1784,6 @@ static void svm_fpu_dirty_intercept(voidvmcb_set_cr0 (vmcb,vmcb_get_cr0 (vmcb) & ~X86_CR0_TS ); } -static int svm_vmexit_do_cpuid (struct cpu_user_regs *regs,unsigned int inst_len) -{ -struct vcpu *curr = current; -struct cpuid_leaf res; - -if (hvm_check_cpuid_faulting (curr) ) - { -hvm_inject_hw_exception (TRAP_gp_fault,0 ); -return 1 ;/* Don't advance the guest IP! */ - } - -guest_cpuid (curr, regs->eax, regs->ecx, &res); -HVMTRACE_5D (CPUID , regs->eax, res.a, res.b, res.c, res.d); - - regs->rax = res.a; - regs->rbx = res.b; - regs->rcx = res.c; - regs->rdx = res.d; - -return hvm_monitor_cpuid (inst_len, regs->eax, regs->ecx); -} -static void svm_vmexit_do_cr_access (struct vmcb_struct *vmcb,struct cpu_user_regs *regs) {
@@ -2828,7 +2806,7 @@ void svm_vmexit_handler(struct cpu_user_if ( inst_len ==0 )break ; - rc =svm_vmexit_do_cpuid (regs, inst_len); + rc =hvm_vmexit_cpuid (regs, inst_len);if ( rc <0 ) goto unexpected_exit_type;
xen/arch/x86/hvm/vmx/vmx.c +1 -24
@@ -2489,29 +2389,6 @@ static void vmx_fpu_dirty_intercept(void } } -static int vmx_do_cpuid (struct cpu_user_regs *regs) -{ -struct vcpu *curr = current; -uint32_t leaf = regs->eax, subleaf = regs->ecx; -struct cpuid_leaf res; - -if (hvm_check_cpuid_faulting (current) ) - { -hvm_inject_hw_exception (TRAP_gp_fault,0 ); -return 1 ;/* Don't advance the guest IP! */ - } - -guest_cpuid (curr, leaf, subleaf, &res); -HVMTRACE_5D (CPUID , leaf, res.a, res.b, res.c, res.d); - - regs->rax = res.a; - regs->rbx = res.b; - regs->rcx = res.c; - regs->rdx = res.d; - -return hvm_monitor_cpuid (get_instruction_length (), leaf, subleaf); -} -static void vmx_dr_access (unsigned long exit_qualification,struct cpu_user_regs *regs) {
@@ -3862,7 +3839,7 @@ void vmx_vmexit_handler(struct cpu_user_ }case EXIT_REASON_CPUID : { -int rc =vmx_do_cpuid (regs); +int rc =hvm_vmexit_cpuid (regs,get_instruction_length ());/* * rc < 0 error in monitor/vm_event, crash
xen/include/asm-x86/hvm/hvm.h +1 -1
@@ -280,7 +280,7 @@ void hvm_set_segment_register(struct vcpbool hvm_set_guest_bndcfgs (struct vcpu *v,u64 val); -bool hvm_check_cpuid_faulting (struct vcpu *v); +int hvm_vmexit_cpuid (struct cpu_user_regs *regs,unsigned int inst_len);void hvm_migrate_timers (struct vcpu *v);void hvm_do_resume (struct vcpu *v);void hvm_migrate_pirq (struct hvm_pirq_dpci *pirq_dpci,const struct vcpu *v);
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 9 lines · Jan Beulich
hvm_monitor_cpuid()expects the input registers, not two of the outputs.However, once having made the necessary adjustment, the SVM and VMX functions are so similar that they should be folded (thus avoiding further similar asymmetries to get introduced). Use the best of both worlds by e.g. using "curr" consistently. This then being the only caller of
hvm_check_cpuid_faulting(), fold in that function as well.Signed-off-by Jan Beulich <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Razvan COJOCARU
Acked-byQuoted 9 lines · Boris Ostrovsky
Quoted 8 lines · Jan Beulich
hvm_monitor_cpuid()expects the input registers, not two of the outputs.However, once having made the necessary adjustment, the SVM and VMX functions are so similar that they should be folded (thus avoiding further similar asymmetries to get introduced). Use the best of both worlds by e.g. using "curr" consistently. This then being the only caller of
hvm_check_cpuid_faulting(), fold in that function as well.
Quoted 3 lines
Quoted 1 line
Signed-off-by Jan Beulich <[email protected]>Reviewed-by Boris Ostrovsky <[email protected]>
Thanks,
Razvan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 9 lines · Jan Beulich
hvm_monitor_cpuid()expects the input registers, not two of the outputs.However, once having made the necessary adjustment, the SVM and VMX functions are so similar that they should be folded (thus avoiding further similar asymmetries to get introduced). Use the best of both worlds by e.g. using "curr" consistently. This then being the only caller of
hvm_check_cpuid_faulting(), fold in that function as well.Signed-off-by Jan Beulich <[email protected]>
xen/arch/x86/hvm/hvm.c unsigned long copy_from_user_hvm(void *t · line 3351
Quoted 7 lines
xen/arch/x86/hvm/hvm.c +0
-0@@ -3349,14 +3349,28 @@ unsigned long copy_from_user_hvm(void *treturn rc ? len :0 ;/* fake a copy_from_user() return code */ }
Useful fold. Maybe a small comment with the reason to have one function would help. Something like both SVM and VMX do the same thing, but it's up to you if it is necessary.
xen/arch/x86/hvm/hvm.c unsigned long copy_from_user_hvm(void *t · line 3352
Quoted 2 lines
xen/arch/x86/hvm/hvm.c +1
-1-bool hvm_check_cpuid_faulting (struct vcpu *v) +int hvm_vmexit_cpuid (struct cpu_user_regs *regs,unsigned int inst_len)
Alex
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 11 lines · Alexandru Stefan ISAILA
Quoted 8 lines · Jan Beulich
hvm_monitor_cpuid()expects the input registers, not two of the outputs.However, once having made the necessary adjustment, the SVM and VMX functions are so similar that they should be folded (thus avoiding further similar asymmetries to get introduced). Use the best of both worlds by e.g. using "curr" consistently. This then being the only caller of
hvm_check_cpuid_faulting(), fold in that function as well.
Quoted 3 lines
Quoted 1 line
Signed-off-by Jan Beulich <[email protected]>Reviewed-by Alexandru Isaila <[email protected]>
Thanks.
Quoted 11 lines
xen/arch/x86/hvm/hvm.c unsigned long copy_from_user_hvm(void *t · line 3351
Quoted 6 lines
xen/arch/x86/hvm/hvm.c +0
-0@@ -3349,14 +3349,28 @@ unsigned long copy_from_user_hvm(void *treturn rc ? len :0 ;/* fake a copy_from_user() return code */ }Useful fold. Maybe a small comment with the reason to have one function would help. Something like both SVM and VMX do the same thing, but it's up to you if it is necessary.
Quoted 2 lines
xen/arch/x86/hvm/hvm.c unsigned long copy_from_user_hvm(void *t · line 3352
Quoted 2 lines
xen/arch/x86/hvm/hvm.c +1
-1-bool hvm_check_cpuid_faulting (struct vcpu *v) +int hvm_vmexit_cpuid (struct cpu_user_regs *regs,unsigned int inst_len)
The patch description explicitly says so. Since having common code for things not differing between vendors is the rule rather than an exception, commenting individual functions to this effect would seem rather odd to me.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 1 line · Jan Beulich
hvm_monitor_cpuid()expects the input registers, not two of the outputs.
Perhaps worth nothing that this has been broken since its introduction in c/s d05f1eb3741b85 ?
Quoted 8 lines
However, once having made the necessary adjustment, the SVM and VMX functions are so similar that they should be folded (thus avoiding further similar asymmetries to get introduced). Use the best of both worlds by e.g. using "curr" consistently. This then being the only caller of
hvm_check_cpuid_faulting(), fold in that function as well.Signed-off-by Jan Beulich <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 5 lines · Andrew Cooper
Quoted 1 line · Jan Beulich
hvm_monitor_cpuid()expects the input registers, not two of the outputs.Perhaps worth nothing that this has been broken since its introduction in c/s
d05f1eb3741b85?
Ah, yes, I should have done this. I've added half a sentence.
Quoted 9 lines
Quoted 7 lines
However, once having made the necessary adjustment, the SVM and VMX functions are so similar that they should be folded (thus avoiding further similar asymmetries to get introduced). Use the best of both worlds by e.g. using "curr" consistently. This then being the only caller of
hvm_check_cpuid_faulting(), fold in that function as well.Signed-off-by Jan Beulich <[email protected]>Reviewed-by Andrew Cooper <[email protected]>
Thanks.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 9 lines · Jan Beulich
hvm_monitor_cpuid()expects the input registers, not two of the outputs.However, once having made the necessary adjustment, the SVM and VMX functions are so similar that they should be folded (thus avoiding further similar asymmetries to get introduced). Use the best of both worlds by e.g. using "curr" consistently. This then being the only caller of
hvm_check_cpuid_faulting(), fold in that function as well.Signed-off-by Jan Beulich <[email protected]>
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 5 lines
From: Jan Beulich [mailto:[email protected]]
Sent: Thursday, September 19, 2019 6:38 PM
hvm_monitor_cpuid()expects the input registers, not two of the outputs.
Quoted 8 lines
However, once having made the necessary adjustment, the SVM and VMX functions are so similar that they should be folded (thus avoiding further similar asymmetries to get introduced). Use the best of both worlds by e.g. using "curr" consistently. This then being the only caller of
hvm_check_cpuid_faulting(), fold in that function as well.Signed-off-by Jan Beulich <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel