[v2,05/10] target/ppc: Split out ppc_hash64_xlate

Message ID 20210621125115.67717-6-bruno.larsen@eldorado.org.br
State New
Headers show
Series
  • [v2,01/10] target/ppc: Remove PowerPCCPUClass.handle_mmu_fault
Related show

Commit Message

Bruno Piazera Larsen June 21, 2021, 12:51 p.m.
From: Richard Henderson <richard.henderson@linaro.org>


Mirror the interface of ppc_radix64_xlate, putting all of
the logic for hash64 translation into a single function.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 target/ppc/mmu-hash64.c | 125 +++++++++++++++++++---------------------
 1 file changed, 59 insertions(+), 66 deletions(-)

-- 
2.17.1

Comments

David Gibson June 24, 2021, 5:55 a.m. | #1
On Mon, Jun 21, 2021 at 09:51:10AM -0300, Bruno Larsen (billionai) wrote:
> From: Richard Henderson <richard.henderson@linaro.org>

> 

> Mirror the interface of ppc_radix64_xlate, putting all of

> the logic for hash64 translation into a single function.

> 

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Applied to ppc-for-6.1, thanks.

> ---

>  target/ppc/mmu-hash64.c | 125 +++++++++++++++++++---------------------

>  1 file changed, 59 insertions(+), 66 deletions(-)

> 

> diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c

> index 2febd369b1..c6b167b4dc 100644

> --- a/target/ppc/mmu-hash64.c

> +++ b/target/ppc/mmu-hash64.c

> @@ -873,8 +873,10 @@ static int build_vrma_slbe(PowerPCCPU *cpu, ppc_slb_t *slb)

>      return -1;

>  }

>  

> -int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,

> -                                MMUAccessType access_type, int mmu_idx)

> +static bool ppc_hash64_xlate(PowerPCCPU *cpu, vaddr eaddr,

> +                             MMUAccessType access_type,

> +                             hwaddr *raddrp, int *psizep, int *protp,

> +                             bool guest_visible)

>  {

>      CPUState *cs = CPU(cpu);

>      CPUPPCState *env = &cpu->env;

> @@ -918,9 +920,11 @@ int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,

>              slb = &vrma_slbe;

>              if (build_vrma_slbe(cpu, slb) != 0) {

>                  /* Invalid VRMA setup, machine check */

> -                cs->exception_index = POWERPC_EXCP_MCHECK;

> -                env->error_code = 0;

> -                return 1;

> +                if (guest_visible) {

> +                    cs->exception_index = POWERPC_EXCP_MCHECK;

> +                    env->error_code = 0;

> +                }

> +                return false;

>              }

>  

>              goto skip_slb_search;

> @@ -929,6 +933,9 @@ int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,

>  

>              /* Emulated old-style RMO mode, bounds check against RMLS */

>              if (raddr >= limit) {

> +                if (!guest_visible) {

> +                    return false;

> +                }

>                  switch (access_type) {

>                  case MMU_INST_FETCH:

>                      ppc_hash64_set_isi(cs, SRR1_PROTFAULT);

> @@ -943,15 +950,16 @@ int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,

>                  default:

>                      g_assert_not_reached();

>                  }

> -                return 1;

> +                return false;

>              }

>  

>              raddr |= env->spr[SPR_RMOR];

>          }

> -        tlb_set_page(cs, eaddr & TARGET_PAGE_MASK, raddr & TARGET_PAGE_MASK,

> -                     PAGE_READ | PAGE_WRITE | PAGE_EXEC, mmu_idx,

> -                     TARGET_PAGE_SIZE);

> -        return 0;

> +

> +        *raddrp = raddr;

> +        *protp = PAGE_READ | PAGE_WRITE | PAGE_EXEC;

> +        *psizep = TARGET_PAGE_BITS;

> +        return true;

>      }

>  

>      /* 2. Translation is on, so look up the SLB */

> @@ -964,6 +972,9 @@ int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,

>              exit(1);

>          }

>          /* Segment still not found, generate the appropriate interrupt */

> +        if (!guest_visible) {

> +            return false;

> +        }

>          switch (access_type) {

>          case MMU_INST_FETCH:

>              cs->exception_index = POWERPC_EXCP_ISEG;

> @@ -978,20 +989,25 @@ int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,

>          default:

>              g_assert_not_reached();

>          }

> -        return 1;

> +        return false;

>      }

>  

> -skip_slb_search:

> + skip_slb_search:

>  

>      /* 3. Check for segment level no-execute violation */

