Cleanup the registers read/write access
cover Cleanup the registers read/write access
The KVM has defined the GP registers and pointer register access methods in the ./arch/x86/kvm/kvm_cache_regs.h file, but there are still some GP and pointer registers access using older style. We should keep those registers access consistent in vmx and svm.
Yang Zhong (2):
KVM: VMX: Keep registers read/write consistent with definition
KVM: SVM: Keep registers read/write consistent with definition
arch/x86/kvm/svm/nested.c | 2 +- arch/x86/kvm/svm/sev.c | 65 ++++++++++++++++++++------------------- arch/x86/kvm/svm/svm.c | 20 ++++++------ arch/x86/kvm/vmx/vmx.c | 11 ++++--- 4 files changed, 50 insertions(+), 48 deletions(-)
Signature · 1 line
2.29.2.334.gfaefdd61ec
PATCH 1/2 KVM: VMX: Keep registers read/write consistent with definition
The kvm_cache_regs.h file has defined inline functions for those general purpose registers and pointer register read/write operations, we need keep those related registers operations consistent with header file definition in the VMX side.
--- arch/x86/kvm/vmx/vmx.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
arch/x86/kvm/vmx/vmx.c +6 -5
@@ -2266,10 +2266,10 @@ static void vmx_cache_reg(struct kvm_vcpu *vcpu, enum kvm_reg reg)switch (reg) {case VCPU_REGS_RSP : - vcpu->arch.regs[VCPU_REGS_RSP ] =vmcs_readl (GUEST_RSP ); +kvm_rsp_write (vcpu,vmcs_readl (GUEST_RSP ));break ;case VCPU_REGS_RIP : - vcpu->arch.regs[VCPU_REGS_RIP ] =vmcs_readl (GUEST_RIP ); +kvm_rip_write (vcpu,vmcs_readl (GUEST_RIP ));break ;case VCPU_EXREG_PDPTR :if (enable_ept)
@@ -4432,7 +4432,7 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) vmx->msr_ia32_umwait_control =0 ; - vmx->vcpu.arch.regs[VCPU_REGS_RDX ] =get_rdx_init_val (); +kvm_rdx_write (&vmx->vcpu,get_rdx_init_val ()); vmx->hv_deadline_tsc =-1 ;kvm_set_cr8 (vcpu,0 );
@@ -6725,9 +6725,10 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)WARN_ON_ONCE (vmx->nested.need_vmcs12_to_shadow_sync);if (kvm_register_is_dirty (vcpu,VCPU_REGS_RSP )) -vmcs_writel (GUEST_RSP , vcpu->arch.regs[VCPU_REGS_RSP ]); +vmcs_writel (GUEST_RSP ,kvm_rsp_read (vcpu)); +if (kvm_register_is_dirty (vcpu,VCPU_REGS_RIP )) -vmcs_writel (GUEST_RIP , vcpu->arch.regs[VCPU_REGS_RIP ]); +vmcs_writel (GUEST_RIP ,kvm_rip_read (vcpu)); cr3 =__get_current_cr3_fast ();if (unlikely (cr3 != vmx->loaded_vmcs->host_state.cr3)) {
Signature · 1 line
2.29.2.334.gfaefdd61ec
Paolo Bonzini
maintainerRe: [PATCH 1/2] KVM: VMX: Keep registers read/write consistent with definition
Quoted 15 lines · Yang Zhong
The
kvm_cache_regs.hfile has defined inline functions for those general purpose registers and pointer register read/write operations, we need keep those related registers operations consistent with header file definition in the VMX side.Signed-off-by Yang Zhong <[email protected]>--- arch/x86/kvm/vmx/vmx.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)arch/x86/kvm/vmx/vmx.c +0
-0
arch/x86/kvm/vmx/vmx.c static void vmx_cache_reg(struct kvm_vcpu *vcpu, enum kvm_reg reg) · line 2273
Quoted 10 lines
arch/x86/kvm/vmx/vmx.c +2
-2@@ -2266,10 +2266,10 @@ static void vmx_cache_reg(struct kvm_vcpu *vcpu, enum kvm_reg reg)switch (reg) {case VCPU_REGS_RSP : - vcpu->arch.regs[VCPU_REGS_RSP ] =vmcs_readl (GUEST_RSP ); +kvm_rsp_write (vcpu,vmcs_readl (GUEST_RSP ));break ;case VCPU_REGS_RIP : - vcpu->arch.regs[VCPU_REGS_RIP ] =vmcs_readl (GUEST_RIP ); +kvm_rip_write (vcpu,vmcs_readl (GUEST_RIP ));break ;
This is on purpose, because you don't want to mark those register dirty.
Likewise, in the case below it's more confusing to go through the helper because it checks kvm_register_is_available and calls vmx_cache_reg if false.
Because these functions are the once that handle the caching, it makes sense for them not to use the helpers.
Paolo
Quoted 25 lines
arch/x86/kvm/vmx/vmx.c +4
-3case VCPU_EXREG_PDPTR :if (enable_ept)@@ -4432,7 +4432,7 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) vmx->msr_ia32_umwait_control =0 ; - vmx->vcpu.arch.regs[VCPU_REGS_RDX ] =get_rdx_init_val (); +kvm_rdx_write (&vmx->vcpu,get_rdx_init_val ()); vmx->hv_deadline_tsc =-1 ;kvm_set_cr8 (vcpu,0 );@@ -6725,9 +6725,10 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)WARN_ON_ONCE (vmx->nested.need_vmcs12_to_shadow_sync);if (kvm_register_is_dirty (vcpu,VCPU_REGS_RSP )) -vmcs_writel (GUEST_RSP , vcpu->arch.regs[VCPU_REGS_RSP ]); +vmcs_writel (GUEST_RSP ,kvm_rsp_read (vcpu)); +if (kvm_register_is_dirty (vcpu,VCPU_REGS_RIP )) -vmcs_writel (GUEST_RIP , vcpu->arch.regs[VCPU_REGS_RIP ]); +vmcs_writel (GUEST_RIP ,kvm_rip_read (vcpu)); cr3 =__get_current_cr3_fast ();if (unlikely (cr3 != vmx->loaded_vmcs->host_state.cr3)) {
Re: [PATCH 1/2] KVM: VMX: Keep registers read/write consistent with definition
Quoted 28 lines · Paolo Bonzini
Quoted 15 lines · Yang Zhong
The
kvm_cache_regs.hfile has defined inline functions for those general purpose registers and pointer register read/write operations, we need keep those related registers operations consistent with header file definition in the VMX side.Signed-off-by Yang Zhong <[email protected]>--- arch/x86/kvm/vmx/vmx.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)arch/x86/kvm/vmx/vmx.c +0
-0arch/x86/kvm/vmx/vmx.c static void vmx_cache_reg(struct kvm_vcpu *vcpu, enum kvm_reg reg) · line 2272
Quoted 9 lines
arch/x86/kvm/vmx/vmx.c +2
-2@@ -2266,10 +2266,10 @@ static void vmx_cache_reg(struct kvm_vcpu *vcpu, enum kvm_reg reg)switch (reg) {case VCPU_REGS_RSP : - vcpu->arch.regs[VCPU_REGS_RSP ] =vmcs_readl (GUEST_RSP ); +kvm_rsp_write (vcpu,vmcs_readl (GUEST_RSP ));break ;case VCPU_REGS_RIP : - vcpu->arch.regs[VCPU_REGS_RIP ] =vmcs_readl (GUEST_RIP ); +kvm_rip_write (vcpu,vmcs_readl (GUEST_RIP ));break ;This is on purpose, because you don't want to mark those register dirty.
Quoted 7 lines
Likewise, in the case below it's more confusing to go through the helper because it checks
kvm_register_is_availableand callsvmx_cache_regif false.Because these functions are the once that handle the caching, it makes sense for them not to use the helpers.
Paolo, thanks for pointing out this issue, i will drop those two patches, thanks!
Yang
Quoted 22 lines
Paolo
Quoted 20 lines
arch/x86/kvm/vmx/vmx.c +4
-3case VCPU_EXREG_PDPTR :if (enable_ept)@@ -4432,7 +4432,7 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) vmx->msr_ia32_umwait_control =0 ; - vmx->vcpu.arch.regs[VCPU_REGS_RDX ] =get_rdx_init_val (); +kvm_rdx_write (&vmx->vcpu,get_rdx_init_val ()); vmx->hv_deadline_tsc =-1 ;kvm_set_cr8 (vcpu,0 );@@ -6725,9 +6725,10 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)WARN_ON_ONCE (vmx->nested.need_vmcs12_to_shadow_sync);if (kvm_register_is_dirty (vcpu,VCPU_REGS_RSP )) -vmcs_writel (GUEST_RSP , vcpu->arch.regs[VCPU_REGS_RSP ]); +vmcs_writel (GUEST_RSP ,kvm_rsp_read (vcpu)); +if (kvm_register_is_dirty (vcpu,VCPU_REGS_RIP )) -vmcs_writel (GUEST_RIP , vcpu->arch.regs[VCPU_REGS_RIP ]); +vmcs_writel (GUEST_RIP ,kvm_rip_read (vcpu)); cr3 =__get_current_cr3_fast ();if (unlikely (cr3 != vmx->loaded_vmcs->host_state.cr3)) {
PATCH 2/2 KVM: SVM: Keep registers read/write consistent with definition
In reply to Yang ZhongThe kvm_cache_regs.h file has defined inline functions for those general purpose registers and pointer register read/write operations, we need keep those related registers operations consistent with header file definition in the SVM side.
--- arch/x86/kvm/svm/nested.c | 2 +- arch/x86/kvm/svm/sev.c | 65 ++++++++++++++++++++------------------- arch/x86/kvm/svm/svm.c | 20 ++++++------ 3 files changed, 44 insertions(+), 43 deletions(-)
arch/x86/kvm/svm/nested.c +1 -1
@@ -805,7 +805,7 @@ static int nested_svm_exit_handled_msr(struct vcpu_svm *svm)if (!(vmcb_is_intercept (&svm->nested.ctl,INTERCEPT_MSR_PROT )))return NESTED_EXIT_HOST ; - msr = svm->vcpu.arch.regs[VCPU_REGS_RCX ]; + msr =kvm_rcx_read (&svm->vcpu); offset =svm_msrpm_offset (msr); write = svm->vmcb->control.exit_info_1 &1 ; mask =1 << ((2 * (msr &0xf )) + write);
arch/x86/kvm/svm/sev.c +33 -32
100 lines not on this page · raw message
arch/x86/kvm/svm/svm.c +10 -10
@@ -1206,7 +1206,7 @@ static void init_vmcb(struct vcpu_svm *svm) save->dr6 =0xffff0ff0 ;kvm_set_rflags (&svm->vcpu,X86_EFLAGS_FIXED ); save->rip =0x0000fff0 ; - svm->vcpu.arch.regs[VCPU_REGS_RIP ] = save->rip; +kvm_rip_write (&svm->vcpu, save->rip);/* * svm_set_cr0() sets PG and WP and clears NW and CD on save->cr0.
@@ -3825,9 +3825,9 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)trace_kvm_entry (vcpu); - svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX ]; - svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP ]; - svm->vmcb->save.rip = vcpu->arch.regs[VCPU_REGS_RIP ]; + svm->vmcb->save.rax =kvm_rax_read (vcpu); + svm->vmcb->save.rsp =kvm_rsp_read (vcpu); + svm->vmcb->save.rip =kvm_rip_read (vcpu);/* * Disable singlestep if we're injecting an interrupt/exception.
@@ -3904,9 +3904,9 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)if (!sev_es_guest (svm->vcpu.kvm)) { vcpu->arch.cr2 = svm->vmcb->save.cr2; - vcpu->arch.regs[VCPU_REGS_RAX ] = svm->vmcb->save.rax; - vcpu->arch.regs[VCPU_REGS_RSP ] = svm->vmcb->save.rsp; - vcpu->arch.regs[VCPU_REGS_RIP ] = svm->vmcb->save.rip; +kvm_rax_write (vcpu, svm->vmcb->save.rax); +kvm_rsp_write (vcpu, svm->vmcb->save.rsp); +kvm_rip_write (vcpu, svm->vmcb->save.rip); }if (unlikely (svm->vmcb->control.exit_code ==SVM_EXIT_NMI ))
@@ -4320,9 +4320,9 @@ static int svm_pre_enter_smm(struct kvm_vcpu *vcpu, char *smstate)/* FEE0h - SVM Guest VMCB Physical Address */ put_smstate (u64, smstate,0x7ee0 , svm->nested.vmcb12_gpa); - svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX ]; - svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP ]; - svm->vmcb->save.rip = vcpu->arch.regs[VCPU_REGS_RIP ]; + svm->vmcb->save.rax =kvm_rax_read (vcpu); + svm->vmcb->save.rsp =kvm_rsp_read (vcpu); + svm->vmcb->save.rip =kvm_rip_read (vcpu); ret =nested_svm_vmexit (svm);if (ret)
Signature · 1 line
2.29.2.334.gfaefdd61ec