From: KarimAllah Ahmed <karahmed@amazon.de>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
pbonzini@redhat.com, rkrcmar@redhat.com
Cc: KarimAllah Ahmed <karahmed@amazon.de>
Subject: [PATCH v5 12/13] KVM/nVMX: Use kvm_vcpu_map for accessing the enlightened VMCS
Date: Wed, 9 Jan 2019 10:42:12 +0100 [thread overview]
Message-ID: <1547026933-31226-13-git-send-email-karahmed@amazon.de> (raw)
In-Reply-To: <1547026933-31226-1-git-send-email-karahmed@amazon.de>
Use kvm_vcpu_map for accessing the enhanced VMCS since using
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>
---
v4 -> v5:
- s/enhanced/enlightened
- unmap with dirty flag
---
arch/x86/kvm/vmx/nested.c | 14 +++++---------
arch/x86/kvm/vmx/vmx.h | 2 +-
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index 04a8b43..ccb3b63 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -193,10 +193,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, true);
vmx->nested.hv_evmcs_vmptr = -1ull;
- vmx->nested.hv_evmcs_page = NULL;
vmx->nested.hv_evmcs = NULL;
}
@@ -1769,13 +1767,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
@@ -4278,7 +4274,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 {
diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
index bd04725..a130139 100644
--- a/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@ -172,7 +172,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;
};
--
2.7.4
next prev parent reply other threads:[~2019-01-09 9:43 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-09 9:42 [PATCH v5 00/13] KVM/X86: Introduce a new guest mapping interface KarimAllah Ahmed
2019-01-09 9:42 ` [PATCH v5 01/13] X86/nVMX: handle_vmon: Read 4 bytes from guest memory KarimAllah Ahmed
2019-01-23 16:59 ` Konrad Rzeszutek Wilk
2019-01-09 9:42 ` [PATCH v5 02/13] X86/nVMX: Update the PML table without mapping and unmapping the page KarimAllah Ahmed
2019-01-23 17:17 ` Konrad Rzeszutek Wilk
2019-01-09 9:42 ` [PATCH v5 03/13] X86/KVM: Handle PFNs outside of kernel reach when touching GPTEs KarimAllah Ahmed
2019-01-23 17:31 ` Konrad Rzeszutek Wilk
2019-01-09 9:42 ` [PATCH v5 04/13] KVM: Introduce a new guest mapping API KarimAllah Ahmed
2019-01-10 13:07 ` David Hildenbrand
2019-01-25 18:01 ` Raslan, KarimAllah
2019-01-23 17:41 ` Konrad Rzeszutek Wilk
2019-01-23 17:50 ` Konrad Rzeszutek Wilk
2019-01-25 18:09 ` Raslan, KarimAllah
2019-01-30 17:08 ` Paolo Bonzini
2019-01-09 9:42 ` [PATCH v5 05/13] X86/nVMX: handle_vmptrld: Use kvm_vcpu_map when copying VMCS12 from guest memory KarimAllah Ahmed
2019-01-23 17:44 ` Konrad Rzeszutek Wilk
2019-01-09 9:42 ` [PATCH v5 06/13] KVM/nVMX: Use kvm_vcpu_map when mapping the L1 MSR bitmap KarimAllah Ahmed
2019-01-09 9:42 ` [PATCH v5 07/13] KVM/nVMX: Use kvm_vcpu_map when mapping the virtual APIC page KarimAllah Ahmed
2019-01-23 17:57 ` Konrad Rzeszutek Wilk
2019-01-25 18:14 ` Raslan, KarimAllah
2019-01-09 9:42 ` [PATCH v5 08/13] KVM/nVMX: Use kvm_vcpu_map when mapping the posted interrupt descriptor table KarimAllah Ahmed
2019-01-23 18:03 ` Konrad Rzeszutek Wilk
2019-01-25 18:15 ` Raslan, KarimAllah
2019-01-09 9:42 ` [PATCH v5 09/13] KVM/X86: Use kvm_vcpu_map in emulator_cmpxchg_emulated KarimAllah Ahmed
2019-01-23 18:04 ` Konrad Rzeszutek Wilk
2019-01-09 9:42 ` [PATCH v5 10/13] KVM/nSVM: Use the new mapping API for mapping guest memory KarimAllah Ahmed
2019-01-23 18:08 ` Konrad Rzeszutek Wilk
2019-01-09 9:42 ` [PATCH v5 11/13] KVM/nVMX: Use kvm_vcpu_map for accessing the shadow VMCS KarimAllah Ahmed
2019-01-23 18:10 ` Konrad Rzeszutek Wilk
2019-01-09 9:42 ` KarimAllah Ahmed [this message]
2019-01-23 18:11 ` [PATCH v5 12/13] KVM/nVMX: Use kvm_vcpu_map for accessing the enlightened VMCS Konrad Rzeszutek Wilk
2019-01-09 9:42 ` [PATCH v5 13/13] KVM/nVMX: Use page_address_valid in a few more locations KarimAllah Ahmed
2019-01-23 18:18 ` Konrad Rzeszutek Wilk
2019-01-25 18:17 ` Raslan, KarimAllah
2019-01-23 18:16 ` [PATCH v5 00/13] KVM/X86: Introduce a new guest mapping interface Konrad Rzeszutek Wilk
2019-01-25 18:28 ` Raslan, KarimAllah
2019-01-30 17:14 ` Paolo Bonzini
2019-01-31 13:03 ` Raslan, KarimAllah
2019-01-31 13:10 ` 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=1547026933-31226-13-git-send-email-karahmed@amazon.de \
--to=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
all inboxes | Powered by JetHome®