From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Gibson Subject: Re: [PATCH v3 30/33] KVM: PPC: Book3S HV: Allow HV module to load without hypervisor mode Date: Wed, 3 Oct 2018 16:15:15 +1000 Message-ID: <20181003061514.GW1886@umbus.fritz.box> References: <1538479892-14835-1-git-send-email-paulus@ozlabs.org> <1538479892-14835-31-git-send-email-paulus@ozlabs.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="iytlPraCFSCqrfnM" Cc: linuxppc-dev@ozlabs.org, kvm-ppc@vger.kernel.org, kvm@vger.kernel.org To: Paul Mackerras Return-path: Content-Disposition: inline In-Reply-To: <1538479892-14835-31-git-send-email-paulus@ozlabs.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Sender: "Linuxppc-dev" List-Id: kvm.vger.kernel.org --iytlPraCFSCqrfnM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 02, 2018 at 09:31:29PM +1000, Paul Mackerras wrote: > With this, the KVM-HV module can be loaded in a guest running under > KVM-HV, and if the hypervisor supports nested virtualization, this > guest can now act as a nested hypervisor and run nested guests. >=20 > This also adds some checks to inform userspace that HPT guests are not > supported by nested hypervisors, and to prevent userspace from > configuring a guest to use HPT mode. >=20 > Signed-off-by: Paul Mackerras > --- > arch/powerpc/kvm/book3s_hv.c | 20 ++++++++++++++++---- > 1 file changed, 16 insertions(+), 4 deletions(-) >=20 > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index f630e91..196bff1 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -4237,6 +4237,10 @@ static int kvm_vm_ioctl_get_smmu_info_hv(struct kv= m *kvm, > { > struct kvm_ppc_one_seg_page_size *sps; > =20 > + /* If we're a nested hypervisor, we only support radix guests */ > + if (kvmhv_on_pseries()) > + return -EINVAL; > + > /* > * POWER7, POWER8 and POWER9 all support 32 storage keys for data. > * POWER7 doesn't support keys for instruction accesses, > @@ -4822,11 +4826,15 @@ static int kvmppc_core_emulate_mfspr_hv(struct kv= m_vcpu *vcpu, int sprn, > =20 > static int kvmppc_core_check_processor_compat_hv(void) > { > - if (!cpu_has_feature(CPU_FTR_HVMODE) || > - !cpu_has_feature(CPU_FTR_ARCH_206)) > - return -EIO; > + if (cpu_has_feature(CPU_FTR_HVMODE) && > + cpu_has_feature(CPU_FTR_ARCH_206)) > + return 0; > =20 > - return 0; > + /* Can run as nested hypervisor on POWER9 in radix mode. */ > + if (cpu_has_feature(CPU_FTR_ARCH_300) && radix_enabled()) Shouldn't we probe the parent hypervisor for ability to support nested guests before we say "yes" here? > + return 0; > + > + return -EIO; > } > =20 > #ifdef CONFIG_KVM_XICS > @@ -5144,6 +5152,10 @@ static int kvmhv_configure_mmu(struct kvm *kvm, st= ruct kvm_ppc_mmuv3_cfg *cfg) > if (radix && !radix_enabled()) > return -EINVAL; > =20 > + /* If we're a nested hypervisor, we currently only support radix */ > + if (kvmhv_on_pseries() && !radix) > + return -EINVAL; > + > mutex_lock(&kvm->lock); > if (radix !=3D kvm_is_radix(kvm)) { > if (kvm->arch.mmu_ready) { --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --iytlPraCFSCqrfnM Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAlu0XnIACgkQbDjKyiDZ s5IdQg//fry5BXYJso3OTVaKcB9pz0hMU/cBG8TjNgJqnACFN+NORKtGqSg6OzQg So+4VUC/KDtunKqktEGiDQuvzhhCJ1A668AI76s2NlTnjV2MpmbjhXfv7Fs8r6A3 ULidBoFMhIvC0KVBxS/pOr858zTGdZ6Zp6L1UYpIOhnfRATxVIl07o+nxQ7Km1CG dcIcMIY23xElk0M1TBk2MxFH4N2D4S26vf6989F/Ocm8n3rOhzsiqR/j/H87IVLt m11hsh/0B4YknxUNuD97K9pFdM2icPhCopfWuy16OeDiAnfu6wZBaand6RN46L3Z 96RVnkUxYaO0HiulUs45Kf9HuYAPw3F2vogHZAN4UEkNKd2t7l/EFLBBVMKRw2v8 3G98f65MviGlS/QWItB+WmrYu3B64MODEYka698KgZfEctJlvsrh4MXVp5ReDK58 j+p+ZQhnATaJ1Rh5fbixylKxjpY00phrIAJKU/VmxRJKGavXNMw3lmWqo0BDopvS zWPh/j5FzySprW0aiox8E7QMqmUHdBiTkJNPX8uTl1jMW2E/3yCn8MZYSnKGPYfH bQc8oqn07FqBh0RTySySZI5Rcasu7CUx69If1r/DW6o+QLckYaS0BpRMAFPkHRZV gEjtyrjSzZPEzCbP+9zr00BixEzbTixLBs/Kn5oJEep2L95ITlY= =k2Eg -----END PGP SIGNATURE----- --iytlPraCFSCqrfnM--