From: Alexandre Chartre <alexandre.chartre@oracle.com>
To: pbonzini@redhat.com, rkrcmar@redhat.com, tglx@linutronix.de,
mingo@redhat.com, bp@alien8.de, hpa@zytor.com,
dave.hansen@linux.intel.com, luto@kernel.org,
peterz@infradead.org, kvm@vger.kernel.org, x86@kernel.org,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc: konrad.wilk@oracle.com, jan.setjeeilers@oracle.com,
liran.alon@oracle.com, jwadams@google.com, graf@amazon.de,
rppt@linux.vnet.ibm.com, alexandre.chartre@oracle.com
Subject: [RFC v2 24/26] KVM: x86/asi: Populate the KVM ASI page-table
Date: Thu, 11 Jul 2019 16:25:36 +0200 [thread overview]
Message-ID: <1562855138-19507-25-git-send-email-alexandre.chartre@oracle.com> (raw)
In-Reply-To: <1562855138-19507-1-git-send-email-alexandre.chartre@oracle.com>
Add mappings to the KVM ASI page-table so that KVM can run with its
address space isolation without faulting too much.
Signed-off-by: Alexandre Chartre <alexandre.chartre@oracle.com>
---
arch/x86/kvm/vmx/isolation.c | 155 ++++++++++++++++++++++++++++++++++++++++-
arch/x86/kvm/vmx/vmx.c | 1 -
arch/x86/kvm/vmx/vmx.h | 3 +
3 files changed, 154 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kvm/vmx/isolation.c b/arch/x86/kvm/vmx/isolation.c
index 644d8d3..d82f6b6 100644
--- a/arch/x86/kvm/vmx/isolation.c
+++ b/arch/x86/kvm/vmx/isolation.c
@@ -5,7 +5,7 @@
* KVM Address Space Isolation
*/
-#include <linux/module.h>
+#include <linux/kvm_host.h>
#include <linux/moduleparam.h>
#include <linux/printk.h>
#include <asm/asi.h>
@@ -14,8 +14,11 @@
#include "vmx.h"
#include "x86.h"
-#define VMX_ASI_MAP_FLAGS \
- (ASI_MAP_STACK_CANARY | ASI_MAP_CPU_PTR | ASI_MAP_CURRENT_TASK)
+#define VMX_ASI_MAP_FLAGS (ASI_MAP_STACK_CANARY | \
+ ASI_MAP_CPU_PTR | \
+ ASI_MAP_CURRENT_TASK | \
+ ASI_MAP_RCU_DATA | \
+ ASI_MAP_CPU_HW_EVENTS)
/*
* When set to true, KVM #VMExit handlers run in isolated address space
@@ -34,9 +37,153 @@
static bool __read_mostly address_space_isolation;
module_param(address_space_isolation, bool, 0444);
+/*
+ * Map various kernel data.
+ */
+static int vmx_isolation_map_kernel_data(struct asi *asi)
+{
+ int err;
+
+ /* map context_tracking, used by guest_enter_irqoff() */
+ err = ASI_MAP_CPUVAR(asi, context_tracking);
+ if (err)
+ return err;
+
+ /* map irq_stat, used by kvm_*_cpu_l1tf_flush_l1d */
+ err = ASI_MAP_CPUVAR(asi, irq_stat);
+ if (err)
+ return err;
+ return 0;
+}
+
+/*
+ * Map kvm module and data from that module.
+ */
+static int vmx_isolation_map_kvm_data(struct asi *asi, struct kvm *kvm)
+{
+ int err;
+
+ /* map kvm module */
+ err = asi_map_module(asi, "kvm");
+ if (err)
+ return err;
+
+ err = asi_map_percpu(asi, kvm->srcu.sda,
+ sizeof(struct srcu_data));
+ if (err)
+ return err;
+
+ return 0;
+}
+
+/*
+ * Map kvm-intel module and generic x86 data.
+ */
+static int vmx_isolation_map_kvm_x86_data(struct asi *asi)
+{
+ int err;
+
+ /* map current module (kvm-intel) */
+ err = ASI_MAP_THIS_MODULE(asi);
+ if (err)
+ return err;
+
+ /* map current_vcpu, used by vcpu_enter_guest() */
+ err = ASI_MAP_CPUVAR(asi, current_vcpu);
+ if (err)
+ return (err);
+
+ return 0;
+}
+
+/*
+ * Map vmx data.
+ */
+static int vmx_isolation_map_kvm_vmx_data(struct asi *asi, struct vcpu_vmx *vmx)
+{
+ struct kvm_vmx *kvm_vmx;
+ struct kvm_vcpu *vcpu;
+ struct kvm *kvm;
+ int err;
+
+ vcpu = &vmx->vcpu;
+ kvm = vcpu->kvm;
+ kvm_vmx = to_kvm_vmx(kvm);
+
+ /* map kvm_vmx (this also maps kvm) */
+ err = asi_map(asi, kvm_vmx, sizeof(*kvm_vmx));
+ if (err)
+ return err;
+
+ /* map vmx (this also maps vcpu) */
+ err = asi_map(asi, vmx, sizeof(*vmx));
+ if (err)
+ return err;
+
+ /* map vcpu data */
+ err = asi_map(asi, vcpu->run, PAGE_SIZE);
+ if (err)
+ return err;
+
+ err = asi_map(asi, vcpu->arch.apic, sizeof(struct kvm_lapic));
+ if (err)
+ return err;
+
+ /*
+ * Map additional vmx data.
+ */
+
+ if (vmx_l1d_flush_pages) {
+ err = asi_map(asi, vmx_l1d_flush_pages,
+ PAGE_SIZE << L1D_CACHE_ORDER);
+ if (err)
+ return err;
+ }
+
+ if (enable_pml) {
+ err = asi_map(asi, vmx->pml_pg, sizeof(struct page));
+ if (err)
+ return err;
+ }
+
+ err = asi_map(asi, vmx->guest_msrs, PAGE_SIZE);
+ if (err)
+ return err;
+
+ err = asi_map(asi, vmx->vmcs01.vmcs, PAGE_SIZE << vmcs_config.order);
+ if (err)
+ return err;
+
+ err = asi_map(asi, vmx->vmcs01.msr_bitmap, PAGE_SIZE);
+ if (err)
+ return err;
+
+ err = asi_map(asi, vmx->vcpu.arch.pio_data, PAGE_SIZE);
+ if (err)
+ return err;
+
+ return 0;
+}
+
static int vmx_isolation_init_mapping(struct asi *asi, struct vcpu_vmx *vmx)
{
- /* TODO: Populate the KVM ASI page-table */
+ int err;
+
+ err = vmx_isolation_map_kernel_data(asi);
+ if (err)
+ return err;
+
+ err = vmx_isolation_map_kvm_data(asi, vmx->vcpu.kvm);
+ if (err)
+ return err;
+
+ err = vmx_isolation_map_kvm_x86_data(asi);
+ if (err)
+ return err;
+
+ err = vmx_isolation_map_kvm_vmx_data(asi, vmx);
+ if (err)
+ return err;
return 0;
}
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 9b92467..d47f093 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -201,7 +201,6 @@
[VMENTER_L1D_FLUSH_NOT_REQUIRED] = {"not required", false},
};
-#define L1D_CACHE_ORDER 4
void *vmx_l1d_flush_pages;
static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf)
diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
index 09c1593..e8de23b 100644
--- a/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@ -11,6 +11,9 @@
#include "ops.h"
#include "vmcs.h"
+#define L1D_CACHE_ORDER 4
+extern void *vmx_l1d_flush_pages;
+
extern const u32 vmx_msr_index[];
extern u64 host_efer;
--
1.7.1
next prev parent reply other threads:[~2019-07-11 14:28 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 14:25 [RFC v2 00/27] Kernel Address Space Isolation Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 01/26] mm/x86: Introduce kernel address space isolation Alexandre Chartre
2019-07-11 21:33 ` Thomas Gleixner
2019-07-12 7:43 ` Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 02/26] mm/asi: Abort isolation on interrupt, exception and context switch Alexandre Chartre
2019-07-11 20:11 ` Andi Kleen
2019-07-11 20:17 ` Mike Rapoport
2019-07-11 20:41 ` Alexandre Chartre
2019-07-12 0:05 ` Andy Lutomirski
2019-07-12 7:50 ` Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 03/26] mm/asi: Handle page fault due to address space isolation Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 04/26] mm/asi: Functions to track buffers allocated for an ASI page-table Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 05/26] mm/asi: Add ASI page-table entry offset functions Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 06/26] mm/asi: Add ASI page-table entry allocation functions Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 07/26] mm/asi: Add ASI page-table entry set functions Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 08/26] mm/asi: Functions to populate an ASI page-table from a VA range Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 09/26] mm/asi: Helper functions to map module into ASI Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 10/26] mm/asi: Keep track of VA ranges mapped in ASI page-table Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 11/26] mm/asi: Functions to clear ASI page-table entries for a VA range Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 12/26] mm/asi: Function to copy page-table entries for percpu buffer Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 13/26] mm/asi: Add asi_remap() function Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 14/26] mm/asi: Handle ASI mapped range leaks and overlaps Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 15/26] mm/asi: Initialize the ASI page-table with core mappings Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 16/26] mm/asi: Option to map current task into ASI Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 17/26] rcu: Move tree.h static forward declarations to tree.c Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 18/26] rcu: Make percpu rcu_data non-static Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 19/26] mm/asi: Add option to map RCU data Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 20/26] mm/asi: Add option to map cpu_hw_events Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 21/26] mm/asi: Make functions to read cr3/cr4 ASI aware Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 22/26] KVM: x86/asi: Introduce address_space_isolation module parameter Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 23/26] KVM: x86/asi: Introduce KVM address space isolation Alexandre Chartre
2019-07-11 14:25 ` Alexandre Chartre [this message]
2019-07-11 14:25 ` [RFC v2 25/26] KVM: x86/asi: Switch to KVM address space on entry to guest Alexandre Chartre
2019-07-11 14:25 ` [RFC v2 26/26] KVM: x86/asi: Map KVM memslots and IO buses into KVM ASI Alexandre Chartre
2019-07-11 14:40 ` [RFC v2 00/27] Kernel Address Space Isolation Alexandre Chartre
2019-07-11 22:38 ` Dave Hansen
2019-07-12 8:09 ` Alexandre Chartre
2019-07-12 13:51 ` Dave Hansen
2019-07-12 14:06 ` Alexandre Chartre
2019-07-12 15:23 ` Thomas Gleixner
2019-07-12 10:44 ` Thomas Gleixner
2019-07-12 11:56 ` Alexandre Chartre
2019-07-12 12:50 ` Peter Zijlstra
2019-07-12 13:43 ` Alexandre Chartre
2019-07-12 13:58 ` Dave Hansen
2019-07-12 14:36 ` Andy Lutomirski
2019-07-14 18:17 ` Alexander Graf
2019-07-12 13:54 ` Dave Hansen
2019-07-12 15:20 ` Peter Zijlstra
2019-07-12 15:16 ` Thomas Gleixner
2019-07-12 16:37 ` Alexandre Chartre
2019-07-12 16:45 ` Andy Lutomirski
2019-07-14 17:11 ` Mike Rapoport
2019-07-12 19:06 ` Peter Zijlstra
2019-07-14 15:06 ` Andy Lutomirski
2019-07-15 10:33 ` Peter Zijlstra
2019-07-12 19:48 ` Thomas Gleixner
2019-07-15 8:23 ` Alexandre Chartre
2019-07-15 8:28 ` Thomas Gleixner
2019-07-12 16:00 ` Thomas Gleixner
2019-07-12 11:44 ` Peter Zijlstra
2019-07-12 12:17 ` Alexandre Chartre
2019-07-12 12:36 ` Peter Zijlstra
2019-07-12 12:47 ` Alexandre Chartre
2019-07-12 13:07 ` Peter Zijlstra
2019-07-12 13:46 ` Alexandre Chartre
2019-07-31 16:31 ` Dario Faggioli
2019-08-22 12:31 ` Alexandre Chartre
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=1562855138-19507-25-git-send-email-alexandre.chartre@oracle.com \
--to=alexandre.chartre@oracle.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=graf@amazon.de \
--cc=hpa@zytor.com \
--cc=jan.setjeeilers@oracle.com \
--cc=jwadams@google.com \
--cc=konrad.wilk@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=liran.alon@oracle.com \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rkrcmar@redhat.com \
--cc=rppt@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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).