From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756653AbeAHK5o (ORCPT + 1 other); Mon, 8 Jan 2018 05:57:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50994 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756418AbeAHK5m (ORCPT ); Mon, 8 Jan 2018 05:57:42 -0500 Subject: Re: [PATCH] kvm/vmx: Use local vmx variable in vmx_get_msr() To: Borislav Petkov , KVM Cc: LKML , Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= References: <20171220115028.3009-1-bp@alien8.de> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: Date: Mon, 8 Jan 2018 11:57:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20171220115028.3009-1-bp@alien8.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 08 Jan 2018 10:57:42 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On 20.12.2017 12:50, Borislav Petkov wrote: > From: Borislav Petkov > > ... just like in vmx_set_msr(). > > No functionality change. > > Signed-off-by: Borislav Petkov > Cc: Paolo Bonzini > Cc: "Radim Krčmář" > --- > arch/x86/kvm/vmx.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index 023afa0c8887..58be7915da81 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -3249,6 +3249,7 @@ static inline bool vmx_feature_control_msr_valid(struct kvm_vcpu *vcpu, > */ > static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) > { > + struct vcpu_vmx *vmx = to_vmx(vcpu); > struct shared_msr_entry *msr; > > switch (msr_info->index) { > @@ -3260,8 +3261,8 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) > msr_info->data = vmcs_readl(GUEST_GS_BASE); > break; > case MSR_KERNEL_GS_BASE: > - vmx_load_host_state(to_vmx(vcpu)); > - msr_info->data = to_vmx(vcpu)->msr_guest_kernel_gs_base; > + vmx_load_host_state(vmx); > + msr_info->data = vmx->msr_guest_kernel_gs_base; > break; > #endif > case MSR_EFER: > @@ -3287,13 +3288,13 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) > break; > case MSR_IA32_MCG_EXT_CTL: > if (!msr_info->host_initiated && > - !(to_vmx(vcpu)->msr_ia32_feature_control & > + !(vmx->msr_ia32_feature_control & > FEATURE_CONTROL_LMCE)) > return 1; > msr_info->data = vcpu->arch.mcg_ext_ctl; > break; > case MSR_IA32_FEATURE_CONTROL: > - msr_info->data = to_vmx(vcpu)->msr_ia32_feature_control; > + msr_info->data = vmx->msr_ia32_feature_control; > break; > case MSR_IA32_VMX_BASIC ... MSR_IA32_VMX_VMFUNC: > if (!nested_vmx_allowed(vcpu)) > @@ -3310,7 +3311,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) > return 1; > /* Otherwise falls through */ > default: > - msr = find_msr_entry(to_vmx(vcpu), msr_info->index); > + msr = find_msr_entry(vmx, msr_info->index); > if (msr) { > msr_info->data = msr->data; > break; > Why not, definitely easier to read. Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb