From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: "Wanpeng Li" <wanpengli@tencent.com>,
"Jim Mattson" <jmattson@google.com>,
"Joerg Roedel" <joro@8bytes.org>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
"Reto Buerki" <reet@codelabs.ch>,
"Liran Alon" <liran.alon@oracle.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>
Subject: Re: [PATCH v2 3/8] KVM: VMX: Consolidate to_vmx() usage in RFLAGS accessors
Date: Mon, 30 Sep 2019 10:48:27 +0200 [thread overview]
Message-ID: <87pnji41b8.fsf@vitty.brq.redhat.com> (raw)
In-Reply-To: <20190927214523.3376-4-sean.j.christopherson@intel.com>
Sean Christopherson <sean.j.christopherson@intel.com> writes:
> Capture struct vcpu_vmx in a local variable to improve the readability
> of vmx_{g,s}et_rflags().
>
> No functional change intended.
>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
> ---
> arch/x86/kvm/vmx/vmx.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> index 0b8dd9c315f8..83fe8b02b732 100644
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@ -1407,35 +1407,37 @@ static void vmx_decache_cr0_guest_bits(struct kvm_vcpu *vcpu);
>
> unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu)
> {
> + struct vcpu_vmx *vmx = to_vmx(vcpu);
> unsigned long rflags, save_rflags;
>
> if (!test_bit(VCPU_EXREG_RFLAGS, (ulong *)&vcpu->arch.regs_avail)) {
> __set_bit(VCPU_EXREG_RFLAGS, (ulong *)&vcpu->arch.regs_avail);
> rflags = vmcs_readl(GUEST_RFLAGS);
> - if (to_vmx(vcpu)->rmode.vm86_active) {
> + if (vmx->rmode.vm86_active) {
> rflags &= RMODE_GUEST_OWNED_EFLAGS_BITS;
> - save_rflags = to_vmx(vcpu)->rmode.save_rflags;
> + save_rflags = vmx->rmode.save_rflags;
> rflags |= save_rflags & ~RMODE_GUEST_OWNED_EFLAGS_BITS;
> }
> - to_vmx(vcpu)->rflags = rflags;
> + vmx->rflags = rflags;
> }
> - return to_vmx(vcpu)->rflags;
> + return vmx->rflags;
> }
>
> void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
> {
> + struct vcpu_vmx *vmx = to_vmx(vcpu);
> unsigned long old_rflags = vmx_get_rflags(vcpu);
>
> __set_bit(VCPU_EXREG_RFLAGS, (ulong *)&vcpu->arch.regs_avail);
> - to_vmx(vcpu)->rflags = rflags;
> - if (to_vmx(vcpu)->rmode.vm86_active) {
> - to_vmx(vcpu)->rmode.save_rflags = rflags;
> + vmx->rflags = rflags;
> + if (vmx->rmode.vm86_active) {
> + vmx->rmode.save_rflags = rflags;
> rflags |= X86_EFLAGS_IOPL | X86_EFLAGS_VM;
> }
> vmcs_writel(GUEST_RFLAGS, rflags);
>
> - if ((old_rflags ^ to_vmx(vcpu)->rflags) & X86_EFLAGS_VM)
> - to_vmx(vcpu)->emulation_required = emulation_required(vcpu);
> + if ((old_rflags ^ vmx->rflags) & X86_EFLAGS_VM)
> + vmx->emulation_required = emulation_required(vcpu);
> }
>
> u32 vmx_get_interrupt_shadow(struct kvm_vcpu *vcpu)
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
--
Vitaly
next prev parent reply other threads:[~2019-09-30 8:48 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-27 21:45 [PATCH v2 0/8] KVM: x86: nVMX GUEST_CR3 bug fix, and then some Sean Christopherson
2019-09-27 21:45 ` [PATCH v2 1/8] KVM: nVMX: Always write vmcs02.GUEST_CR3 during nested VM-Enter Sean Christopherson
2019-09-27 23:37 ` Jim Mattson
2019-09-27 21:45 ` [PATCH v2 2/8] KVM: VMX: Skip GUEST_CR3 VMREAD+VMWRITE if the VMCS is up-to-date Sean Christopherson
2019-09-27 21:45 ` [PATCH v2 3/8] KVM: VMX: Consolidate to_vmx() usage in RFLAGS accessors Sean Christopherson
2019-09-30 8:48 ` Vitaly Kuznetsov [this message]
2019-09-27 21:45 ` [PATCH v2 4/8] KVM: VMX: Optimize vmx_set_rflags() for unrestricted guest Sean Christopherson
2019-09-30 8:57 ` Vitaly Kuznetsov
2019-09-30 15:19 ` Sean Christopherson
2019-09-30 15:55 ` Vitaly Kuznetsov
2019-10-09 10:40 ` Paolo Bonzini
2019-10-09 16:38 ` Sean Christopherson
2019-10-09 20:59 ` Paolo Bonzini
2019-10-09 21:30 ` Sean Christopherson
2019-09-27 21:45 ` [PATCH v2 5/8] KVM: x86: Add WARNs to detect out-of-bounds register indices Sean Christopherson
2019-09-30 9:19 ` Vitaly Kuznetsov
2019-10-09 10:50 ` Paolo Bonzini
2019-10-09 16:36 ` Sean Christopherson
2019-09-27 21:45 ` [PATCH v2 6/8] KVM: x86: Fold 'enum kvm_ex_reg' definitions into 'enum kvm_reg' Sean Christopherson
2019-09-30 9:25 ` Vitaly Kuznetsov
2019-10-09 10:52 ` Paolo Bonzini
2019-10-09 11:27 ` Vitaly Kuznetsov
2019-09-27 21:45 ` [PATCH v2 7/8] KVM: x86: Add helpers to test/mark reg availability and dirtiness Sean Christopherson
2019-09-30 9:32 ` Vitaly Kuznetsov
2019-10-09 11:00 ` Paolo Bonzini
2019-09-27 21:45 ` [PATCH v2 8/8] KVM: x86: Fold decache_cr3() into cache_reg() Sean Christopherson
2019-09-30 10:58 ` Vitaly Kuznetsov
2019-09-30 15:04 ` Sean Christopherson
2019-09-30 15:27 ` Vitaly Kuznetsov
2019-09-30 15:33 ` Sean Christopherson
2019-10-09 11:03 ` Paolo Bonzini
2019-09-30 10:42 ` [PATCH v2 0/8] KVM: x86: nVMX GUEST_CR3 bug fix, and then some Reto Buerki
2019-10-29 15:03 ` Martin Lucina
2019-10-30 9:09 ` Sean Christopherson
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=87pnji41b8.fsf@vitty.brq.redhat.com \
--to=vkuznets@redhat.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liran.alon@oracle.com \
--cc=pbonzini@redhat.com \
--cc=reet@codelabs.ch \
--cc=rkrcmar@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=wanpengli@tencent.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.