From: Maxim Levitsky <mlevitsk@redhat.com>
To: Vitaly Kuznetsov <vkuznets@redhat.com>,
kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>
Cc: Sean Christopherson <seanjc@google.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 3/4] KVM: nVMX: Introduce __nested_vmx_handle_enlightened_vmptrld()
Date: Wed, 05 May 2021 11:24:35 +0300 [thread overview]
Message-ID: <634edad3ff66e3a63bbfd0b1728a29010d3dbff8.camel@redhat.com> (raw)
In-Reply-To: <20210503150854.1144255-4-vkuznets@redhat.com>
On Mon, 2021-05-03 at 17:08 +0200, Vitaly Kuznetsov wrote:
> As a preparation to mapping eVMCS from vmx_set_nested_state() split
> the actual eVMCS mappign from aquiring eVMCS GPA.
>
> No functional change intended.
>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> ---
> arch/x86/kvm/vmx/nested.c | 26 +++++++++++++++++---------
> 1 file changed, 17 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
> index 2febb1dd68e8..37fdc34f7afc 100644
> --- a/arch/x86/kvm/vmx/nested.c
> +++ b/arch/x86/kvm/vmx/nested.c
> @@ -1972,18 +1972,11 @@ static int copy_vmcs12_to_enlightened(struct vcpu_vmx *vmx)
> * This is an equivalent of the nested hypervisor executing the vmptrld
> * instruction.
> */
> -static enum nested_evmptrld_status nested_vmx_handle_enlightened_vmptrld(
> - struct kvm_vcpu *vcpu, bool from_launch)
> +static enum nested_evmptrld_status __nested_vmx_handle_enlightened_vmptrld(
> + struct kvm_vcpu *vcpu, u64 evmcs_gpa, bool from_launch)
> {
> struct vcpu_vmx *vmx = to_vmx(vcpu);
> bool evmcs_gpa_changed = false;
> - u64 evmcs_gpa;
> -
> - if (likely(!vmx->nested.enlightened_vmcs_enabled))
> - return EVMPTRLD_DISABLED;
> -
> - if (!nested_enlightened_vmentry(vcpu, &evmcs_gpa))
> - return EVMPTRLD_DISABLED;
>
> if (unlikely(!vmx->nested.hv_evmcs ||
> evmcs_gpa != vmx->nested.hv_evmcs_vmptr)) {
> @@ -2055,6 +2048,21 @@ static enum nested_evmptrld_status nested_vmx_handle_enlightened_vmptrld(
> return EVMPTRLD_SUCCEEDED;
> }
>
> +static enum nested_evmptrld_status nested_vmx_handle_enlightened_vmptrld(
> + struct kvm_vcpu *vcpu, bool from_launch)
> +{
> + struct vcpu_vmx *vmx = to_vmx(vcpu);
> + u64 evmcs_gpa;
> +
> + if (likely(!vmx->nested.enlightened_vmcs_enabled))
> + return EVMPTRLD_DISABLED;
> +
> + if (!nested_enlightened_vmentry(vcpu, &evmcs_gpa))
> + return EVMPTRLD_DISABLED;
> +
> + return __nested_vmx_handle_enlightened_vmptrld(vcpu, evmcs_gpa, from_launch);
> +}
> +
> void nested_sync_vmcs12_to_shadow(struct kvm_vcpu *vcpu)
> {
> struct vcpu_vmx *vmx = to_vmx(vcpu);
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Best regards,
Maxim Levitsky
next prev parent reply other threads:[~2021-05-05 8:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 15:08 [PATCH 0/4] KVM: nVMX: Fix migration of nested guests when eVMCS is in use Vitaly Kuznetsov
2021-05-03 15:08 ` [PATCH 1/4] KVM: nVMX: Always make an attempt to map eVMCS after migration Vitaly Kuznetsov
2021-05-05 8:22 ` Maxim Levitsky
2021-05-05 8:39 ` Vitaly Kuznetsov
2021-05-05 9:17 ` Maxim Levitsky
2021-05-05 9:23 ` Vitaly Kuznetsov
2021-05-03 15:08 ` [PATCH 2/4] KVM: nVMX: Properly pad 'struct kvm_vmx_nested_state_hdr' Vitaly Kuznetsov
2021-05-05 8:24 ` Maxim Levitsky
2021-05-05 17:34 ` Sean Christopherson
2021-05-03 15:08 ` [PATCH 3/4] KVM: nVMX: Introduce __nested_vmx_handle_enlightened_vmptrld() Vitaly Kuznetsov
2021-05-05 8:24 ` Maxim Levitsky [this message]
2021-05-03 15:08 ` [PATCH 4/4] KVM: nVMX: Map enlightened VMCS upon restore when possible Vitaly Kuznetsov
2021-05-03 15:53 ` Paolo Bonzini
2021-05-04 8:02 ` Vitaly Kuznetsov
2021-05-04 8:06 ` Paolo Bonzini
2021-05-05 8:33 ` Maxim Levitsky
2021-05-05 9:17 ` Vitaly Kuznetsov
2021-05-03 15:43 ` [PATCH 0/4] KVM: nVMX: Fix migration of nested guests when eVMCS is in use Paolo Bonzini
2021-05-03 15:52 ` Vitaly Kuznetsov
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=634edad3ff66e3a63bbfd0b1728a29010d3dbff8.camel@redhat.com \
--to=mlevitsk@redhat.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=vkuznets@redhat.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 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).