| Message ID | 20210713163324.627647-46-seanjc@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: x86: vCPU RESET/INIT fixes and consolidation | expand |
On Tue, Jul 13, 2021 at 9:35 AM Sean Christopherson <seanjc@google.com> wrote: > > Drop redundant clears of vcpu->arch.hflags in init_vmcb() now that > init_vmcb() is invoked only through kvm_vcpu_reset(), which always clears > hflags. And of course, the second clearing in init_vmcb() was always > redundant. > > Suggested-by: Reiji Watanabe <reijiw@google.com> > Signed-off-by: Sean Christopherson <seanjc@google.com> Reviewed-by: Reiji Watanabe <reijiw@google.com> Thank you for removing the redundant code. Regards, Reiji
On 13/07/21 18:33, Sean Christopherson wrote: > Drop redundant clears of vcpu->arch.hflags in init_vmcb() now that > init_vmcb() is invoked only through kvm_vcpu_reset(), Not true if patch 9 is kept, but at this point hflags is zero anyway, so the patch is okay. Paolo > which always clears > hflags. And of course, the second clearing in init_vmcb() was always > redundant.
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 285587a7fe80..46d341f57e26 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -1177,8 +1177,6 @@ static void init_vmcb(struct kvm_vcpu *vcpu) struct vmcb_control_area *control = &svm->vmcb->control; struct vmcb_save_area *save = &svm->vmcb->save; - vcpu->arch.hflags = 0; - svm_set_intercept(svm, INTERCEPT_CR0_READ); svm_set_intercept(svm, INTERCEPT_CR3_READ); svm_set_intercept(svm, INTERCEPT_CR4_READ); @@ -1277,7 +1275,6 @@ static void init_vmcb(struct kvm_vcpu *vcpu) svm->nested.vmcb12_gpa = INVALID_GPA; svm->nested.last_vmcb12_gpa = INVALID_GPA; - vcpu->arch.hflags = 0; if (!kvm_pause_in_guest(vcpu->kvm)) { control->pause_filter_count = pause_filter_count;
Drop redundant clears of vcpu->arch.hflags in init_vmcb() now that init_vmcb() is invoked only through kvm_vcpu_reset(), which always clears hflags. And of course, the second clearing in init_vmcb() was always redundant. Suggested-by: Reiji Watanabe <reijiw@google.com> Signed-off-by: Sean Christopherson <seanjc@google.com> --- arch/x86/kvm/svm/svm.c | 3 --- 1 file changed, 3 deletions(-)