>      if (access_type == MMU_INST_FETCH && (slb->vsid & SLB_VSID_N)) {

> -        ppc_hash64_set_isi(cs, SRR1_NOEXEC_GUARD);

> -        return 1;

> +        if (guest_visible) {

> +            ppc_hash64_set_isi(cs, SRR1_NOEXEC_GUARD);

> +        }

> +        return false;

>      }

>  

>      /* 4. Locate the PTE in the hash table */

>      ptex = ppc_hash64_htab_lookup(cpu, slb, eaddr, &pte, &apshift);

>      if (ptex == -1) {

> +        if (!guest_visible) {

> +            return false;

> +        }

>          switch (access_type) {

>          case MMU_INST_FETCH:

>              ppc_hash64_set_isi(cs, SRR1_NOPTE);

> @@ -1005,7 +1021,7 @@ skip_slb_search:

>          default:

>              g_assert_not_reached();

>          }

> -        return 1;

> +        return false;

>      }

>      qemu_log_mask(CPU_LOG_MMU,

>                    "found PTE at index %08" HWADDR_PRIx "\n", ptex);

> @@ -1021,6 +1037,9 @@ skip_slb_search:

>      if (need_prot & ~prot) {

>          /* Access right violation */

>          qemu_log_mask(CPU_LOG_MMU, "PTE access rejected\n");

> +        if (!guest_visible) {

> +            return false;

> +        }

>          if (access_type == MMU_INST_FETCH) {

>              int srr1 = 0;

>              if (PAGE_EXEC & ~exec_prot) {

> @@ -1045,7 +1064,7 @@ skip_slb_search:

>              }

>              ppc_hash64_set_dsi(cs, eaddr, dsisr);

>          }

> -        return 1;

> +        return false;

>      }

>  

>      qemu_log_mask(CPU_LOG_MMU, "PTE access granted !\n");

> @@ -1069,66 +1088,40 @@ skip_slb_search:

>  

>      /* 7. Determine the real address from the PTE */

>  

> -    raddr = deposit64(pte.pte1 & HPTE64_R_RPN, 0, apshift, eaddr);

> -

> -    tlb_set_page(cs, eaddr & TARGET_PAGE_MASK, raddr & TARGET_PAGE_MASK,

> -                 prot, mmu_idx, 1ULL << apshift);

> -

> -    return 0;

> +    *raddrp = deposit64(pte.pte1 & HPTE64_R_RPN, 0, apshift, eaddr);

> +    *protp = prot;

> +    *psizep = apshift;

> +    return true;

>  }

>  

> -hwaddr ppc_hash64_get_phys_page_debug(PowerPCCPU *cpu, target_ulong addr)

> +int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,

> +                                MMUAccessType access_type, int mmu_idx)

>  {

> -    CPUPPCState *env = &cpu->env;

> -    ppc_slb_t vrma_slbe;

> -    ppc_slb_t *slb;

> -    hwaddr ptex, raddr;

> -    ppc_hash_pte64_t pte;

> -    unsigned apshift;

> +    CPUState *cs = CPU(cpu);

> +    int page_size, prot;

> +    hwaddr raddr;

>  

> -    /* Handle real mode */

> -    if (msr_dr == 0) {

> -        /* In real mode the top 4 effective address bits are ignored */

> -        raddr = addr & 0x0FFFFFFFFFFFFFFFULL;

> +    if (!ppc_hash64_xlate(cpu, eaddr, access_type, &raddr,

> +                          &page_size, &prot, true)) {

> +        return 1;

> +    }

>  

> -        if (cpu->vhyp) {

> -            /*

> -             * In virtual hypervisor mode, there's nothing to do:

> -             *   EA == GPA == qemu guest address

> -             */

> -            return raddr;

> -        } else if ((msr_hv || !env->has_hv_mode) && !(addr >> 63)) {

> -            /* In HV mode, add HRMOR if top EA bit is clear */

> -            return raddr | env->spr[SPR_HRMOR];

> -        } else if (ppc_hash64_use_vrma(env)) {

> -            /* Emulated VRMA mode */

> -            slb = &vrma_slbe;

> -            if (build_vrma_slbe(cpu, slb) != 0) {

> -                return -1;

> -            }

> -        } else {

> -            target_ulong limit = rmls_limit(cpu);

> +    tlb_set_page(cs, eaddr & TARGET_PAGE_MASK, raddr & TARGET_PAGE_MASK,

> +                 prot, mmu_idx, 1UL << page_size);

> +    return 0;

> +}

>  

> -            /* Emulated old-style RMO mode, bounds check against RMLS */

> -            if (raddr >= limit) {

> -                return -1;

> -            }

> -            return raddr | env->spr[SPR_RMOR];

> -        }

> -    } else {

> -        slb = slb_lookup(cpu, addr);

> -        if (!slb) {

> -            return -1;

> -        }

> -    }

