KVM: PPC: Book3S HV: Set process table for HPT guests on POWER9

This adds the implementation of the KVM_PPC_CONFIGURE_V3_MMU ioctl
for HPT guests on POWER9.  With this, we can return 1 for the
KVM_CAP_PPC_MMU_HASH_V3 capability.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index e59b172666cd31aa35635216d74ecdb21106b0dd..944532dc4a5747b5bd08e54b2781813d88399876 100644 (file)
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -264,6 +264,7 @@ struct kvm_arch {
        atomic_t hpte_mod_interest;
        cpumask_t need_tlb_flush;
        int hpt_cma_alloc;
+       u64 process_table;
        struct dentry *debugfs_dir;
        struct dentry *htab_dentry;
 #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 5f08ed070ae599da611ee9107d367045ca689db0..bb2854314ba45c1a80c482dc6d1aaf7123fc9171 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -3091,8 +3091,8 @@ static void kvmppc_setup_partition_table(struct kvm *kvm)
        /* HTABSIZE and HTABORG fields */
        dw0 |= kvm->arch.sdr1;
 
-       /* Second dword has GR=0; other fields are unused since UPRT=0 */
-       dw1 = 0;
+       /* Second dword as set by userspace */
+       dw1 = kvm->arch.process_table;
 
        mmu_partition_table_set_entry(kvm->arch.lpid, dw0, dw1);
 }
@@ -3657,10 +3657,37 @@ static void init_default_hcalls(void)
        }
 }
 
-/* dummy implementations for now */
 static int kvmhv_configure_mmu(struct kvm *kvm, struct kvm_ppc_mmuv3_cfg *cfg)
 {
-       return -EINVAL;
+       unsigned long lpcr;
+
+       /* If not on a POWER9, reject it */
+       if (!cpu_has_feature(CPU_FTR_ARCH_300))
+               return -ENODEV;
+
+       /* If any unknown flags set, reject it */
+       if (cfg->flags & ~(KVM_PPC_MMUV3_RADIX | KVM_PPC_MMUV3_GTSE))
+               return -EINVAL;
+
+       /* We can't do radix yet */
+       if (cfg->flags & KVM_PPC_MMUV3_RADIX)
+               return -EINVAL;
+
+       /* GR (guest radix) bit in process_table field must match */
+       if (cfg->process_table & PATB_GR)
+               return -EINVAL;
+
+       /* Process table size field must be reasonable, i.e. <= 24 */
+       if ((cfg->process_table & PRTS_MASK) > 24)
+               return -EINVAL;
+
+       kvm->arch.process_table = cfg->process_table;
+       kvmppc_setup_partition_table(kvm);
+
+       lpcr = (cfg->flags & KVM_PPC_MMUV3_GTSE) ? LPCR_GTSE : 0;
+       kvmppc_update_lpcr(kvm, lpcr, LPCR_GTSE);
+
+       return 0;
 }
 
 static int kvmhv_get_rmmu_info(struct kvm *kvm, struct kvm_ppc_rmmu_info *info)

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 38c0d154c01eea2dea2c37bacf423e9a62f158e5..1476a480745e19af84f5e203fb04a1c1cd2ac86b 100644 (file)
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -569,7 +569,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
                r = !!(0 && hv_enabled && radix_enabled());
                break;
        case KVM_CAP_PPC_MMU_HASH_V3:
-               r = !!(0 && hv_enabled && !radix_enabled() &&
+               r = !!(hv_enabled && !radix_enabled() &&
                       cpu_has_feature(CPU_FTR_ARCH_300));
                break;
 #endif