From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Xiaoyao Li <xiaoyao.li@intel.com>
Subject: Re: [PATCH 03/10] KVM: nVMX: Pull exit_reason from vcpu_vmx in nested_vmx_exit_reflected()
Date: Fri, 13 Mar 2020 13:38:37 +0100 [thread overview]
Message-ID: <87d09gpgz6.fsf@vitty.brq.redhat.com> (raw)
In-Reply-To: <20200312184521.24579-4-sean.j.christopherson@intel.com>
Sean Christopherson <sean.j.christopherson@intel.com> writes:
> Grab the exit reason from the vcpu struct in nested_vmx_exit_reflected()
> instead of having the exit reason explicitly passed from the caller.
> This fixes a discrepancy between VM-Fail and VM-Exit handling, as the
> VM-Fail case is already handled by checking vcpu_vmx, e.g. the exit
> reason previously passed on the stack is bogus if vmx->fail is set.
It's 0xdead, not bogus :-)
>
> Not taking the exit reason on the stack also avoids having to document
> that nested_vmx_exit_reflected() requires the full exit reason, as
> opposed to just the basic exit reason, which is not at all obvious since
> the only usage of the full exit reason is for tracing.
>
> No functional change intended.
>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
> ---
> arch/x86/kvm/vmx/nested.c | 3 ++-
> arch/x86/kvm/vmx/nested.h | 9 ++++-----
> arch/x86/kvm/vmx/vmx.c | 2 +-
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
> index 79c7764c77b1..cb05bcbbfc4e 100644
> --- a/arch/x86/kvm/vmx/nested.c
> +++ b/arch/x86/kvm/vmx/nested.c
> @@ -5518,11 +5518,12 @@ static bool nested_vmx_exit_handled_vmcs_access(struct kvm_vcpu *vcpu,
> * should handle it ourselves in L0 (and then continue L2). Only call this
> * when in is_guest_mode (L2).
> */
> -bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu, u32 exit_reason)
> +bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu)
> {
> u32 intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
> struct vcpu_vmx *vmx = to_vmx(vcpu);
> struct vmcs12 *vmcs12 = get_vmcs12(vcpu);
> + u32 exit_reason = vmx->exit_reason;
>
> if (vmx->nested.nested_run_pending)
> return false;
> diff --git a/arch/x86/kvm/vmx/nested.h b/arch/x86/kvm/vmx/nested.h
> index 8f5ff3e259c9..569cb828b6ca 100644
> --- a/arch/x86/kvm/vmx/nested.h
> +++ b/arch/x86/kvm/vmx/nested.h
> @@ -24,7 +24,7 @@ void nested_vmx_set_vmcs_shadowing_bitmap(void);
> void nested_vmx_free_vcpu(struct kvm_vcpu *vcpu);
> enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,
> bool from_vmentry);
> -bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu, u32 exit_reason);
> +bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu);
> void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,
> u32 exit_intr_info, unsigned long exit_qualification);
> void nested_sync_vmcs12_to_shadow(struct kvm_vcpu *vcpu);
> @@ -75,12 +75,11 @@ static inline bool nested_ept_ad_enabled(struct kvm_vcpu *vcpu)
> * Conditionally reflect a VM-Exit into L1. Returns %true if the VM-Exit was
> * reflected into L1.
> */
> -static inline bool nested_vmx_reflect_vmexit(struct kvm_vcpu *vcpu,
> - u32 exit_reason)
> +static inline bool nested_vmx_reflect_vmexit(struct kvm_vcpu *vcpu)
> {
> u32 exit_intr_info;
>
> - if (!nested_vmx_exit_reflected(vcpu, exit_reason))
> + if (!nested_vmx_exit_reflected(vcpu))
> return false;
>
> /*
> @@ -99,7 +98,7 @@ static inline bool nested_vmx_reflect_vmexit(struct kvm_vcpu *vcpu,
> vmcs_read32(VM_EXIT_INTR_ERROR_CODE);
> }
>
> - nested_vmx_vmexit(vcpu, exit_reason, exit_intr_info,
> + nested_vmx_vmexit(vcpu, to_vmx(vcpu)->exit_reason, exit_intr_info,
> vmcs_readl(EXIT_QUALIFICATION));
> return true;
> }
> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> index c1caac7e8f57..c7715c880ea7 100644
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@ -5863,7 +5863,7 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu,
> if (vmx->emulation_required)
> return handle_invalid_guest_state(vcpu);
>
> - if (is_guest_mode(vcpu) && nested_vmx_reflect_vmexit(vcpu, exit_reason))
> + if (is_guest_mode(vcpu) && nested_vmx_reflect_vmexit(vcpu))
> return 1;
>
> if (exit_reason & VMX_EXIT_REASONS_FAILED_VMENTRY) {
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
--
Vitaly
next prev parent reply other threads:[~2020-03-13 12:38 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 18:45 [PATCH 00/10] KVM: VMX: Unionize vcpu_vmx.exit_reason Sean Christopherson
2020-03-12 18:45 ` [PATCH 01/10] KVM: nVMX: Move reflection check into nested_vmx_reflect_vmexit() Sean Christopherson
2020-03-13 12:12 ` Vitaly Kuznetsov
2020-03-17 5:33 ` Sean Christopherson
2020-03-17 16:16 ` Sean Christopherson
2020-03-17 17:00 ` Vitaly Kuznetsov
2020-03-17 17:38 ` Paolo Bonzini
2020-03-17 18:01 ` Sean Christopherson
2020-03-12 18:45 ` [PATCH 02/10] KVM: nVMX: Drop a superfluous WARN on reflecting EXTERNAL_INTERRUPT Sean Christopherson
2020-03-13 12:14 ` Vitaly Kuznetsov
2020-03-12 18:45 ` [PATCH 03/10] KVM: nVMX: Pull exit_reason from vcpu_vmx in nested_vmx_exit_reflected() Sean Christopherson
2020-03-13 12:38 ` Vitaly Kuznetsov [this message]
2020-03-12 18:45 ` [PATCH 04/10] KVM: VMX: Convert local exit_reason to u16 " Sean Christopherson
2020-03-13 12:47 ` Vitaly Kuznetsov
2020-03-12 18:45 ` [PATCH 05/10] KVM: VMX: Convert local exit_reason to u16 in vmx_handle_exit() Sean Christopherson
2020-03-13 13:48 ` Vitaly Kuznetsov
2020-03-12 18:45 ` [PATCH 06/10] KVM: nVMX: Convert local exit_reason to u16 in ...enter_non_root_mode() Sean Christopherson
2020-03-13 13:55 ` Vitaly Kuznetsov
2020-03-13 14:00 ` David Laight
2020-03-17 5:29 ` Sean Christopherson
2020-03-17 17:40 ` Paolo Bonzini
2020-03-12 18:45 ` [PATCH 07/10] KVM: nVMX: Cast exit_reason to u16 to check for nested EXTERNAL_INTERRUPT Sean Christopherson
2020-03-13 13:56 ` Vitaly Kuznetsov
2020-03-12 18:45 ` [PATCH 08/10] KVM: nVMX: Rename exit_reason to vm_exit_reason for nested VM-Exit Sean Christopherson
2020-03-13 14:01 ` Vitaly Kuznetsov
2020-03-13 16:17 ` Sean Christopherson
2020-03-12 18:45 ` [PATCH 09/10] KVM: VMX: Cache vmx->exit_reason in local u16 in vmx_handle_exit_irqoff() Sean Christopherson
2020-03-13 14:09 ` Vitaly Kuznetsov
2020-03-17 17:50 ` Paolo Bonzini
2020-03-12 18:45 ` [PATCH 10/10] KVM: VMX: Convert vcpu_vmx.exit_reason to a union Sean Christopherson
2020-03-13 14:18 ` Vitaly Kuznetsov
2020-03-17 5:28 ` Sean Christopherson
2020-03-17 17:51 ` Paolo Bonzini
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=87d09gpgz6.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=pbonzini@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=wanpengli@tencent.com \
--cc=xiaoyao.li@intel.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;
as well as URLs for NNTP newsgroup(s).