| Message ID | a8621842537496c91b6d021ad329e6fa6404cc17.1486436186.git.sam.bobroff@au1.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Feb 07, 2017 at 01:56:47PM +1100, Sam Bobroff wrote: > Query and cache the value of two new KVM capabilities that indicate > KVM's support for new radix and hash modes of the MMU. > > Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com> > --- > target/ppc/kvm.c | 14 ++++++++++++++ > target/ppc/kvm_ppc.h | 12 ++++++++++++ > 2 files changed, 26 insertions(+) > > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index 390d6342cc..8d6fd1b067 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -81,6 +81,8 @@ static int cap_papr; > static int cap_htab_fd; > static int cap_fixup_hcalls; > static int cap_htm; /* Hardware transactional memory support */ > +static int cap_mmu_radix; > +static int cap_mmu_hash; Please rename this cap_mmu_hashv3 to avoid confusion. Apart from that, Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > > static uint32_t debug_inst_opcode; > > @@ -134,6 +136,8 @@ int kvm_arch_init(MachineState *ms, KVMState *s) > cap_htab_fd = kvm_check_extension(s, KVM_CAP_PPC_HTAB_FD); > cap_fixup_hcalls = kvm_check_extension(s, KVM_CAP_PPC_FIXUP_HCALL); > cap_htm = kvm_vm_check_extension(s, KVM_CAP_PPC_HTM); > + cap_mmu_radix = kvm_vm_check_extension(s, KVM_CAP_PPC_MMU_RADIX); > + cap_mmu_hash = kvm_vm_check_extension(s, KVM_CAP_PPC_MMU_HASH_V3); > > if (!cap_interrupt_level) { > fprintf(stderr, "KVM: Couldn't find level irq capability. Expect the " > @@ -2408,6 +2412,16 @@ bool kvmppc_has_cap_htm(void) > return cap_htm; > } > > +bool kvmppc_has_cap_mmu_radix(void) > +{ > + return cap_mmu_radix; > +} > + > +bool kvmppc_has_cap_mmu_hash(void) > +{ > + return cap_mmu_hash; > +} > + > static PowerPCCPUClass *ppc_cpu_get_family_class(PowerPCCPUClass *pcc) > { > ObjectClass *oc = OBJECT_CLASS(pcc); > diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h > index 4b43283913..1c1b94847c 100644 > --- a/target/ppc/kvm_ppc.h > +++ b/target/ppc/kvm_ppc.h > @@ -56,6 +56,8 @@ void kvmppc_hash64_write_pte(CPUPPCState *env, target_ulong pte_index, > target_ulong pte0, target_ulong pte1); > bool kvmppc_has_cap_fixup_hcalls(void); > bool kvmppc_has_cap_htm(void); > +bool kvmppc_has_cap_mmu_radix(void); > +bool kvmppc_has_cap_mmu_hash(void); > int kvmppc_enable_hwrng(void); > int kvmppc_put_books_sregs(PowerPCCPU *cpu); > PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void); > @@ -255,6 +257,16 @@ static inline bool kvmppc_has_cap_htm(void) > return false; > } > > +static inline bool kvmppc_has_cap_mmu_radix(void) > +{ > + return false; > +} > + > +static inline bool kvmppc_has_cap_mmu_hash(void) > +{ > + return false; > +} > + > static inline int kvmppc_enable_hwrng(void) > { > return -1;
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 390d6342cc..8d6fd1b067 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -81,6 +81,8 @@ static int cap_papr; static int cap_htab_fd; static int cap_fixup_hcalls; static int cap_htm; /* Hardware transactional memory support */ +static int cap_mmu_radix; +static int cap_mmu_hash; static uint32_t debug_inst_opcode; @@ -134,6 +136,8 @@ int kvm_arch_init(MachineState *ms, KVMState *s) cap_htab_fd = kvm_check_extension(s, KVM_CAP_PPC_HTAB_FD); cap_fixup_hcalls = kvm_check_extension(s, KVM_CAP_PPC_FIXUP_HCALL); cap_htm = kvm_vm_check_extension(s, KVM_CAP_PPC_HTM); + cap_mmu_radix = kvm_vm_check_extension(s, KVM_CAP_PPC_MMU_RADIX); + cap_mmu_hash = kvm_vm_check_extension(s, KVM_CAP_PPC_MMU_HASH_V3); if (!cap_interrupt_level) { fprintf(stderr, "KVM: Couldn't find level irq capability. Expect the " @@ -2408,6 +2412,16 @@ bool kvmppc_has_cap_htm(void) return cap_htm; } +bool kvmppc_has_cap_mmu_radix(void) +{ + return cap_mmu_radix; +} + +bool kvmppc_has_cap_mmu_hash(void) +{ + return cap_mmu_hash; +} + static PowerPCCPUClass *ppc_cpu_get_family_class(PowerPCCPUClass *pcc) { ObjectClass *oc = OBJECT_CLASS(pcc); diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 4b43283913..1c1b94847c 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -56,6 +56,8 @@ void kvmppc_hash64_write_pte(CPUPPCState *env, target_ulong pte_index, target_ulong pte0, target_ulong pte1); bool kvmppc_has_cap_fixup_hcalls(void); bool kvmppc_has_cap_htm(void); +bool kvmppc_has_cap_mmu_radix(void); +bool kvmppc_has_cap_mmu_hash(void); int kvmppc_enable_hwrng(void); int kvmppc_put_books_sregs(PowerPCCPU *cpu); PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void); @@ -255,6 +257,16 @@ static inline bool kvmppc_has_cap_htm(void) return false; } +static inline bool kvmppc_has_cap_mmu_radix(void) +{ + return false; +} + +static inline bool kvmppc_has_cap_mmu_hash(void) +{ + return false; +} + static inline int kvmppc_enable_hwrng(void) { return -1;
Query and cache the value of two new KVM capabilities that indicate KVM's support for new radix and hash modes of the MMU. Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com> --- target/ppc/kvm.c | 14 ++++++++++++++ target/ppc/kvm_ppc.h | 12 ++++++++++++ 2 files changed, 26 insertions(+)