From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: KarimAllah Ahmed <karahmed@amazon.de>
Cc: rkrcmar@redhat.com, pbonzini@redhat.com,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
jmattson@google.com
Subject: Re: [PATCH v4 14/14] KVM/nVMX: Use kvm_vcpu_map for accessing the enhanced VMCS
Date: Thu, 06 Dec 2018 18:46:09 +0100 [thread overview]
Message-ID: <875zw67dlq.fsf@vitty.brq.redhat.com> (raw)
In-Reply-To: <1543829467-18025-15-git-send-email-karahmed@amazon.de>
KarimAllah Ahmed <karahmed@amazon.de> writes:
> Use kvm_vcpu_map for accessing the enhanced VMCS since using
just a nitpick: "eVMCS" stands for Enlightened VMCS, not 'enhanced' :-)
> kvm_vcpu_gpa_to_page() and kmap() will only work for guest memory that has
> a "struct page".
>
> Signed-off-by: KarimAllah Ahmed <karahmed@amazon.de>
> ---
> arch/x86/kvm/vmx.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index a958700..83a614f 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -894,7 +894,7 @@ struct nested_vmx {
> } smm;
>
> gpa_t hv_evmcs_vmptr;
> - struct page *hv_evmcs_page;
> + struct kvm_host_map hv_evmcs_map;
> struct hv_enlightened_vmcs *hv_evmcs;
> };
>
> @@ -8456,10 +8456,8 @@ static inline void nested_release_evmcs(struct kvm_vcpu *vcpu)
> if (!vmx->nested.hv_evmcs)
> return;
>
> - kunmap(vmx->nested.hv_evmcs_page);
> - kvm_release_page_dirty(vmx->nested.hv_evmcs_page);
> + kvm_vcpu_unmap(&vmx->nested.hv_evmcs_map);
> vmx->nested.hv_evmcs_vmptr = -1ull;
> - vmx->nested.hv_evmcs_page = NULL;
> vmx->nested.hv_evmcs = NULL;
> }
>
> @@ -8559,7 +8557,7 @@ static int handle_vmclear(struct kvm_vcpu *vcpu)
> return nested_vmx_failValid(vcpu,
> VMXERR_VMCLEAR_VMXON_POINTER);
>
> - if (vmx->nested.hv_evmcs_page) {
> + if (vmx->nested.hv_evmcs_map.hva) {
> if (vmptr == vmx->nested.hv_evmcs_vmptr)
> nested_release_evmcs(vcpu);
> } else {
> @@ -9355,13 +9353,11 @@ static int nested_vmx_handle_enlightened_vmptrld(struct kvm_vcpu *vcpu,
>
> nested_release_evmcs(vcpu);
>
> - vmx->nested.hv_evmcs_page = kvm_vcpu_gpa_to_page(
> - vcpu, assist_page.current_nested_vmcs);
> -
> - if (unlikely(is_error_page(vmx->nested.hv_evmcs_page)))
> + if (kvm_vcpu_map(vcpu, gpa_to_gfn(assist_page.current_nested_vmcs),
> + &vmx->nested.hv_evmcs_map))
> return 0;
>
> - vmx->nested.hv_evmcs = kmap(vmx->nested.hv_evmcs_page);
> + vmx->nested.hv_evmcs = vmx->nested.hv_evmcs_map.hva;
>
> /*
> * Currently, KVM only supports eVMCS version 1
--
Vitaly
next prev parent reply other threads:[~2018-12-06 17:46 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-03 9:30 [PATCH v4 00/14] KVM/X86: Introduce a new guest mapping interface KarimAllah Ahmed
2018-12-03 9:30 ` [PATCH v4 01/14] X86/nVMX: handle_vmon: Read 4 bytes from guest memory KarimAllah Ahmed
2018-12-03 12:48 ` David Hildenbrand
2018-12-03 9:30 ` [PATCH v4 02/14] X86/nVMX: handle_vmptrld: Copy the VMCS12 directly " KarimAllah Ahmed
2018-12-03 12:59 ` David Hildenbrand
2018-12-05 23:10 ` Jim Mattson
2018-12-21 15:20 ` Paolo Bonzini
2019-01-03 14:22 ` Raslan, KarimAllah
2018-12-03 9:30 ` [PATCH v4 03/14] X86/nVMX: Update the PML table without mapping and unmapping the page KarimAllah Ahmed
2018-12-03 13:10 ` David Hildenbrand
2018-12-03 9:30 ` [PATCH v4 04/14] X86/KVM: Handle PFNs outside of kernel reach when touching GPTEs KarimAllah Ahmed
2018-12-03 9:30 ` [PATCH v4 05/14] KVM: Introduce a new guest mapping API KarimAllah Ahmed
2018-12-19 21:26 ` Paolo Bonzini
2018-12-03 9:30 ` [PATCH v4 06/14] KVM/nVMX: Use kvm_vcpu_map when mapping the L1 MSR bitmap KarimAllah Ahmed
2018-12-03 9:31 ` [PATCH v4 07/14] KVM/nVMX: Use kvm_vcpu_map when mapping the virtual APIC page KarimAllah Ahmed
2018-12-03 9:31 ` [PATCH v4 08/14] KVM/nVMX: Use kvm_vcpu_map when mapping the posted interrupt descriptor table KarimAllah Ahmed
2018-12-03 9:31 ` [PATCH v4 09/14] KVM/X86: Use kvm_vcpu_map in emulator_cmpxchg_emulated KarimAllah Ahmed
2018-12-03 9:31 ` [PATCH v4 10/14] KVM/X86: hyperv: Use kvm_vcpu_map in synic_clear_sint_msg_pending KarimAllah Ahmed
2018-12-03 9:31 ` [PATCH v4 11/14] KVM/X86: hyperv: Use kvm_vcpu_map in synic_deliver_msg KarimAllah Ahmed
2018-12-03 9:31 ` [PATCH v4 12/14] KVM/nSVM: Use the new mapping API for mapping guest memory KarimAllah Ahmed
2018-12-03 9:31 ` [PATCH v4 13/14] KVM/nVMX: Use kvm_vcpu_map for accessing the shadow VMCS KarimAllah Ahmed
2018-12-03 9:31 ` [PATCH v4 14/14] KVM/nVMX: Use kvm_vcpu_map for accessing the enhanced VMCS KarimAllah Ahmed
2018-12-06 17:46 ` Vitaly Kuznetsov [this message]
2018-12-06 16:01 ` [PATCH v4 00/14] KVM/X86: Introduce a new guest mapping interface Konrad Rzeszutek Wilk
2018-12-19 21:27 ` Paolo Bonzini
2018-12-21 15:22 ` 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=875zw67dlq.fsf@vitty.brq.redhat.com \
--to=vkuznets@redhat.com \
--cc=jmattson@google.com \
--cc=karahmed@amazon.de \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--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;
as well as URLs for NNTP newsgroup(s).