KVM: PPC: Book3S HV: Use H_RPT_INVALIDATE in nested KVM

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.

Signed-off-by: Bharata B Rao <bharata@linux.ibm.com>
Reviewed-by: Fabiano Rosas <farosas@linux.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210621085003.904767-7-bharata@linux.ibm.com

diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c
index d909c06..b5905ae 100644 (file)
--- a/arch/powerpc/kvm/book3s_64_mmu_radix.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c
@@ -21,6 +21,7 @@
 #include <asm/pte-walk.h>
 #include <asm/ultravisor.h>
 #include <asm/kvm_book3s_uvmem.h>
+#include <asm/plpar_wrappers.h>
 
 /*
  * Supported radix tree geometry.
@@ -318,9 +319,19 @@ void kvmppc_radix_tlbie_page(struct kvm *kvm, unsigned long addr,
        }
 
        psi = shift_to_mmu_psize(pshift);
-       rb = addr | (mmu_get_ap(psi) << PPC_BITLSHIFT(58));
-       rc = plpar_hcall_norets(H_TLB_INVALIDATE, H_TLBIE_P1_ENC(0, 0, 1),
-                               lpid, rb);
+
+       if (!firmware_has_feature(FW_FEATURE_RPT_INVALIDATE)) {
+               rb = addr | (mmu_get_ap(psi) << PPC_BITLSHIFT(58));
+               rc = plpar_hcall_norets(H_TLB_INVALIDATE, H_TLBIE_P1_ENC(0, 0, 1),
+                                       lpid, rb);
+       } else {
+               rc = 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=%ld\n", rc);
 }
@@ -334,8 +345,14 @@ static void kvmppc_radix_flush_pwc(struct kvm *kvm, unsigned int lpid)
                return;
        }
 
-       rc = 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 = plpar_hcall_norets(H_TLB_INVALIDATE, H_TLBIE_P1_ENC(1, 0, 1),
+                                       lpid, TLBIEL_INVAL_SET_LPID);
+       else
+               rc = 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=%ld\n", rc);
 }

diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c
index 2e9958e..3a06ac0 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_nested.c
+++ b/arch/powerpc/kvm/book3s_hv_nested.c
@@ -19,6 +19,7 @@
 #include <asm/pgalloc.h>
 #include <asm/pte-walk.h>
 #include <asm/reg.h>
+#include <asm/plpar_wrappers.h>
 
 static struct patb_entry *pseries_partition_tb;
 
@@ -467,8 +468,15 @@ static void kvmhv_flush_lpid(unsigned int lpid)
                return;
        }
 
-       rc = 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 = plpar_hcall_norets(H_TLB_INVALIDATE, H_TLBIE_P1_ENC(2, 0, 1),
+                                       lpid, TLBIEL_INVAL_SET_LPID);
+       else
+               rc = 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=%ld\n", rc);
 }