From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Gibson Date: Tue, 23 Mar 2021 02:35:53 +0000 Subject: Re: [PATCH v6 6/6] KVM: PPC: Book3S HV: Use H_RPT_INVALIDATE in nested KVM Message-Id: MIME-Version: 1 Content-Type: multipart/mixed; boundary="nNWWeyy0OjAtXMD1" List-Id: References: <20210311083939.595568-1-bharata@linux.ibm.com> <20210311083939.595568-7-bharata@linux.ibm.com> In-Reply-To: <20210311083939.595568-7-bharata@linux.ibm.com> To: Bharata B Rao Cc: farosas@linux.ibm.com, aneesh.kumar@linux.ibm.com, npiggin@gmail.com, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org --nNWWeyy0OjAtXMD1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Mar 11, 2021 at 02:09:39PM +0530, Bharata B Rao wrote: > In the nested KVM case, replace H_TLB_INVALIDATE by the new hcall > H_RPT_INVALIDATE if available. The availability of this hcall > is determined from "hcall-rpt-invalidate" string in ibm,hypertas-functions > DT property. >=20 > Signed-off-by: Bharata B Rao > Reviewed-by: Fabiano Rosas Reviewed-by: David Gibson > --- > arch/powerpc/kvm/book3s_64_mmu_radix.c | 27 +++++++++++++++++++++----- > arch/powerpc/kvm/book3s_hv_nested.c | 12 ++++++++++-- > 2 files changed, 32 insertions(+), 7 deletions(-) >=20 > diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/bo= ok3s_64_mmu_radix.c > index e603de7ade52..1e1e55fd0ee5 100644 > --- a/arch/powerpc/kvm/book3s_64_mmu_radix.c > +++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > =20 > /* > * Supported radix tree geometry. > @@ -318,9 +319,19 @@ void kvmppc_radix_tlbie_page(struct kvm *kvm, unsign= ed long addr, > } > =20 > psi =3D shift_to_mmu_psize(pshift); > - rb =3D addr | (mmu_get_ap(psi) << PPC_BITLSHIFT(58)); > - rc =3D plpar_hcall_norets(H_TLB_INVALIDATE, H_TLBIE_P1_ENC(0, 0, 1), > - lpid, rb); > + > + if (!firmware_has_feature(FW_FEATURE_RPT_INVALIDATE)) { > + rb =3D addr | (mmu_get_ap(psi) << PPC_BITLSHIFT(58)); > + rc =3D plpar_hcall_norets(H_TLB_INVALIDATE, H_TLBIE_P1_ENC(0, 0, 1), > + lpid, rb); > + } else { > + rc =3D pseries_rpt_invalidate(lpid, H_RPTI_TARGET_CMMU, > + H_RPTI_TYPE_NESTED | > + H_RPTI_TYPE_TLB, > + psize_to_rpti_pgsize(psi), > + addr, addr + psize); > + } > + > if (rc) > pr_err("KVM: TLB page invalidation hcall failed, rc=3D%ld\n", rc); > } > @@ -334,8 +345,14 @@ static void kvmppc_radix_flush_pwc(struct kvm *kvm, = unsigned int lpid) > return; > } > =20 > - rc =3D plpar_hcall_norets(H_TLB_INVALIDATE, H_TLBIE_P1_ENC(1, 0, 1), > - lpid, TLBIEL_INVAL_SET_LPID); > + if (!firmware_has_feature(FW_FEATURE_RPT_INVALIDATE)) > + rc =3D plpar_hcall_norets(H_TLB_INVALIDATE, H_TLBIE_P1_ENC(1, 0, 1), > + lpid, TLBIEL_INVAL_SET_LPID); > + else > + rc =3D pseries_rpt_invalidate(lpid, H_RPTI_TARGET_CMMU, > + H_RPTI_TYPE_NESTED | > + H_RPTI_TYPE_PWC, H_RPTI_PAGE_ALL, > + 0, -1UL); > if (rc) > pr_err("KVM: TLB PWC invalidation hcall failed, rc=3D%ld\n", rc); > } > diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3= s_hv_nested.c > index adcc8e26ef22..5601b7eb9b89 100644 > --- a/arch/powerpc/kvm/book3s_hv_nested.c > +++ b/arch/powerpc/kvm/book3s_hv_nested.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > =20 > static struct patb_entry *pseries_partition_tb; > =20 > @@ -444,8 +445,15 @@ static void kvmhv_flush_lpid(unsigned int lpid) > return; > } > =20 > - rc =3D plpar_hcall_norets(H_TLB_INVALIDATE, H_TLBIE_P1_ENC(2, 0, 1), > - lpid, TLBIEL_INVAL_SET_LPID); > + if (!firmware_has_feature(FW_FEATURE_RPT_INVALIDATE)) > + rc =3D plpar_hcall_norets(H_TLB_INVALIDATE, H_TLBIE_P1_ENC(2, 0, 1), > + lpid, TLBIEL_INVAL_SET_LPID); > + else > + rc =3D pseries_rpt_invalidate(lpid, H_RPTI_TARGET_CMMU, > + H_RPTI_TYPE_NESTED | > + H_RPTI_TYPE_TLB | H_RPTI_TYPE_PWC | > + H_RPTI_TYPE_PAT, > + H_RPTI_PAGE_ALL, 0, -1UL); > if (rc) > pr_err("KVM: TLB LPID invalidation hcall failed, rc=3D%ld\n", rc); > } --=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 --nNWWeyy0OjAtXMD1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAmBZVAkACgkQbDjKyiDZ s5KCYxAAvbX2KvujBQtx/xZsQHgUDAHv0CA5dMjMEN0FlAB0QqbcpVJCJGFreyhY AzXh6foFMl6hD9QSjQw56JkxddJeXiYwFtj0BJumGboBweDe8hVDiy5HZUV9JpY0 p+IldPEuqYf/RkvPmCEzM2Vwk67vyXpSTiW/sxanIP20Yz/GnE5z0ooF74ifWJfU P1tLFxw+jGuigQjm3LCpEmel3dXiZuT2X5gD52465VC2KbeBMBKvWFqkqX2jgi0J 1GSfMQwn6g2TDD5HYWKJ7BwRhs+bradhb+wuHrymgXg8csEz6xVGVtKEYMSCCmZ2 TOiY9lJFD4GU5ahGxtST8MOY1FyFjgmQTFo3d8SSCL6Vc0CbcNx5YPwQZ6RmpsSp y/vzqX767wzlnaMDIXSGhKoYcd9qOjx462ZshKn/CLJBYr7SbVILb+LXwaYJn7Cy SpjmTWUMc3u9zcCFTObgQ5Qrm4K2t+CUnBOrI7TQ3zw6PSAFLP969GqM5pMRCrQG 5/tyGwH30QuxPxfmOA2h9MD1fkVuF4bqWFB5eCsQFffCocb0Ov10j/U536BHvbbF JT36ZEzGRlwVODLoP1w9vUk2WJ6JNRfD9ngHZlThdGVmg9auSpMHXndTHcO2eM2S MSpbiylj+9TekFgDmsVBHMrLVChyOEVNCnMY2OC1Zxe0DuLgYbU= =qYMy -----END PGP SIGNATURE----- --nNWWeyy0OjAtXMD1--