powerpc/mm: Use UV_WRITE_PATE ucall to register a PATE

When Ultravisor (UV) is enabled, the partition table is stored in secure
memory and can only be accessed via the UV. The Hypervisor (HV) however
maintains a copy of the partition table in normal memory to allow Nest MMU
translations to occur (for normal VMs). The HV copy includes partition
table entries (PATE)s for secure VMs which would currently be unused
(Nest MMU translations cannot access secure memory) but they would be
needed as we add functionality.

This patch adds the UV_WRITE_PATE ucall which is used to update the PATE
for a VM (both normal and secure) when Ultravisor is enabled.

Signed-off-by: Michael Anderson <andmike@linux.ibm.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
[ cclaudio: Write the PATE in HV's table before doing that in UV's ]
Signed-off-by: Claudio Carvalho <cclaudio@linux.ibm.com>
Reviewed-by: Ryan Grimm <grimm@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190822034838.27876-5-cclaudio@linux.ibm.com

diff --git a/arch/powerpc/include/asm/ultravisor-api.h b/arch/powerpc/include/asm/ultravisor-api.h
index 88ffa78f9d619050d08bce732025735248ac1533..8cd49abff4f33049d68d27445de78e28556a74aa 100644 (file)
--- a/arch/powerpc/include/asm/ultravisor-api.h
+++ b/arch/powerpc/include/asm/ultravisor-api.h
@@ -11,6 +11,7 @@
 #include <asm/hvcall.h>
 
 /* Return codes */
+#define U_BUSY                 H_BUSY
 #define U_FUNCTION             H_FUNCTION
 #define U_NOT_AVAILABLE                H_NOT_AVAILABLE
 #define U_P2                   H_P2
@@ -18,6 +19,10 @@
 #define U_P4                   H_P4
 #define U_P5                   H_P5
 #define U_PARAMETER            H_PARAMETER
+#define U_PERMISSION           H_PERMISSION
 #define U_SUCCESS              H_SUCCESS
 
+/* opcodes */
+#define UV_WRITE_PATE                  0xF104
+
 #endif /* _ASM_POWERPC_ULTRAVISOR_API_H */

diff --git a/arch/powerpc/include/asm/ultravisor.h b/arch/powerpc/include/asm/ultravisor.h
index dc6e1ea198f2e1e0887638ad16cc4d04c063c4e8..6fe1f365dec8dbb5eab674e22d359a654e041a87 100644 (file)
--- a/arch/powerpc/include/asm/ultravisor.h
+++ b/arch/powerpc/include/asm/ultravisor.h
@@ -8,7 +8,15 @@
 #ifndef _ASM_POWERPC_ULTRAVISOR_H
 #define _ASM_POWERPC_ULTRAVISOR_H
 
+#include <asm/asm-prototypes.h>
+#include <asm/ultravisor-api.h>
+
 int early_init_dt_scan_ultravisor(unsigned long node, const char *uname,
                                  int depth, void *data);
 
+static inline int uv_register_pate(u64 lpid, u64 dw0, u64 dw1)
+{
+       return ucall_norets(UV_WRITE_PATE, lpid, dw0, dw1);
+}
+
 #endif /* _ASM_POWERPC_ULTRAVISOR_H */

diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c
index 7d0e0d0d22c4053be6823d70442f42944b19f1a4..4173f6931009f7cf60d2fab86c11c89780aa91a5 100644 (file)
--- a/arch/powerpc/mm/book3s64/pgtable.c
+++ b/arch/powerpc/mm/book3s64/pgtable.c
@@ -12,6 +12,8 @@
 #include <asm/tlb.h>
 #include <asm/trace.h>
 #include <asm/powernv.h>
+#include <asm/firmware.h>
+#include <asm/ultravisor.h>
 
 #include <mm/mmu_decl.h>
 #include <trace/events/thp.h>
@@ -209,21 +211,10 @@ void __init mmu_partition_table_init(void)
        powernv_set_nmmu_ptcr(ptcr);
 }
 
-void mmu_partition_table_set_entry(unsigned int lpid, unsigned long dw0,
-                                  unsigned long dw1)
+static void flush_partition(unsigned int lpid, bool radix)
 {
-       unsigned long old = be64_to_cpu(partition_tb[lpid].patb0);
-
-       partition_tb[lpid].patb0 = cpu_to_be64(dw0);
-       partition_tb[lpid].patb1 = cpu_to_be64(dw1);
-
-       /*
-        * Global flush of TLBs and partition table caches for this lpid.
-        * The type of flush (hash or radix) depends on what the previous
-        * use of this partition ID was, not the new use.
-        */
        asm volatile("ptesync" : : : "memory");
-       if (old & PATB_HR) {
+       if (radix) {
                asm volatile(PPC_TLBIE_5(%0,%1,2,0,1) : :
                             "r" (TLBIEL_INVAL_SET_LPID), "r" (lpid));
                asm volatile(PPC_TLBIE_5(%0,%1,2,1,1) : :
@@ -237,6 +228,39 @@ void mmu_partition_table_set_entry(unsigned int lpid, unsigned long dw0,
        /* do we need fixup here ?*/
        asm volatile("eieio; tlbsync; ptesync" : : : "memory");
 }
+
+void mmu_partition_table_set_entry(unsigned int lpid, unsigned long dw0,
+                                 unsigned long dw1)
+{
+       unsigned long old = be64_to_cpu(partition_tb[lpid].patb0);
+
+       /*
+        * When ultravisor is enabled, the partition table is stored in secure
+        * memory and can only be accessed doing an ultravisor call. However, we
+        * maintain a copy of the partition table in normal memory to allow Nest
+        * MMU translations to occur (for normal VMs).
+        *
+        * Therefore, here we always update partition_tb, regardless of whether
+        * we are running under an ultravisor or not.
+        */
+       partition_tb[lpid].patb0 = cpu_to_be64(dw0);
+       partition_tb[lpid].patb1 = cpu_to_be64(dw1);
+
+       /*
+        * If ultravisor is enabled, we do an ultravisor call to register the
+        * partition table entry (PATE), which also do a global flush of TLBs
+        * and partition table caches for the lpid. Otherwise, just do the
+        * flush. The type of flush (hash or radix) depends on what the previous
+        * use of the partition ID was, not the new use.
+        */
+       if (firmware_has_feature(FW_FEATURE_ULTRAVISOR)) {
+               uv_register_pate(lpid, dw0, dw1);
+               pr_info("PATE registered by ultravisor: dw0 = 0x%lx, dw1 = 0x%lx\n",
+                       dw0, dw1);
+       } else {
+               flush_partition(lpid, (old & PATB_HR));
+       }
+}
 EXPORT_SYMBOL_GPL(mmu_partition_table_set_entry);
 
 static pmd_t *get_pmd_from_cache(struct mm_struct *mm)