target/ppc: Add support for Radix partition-scoped translation
v3 cover target/ppc: Add support for Radix partition-scoped translation
Hello,
The Radix tree translation model currently supports process-scoped translation for the PowerNV machine (Hypervisor mode) and for the pSeries machine (Guest mode). Guests running under an emulated Hypervisor (PowerNV machine) require a new type of Radix translation, called partition-scoped, which is missing today.
The Radix tree translation is a 2 steps process. The first step, process-scoped translation, converts an effective Address to a guest real address, and the second step, partition-scoped translation, converts a guest real address to a host real address.
There are difference cases to covers :
* Hypervisor real mode access: no Radix translation.
* Hypervisor or host application access (quadrant 0 and 3) with relocation on: process-scoped translation.
* Guest OS real mode access: only partition-scoped translation.
* Guest OS real or guest application access (quadrant 0 and 3) with relocation on: both process-scoped translation and partition-scoped translations.
* Hypervisor access in quadrant 1 and 2 with relocation on: both process-scoped translation and partition-scoped translations.
The radix tree partition-scoped translation is performed using tables pointed to by the first double-word of the Partition Table Entries and process-scoped translation uses tables pointed to by the Process Table Entries (second double-word of the Partition Table Entries).
Both partition-scoped and process-scoped translations process are identical and thus the radix tree traversing code is largely reused. However, errors in partition-scoped translations generate hypervisor exceptions.
Based on work from Suraj Jitindar Singh <[email protected]>
Thanks,
C.
Changes since v2:
- removed the changes on the routines raising the exceptions to take a 'cause_excp' bool.
Changes since v1:
- removed checks (cpu->vhyp && lpid == 0)
- changed ppc_radix64_walk_tree() and ppc_radix64_next_level() to use an 'AddressSpace *'
- moved call to ppc_radix64_get_fully_qualified_addr() under ppc_radix64_xlate()
- reworked the prototype of the routines raising the exceptions to take a 'cause_excp' bool.
- re-introduced an extra test on nls in ppc_radix64_walk_tree()
Cédric Le Goater (4):
target/ppc: Introduce ppc_radix64_xlate() for Radix tree translation target/ppc: Extend ppc_radix64_check_prot() with a 'partition_scoped'
bool
target/ppc: Rework ppc_radix64_walk_tree() for partition-scoped
translation
target/ppc: Add support for Radix partition-scoped translation
target/ppc/cpu.h | 3 + target/ppc/excp_helper.c | 3 +- target/ppc/mmu-radix64.c | 426 ++++++++++++++++++++++++++++----------- 3 files changed, 312 insertions(+), 120 deletions(-)
Signature · 1 line
2.21.1
PATCH v3 1/4 target/ppc: Introduce ppc_radix64_xlate() for Radix tree translation
This is moving code under a new ppc_radix64_xlate() routine shared by the MMU Radix page fault handler and the 'get_phys_page_debug' PPC callback. The difference being that 'get_phys_page_debug' does not generate exceptions.
The specific part of process-scoped Radix translation is moved under ppc_radix64_process_scoped_xlate() in preparation of the future support for partition-scoped Radix translation. Routines raising the exceptions now take a 'cause_excp' bool to cover the 'get_phys_page_debug' case.
It should be functionally equivalent.
--- target/ppc/mmu-radix64.c | 221 ++++++++++++++++++++++----------------- 1 file changed, 124 insertions(+), 97 deletions(-)
target/ppc/mmu-radix64.c +124 -97
@@ -84,7 +84,7 @@ static void ppc_radix64_raise_segi(PowerPCCPU *cpu, int rwx, vaddr eaddr) }static void ppc_radix64_raise_si (PowerPCCPU *cpu,int rwx,vaddr eaddr, -uint32_t cause) +uint32_t cause) {CPUState *cs =CPU (cpu);CPUPPCState *env = &cpu->env;
@@ -219,17 +219,127 @@ static bool validate_pate(PowerPCCPU *cpu, uint64_t lpid, ppc_v3_pate_t *pate)return true; } +static int ppc_radix64_process_scoped_xlate (PowerPCCPU *cpu,int rwx, +vaddr eaddr,uint64_t pid, +ppc_v3_pate_t pate,hwaddr *g_raddr, +int *g_prot,int *g_page_size, +bool cause_excp) +{ +CPUState *cs =CPU (cpu); +uint64_t offset, size, prtbe_addr, prtbe0, pte; +int fault_cause =0 ; +hwaddr pte_addr; + +/* Index Process Table by PID to Find Corresponding Process Table Entry */ + offset = pid *sizeof (struct prtb_entry ); + size =1ULL << ((pate.dw1 &PATE1_R_PRTS ) +12 ); +if (offset >= size) { +/* offset exceeds size of the process table */ +if (cause_excp) { +ppc_radix64_raise_si (cpu, rwx, eaddr,DSISR_NOPTE ); + } +return 1 ; + } + prtbe_addr = (pate.dw1 &PATE1_R_PRTB ) + offset; + prtbe0 =ldq_phys (cs->as, prtbe_addr); + +/* Walk Radix Tree from Process Table Entry to Convert EA to RA */ + *g_page_size =PRTBE_R_GET_RTS (prtbe0); + pte =ppc_radix64_walk_tree (cpu, eaddr &R_EADDR_MASK , + prtbe0 &PRTBE_R_RPDB , prtbe0 &PRTBE_R_RPDS , + g_raddr, g_page_size, &fault_cause, &pte_addr); + +if (!(pte &R_PTE_VALID ) || +ppc_radix64_check_prot (cpu, rwx, pte, &fault_cause, g_prot)) { +/* No valid pte or access denied due to protection */ +if (cause_excp) { +ppc_radix64_raise_si (cpu, rwx, eaddr, fault_cause); + } +return 1 ; + } + +ppc_radix64_set_rc (cpu, rwx, pte, pte_addr, g_prot); + +return 0 ; +} + +static int ppc_radix64_xlate (PowerPCCPU *cpu,vaddr eaddr,int rwx, +bool relocation, +hwaddr *raddr,int *psizep,int *protp, +bool cause_excp) +{ +uint64_t lpid =0 , pid =0 ; +ppc_v3_pate_t pate; +int psize, prot; +hwaddr g_raddr; + +/* Virtual Mode Access - get the fully qualified address */ +if (!ppc_radix64_get_fully_qualified_addr (&cpu->env, eaddr, &lpid, &pid)) { +if (cause_excp) { +ppc_radix64_raise_segi (cpu, rwx, eaddr); + } +return 1 ; + } + +/* Get Process Table */ +if (cpu->vhyp) { +PPCVirtualHypervisorClass *vhc; + vhc =PPC_VIRTUAL_HYPERVISOR_GET_CLASS (cpu->vhyp); + vhc->get_pate (cpu->vhyp, &pate); + }else { +if (!ppc64_v3_get_pate (cpu, lpid, &pate)) { +if (cause_excp) { +ppc_radix64_raise_si (cpu, rwx, eaddr,DSISR_NOPTE ); + } +return 1 ; + } +if (!validate_pate (cpu, lpid, &pate)) { +if (cause_excp) { +ppc_radix64_raise_si (cpu, rwx, eaddr,DSISR_R_BADCONFIG ); + } +return 1 ; + } +/* We don't support guest mode yet */ +if (lpid !=0 ) { +error_report ("PowerNV guest support Unimplemented" ); +exit (1 ); + } + } + + *psizep =INT_MAX ; + *protp =PAGE_READ |PAGE_WRITE |PAGE_EXEC ; + +/* +* Perform process-scoped translation if relocation enabled. +* +* - Translates an effective address to a host real address in +* quadrants 0 and 3 when HV=1. +*/ +if (relocation) { +int ret =ppc_radix64_process_scoped_xlate (cpu, rwx, eaddr, pid, + pate, &g_raddr, &prot, + &psize, cause_excp); +if (ret) { +return ret; + } + *psizep =MIN (*psizep, psize); + *protp &= prot; + }else { + g_raddr = eaddr &R_EADDR_MASK ; + } + + *raddr = g_raddr; +return 0 ; +} +int ppc_radix64_handle_mmu_fault (PowerPCCPU *cpu,vaddr eaddr,int rwx,int mmu_idx) {CPUState *cs =CPU (cpu);CPUPPCState *env = &cpu->env; -PPCVirtualHypervisorClass *vhc; -hwaddr raddr, pte_addr; -uint64_t lpid =0 , pid =0 , offset, size, prtbe0, pte; -int page_size, prot, fault_cause =0 ; -ppc_v3_pate_t pate; +int page_size, prot;bool relocation; +hwaddr raddr;assert (!(msr_hv && cpu->vhyp));assert ((rwx ==0 ) || (rwx ==1 ) || (rwx ==2 ));
@@ -262,55 +372,12 @@ int ppc_radix64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr, int rwx, TARGET_FMT_lx "\n", env->spr[SPR_LPCR]); } -/* Virtual Mode Access - get the fully qualified address */ -if (!ppc_radix64_get_fully_qualified_addr (env, eaddr, &lpid, &pid)) { -ppc_radix64_raise_segi (cpu, rwx, eaddr); +/* Translate eaddr to raddr (where raddr is addr qemu needs for access) */ +if (ppc_radix64_xlate (cpu, eaddr, rwx, relocation, &raddr, + &page_size, &prot,1 )) {return 1 ; } -/* Get Process Table */ -if (cpu->vhyp) { - vhc =PPC_VIRTUAL_HYPERVISOR_GET_CLASS (cpu->vhyp); - vhc->get_pate (cpu->vhyp, &pate); - }else { -if (!ppc64_v3_get_pate (cpu, lpid, &pate)) { -ppc_radix64_raise_si (cpu, rwx, eaddr,DSISR_NOPTE ); -return 1 ; - } -if (!validate_pate (cpu, lpid, &pate)) { -ppc_radix64_raise_si (cpu, rwx, eaddr,DSISR_R_BADCONFIG ); - } -/* We don't support guest mode yet */ -if (lpid !=0 ) { -error_report ("PowerNV guest support Unimplemented" ); -exit (1 ); - } - } - -/* Index Process Table by PID to Find Corresponding Process Table Entry */ - offset = pid *sizeof (struct prtb_entry ); - size =1ULL << ((pate.dw1 &PATE1_R_PRTS ) +12 ); -if (offset >= size) { -/* offset exceeds size of the process table */ -ppc_radix64_raise_si (cpu, rwx, eaddr,DSISR_NOPTE ); -return 1 ; - } - prtbe0 =ldq_phys (cs->as, (pate.dw1 &PATE1_R_PRTB ) + offset); - -/* Walk Radix Tree from Process Table Entry to Convert EA to RA */ - page_size =PRTBE_R_GET_RTS (prtbe0); - pte =ppc_radix64_walk_tree (cpu, eaddr &R_EADDR_MASK , - prtbe0 &PRTBE_R_RPDB , prtbe0 &PRTBE_R_RPDS , - &raddr, &page_size, &fault_cause, &pte_addr); -if (!pte ||ppc_radix64_check_prot (cpu, rwx, pte, &fault_cause, &prot)) { -/* Couldn't get pte or access denied due to protection */ -ppc_radix64_raise_si (cpu, rwx, eaddr, fault_cause); -return 1 ; - } - -/* Update Reference and Change Bits */ -ppc_radix64_set_rc (cpu, rwx, pte, pte_addr, &prot); -tlb_set_page (cs, eaddr &TARGET_PAGE_MASK , raddr &TARGET_PAGE_MASK , prot, mmu_idx,1UL << page_size);return 0 ;
@@ -318,58 +385,18 @@ int ppc_radix64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr, int rwx,hwaddr ppc_radix64_get_phys_page_debug (PowerPCCPU *cpu,target_ulong eaddr) { -CPUState *cs =CPU (cpu);CPUPPCState *env = &cpu->env; -PPCVirtualHypervisorClass *vhc; -hwaddr raddr, pte_addr; -uint64_t lpid =0 , pid =0 , offset, size, prtbe0, pte; -int page_size, fault_cause =0 ; -ppc_v3_pate_t pate; +int psize, prot; +hwaddr raddr;/* Handle Real Mode */ -if (msr_dr ==0 ) { +if ((msr_dr ==0 ) && (msr_hv || cpu->vhyp)) {/* In real mode top 4 effective addr bits (mostly) ignored */ return eaddr &0x0FFFFFFFFFFFFFFFULL ; } -/* Virtual Mode Access - get the fully qualified address */ -if (!ppc_radix64_get_fully_qualified_addr (env, eaddr, &lpid, &pid)) { -return -1 ; - } - -/* Get Process Table */ -if (cpu->vhyp) { - vhc =PPC_VIRTUAL_HYPERVISOR_GET_CLASS (cpu->vhyp); - vhc->get_pate (cpu->vhyp, &pate); - }else { -if (!ppc64_v3_get_pate (cpu, lpid, &pate)) { -return -1 ; - } -if (!validate_pate (cpu, lpid, &pate)) { -return -1 ; - } -/* We don't support guest mode yet */ -if (lpid !=0 ) { -error_report ("PowerNV guest support Unimplemented" ); -exit (1 ); - } - } - -/* Index Process Table by PID to Find Corresponding Process Table Entry */ - offset = pid *sizeof (struct prtb_entry ); - size =1ULL << ((pate.dw1 &PATE1_R_PRTS ) +12 ); -if (offset >= size) { -/* offset exceeds size of the process table */ -return -1 ; - } - prtbe0 =ldq_phys (cs->as, (pate.dw1 &PATE1_R_PRTB ) + offset); - -/* Walk Radix Tree from Process Table Entry to Convert EA to RA */ - page_size =PRTBE_R_GET_RTS (prtbe0); - pte =ppc_radix64_walk_tree (cpu, eaddr &R_EADDR_MASK , - prtbe0 &PRTBE_R_RPDB , prtbe0 &PRTBE_R_RPDS , - &raddr, &page_size, &fault_cause, &pte_addr); -if (!pte) { +if (ppc_radix64_xlate (cpu, eaddr,0 , msr_dr, &raddr, &psize, + &prot,0 )) {return -1 ; }
Signature · 1 line
2.21.1
PATCH v3 2/4 target/ppc: Extend ppc_radix64_check_prot() with a 'partition_scoped' bool
In reply to Cédric Le GoaterThis prepares ground for partition-scoped Radix translation.
--- target/ppc/mmu-radix64.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
target/ppc/mmu-radix64.c +6 -5
@@ -105,7 +105,8 @@ static void ppc_radix64_raise_si(PowerPCCPU *cpu, int rwx, vaddr eaddr,static bool ppc_radix64_check_prot (PowerPCCPU *cpu,int rwx,uint64_t pte, -int *fault_cause,int *prot) +int *fault_cause,int *prot, +bool partition_scoped) {CPUPPCState *env = &cpu->env;const int need_prot[] = {PAGE_READ ,PAGE_WRITE ,PAGE_EXEC };
@@ -121,11 +122,11 @@ static bool ppc_radix64_check_prot(PowerPCCPU *cpu, int rwx, uint64_t pte, }/* Determine permissions allowed by Encoded Access Authority */ -if ((pte &R_PTE_EAA_PRIV ) && msr_pr) {/* Insufficient Privilege */ +if (!partition_scoped && (pte &R_PTE_EAA_PRIV ) && msr_pr) { *prot =0 ; - }else if (msr_pr || (pte &R_PTE_EAA_PRIV )) { + }else if (msr_pr || (pte &R_PTE_EAA_PRIV ) || partition_scoped) { *prot =ppc_radix64_get_prot_eaa (pte); - }else {/* !msr_pr && !(pte & R_PTE_EAA_PRIV) */ + }else {/* !msr_pr && !(pte & R_PTE_EAA_PRIV) && !partition_scoped */ *prot =ppc_radix64_get_prot_eaa (pte); *prot &=ppc_radix64_get_prot_amr (cpu);/* Least combined permissions */ }
@@ -250,7 +251,7 @@ static int ppc_radix64_process_scoped_xlate(PowerPCCPU *cpu, int rwx, g_raddr, g_page_size, &fault_cause, &pte_addr);if (!(pte &R_PTE_VALID ) || -ppc_radix64_check_prot (cpu, rwx, pte, &fault_cause, g_prot)) { +ppc_radix64_check_prot (cpu, rwx, pte, &fault_cause, g_prot, false)) {/* No valid pte or access denied due to protection */ if (cause_excp) {ppc_radix64_raise_si (cpu, rwx, eaddr, fault_cause);
Signature · 1 line
2.21.1
PATCH v3 3/4 target/ppc: Rework ppc_radix64_walk_tree() for partition-scoped translation
In reply to Cédric Le GoaterThe ppc_radix64_walk_tree() routine walks through the nested radix tables to look for a PTE.
Split it in two and introduce a new routine ppc_radix64_next_level() which we will use for partition-scoped Radix translation when translating the process tree addresses. Use also a 'AddressSpace *as' parameter instead of a 'PowerPCCPU *cpu'.
--- target/ppc/mmu-radix64.c | 58 +++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 19 deletions(-)
target/ppc/mmu-radix64.c +39 -19
@@ -163,44 +163,64 @@ static void ppc_radix64_set_rc(PowerPCCPU *cpu, int rwx, uint64_t pte, } } -static uint64_t ppc_radix64_walk_tree (PowerPCCPU *cpu,vaddr eaddr, -uint64_t base_addr,uint64_t nls, -hwaddr *raddr,int *psize, -int *fault_cause,hwaddr *pte_addr) +static uint64_t ppc_radix64_next_level (AddressSpace *as,vaddr eaddr, +uint64_t *pte_addr,uint64_t *nls, +int *psize,int *fault_cause) { -CPUState *cs =CPU (cpu);uint64_t index, pde; -if (nls <5 ) {/* Directory maps less than 2**5 entries */ +if (*nls <5 ) {/* Directory maps less than 2**5 entries */ *fault_cause |=DSISR_R_BADCONFIG ;return 0 ; }/* Read page <directory/table> entry from guest address space */ - index = eaddr >> (*psize - nls);/* Shift */ - index &= ((1UL << nls) -1 );/* Mask */ - pde =ldq_phys (cs->as, base_addr + (index *sizeof (pde))); -if (!(pde &R_PTE_VALID )) {/* Invalid Entry */ + pde =ldq_phys (as, *pte_addr); +if (!(pde &R_PTE_VALID )) {/* Invalid Entry */ *fault_cause |=DSISR_NOPTE ;return 0 ; } - *psize -= nls; + *psize -= *nls; +if (!(pde &R_PTE_LEAF )) {/* Prepare for next iteration */ + *nls = pde &R_PDE_NLS ; + index = eaddr >> (*psize - *nls);/* Shift */ + index &= ((1UL << *nls) -1 );/* Mask */ + *pte_addr = (pde &R_PDE_NLB ) + (index *sizeof (pde)); + } +return pde; +} + +static uint64_t ppc_radix64_walk_tree (AddressSpace *as,vaddr eaddr, +uint64_t base_addr,uint64_t nls, +hwaddr *raddr,int *psize, +int *fault_cause,hwaddr *pte_addr) +{ +uint64_t index, pde; + +if (nls <5 ) {/* Directory maps less than 2**5 entries */ + *fault_cause |=DSISR_R_BADCONFIG ; +return 0 ; + } + + index = eaddr >> (*psize - nls);/* Shift */ + index &= ((1UL << nls) -1 );/* Mask */ + *pte_addr = base_addr + (index *sizeof (pde)); +do { + pde =ppc_radix64_next_level (as, eaddr, pte_addr, &nls, psize, + fault_cause); + }while ((pde &R_PTE_VALID ) && !(pde &R_PTE_LEAF )); -/* Check if Leaf Entry -> Page Table Entry -> Stop the Search */ -if (pde &R_PTE_LEAF ) { +/* Did we find a valid leaf? */ +if ((pde &R_PTE_VALID ) && (pde &R_PTE_LEAF )) {uint64_t rpn = pde &R_PTE_RPN ;uint64_t mask = (1UL << *psize) -1 ;/* Or high bits of rpn and low bits to ea to form whole real addr */ *raddr = (rpn & ~mask) | (eaddr & mask); - *pte_addr = base_addr + (index *sizeof (pde)); -return pde; } -/* Next Level of Radix Tree */ -return ppc_radix64_walk_tree (cpu, eaddr, pde &R_PDE_NLB , pde &R_PDE_NLS , - raddr, psize, fault_cause, pte_addr); +return pde; }static bool validate_pate (PowerPCCPU *cpu,uint64_t lpid,ppc_v3_pate_t *pate)
@@ -246,7 +266,7 @@ static int ppc_radix64_process_scoped_xlate(PowerPCCPU *cpu, int rwx,/* Walk Radix Tree from Process Table Entry to Convert EA to RA */ *g_page_size =PRTBE_R_GET_RTS (prtbe0); - pte =ppc_radix64_walk_tree (cpu, eaddr &R_EADDR_MASK , + pte =ppc_radix64_walk_tree (cs->as, eaddr &R_EADDR_MASK , prtbe0 &PRTBE_R_RPDB , prtbe0 &PRTBE_R_RPDS , g_raddr, g_page_size, &fault_cause, &pte_addr);
Signature · 1 line
2.21.1
PATCH v3 4/4 target/ppc: Add support for Radix partition-scoped translation
In reply to Cédric Le GoaterThe Radix tree translation model currently supports process-scoped translation for the PowerNV machine (Hypervisor mode) and for the pSeries machine (Guest mode). Guests running under an emulated Hypervisor (PowerNV machine) require a new type of Radix translation, called partition-scoped, which is missing today.
The Radix tree translation is a 2 steps process. The first step, process-scoped translation, converts an effective Address to a guest real address, and the second step, partition-scoped translation, converts a guest real address to a host real address.
There are difference cases to covers :
* Hypervisor real mode access: no Radix translation.
* Hypervisor or host application access (quadrant 0 and 3) with relocation on: process-scoped translation.
* Guest OS real mode access: only partition-scoped translation.
* Guest OS real or guest application access (quadrant 0 and 3) with relocation on: both process-scoped translation and partition-scoped translations.
* Hypervisor access in quadrant 1 and 2 with relocation on: both process-scoped translation and partition-scoped translations.
The radix tree partition-scoped translation is performed using tables pointed to by the first double-word of the Partition Table Entries and process-scoped translation uses tables pointed to by the Process Table Entries (second double-word of the Partition Table Entries).
Both partition-scoped and process-scoped translations process are identical and thus the radix tree traversing code is largely reused. However, errors in partition-scoped translations generate hypervisor exceptions.
--- target/ppc/cpu.h | 3 + target/ppc/excp_helper.c | 3 +- target/ppc/mmu-radix64.c | 166 ++++++++++++++++++++++++++++++++++++--- 3 files changed, 158 insertions(+), 14 deletions(-)
target/ppc/cpu.h +3 -0
@@ -463,6 +463,9 @@ typedef struct ppc_v3_pate_t {#define DSISR_AMR 0x00200000/* Unsupported Radix Tree Configuration */ #define DSISR_R_BADCONFIG 0x00080000 +#define DSISR_ATOMIC_RC 0x00040000 +/* Unable to translate address of (guest) pde or process/page table entry */ +#define DSISR_PRTABLE_FAULT 0x00020000/* SRR1 error code fields */
target/ppc/excp_helper.c +2 -1
@@ -506,9 +506,10 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp)case POWERPC_EXCP_ISEG :/* Instruction segment exception */ case POWERPC_EXCP_TRACE :/* Trace exception */ break ; +case POWERPC_EXCP_HISI :/* Hypervisor instruction storage exception */ + msr |= env->error_code;case POWERPC_EXCP_HDECR :/* Hypervisor decrementer exception */ case POWERPC_EXCP_HDSI :/* Hypervisor data storage exception */ -case POWERPC_EXCP_HISI :/* Hypervisor instruction storage exception */ case POWERPC_EXCP_HDSEG :/* Hypervisor data segment exception */ case POWERPC_EXCP_HISEG :/* Hypervisor instruction segment exception */ case POWERPC_EXCP_SDOOR_HV :/* Hypervisor Doorbell interrupt */
target/ppc/mmu-radix64.c +153 -13
222 lines not on this page · raw message
Signature · 1 line
2.21.1