* [PATCH] kvm/vmx: Use local vmx variable in vmx_get_msr()
@ 2017-12-20 11:50 Borislav Petkov
2017-12-20 14:41 ` Paolo Bonzini
2018-01-08 10:57 ` David Hildenbrand
0 siblings, 2 replies; 3+ messages in thread
From: Borislav Petkov @ 2017-12-20 11:50 UTC (permalink / raw)
To: KVM; +Cc: LKML, Paolo Bonzini, Radim Krčmář
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;
--
2.14.0.rc0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] kvm/vmx: Use local vmx variable in vmx_get_msr()
2017-12-20 11:50 [PATCH] kvm/vmx: Use local vmx variable in vmx_get_msr() Borislav Petkov
@ 2017-12-20 14:41 ` Paolo Bonzini
2018-01-08 10:57 ` David Hildenbrand
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2017-12-20 14:41 UTC (permalink / raw)
To: Borislav Petkov, KVM; +Cc: LKML, Radim Krčmář
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] kvm/vmx: Use local vmx variable in vmx_get_msr()
2017-12-20 11:50 [PATCH] kvm/vmx: Use local vmx variable in vmx_get_msr() Borislav Petkov
2017-12-20 14:41 ` Paolo Bonzini
@ 2018-01-08 10:57 ` David Hildenbrand
1 sibling, 0 replies; 3+ messages in thread
From: David Hildenbrand @ 2018-01-08 10:57 UTC (permalink / raw)
To: Borislav Petkov, KVM; +Cc: LKML, Paolo Bonzini, Radim Krčmář
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;
>
Why not, definitely easier to read.
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-08 10:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-20 11:50 [PATCH] kvm/vmx: Use local vmx variable in vmx_get_msr() Borislav Petkov
2017-12-20 14:41 ` Paolo Bonzini
2018-01-08 10:57 ` David Hildenbrand
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).