Fix some PMP implementations
v5 cover Fix some PMP implementations
This patch set contains the fixes for wrong index of pmpcfg CSR on rv64, and the pmp range in CSR function table. After 3rd version of this patch series, we also fix the PMP issues such as wrong physical address translation and ignoring PMP checking.
Changed in v5:
- Pick the suggestion which was lost in last version.
Changed in v4:
- Refine the implementation. Suggested by Bin Meng.
- Add fix for PMP checking was ignored.
Changed in v3:
- Refine the implementation. Suggested by Bin Meng.
- Add fix for wrong pphysical address translation.
Changed in v2:
- Move out the shifting operation from loop. Suggested by Bin Meng.
Zong Li (4):
target/riscv: Fix the range of pmpcfg of CSR funcion table target/riscv/pmp.c: Fix the index offset on RV64 target/riscv: Fix the translation of physical address target/riscv: Change the TLB page size depends on PMP entries.
target/riscv/cpu_helper.c | 13 ++++++-- target/riscv/csr.c | 2 +- target/riscv/pmp.c | 63 ++++++++++++++++++++++++++++++++++++++- target/riscv/pmp.h | 2 ++ 4 files changed, 75 insertions(+), 5 deletions(-)
Signature · 1 line
2.27.0
PATCH v5 1/4 target/riscv: Fix the range of pmpcfg of CSR funcion table
The range of Physical Memory Protection should be from CSR_PMPCFG0 to CSR_PMPCFG3, not to CSR_PMPADDR9.
--- target/riscv/csr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/riscv/csr.c +1 -1
@@ -1353,7 +1353,7 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MTINST] = { hmode, read_mtinst, write_mtinst },/* Physical Memory Protection */ - [CSR_PMPCFG0 ... CSR_PMPADDR9] = { pmp, read_pmpcfg, write_pmpcfg }, + [CSR_PMPCFG0 ... CSR_PMPCFG3] = { pmp, read_pmpcfg, write_pmpcfg }, [CSR_PMPADDR0 ... CSR_PMPADDR15] = { pmp, read_pmpaddr, write_pmpaddr }, /* Performance Counters */
Signature · 1 line
2.27.0
PATCH v5 2/4 target/riscv/pmp.c: Fix the index offset on RV64
In reply to Zong LiOn RV64, the reg_index is 2 (pmpcfg2 CSR) after the seventh pmp entry, it is not 1 (pmpcfg1 CSR) like RV32. In the original implementation, the second parameter of pmp_write_cfg is "reg_index * sizeof(target_ulong)", and we get the the result which is started from 16 if reg_index is 2, but we expect that it should be started from 8. Separate the implementation for RV32 and RV64 respectively.
--- target/riscv/pmp.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
target/riscv/pmp.c +10 -1
@@ -318,6 +318,10 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index,return ; } +#if defined(TARGET_RISCV64 ) + reg_index >>=1 ; +#endif +for (i =0 ; i <sizeof (target_ulong); i++) { cfg_val = (val >>8 * i) &0xff ; pmp_write_cfg(env, (reg_index * sizeof(target_ulong)) + i,
@@ -335,11 +339,16 @@ target_ulong pmpcfg_csr_read(CPURISCVState *env, uint32_t reg_index)target_ulong cfg_val =0 ;target_ulong val =0 ; +trace_pmpcfg_csr_read (env->mhartid, reg_index, cfg_val); + +#if defined(TARGET_RISCV64 ) + reg_index >>=1 ; +#endif +for (i =0 ; i <sizeof (target_ulong); i++) { val =pmp_read_cfg (env, (reg_index *sizeof (target_ulong)) + i); cfg_val |= (val << (i *8 )); } -trace_pmpcfg_csr_read (env->mhartid, reg_index, cfg_val);return cfg_val; }
Signature · 1 line
2.27.0
PATCH v5 3/4 target/riscv: Fix the translation of physical address
In reply to Zong LiThe real physical address should add the 12 bits page offset. It also causes the PMP wrong checking due to the minimum granularity of PMP is 4 byte, but we always get the physical address which is 4KB alignment, that means, we always use the start address of the page to check PMP for all addresses which in the same page.
--- target/riscv/cpu_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
target/riscv/cpu_helper.c +2 -1
@@ -543,7 +543,8 @@ restart:/* for superpage mappings, make a fake leaf PTE for the TLB's benefit. */ target_ulong vpn = addr >>PGSHIFT ; - *physical = (ppn | (vpn & ((1L << ptshift) -1 ))) <<PGSHIFT ; + *physical = ((ppn | (vpn & ((1L << ptshift) -1 ))) <<PGSHIFT ) | + (addr & ~TARGET_PAGE_MASK );/* set permissions on the TLB entry */ if ((pte &PTE_R ) || ((pte &PTE_X ) && mxr)) {
Signature · 1 line
2.27.0
PATCH v5 4/4 target/riscv: Change the TLB page size depends on PMP entries.
In reply to Zong LiThe minimum granularity of PMP is 4 bytes, it is small than 4KB page size, therefore, the pmp checking would be ignored if its range doesn't start from the alignment of one page. This patch detects the pmp entries and sets the small page size to TLB if there is a PMP entry which cover the page size.
--- target/riscv/cpu_helper.c | 10 ++++++-- target/riscv/pmp.c | 52 +++++++++++++++++++++++++++++++++++++++ target/riscv/pmp.h | 2 ++ 3 files changed, 62 insertions(+), 2 deletions(-)
target/riscv/cpu_helper.c +8 -2
@@ -693,6 +693,7 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,bool first_stage_error = true;int ret =TRANSLATE_FAIL ;int mode = mmu_idx; +target_ulong tlb_size =0 ; env->guest_phys_fault_addr =0 ;
@@ -784,8 +785,13 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size, }if (ret ==TRANSLATE_SUCCESS ) { -tlb_set_page (cs, address &TARGET_PAGE_MASK , pa &TARGET_PAGE_MASK , - prot, mmu_idx,TARGET_PAGE_SIZE ); +if (pmp_is_range_in_tlb (env, pa &TARGET_PAGE_MASK , &tlb_size)) { +tlb_set_page (cs, address & ~(tlb_size -1 ), pa & ~(tlb_size -1 ), + prot, mmu_idx, tlb_size); + }else { +tlb_set_page (cs, address &TARGET_PAGE_MASK , pa &TARGET_PAGE_MASK , + prot, mmu_idx,TARGET_PAGE_SIZE ); + }return true; }else if (probe) {return false;
target/riscv/pmp.c +52 -0
55 lines not on this page · raw message
target/riscv/pmp.h +2 -0
@@ -60,5 +60,7 @@ void pmpaddr_csr_write(CPURISCVState *env, uint32_t addr_index,target_ulong pmpaddr_csr_read (CPURISCVState *env,uint32_t addr_index);bool pmp_hart_has_privs (CPURISCVState *env,target_ulong addr,target_ulong size,pmp_priv_t priv,target_ulong mode); +bool pmp_is_range_in_tlb (CPURISCVState *env,hwaddr tlb_sa, +target_ulong *tlb_size);#endif
Signature · 1 line
2.27.0
Re: [PATCH v5 2/4] target/riscv/pmp.c: Fix the index offset on RV64
In reply to Zong LiQuoted 9 lines · Zong Li
On RV64, the
reg_indexis 2 (pmpcfg2 CSR) after the seventh pmp entry, it is not 1 (pmpcfg1 CSR) like RV32. In the original implementation, the second parameter ofpmp_write_cfgis "reg_index*sizeof(target_ulong)", and we get the the result which is started from 16 ifreg_indexis 2, but we expect that it should be started from 8. Separate the implementation for RV32 and RV64 respectively.
Quoted 5 lines
Signed-off-by Zong Li <[email protected]>--- target/riscv/pmp.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
Re: [PATCH v5 2/4] target/riscv/pmp.c: Fix the index offset on RV64
In reply to Zong LiQuoted 10 lines · Zong Li
On RV64, the
reg_indexis 2 (pmpcfg2 CSR) after the seventh pmp entry, it is not 1 (pmpcfg1 CSR) like RV32. In the original implementation, the second parameter ofpmp_write_cfgis "reg_index*sizeof(target_ulong)", and we get the the result which is started from 16 ifreg_indexis 2, but we expect that it should be started from 8. Separate the implementation for RV32 and RV64 respectively.Signed-off-by Zong Li <[email protected]>
Alistair
Quoted 41 lines
--- target/riscv/pmp.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)target/riscv/pmp.c +10
-2@@ -318,6 +318,10 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index,return ; } +#if defined(TARGET_RISCV64 ) + reg_index >>=1 ; +#endif +for (i =0 ; i <sizeof (target_ulong); i++) { cfg_val = (val >>8 * i) &0xff ; pmp_write_cfg(env, (reg_index * sizeof(target_ulong)) + i,@@ -335,11 +339,16 @@ target_ulong pmpcfg_csr_read(CPURISCVState *env, uint32_t reg_index)target_ulong cfg_val =0 ;target_ulong val =0 ; +trace_pmpcfg_csr_read (env->mhartid, reg_index, cfg_val); + +#if defined(TARGET_RISCV64 ) + reg_index >>=1 ; +#endif +for (i =0 ; i <sizeof (target_ulong); i++) { val =pmp_read_cfg (env, (reg_index *sizeof (target_ulong)) + i); cfg_val |= (val << (i *8 )); } -trace_pmpcfg_csr_read (env->mhartid, reg_index, cfg_val);return cfg_val; } --2.27.0
Re: [PATCH v5 3/4] target/riscv: Fix the translation of physical address
In reply to Zong LiQuoted 6 lines · Zong Li
The real physical address should add the 12 bits page offset. It also causes the PMP wrong checking due to the minimum granularity of PMP is 4 byte, but we always get the physical address which is 4KB alignment, that means, we always use the start address of the page to check PMP for all addresses which in the same page.
So riscv_cpu_tlb_fill() will clear these bits when calling tlb_set_page(), so this won't have an impact on actual translation (although it will change in input address for 2-stage translation, but that seems fine).
Your point about PMP seems correct as we allow a smaller then page granularity this seems like the right approach.
Can you edit riscv_cpu_get_phys_page_debug() to mask these bits out at the end? Otherwise we will break what callers to cpu_get_phys_page_attrs_debug() expect.
Alistair
Quoted 24 lines
Signed-off-by Zong Li <[email protected]>--- target/riscv/cpu_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)target/riscv/cpu_helper.c +2
-2@@ -543,7 +543,8 @@ restart:/* for superpage mappings, make a fake leaf PTE for the TLB's benefit. */ target_ulong vpn = addr >>PGSHIFT ; - *physical = (ppn | (vpn & ((1L << ptshift) -1 ))) <<PGSHIFT ; + *physical = ((ppn | (vpn & ((1L << ptshift) -1 ))) <<PGSHIFT ) | + (addr & ~TARGET_PAGE_MASK );/* set permissions on the TLB entry */ if ((pte &PTE_R ) || ((pte &PTE_X ) && mxr)) { --2.27.0
Re: [PATCH v5 3/4] target/riscv: Fix the translation of physical address
Quoted 14 lines · Alistair Francis
Quoted 6 lines · Zong Li
The real physical address should add the 12 bits page offset. It also causes the PMP wrong checking due to the minimum granularity of PMP is 4 byte, but we always get the physical address which is 4KB alignment, that means, we always use the start address of the page to check PMP for all addresses which in the same page.
So
riscv_cpu_tlb_fill()will clear these bits when callingtlb_set_page(), so this won't have an impact on actual translation (although it will change in input address for 2-stage translation, but that seems fine).
Quoted 7 lines
Your point about PMP seems correct as we allow a smaller then page granularity this seems like the right approach.
Can you edit
riscv_cpu_get_phys_page_debug()to mask these bits out at the end? Otherwise we will break what callers tocpu_get_phys_page_attrs_debug()expect.
OK, I checked that already, the callers would add these bits again, because they expect to get the address for the page. Thanks for your reviewing, modify it in the next version.
Quoted 26 lines
Alistair
Quoted 24 lines
Signed-off-by Zong Li <[email protected]>--- target/riscv/cpu_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)target/riscv/cpu_helper.c +2
-2@@ -543,7 +543,8 @@ restart:/* for superpage mappings, make a fake leaf PTE for the TLB's benefit. */ target_ulong vpn = addr >>PGSHIFT ; - *physical = (ppn | (vpn & ((1L << ptshift) -1 ))) <<PGSHIFT ; + *physical = ((ppn | (vpn & ((1L << ptshift) -1 ))) <<PGSHIFT ) | + (addr & ~TARGET_PAGE_MASK );/* set permissions on the TLB entry */ if ((pte &PTE_R ) || ((pte &PTE_X ) && mxr)) { --2.27.0