From: Paolo Bonzini <pbonzini@redhat.com>
To: Borislav Petkov <bp@alien8.de>, KVM <kvm@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>, "Radim Krčmář" <rkrcmar@redhat.com>
Subject: Re: [PATCH] kvm/vmx: Use local vmx variable in vmx_get_msr()
Date: Wed, 20 Dec 2017 15:41:09 +0100 [thread overview]
Message-ID: <648fd3fc-90ee-ff5b-48ee-288f318711f2@redhat.com> (raw)
In-Reply-To: <20171220115028.3009-1-bp@alien8.de>
On 20/12/2017 12:50, Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
>
> ... just like in vmx_set_msr().
>
> No functionality change.
>
> Signed-off-by: Borislav Petkov <bp@suse.de>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: "Radim Krčmář" <rkrcmar@redhat.com>
> ---
> 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;
>
Queued, thanks.
Paolo
next prev parent reply other threads:[~2017-12-20 14:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-20 11:50 Borislav Petkov
2017-12-20 14:41 ` Paolo Bonzini [this message]
2018-01-08 10:57 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=648fd3fc-90ee-ff5b-48ee-288f318711f2@redhat.com \
--to=pbonzini@redhat.com \
--cc=bp@alien8.de \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rkrcmar@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome