Fix some PMP implementations
v6 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 wrong ignoring PMP checking.
Changed in v6:
- Mask low 12 bits of return value of riscv_cpu_get_phys_page_debug. Suggested by Alistair Francis.
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 physical 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 | 15 +++++++--- target/riscv/csr.c | 2 +- target/riscv/pmp.c | 63 ++++++++++++++++++++++++++++++++++++++- target/riscv/pmp.h | 2 ++ 4 files changed, 76 insertions(+), 6 deletions(-)
Signature · 1 line
2.27.0
PATCH v6 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 v6 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 v6 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
target/riscv/cpu_helper.c +3 -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)) {
@@ -630,7 +631,7 @@ hwaddr riscv_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } } -return phys_addr; +return phys_addr &TARGET_PAGE_MASK ; } void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr,
Signature · 1 line
2.27.0
Re: [PATCH v6 3/4] target/riscv: Fix the translation of physical address
Quoted 8 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.
Signed-off-by Zong Li <[email protected]>
Alistair
Quoted 31 lines
--- target/riscv/cpu_helper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)target/riscv/cpu_helper.c +3
-3@@ -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)) {@@ -630,7 +631,7 @@ hwaddr riscv_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } } -return phys_addr; +return phys_addr &TARGET_PAGE_MASK ; } void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, --2.27.0
PATCH v6 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 v6 4/4] target/riscv: Change the TLB page size depends on PMP entries.
Quoted 115 lines · Zong Li
The 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.
Signed-off-by Zong Li <[email protected]>--- 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@@ -393,3 +393,55 @@ target_ulong pmpaddr_csr_read(CPURISCVState *env, uint32_t addr_index)return val; } + +/* +* Calculate the TLB size if the start address or the end address of +* PMP entry is presented in thie TLB page. +*/ +static target_ulong pmp_get_tlb_size (CPURISCVState *env,int pmp_index, +target_ulong tlb_sa,target_ulong tlb_ea) +{ +target_ulong pmp_sa = env->pmp_state.addr[pmp_index].sa; +target_ulong pmp_ea = env->pmp_state.addr[pmp_index].ea; + +if (pmp_sa >= tlb_sa && pmp_ea <= tlb_ea) { +return pmp_ea - pmp_sa +1 ; + } + +if (pmp_sa >= tlb_sa && pmp_sa <= tlb_ea && pmp_ea >= tlb_ea) { +return tlb_ea - pmp_sa +1 ; + } + +if (pmp_ea <= tlb_ea && pmp_ea >= tlb_sa && pmp_sa <= tlb_sa) { +return pmp_ea - tlb_sa +1 ; + } + +return 0 ; +} + +/* +* Check is there a PMP entry whcih range covers this page. If so, +* try to find the minimum granularity for the TLB size. +*/ +bool pmp_is_range_in_tlb (CPURISCVState *env,hwaddr tlb_sa, +target_ulong *tlb_size) +{ +int i; +target_ulong val; +target_ulong tlb_ea = (tlb_sa +TARGET_PAGE_SIZE -1 ); + +for (i =0 ; i <MAX_RISCV_PMPS ; i++) { + val =pmp_get_tlb_size (env, i, tlb_sa, tlb_ea); +if (val) { +if (*tlb_size ==0 || *tlb_size > val) { + *tlb_size = val; + } + } + } + +if (*tlb_size !=0 ) { +return true; + } + +return false; +}target/riscv/pmp.h +2
-1@@ -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 --
Quoted 2 lines
2.27.0
ping
Re: [PATCH v6 4/4] target/riscv: Change the TLB page size depends on PMP entries.
In reply to Zong LiQuoted 68 lines · Zong Li
The 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.
Signed-off-by Zong Li <[email protected]>--- 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 +18
-0@@ -393,3 +393,55 @@ target_ulong pmpaddr_csr_read(CPURISCVState *env, uint32_t addr_index)return val; } + +/* +* Calculate the TLB size if the start address or the end address of +* PMP entry is presented in thie TLB page. +*/ +static target_ulong pmp_get_tlb_size (CPURISCVState *env,int pmp_index, +target_ulong tlb_sa,target_ulong tlb_ea) +{ +target_ulong pmp_sa = env->pmp_state.addr[pmp_index].sa; +target_ulong pmp_ea = env->pmp_state.addr[pmp_index].ea; + +if (pmp_sa >= tlb_sa && pmp_ea <= tlb_ea) { +return pmp_ea - pmp_sa +1 ; + } + +if (pmp_sa >= tlb_sa && pmp_sa <= tlb_ea && pmp_ea >= tlb_ea) { +return tlb_ea - pmp_sa +1 ; + }
target/riscv/pmp.c target_ulong pmpaddr_csr_read(CPURISCVState *env, uint32_t addr_index) · line 423
Quoted 10 lines
target/riscv/pmp.c +10
-0+ +if (pmp_ea <= tlb_ea && pmp_ea >= tlb_sa && pmp_sa <= tlb_sa) { +return pmp_ea - tlb_sa +1 ; + } + +return 0 ; +} + +/* +* Check is there a PMP entry whcih range covers this page. If so,
s/whcih/which/g
I fixed this when apply it.
Quoted 29 lines
target/riscv/pmp.c +24
-0+* try to find the minimum granularity for the TLB size. +*/ +bool pmp_is_range_in_tlb (CPURISCVState *env,hwaddr tlb_sa, +target_ulong *tlb_size) +{ +int i; +target_ulong val; +target_ulong tlb_ea = (tlb_sa +TARGET_PAGE_SIZE -1 ); + +for (i =0 ; i <MAX_RISCV_PMPS ; i++) { + val =pmp_get_tlb_size (env, i, tlb_sa, tlb_ea); +if (val) { +if (*tlb_size ==0 || *tlb_size > val) { + *tlb_size = val; + } + } + } + +if (*tlb_size !=0 ) { +return true; + } + +return false; +}target/riscv/pmp.h +0
-0
target/riscv/pmp.h void pmpaddr_csr_write(CPURISCVState *env, uint32_t addr_index, · line 64
Quoted 5 lines
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);
The indentation is wrong here (as it is in the rest of the file). I just fixed this up as well as the others when I applied it.
I have applied patch 3 and 4 of this series. Patch 1 has already been applied and patch 2 no longer applies due to a different fix, sorry about that.
Alistair
Quoted 6 lines
target/riscv/pmp.h +0
-1#endif --2.27.0
Re: [PATCH v6 4/4] target/riscv: Change the TLB page size depends on PMP entries.
Quoted 123 lines · Alistair Francis
Quoted 68 lines · Zong Li
The 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.
Signed-off-by Zong Li <[email protected]>--- 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 +18
-0@@ -393,3 +393,55 @@ target_ulong pmpaddr_csr_read(CPURISCVState *env, uint32_t addr_index)return val; } + +/* +* Calculate the TLB size if the start address or the end address of +* PMP entry is presented in thie TLB page. +*/ +static target_ulong pmp_get_tlb_size (CPURISCVState *env,int pmp_index, +target_ulong tlb_sa,target_ulong tlb_ea) +{ +target_ulong pmp_sa = env->pmp_state.addr[pmp_index].sa; +target_ulong pmp_ea = env->pmp_state.addr[pmp_index].ea; + +if (pmp_sa >= tlb_sa && pmp_ea <= tlb_ea) { +return pmp_ea - pmp_sa +1 ; + } + +if (pmp_sa >= tlb_sa && pmp_sa <= tlb_ea && pmp_ea >= tlb_ea) { +return tlb_ea - pmp_sa +1 ; + }target/riscv/pmp.c target_ulong pmpaddr_csr_read(CPURISCVState *env, uint32_t addr_index) · line 423
Quoted 10 lines
target/riscv/pmp.c +10
-0+ +if (pmp_ea <= tlb_ea && pmp_ea >= tlb_sa && pmp_sa <= tlb_sa) { +return pmp_ea - tlb_sa +1 ; + } + +return 0 ; +} + +/* +* Check is there a PMP entry whcih range covers this page. If so, s/whcih/which/g
I fixed this when apply it.
Quoted 29 lines
target/riscv/pmp.c +24
-0+* try to find the minimum granularity for the TLB size. +*/ +bool pmp_is_range_in_tlb (CPURISCVState *env,hwaddr tlb_sa, +target_ulong *tlb_size) +{ +int i; +target_ulong val; +target_ulong tlb_ea = (tlb_sa +TARGET_PAGE_SIZE -1 ); + +for (i =0 ; i <MAX_RISCV_PMPS ; i++) { + val =pmp_get_tlb_size (env, i, tlb_sa, tlb_ea); +if (val) { +if (*tlb_size ==0 || *tlb_size > val) { + *tlb_size = val; + } + } + } + +if (*tlb_size !=0 ) { +return true; + } + +return false; +}target/riscv/pmp.h +0
-0target/riscv/pmp.h void pmpaddr_csr_write(CPURISCVState *env, uint32_t addr_index, · line 64
Quoted 5 lines
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);The indentation is wrong here (as it is in the rest of the file). I just fixed this up as well as the others when I applied it.
Quoted 6 lines
Reviewed-by Alistair Francis <[email protected]>I have applied patch 3 and 4 of this series. Patch 1 has already been applied and patch 2 no longer applies due to a different fix, sorry about that.
Thanks for your reviewing and applying. I don't follow with you about patch 2, could you please also forward the information or the fix to me?
Quoted 8 lines
Alistair
Quoted 6 lines
target/riscv/pmp.h +0
-1#endif --2.27.0
Re: [PATCH v6 4/4] target/riscv: Change the TLB page size depends on PMP entries.
Quoted 127 lines · Zong Li
Quoted 125 lines · Alistair Francis
Quoted 68 lines · Zong Li
The 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.
Signed-off-by Zong Li <[email protected]>--- 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 +18
-0@@ -393,3 +393,55 @@ target_ulong pmpaddr_csr_read(CPURISCVState *env, uint32_t addr_index)return val; } + +/* +* Calculate the TLB size if the start address or the end address of +* PMP entry is presented in thie TLB page. +*/ +static target_ulong pmp_get_tlb_size (CPURISCVState *env,int pmp_index, +target_ulong tlb_sa,target_ulong tlb_ea) +{ +target_ulong pmp_sa = env->pmp_state.addr[pmp_index].sa; +target_ulong pmp_ea = env->pmp_state.addr[pmp_index].ea; + +if (pmp_sa >= tlb_sa && pmp_ea <= tlb_ea) { +return pmp_ea - pmp_sa +1 ; + } + +if (pmp_sa >= tlb_sa && pmp_sa <= tlb_ea && pmp_ea >= tlb_ea) { +return tlb_ea - pmp_sa +1 ; + }target/riscv/pmp.c target_ulong pmpaddr_csr_read(CPURISCVState *env, uint32_t addr_index) · line 423
Quoted 10 lines
target/riscv/pmp.c +10
-0+ +if (pmp_ea <= tlb_ea && pmp_ea >= tlb_sa && pmp_sa <= tlb_sa) { +return pmp_ea - tlb_sa +1 ; + } + +return 0 ; +} + +/* +* Check is there a PMP entry whcih range covers this page. If so, s/whcih/which/g
I fixed this when apply it.
Quoted 29 lines
target/riscv/pmp.c +24
-0+* try to find the minimum granularity for the TLB size. +*/ +bool pmp_is_range_in_tlb (CPURISCVState *env,hwaddr tlb_sa, +target_ulong *tlb_size) +{ +int i; +target_ulong val; +target_ulong tlb_ea = (tlb_sa +TARGET_PAGE_SIZE -1 ); + +for (i =0 ; i <MAX_RISCV_PMPS ; i++) { + val =pmp_get_tlb_size (env, i, tlb_sa, tlb_ea); +if (val) { +if (*tlb_size ==0 || *tlb_size > val) { + *tlb_size = val; + } + } + } + +if (*tlb_size !=0 ) { +return true; + } + +return false; +}target/riscv/pmp.h +0
-0target/riscv/pmp.h void pmpaddr_csr_write(CPURISCVState *env, uint32_t addr_index, · line 64
Quoted 5 lines
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);The indentation is wrong here (as it is in the rest of the file). I just fixed this up as well as the others when I applied it.
Reviewed-by Alistair Francis <[email protected]>
Quoted 8 lines
Quoted 4 lines
I have applied patch 3 and 4 of this series. Patch 1 has already been applied and patch 2 no longer applies due to a different fix, sorry about that.
Thanks for your reviewing and applying. I don't follow with you about patch 2, could you please also forward the information or the fix to me?
This patch fixes the same problem and I find it a little simpler:
https://patchew.org/QEMU/[email protected]/[email protected]/
Alistair
Quoted 9 lines
Quoted 9 lines
Alistair
Quoted 6 lines
target/riscv/pmp.h +0
-1#endif --2.27.0