> +hwaddr ppc_hash64_get_phys_page_debug(PowerPCCPU *cpu, target_ulong eaddr)

> +{

> +    int psize, prot;

> +    hwaddr raddr;

>  

> -    ptex = ppc_hash64_htab_lookup(cpu, slb, addr, &pte, &apshift);

> -    if (ptex == -1) {

> +    if (!ppc_hash64_xlate(cpu, eaddr, MMU_DATA_LOAD, &raddr,

> +                          &psize, &prot, false)) {

>          return -1;

>      }

>  

> -    return deposit64(pte.pte1 & HPTE64_R_RPN, 0, apshift, addr)

> -        & TARGET_PAGE_MASK;

> +    return raddr & TARGET_PAGE_MASK;

>  }

>  

>  void ppc_hash64_tlb_flush_hpte(PowerPCCPU *cpu, target_ulong ptex,


-- 
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

Patch

diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c
index 2febd369b1..c6b167b4dc 100644
--- a/target/ppc/mmu-hash64.c
+++ b/target/ppc/mmu-hash64.c
@@ -873,8 +873,10 @@  static int build_vrma_slbe(PowerPCCPU *cpu, ppc_slb_t *slb)
     return -1;
 }
 
-int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
-                                MMUAccessType access_type, int mmu_idx)
+static bool ppc_hash64_xlate(PowerPCCPU *cpu, vaddr eaddr,
+                             MMUAccessType access_type,
+                             hwaddr *raddrp, int *psizep, int *protp,
+                             bool guest_visible)
 {
     CPUState *cs = CPU(cpu);
     CPUPPCState *env = &cpu->env;
@@ -918,9 +920,11 @@  int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
             slb = &vrma_slbe;
             if (build_vrma_slbe(cpu, slb) != 0) {
                 /* Invalid VRMA setup, machine check */
-                cs->exception_index = POWERPC_EXCP_MCHECK;
-                env->error_code = 0;
-                return 1;
+                if (guest_visible) {
+                    cs->exception_index = POWERPC_EXCP_MCHECK;
+                    env->error_code = 0;
+                }
+                return false;
             }
 
             goto skip_slb_search;
@@ -929,6 +933,9 @@  int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
 
             /* Emulated old-style RMO mode, bounds check against RMLS */
             if (raddr >= limit) {
+                if (!guest_visible) {
+                    return false;
+                }
                 switch (access_type) {
                 case MMU_INST_FETCH:
                     ppc_hash64_set_isi(cs, SRR1_PROTFAULT);
@@ -943,15 +950,16 @@  int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
                 default:
                     g_assert_not_reached();
                 }
-                return 1;
+                return false;
             }
 
             raddr |= env->spr[SPR_RMOR];
         }
-        tlb_set_page(cs, eaddr & TARGET_PAGE_MASK, raddr & TARGET_PAGE_MASK,
-                     PAGE_READ | PAGE_WRITE | PAGE_EXEC, mmu_idx,
-                     TARGET_PAGE_SIZE);
-        return 0;
+
+        *raddrp = raddr;
+        *protp = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
+        *psizep = TARGET_PAGE_BITS;
+        return true;
     }
 
     /* 2. Translation is on, so look up the SLB */
@@ -964,6 +972,9 @@  int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
             exit(1);
         }
         /* Segment still not found, generate the appropriate interrupt */
+        if (!guest_visible) {
+            return false;
+        }
         switch (access_type) {
         case MMU_INST_FETCH:
             cs->exception_index = POWERPC_EXCP_ISEG;
@@ -978,20 +989,25 @@  int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
         default:
             g_assert_not_reached();
         }
-        return 1;
+        return false;
     }
 
-skip_slb_search:
+ skip_slb_search:
 
     /* 3. Check for segment level no-execute violation */
     if (access_type == MMU_INST_FETCH && (slb->vsid & SLB_VSID_N)) {
-        ppc_hash64_set_isi(cs, SRR1_NOEXEC_GUARD);
-        return 1;
+        if (guest_visible) {
+            ppc_hash64_set_isi(cs, SRR1_NOEXEC_GUARD);
+        }
+        return false;
     }
 
     /* 4. Locate the PTE in the hash table */
     ptex = ppc_hash64_htab_lookup(cpu, slb, eaddr, &pte, &apshift);
     if (ptex == -1) {
+        if (!guest_visible) {
+            return false;
+        }
         switch (access_type) {
         case MMU_INST_FETCH:
             ppc_hash64_set_isi(cs, SRR1_NOPTE);
@@ -1005,7 +1021,7 @@  skip_slb_search:
         default:
             g_assert_not_reached();
         }
-        return 1;
+        return false;
     }
     qemu_log_mask(CPU_LOG_MMU,
                   "found PTE at index %08" HWADDR_PRIx "\n", ptex);
