From: Avi Kivity <avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
To: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH 39/41] KVM: Add physical memory aliasing feature
Date: Sun, 1 Apr 2007 17:35:36 +0300 [thread overview]
Message-ID: <11754381393962-git-send-email-avi@qumranet.com> (raw)
In-Reply-To: <117543813933-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
With this, we can specify that accesses to one physical memory range will
be remapped to another. This is useful for the vga window at 0xa0000 which
is used as a movable window into the (much larger) framebuffer.
Signed-off-by: Avi Kivity <avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
---
drivers/kvm/kvm.h | 9 +++++
drivers/kvm/kvm_main.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++--
include/linux/kvm.h | 10 +++++-
3 files changed, 104 insertions(+), 4 deletions(-)
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index d19985a..fceeb84 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -51,6 +51,7 @@
#define UNMAPPED_GVA (~(gpa_t)0)
#define KVM_MAX_VCPUS 1
+#define KVM_ALIAS_SLOTS 4
#define KVM_MEMORY_SLOTS 4
#define KVM_NUM_MMU_PAGES 256
#define KVM_MIN_FREE_MMU_PAGES 5
@@ -312,6 +313,12 @@ struct kvm_vcpu {
struct kvm_cpuid_entry cpuid_entries[KVM_MAX_CPUID_ENTRIES];
};
+struct kvm_mem_alias {
+ gfn_t base_gfn;
+ unsigned long npages;
+ gfn_t target_gfn;
+};
+
struct kvm_memory_slot {
gfn_t base_gfn;
unsigned long npages;
@@ -322,6 +329,8 @@ struct kvm_memory_slot {
struct kvm {
spinlock_t lock; /* protects everything except vcpus */
+ int naliases;
+ struct kvm_mem_alias aliases[KVM_ALIAS_SLOTS];
int nmemslots;
struct kvm_memory_slot memslots[KVM_MEMORY_SLOTS];
/*
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index aaaf306..56ddbc1 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -846,7 +846,73 @@ out:
return r;
}
-struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn)
+/*
+ * Set a new alias region. Aliases map a portion of physical memory into
+ * another portion. This is useful for memory windows, for example the PC
+ * VGA region.
+ */
+static int kvm_vm_ioctl_set_memory_alias(struct kvm *kvm,
+ struct kvm_memory_alias *alias)
+{
+ int r, n;
+ struct kvm_mem_alias *p;
+
+ r = -EINVAL;
+ /* General sanity checks */
+ if (alias->memory_size & (PAGE_SIZE - 1))
+ goto out;
+ if (alias->guest_phys_addr & (PAGE_SIZE - 1))
+ goto out;
+ if (alias->slot >= KVM_ALIAS_SLOTS)
+ goto out;
+ if (alias->guest_phys_addr + alias->memory_size
+ < alias->guest_phys_addr)
+ goto out;
+ if (alias->target_phys_addr + alias->memory_size
+ < alias->target_phys_addr)
+ goto out;
+
+ spin_lock(&kvm->lock);
+
+ p = &kvm->aliases[alias->slot];
+ p->base_gfn = alias->guest_phys_addr >> PAGE_SHIFT;
+ p->npages = alias->memory_size >> PAGE_SHIFT;
+ p->target_gfn = alias->target_phys_addr >> PAGE_SHIFT;
+
+ for (n = KVM_ALIAS_SLOTS; n > 0; --n)
+ if (kvm->aliases[n - 1].npages)
+ break;
+ kvm->naliases = n;
+
+ spin_unlock(&kvm->lock);
+
+ vcpu_load(&kvm->vcpus[0]);
+ spin_lock(&kvm->lock);
+ kvm_mmu_zap_all(&kvm->vcpus[0]);
+ spin_unlock(&kvm->lock);
+ vcpu_put(&kvm->vcpus[0]);
+
+ return 0;
+
+out:
+ return r;
+}
+
+static gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn)
+{
+ int i;
+ struct kvm_mem_alias *alias;
+
+ for (i = 0; i < kvm->naliases; ++i) {
+ alias = &kvm->aliases[i];
+ if (gfn >= alias->base_gfn
+ && gfn < alias->base_gfn + alias->npages)
+ return alias->target_gfn + gfn - alias->base_gfn;
+ }
+ return gfn;
+}
+
+static struct kvm_memory_slot *__gfn_to_memslot(struct kvm *kvm, gfn_t gfn)
{
int i;
@@ -859,13 +925,19 @@ struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn)
}
return NULL;
}
-EXPORT_SYMBOL_GPL(gfn_to_memslot);
+
+struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn)
+{
+ gfn = unalias_gfn(kvm, gfn);
+ return __gfn_to_memslot(kvm, gfn);
+}
struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn)
{
struct kvm_memory_slot *slot;
- slot = gfn_to_memslot(kvm, gfn);
+ gfn = unalias_gfn(kvm, gfn);
+ slot = __gfn_to_memslot(kvm, gfn);
if (!slot)
return NULL;
return slot->phys_mem[gfn - slot->base_gfn];
@@ -2503,6 +2575,17 @@ static long kvm_vm_ioctl(struct file *filp,
goto out;
break;
}
+ case KVM_SET_MEMORY_ALIAS: {
+ struct kvm_memory_alias alias;
+
+ r = -EFAULT;
+ if (copy_from_user(&alias, argp, sizeof alias))
+ goto out;
+ r = kvm_vm_ioctl_set_memory_alias(kvm, &alias);
+ if (r)
+ goto out;
+ break;
+ }
default:
;
}
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 728b24c..da9b23f 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -11,7 +11,7 @@
#include <asm/types.h>
#include <linux/ioctl.h>
-#define KVM_API_VERSION 9
+#define KVM_API_VERSION 10
/*
* Architectural interrupt line count, and the size of the bitmap needed
@@ -33,6 +33,13 @@ struct kvm_memory_region {
/* for kvm_memory_region::flags */
#define KVM_MEM_LOG_DIRTY_PAGES 1UL
+struct kvm_memory_alias {
+ __u32 slot; /* this has a different namespace than memory slots */
+ __u32 flags;
+ __u64 guest_phys_addr;
+ __u64 memory_size;
+ __u64 target_phys_addr;
+};
enum kvm_exit_reason {
KVM_EXIT_UNKNOWN = 0,
@@ -261,6 +268,7 @@ struct kvm_signal_mask {
*/
#define KVM_CREATE_VCPU _IO(KVMIO, 0x41)
#define KVM_GET_DIRTY_LOG _IOW(KVMIO, 0x42, struct kvm_dirty_log)
+#define KVM_SET_MEMORY_ALIAS _IOW(KVMIO, 0x43, struct kvm_memory_alias)
/*
* ioctls for vcpu fds
--
1.5.0.5
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
next prev parent reply other threads:[~2007-04-01 14:35 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-01 14:34 [PATCH 00/41] kvm updates for 2.6.22 Avi Kivity
[not found] ` <1175438138288-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:34 ` [PATCH 01/41] KVM: Fix guest register corruption on paravirt hypercall Avi Kivity
[not found] ` <11754381381990-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:34 ` [PATCH 02/41] KVM: Use the generic skip_emulated_instruction() in hypercall code Avi Kivity
[not found] ` <11754381384009-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 03/41] KVM: Use own minor number Avi Kivity
[not found] ` <1175438138805-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 04/41] KVM: Export <linux/kvm.h> Avi Kivity
[not found] ` <11754381382515-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 05/41] KVM: Fix bogus sign extension in mmu mapping audit Avi Kivity
[not found] ` <11754381383730-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 06/41] KVM: Use a shared page for kernel/user communication when runing a vcpu Avi Kivity
[not found] ` <11754381383144-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 07/41] KVM: Do not communicate to userspace through cpu registers during PIO Avi Kivity
[not found] ` <11754381381597-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 08/41] KVM: Handle cpuid in the kernel instead of punting to userspace Avi Kivity
[not found] ` <1175438139242-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 09/41] KVM: Remove the 'emulated' field from the userspace interface Avi Kivity
[not found] ` <1175438139494-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 10/41] KVM: Remove minor wart from KVM_CREATE_VCPU ioctl Avi Kivity
[not found] ` <11754381392046-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 11/41] KVM: Renumber ioctls Avi Kivity
[not found] ` <1175438139795-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 12/41] KVM: Add method to check for backwards-compatible API extensions Avi Kivity
[not found] ` <1175438139430-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 13/41] KVM: Allow userspace to process hypercalls which have no kernel handler Avi Kivity
[not found] ` <11754381393496-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 14/41] KVM: Fold kvm_run::exit_type into kvm_run::exit_reason Avi Kivity
[not found] ` <11754381391514-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 15/41] KVM: Add a special exit reason when exiting due to an interrupt Avi Kivity
[not found] ` <11754381392382-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 16/41] KVM: Initialize the apic_base msr on svm too Avi Kivity
[not found] ` <11754381392358-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 17/41] KVM: Add guest mode signal mask Avi Kivity
[not found] ` <1175438139872-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 18/41] KVM: Allow kernel to select size of mmap() buffer Avi Kivity
[not found] ` <11754381392921-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 19/41] KVM: Future-proof argument-less ioctls Avi Kivity
[not found] ` <117543813978-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 20/41] KVM: Avoid guest virtual addresses in string pio userspace interface Avi Kivity
[not found] ` <117543 81393061-git-send-email-avi@qumranet.com>
[not found] ` <11754381393061-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 21/41] KVM: MMU: Remove unnecessary check for pdptr access Avi Kivity
[not found] ` <11754381392186-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 22/41] KVM: MMU: Remove global pte tracking Avi Kivity
[not found] ` <117543813916-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 23/41] KVM: Workaround vmx inability to virtualize the reset state Avi Kivity
[not found] ` <1175438139530-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 24/41] KVM: Remove set_cr0_no_modeswitch() arch op Avi Kivity
[not found] ` <1175438139960-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 25/41] KVM: Modify guest segments after potentially switching modes Avi Kivity
[not found] ` <1175438139816-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 26/41] KVM: Hack real-mode segments on vmx from KVM_SET_SREGS Avi Kivity
[not found] ` <1175438139141-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 27/41] KVM: Don't allow the guest to turn off the cpu cache Avi Kivity
[not found] ` <11754381391993-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 28/41] KVM: Remove unused and write-only variables Avi Kivity
[not found] ` <1175438139877-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 29/41] KVM: Handle writes to MCG_STATUS msr Avi Kivity
[not found] ` <11754381391119-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 30/41] KVM: SVM: forbid guest to execute monitor/mwait Avi Kivity
[not found] ` <1175438139312-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 31/41] KVM: MMU: Fix hugepage pdes mapping same physical address with different access Avi Kivity
[not found] ` <11754381392527-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 32/41] KVM: SVM: Ensure timestamp counter monotonicity Avi Kivity
[not found] ` <11754381393184-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 33/41] KVM: Remove unused function Avi Kivity
[not found] ` <1175438139249-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 34/41] KVM: Use list_move() Avi Kivity
[not found] ` <11754381391161-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 35/41] KVM: Remove debug message Avi Kivity
[not found] ` <11754381393714-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 36/41] KVM: x86 emulator: fix bit string operations operand size Avi Kivity
[not found] ` <11754381392948-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 37/41] KVM: Add mmu cache clear function Avi Kivity
[not found] ` <1175438139458-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 38/41] KVM: Simply gfn_to_page() Avi Kivity
[not found] ` <117543813933-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` Avi Kivity [this message]
[not found] ` <11754381393962-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 40/41] KVM: Add fpu get/set operations Avi Kivity
[not found] ` <11754381393751-git-send-ema il-avi@qumranet.com>
[not found] ` <11754381393751-git-send-email-avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-04-01 14:35 ` [PATCH 41/41] KVM: SVM: enable LBRV virtualization if available Avi Kivity
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=11754381393962-git-send-email-avi@qumranet.com \
--to=avi-atkuwr5tajbwk0htik3j/w@public.gmane.org \
--cc=kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.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