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 26/26] KVM: x86/asi: Map KVM memslots and IO buses into KVM ASI
Date: Thu, 11 Jul 2019 16:25:38 +0200 [thread overview]
Message-ID: <1562855138-19507-27-git-send-email-alexandre.chartre@oracle.com> (raw)
In-Reply-To: <1562855138-19507-1-git-send-email-alexandre.chartre@oracle.com>
Map KVM memslots and IO buses into KVM ASI. Mapping is checking on each
KVM ASI enter because they can change.
Signed-off-by: Alexandre Chartre <alexandre.chartre@oracle.com>
---
arch/x86/kvm/x86.c | 36 +++++++++++++++++++++++++++++++++++-
include/linux/kvm_host.h | 2 ++
2 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 9458413..7c52827 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7748,11 +7748,45 @@ void __kvm_request_immediate_exit(struct kvm_vcpu *vcpu)
static void vcpu_isolation_enter(struct kvm_vcpu *vcpu)
{
- int err;
+ struct kvm *kvm = vcpu->kvm;
+ struct kvm_io_bus *bus;
+ int i, err;
if (!vcpu->asi)
return;
+ /*
+ * Check memslots and buses mapping as they tend to change.
+ */
+ for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++) {
+ if (vcpu->asi_memslots[i] == kvm->memslots[i])
+ continue;
+ pr_debug("remapping kvm memslots[%d]: %px -> %px\n",
+ i, vcpu->asi_memslots[i], kvm->memslots[i]);
+ err = asi_remap(vcpu->asi, &vcpu->asi_memslots[i],
+ kvm->memslots[i], sizeof(struct kvm_memslots));
+ if (err) {
+ pr_debug("failed to map kvm memslots[%d]: error %d\n",
+ i, err);
+ }
+ }
+
+
+ for (i = 0; i < KVM_NR_BUSES; i++) {
+ bus = kvm->buses[i];
+ if (bus == vcpu->asi_buses[i])
+ continue;
+ pr_debug("remapped kvm buses[%d]: %px -> %px\n",
+ i, vcpu->asi_buses[i], bus);
+ err = asi_remap(vcpu->asi, &vcpu->asi_buses[i], bus,
+ sizeof(*bus) + bus->dev_count *
+ sizeof(struct kvm_io_range));
+ if (err) {
+ pr_debug("failed to map kvm buses[%d]: error %d\n",
+ i, err);
+ }
+ }
+
err = asi_enter(vcpu->asi);
if (err)
pr_debug("KVM isolation failed: error %d\n", err);
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 2a9d073..1f82de4 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -324,6 +324,8 @@ struct kvm_vcpu {
#ifdef CONFIG_ADDRESS_SPACE_ISOLATION
struct asi *asi;
+ void *asi_memslots[KVM_ADDRESS_SPACE_NUM];
+ void *asi_buses[KVM_NR_BUSES];
#endif
};
--
1.7.1
next prev parent reply other threads:[~2019-07-11 14:29 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 ` [RFC v2 24/26] KVM: x86/asi: Populate the KVM ASI page-table Alexandre Chartre
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 ` Alexandre Chartre [this message]
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-27-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).