@@ -1021,6 +1037,9 @@  skip_slb_search:
     if (need_prot & ~prot) {
         /* Access right violation */
         qemu_log_mask(CPU_LOG_MMU, "PTE access rejected\n");
+        if (!guest_visible) {
+            return false;
+        }
         if (access_type == MMU_INST_FETCH) {
             int srr1 = 0;
             if (PAGE_EXEC & ~exec_prot) {
@@ -1045,7 +1064,7 @@  skip_slb_search:
             }
             ppc_hash64_set_dsi(cs, eaddr, dsisr);
         }
-        return 1;
+        return false;
     }
 
     qemu_log_mask(CPU_LOG_MMU, "PTE access granted !\n");
@@ -1069,66 +1088,40 @@  skip_slb_search:
 
     /* 7. Determine the real address from the PTE */
 
-    raddr = deposit64(pte.pte1 & HPTE64_R_RPN, 0, apshift, eaddr);
-
-    tlb_set_page(cs, eaddr & TARGET_PAGE_MASK, raddr & TARGET_PAGE_MASK,
-                 prot, mmu_idx, 1ULL << apshift);
-
-    return 0;
+    *raddrp = deposit64(pte.pte1 & HPTE64_R_RPN, 0, apshift, eaddr);
+    *protp = prot;
+    *psizep = apshift;
+    return true;
 }
 
-hwaddr ppc_hash64_get_phys_page_debug(PowerPCCPU *cpu, target_ulong addr)
+int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
+                                MMUAccessType access_type, int mmu_idx)
 {
-    CPUPPCState *env = &cpu->env;
-    ppc_slb_t vrma_slbe;
-    ppc_slb_t *slb;
-    hwaddr ptex, raddr;
-    ppc_hash_pte64_t pte;
-    unsigned apshift;
+    CPUState *cs = CPU(cpu);
+    int page_size, prot;
+    hwaddr raddr;
 
-    /* Handle real mode */
-    if (msr_dr == 0) {
-        /* In real mode the top 4 effective address bits are ignored */
-        raddr = addr & 0x0FFFFFFFFFFFFFFFULL;
+    if (!ppc_hash64_xlate(cpu, eaddr, access_type, &raddr,
+                          &page_size, &prot, true)) {
+        return 1;
+    }
 
-        if (cpu->vhyp) {
-            /*
-             * In virtual hypervisor mode, there's nothing to do:
-             *   EA == GPA == qemu guest address
-             */
-            return raddr;
-        } else if ((msr_hv || !env->has_hv_mode) && !(addr >> 63)) {
-            /* In HV mode, add HRMOR if top EA bit is clear */
-            return raddr | env->spr[SPR_HRMOR];
-        } else if (ppc_hash64_use_vrma(env)) {
-            /* Emulated VRMA mode */
-            slb = &vrma_slbe;
-            if (build_vrma_slbe(cpu, slb) != 0) {
-                return -1;
-            }
-        } else {
-            target_ulong limit = rmls_limit(cpu);
+    tlb_set_page(cs, eaddr & TARGET_PAGE_MASK, raddr & TARGET_PAGE_MASK,
+                 prot, mmu_idx, 1UL << page_size);
+    return 0;
+}
 
-            /* Emulated old-style RMO mode, bounds check against RMLS */
-            if (raddr >= limit) {
-                return -1;
-            }
-            return raddr | env->spr[SPR_RMOR];
-        }
-    } else {
-        slb = slb_lookup(cpu, addr);
-        if (!slb) {
-            return -1;
-        }
-    }
+hwaddr ppc_hash64_get_phys_page_debug(PowerPCCPU *cpu, target_ulong eaddr)
+{
+    int psize, prot;
+    hwaddr raddr;
 
-    ptex = ppc_hash64_htab_lookup(cpu, slb, addr, &pte, &apshift);
-    if (ptex == -1) {
+    if (!ppc_hash64_xlate(cpu, eaddr, MMU_DATA_LOAD, &raddr,
+                          &psize, &prot, false)) {
         return -1;
     }
 
-    return deposit64(pte.pte1 & HPTE64_R_RPN, 0, apshift, addr)
-        & TARGET_PAGE_MASK;
+    return raddr & TARGET_PAGE_MASK;
 }
 
 void ppc_hash64_tlb_flush_hpte(PowerPCCPU *cpu, target_ulong ptex,