| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 11 Nov 2021 22:13:51 +0800
From: Chao Peng <chao.p.peng@...ux.intel.com>
To: kvm@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-mm@...ck.org, linux-fsdevel@...r.kernel.org,
qemu-devel@...gnu.org
Cc: Paolo Bonzini <pbonzini@...hat.com>,
Jonathan Corbet <corbet@....net>,
Sean Christopherson <seanjc@...gle.com>,
Vitaly Kuznetsov <vkuznets@...hat.com>,
Wanpeng Li <wanpengli@...cent.com>,
Jim Mattson <jmattson@...gle.com>,
Joerg Roedel <joro@...tes.org>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>, Borislav Petkov <bp@...en8.de>,
x86@...nel.org, "H . Peter Anvin" <hpa@...or.com>,
Hugh Dickins <hughd@...gle.com>,
Jeff Layton <jlayton@...nel.org>,
"J . Bruce Fields" <bfields@...ldses.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Yu Zhang <yu.c.zhang@...ux.intel.com>,
Chao Peng <chao.p.peng@...ux.intel.com>,
"Kirill A . Shutemov" <kirill.shutemov@...ux.intel.com>,
luto@...nel.org, john.ji@...el.com, susie.li@...el.com,
jun.nakajima@...el.com, dave.hansen@...el.com, ak@...ux.intel.com,
david@...hat.com
Subject: [RFC PATCH 12/13] kvm: handle private to shared memory conversion
Signed-off-by: Chao Peng <chao.p.peng@...ux.intel.com>
---
accel/kvm/kvm-all.c | 49 ++++++++++++++++++++++++++++++++++++++++++
include/sysemu/kvm.h | 1 +
target/arm/kvm.c | 5 +++++
target/i386/kvm/kvm.c | 27 +++++++++++++++++++++++
target/mips/kvm.c | 5 +++++
target/ppc/kvm.c | 5 +++++
target/s390x/kvm/kvm.c | 5 +++++
7 files changed, 97 insertions(+)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index d336458e9e..6feda9c89b 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1445,6 +1445,38 @@ out:
kvm_slots_unlock();
}
+static int kvm_map_private_memory(hwaddr start, hwaddr size)
+{
+ return 0;
+}
+
+static int kvm_map_shared_memory(hwaddr start, hwaddr size)
+{
+ MemoryRegionSection section;
+ void *addr;
+ RAMBlock *rb;
+ ram_addr_t offset;
+
+ /* Punch a hole in private memory. */
+ section = memory_region_find(get_system_private_memory(), start, size);
+ if (section.mr) {
+ addr = memory_region_get_ram_ptr(section.mr) +
+ section.offset_within_region;
+ rb = qemu_ram_block_from_host(addr, false, &offset);
+ ram_block_discard_range(rb, offset, size);
+ memory_region_unref(section.mr);
+ }
+
+ /* Create new shared memory. */
+ section = memory_region_find(get_system_memory(), start, size);
+ if (section.mr) {
+ memory_region_unref(section.mr);
+ return -1; /*Already existed. */
+ }
+
+ return kvm_arch_map_shared_memory(start, size);
+}
+
static void *kvm_dirty_ring_reaper_thread(void *data)
{
KVMState *s = data;
@@ -2957,6 +2989,23 @@ int kvm_cpu_exec(CPUState *cpu)
break;
}
break;
+ case KVM_EXIT_MEMORY_ERROR:
+ switch (run->mem.type) {
+ case KVM_EXIT_MEM_MAP_PRIVATE:
+ ret = kvm_map_private_memory(run->mem.u.map.gpa,
+ run->mem.u.map.size);
+ break;
+ case KVM_EXIT_MEM_MAP_SHARE:
+ ret = kvm_map_shared_memory(run->mem.u.map.gpa,
+ run->mem.u.map.size);
+ break;
+ default:
+ DPRINTF("kvm_arch_handle_exit\n");
+ ret = kvm_arch_handle_exit(cpu, run);
+ break;
+ }
+ break;
+
default:
DPRINTF("kvm_arch_handle_exit\n");
ret = kvm_arch_handle_exit(cpu, run);
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index a1ab1ee12d..5f00aa0ee0 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -547,4 +547,5 @@ bool kvm_cpu_check_are_resettable(void);
bool kvm_arch_cpu_check_are_resettable(void);
+int kvm_arch_map_shared_memory(hwaddr start, hwaddr size);
#endif
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 5d55de1a49..97e51b8b88 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -1051,3 +1051,8 @@ bool kvm_arch_cpu_check_are_resettable(void)
{
return true;
}
+
+int kvm_arch_map_shared_memory(hwaddr start, hwaddr size)
+{
+ return 0;
+}
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 500d2e0e68..b3209402bc 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -4925,3 +4925,30 @@ bool kvm_arch_cpu_check_are_resettable(void)
{
return !sev_es_enabled();
}
+
+int kvm_arch_map_shared_memory(hwaddr start, hwaddr size)
+{
+ MachineState *pcms = current_machine;
+ X86MachineState *x86ms = X86_MACHINE(pcms);
+ MemoryRegion *system_memory = get_system_memory();
+ MemoryRegion *region;
+ char name[134];
+ hwaddr offset;
+
+ if (start + size < x86ms->below_4g_mem_size) {
+ sprintf(name, "0x%lx@...lx", size, start);
+ region = g_malloc(sizeof(*region));
+ memory_region_init_alias(region, NULL, name, pcms->ram, start, size);
+ memory_region_add_subregion(system_memory, start, region);
+ return 0;
+ } else if (start > 0x100000000ULL){
+ sprintf(name, "0x%lx@...lx", size, start);
+ offset = start - 0x100000000ULL + x86ms->below_4g_mem_size;
+ region = g_malloc(sizeof(*region));
+ memory_region_init_alias(region, NULL, name, pcms->ram, offset, size);
+ memory_region_add_subregion(system_memory, start, region);
+ return 0;
+ }
+
+ return -1;
+}
diff --git a/target/mips/kvm.c b/target/mips/kvm.c
index 086debd9f0..4aed54aa9f 100644
--- a/target/mips/kvm.c
+++ b/target/mips/kvm.c
@@ -1295,3 +1295,8 @@ bool kvm_arch_cpu_check_are_resettable(void)
{
return true;
}
+
+int kvm_arch_map_shared_memory(hwaddr start, hwaddr size)
+{
+ return 0;
+}
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index dc93b99189..cc31a7c38d 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -2959,3 +2959,8 @@ bool kvm_arch_cpu_check_are_resettable(void)
{
return true;
}
+
+int kvm_arch_map_shared_memory(hwaddr start, hwaddr size)
+{
+ return 0;
+}
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index 5b1fdb55c4..4a9161ba3a 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -2562,3 +2562,8 @@ bool kvm_arch_cpu_check_are_resettable(void)
{
return true;
}
+
+int kvm_arch_map_shared_memory(hwaddr start, hwaddr size)
+{
+ return 0;
+}
--
2.17.1
Powered by blists - more mailing lists