[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v2 09/12] spapr: Add h_register_process_table()
From: |
Sam Bobroff |
Subject: |
[Qemu-devel] [RFC PATCH v2 09/12] spapr: Add h_register_process_table() hypercall |
Date: |
Thu, 23 Feb 2017 17:00:02 +1100 |
Both radix and hash modes require guests to use
h_register_process_table() to set up the MMU. Implement it using the
new KVM ioctl KVM_PPC_CONFIGURE_V3_MMU.
This hypercall is also necessary for fully emulated guests, so it will
need to be reworked to integrate with Suraj's TCG patchset.
---
v2:
* I haven't addressed review comments for this patch because it overlaps with
Suraj's implementation of the same function and we'll work together to
integrate them.
hw/ppc/spapr_hcall.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
include/hw/ppc/spapr.h | 1 +
target/ppc/kvm.c | 12 ++++++++++++
target/ppc/kvm_ppc.h | 1 +
4 files changed, 62 insertions(+)
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index cea34073aa..9391619ed6 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -1027,6 +1027,50 @@ static target_ulong
h_client_architecture_support(PowerPCCPU *cpu,
return H_SUCCESS;
}
+static target_ulong h_register_process_table(PowerPCCPU *cpu,
+ sPAPRMachineState *spapr,
+ target_ulong opcode,
+ target_ulong *args)
+{
+ static target_ulong last_process_table;
+ target_ulong flags = args[0];
+ target_ulong proc_tbl = args[1];
+ target_ulong page_size = args[2];
+ target_ulong table_size = args[3];
+ uint64_t cflags, cproc;
+
+ cflags = (flags & 4) ? KVM_PPC_MMUV3_RADIX : 0;
+ cflags |= (flags & 1) ? KVM_PPC_MMUV3_GTSE : 0;
+ cproc = (flags & 4) ? (1ul << 63) : 0;
+ if (!(flags & 0x10)) {
+ if ((last_process_table & (1ul << 63)) != cproc) {
+ return H_PARAMETER;
+ }
+ cproc = last_process_table;
+ } else if (!(flags & 0x8)) {
+ ; /* do nothing */
+ } else if (flags & 4) {
+ /* radix */
+ if (table_size > 24 || (proc_tbl & 0xfff) || (proc_tbl >> 60)) {
+ return H_PARAMETER;
+ }
+ cproc |= proc_tbl | table_size;
+ } else {
+ /* hash, possibly with process table */
+ if (table_size > 24 || (proc_tbl >> 38) || page_size > 7) {
+ return H_PARAMETER;
+ }
+ cproc = (proc_tbl << 25) | (page_size << 5) | table_size;
+ }
+ last_process_table = cproc;
+ fprintf(stderr, "calling config mmu flags=%lx proctbl=%lx\n",
+ cflags, cproc);
+ if (!kvmppc_configure_v3_mmu(cpu, cflags, cproc)) {
+ return H_HARDWARE;
+ }
+ return H_SUCCESS;
+}
+
static spapr_hcall_fn papr_hypercall_table[(MAX_HCALL_OPCODE / 4) + 1];
static spapr_hcall_fn kvmppc_hypercall_table[KVMPPC_HCALL_MAX -
KVMPPC_HCALL_BASE + 1];
@@ -1115,6 +1159,10 @@ static void hypercall_register_types(void)
/* ibm,client-architecture-support support */
spapr_register_hypercall(KVMPPC_H_CAS, h_client_architecture_support);
+
+ /* Power9 MMU support */
+ spapr_register_hypercall(H_REGISTER_PROC_TBL,
+ h_register_process_table);
}
type_init(hypercall_register_types)
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index a30cbc485c..d523db3b4a 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -346,6 +346,7 @@ struct sPAPRMachineState {
#define H_XIRR_X 0x2FC
#define H_RANDOM 0x300
#define H_SET_MODE 0x31C
+#define H_REGISTER_PROC_TBL 0x37C
#define H_SIGNAL_SYS_RESET 0x380
#define MAX_HCALL_OPCODE H_SIGNAL_SYS_RESET
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 8b153808fd..34dde45eef 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -358,6 +358,18 @@ struct ppc_radix_page_info *kvm_get_radix_page_info(void)
return radix_page_info;
}
+bool kvmppc_configure_v3_mmu(PowerPCCPU *cpu, uint64_t flags, uint64_t
proc_tbl)
+{
+ CPUState *cs = CPU(cpu);
+ int ret;
+ struct kvm_ppc_mmuv3_cfg cfg;
+
+ cfg.flags = flags;
+ cfg.process_table = proc_tbl;
+ ret = kvm_vm_ioctl(cs->kvm_state, KVM_PPC_CONFIGURE_V3_MMU, &cfg);
+ return ret == 0;
+}
+
static long gethugepagesize(const char *mem_path)
{
struct statfs fs;
diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
index 56e222dfc2..441fa6a2db 100644
--- a/target/ppc/kvm_ppc.h
+++ b/target/ppc/kvm_ppc.h
@@ -33,6 +33,7 @@ int kvmppc_clear_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits);
int kvmppc_or_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits);
int kvmppc_set_tcr(PowerPCCPU *cpu);
int kvmppc_booke_watchdog_enable(PowerPCCPU *cpu);
+bool kvmppc_configure_v3_mmu(PowerPCCPU *cpu, uint64_t flags, uint64_t
proctbl);
#ifndef CONFIG_USER_ONLY
off_t kvmppc_alloc_rma(void **rma);
bool kvmppc_spapr_use_multitce(void);
--
2.11.0
- [Qemu-devel] [RFC PATCH v2 01/12] spapr: Small cleanup of PPC MMU enums, (continued)
- [Qemu-devel] [RFC PATCH v2 01/12] spapr: Small cleanup of PPC MMU enums, Sam Bobroff, 2017/02/23
- [Qemu-devel] [RFC PATCH v2 08/12] spapr: Only setup HTP if necessary., Sam Bobroff, 2017/02/23
- [Qemu-devel] [RFC PATCH v2 07/12] target-ppc: support KVM_CAP_PPC_MMU_RADIX, KVM_CAP_PPC_MMU_HASH_V3, Sam Bobroff, 2017/02/23
- [Qemu-devel] [RFC PATCH v2 06/12] spapr: Add ibm, processor-radix-AP-encodings to the device tree, Sam Bobroff, 2017/02/23
- [Qemu-devel] [RFC PATCH v2 09/12] spapr: Add h_register_process_table() hypercall,
Sam Bobroff <=
- [Qemu-devel] [RFC PATCH v2 11/12] spapr: Enable ISA 3.0 MMU mode selection via CAS, Sam Bobroff, 2017/02/23
- [Qemu-devel] [RFC PATCH v2 05/12] Update headers using update-linux-headers.sh, Sam Bobroff, 2017/02/23
- [Qemu-devel] [RFC PATCH v2 10/12] spapr: move spapr_populate_pa_features(), Sam Bobroff, 2017/02/23
- [Qemu-devel] [RFC PATCH v2 12/12] spapr: Workaround for broken radix guests, Sam Bobroff, 2017/02/23