[PATCH v2 0/5] Check PMP rules num before propagation

[PATCH v2 0/5] Check PMP rules num before propagation

[LIU Zhiwei]

In this patch set, fix pmp propagation to tlb and replace pmp_is_range_in_tlb
with a more straightforward function pmp_adjust_tlb_size.

v2:
  move pmp rules num check to pmp_is_range_in_tlb
  define pmp_adjust_tlb_size to replace pmp_is_range_in_tlb


LIU Zhiwei (5):
  target/riscv: Check PMP rules num before propagation
  target/riscv: Give a more generic size for tlb
  target/riscv: Discard return value for pmp_is_range_in_tlb
  target/riscv: Rename pmp_is_range_in_tlb
  target/riscv: Modify return and parameter type for pmp_adjust_tlb_size

 target/riscv/cpu_helper.c |  6 ++----
 target/riscv/pmp.c        | 21 ++++++++++-----------
 target/riscv/pmp.h        |  4 ++--
 3 files changed, 14 insertions(+), 17 deletions(-)

-- 
2.25.1

[PATCH v2 0/5] Check PMP rules num before propagation

[LIU Zhiwei]

In this patch set, fix pmp propagation to tlb and replace pmp_is_range_in_tlb
with a more straightforward function pmp_adjust_tlb_size.

v2:
  move pmp rules num check to pmp_is_range_in_tlb
  define pmp_adjust_tlb_size to replace pmp_is_range_in_tlb


LIU Zhiwei (5):
  target/riscv: Check PMP rules num before propagation
  target/riscv: Give a more generic size for tlb
  target/riscv: Discard return value for pmp_is_range_in_tlb
  target/riscv: Rename pmp_is_range_in_tlb
  target/riscv: Modify return and parameter type for pmp_adjust_tlb_size

 target/riscv/cpu_helper.c |  6 ++----
 target/riscv/pmp.c        | 21 ++++++++++-----------
 target/riscv/pmp.h        |  4 ++--
 3 files changed, 14 insertions(+), 17 deletions(-)

-- 
2.25.1

[PATCH v2 1/5] target/riscv: Check PMP rules num before propagation

[LIU Zhiwei]

When an address is in [0-4K) and no pmp rule configured, the tlb_size will
be set to 1.

This is caused by pmp_get_tlb_size return a value 1.

if (pmp_sa >= tlb_sa && pmp_ea <= tlb_ea) {
    return pmp_ea - pmp_sa + 1;
}

Here pmp_sa == 0 and pmp_ea == 0.

Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>
---
 target/riscv/pmp.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index 54abf42583..190ff59fab 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -627,6 +627,10 @@ bool pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
     target_ulong val;
     target_ulong tlb_ea = (tlb_sa + TARGET_PAGE_SIZE - 1);
 
+    if (pmp_get_num_rules(env) == 0) {
+        return false;
+    }
+
     for (i = 0; i < MAX_RISCV_PMPS; i++) {
         val = pmp_get_tlb_size(env, i, tlb_sa, tlb_ea);
         if (val) {
-- 
2.25.1

[PATCH v2 1/5] target/riscv: Check PMP rules num before propagation

[LIU Zhiwei]

When an address is in [0-4K) and no pmp rule configured, the tlb_size will
be set to 1.

This is caused by pmp_get_tlb_size return a value 1.

if (pmp_sa >= tlb_sa && pmp_ea <= tlb_ea) {
    return pmp_ea - pmp_sa + 1;
}

Here pmp_sa == 0 and pmp_ea == 0.

Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>
---
 target/riscv/pmp.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index 54abf42583..190ff59fab 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -627,6 +627,10 @@ bool pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
     target_ulong val;
     target_ulong tlb_ea = (tlb_sa + TARGET_PAGE_SIZE - 1);
 
+    if (pmp_get_num_rules(env) == 0) {
+        return false;
+    }
+
     for (i = 0; i < MAX_RISCV_PMPS; i++) {
         val = pmp_get_tlb_size(env, i, tlb_sa, tlb_ea);
         if (val) {
-- 
2.25.1

[PATCH v2 2/5] target/riscv: Give a more generic size for tlb

[LIU Zhiwei]

As the caller has given a tlb size parameter, we should use it
to keep pace with it.

Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>
---
 target/riscv/cpu_helper.c | 5 +----
 target/riscv/pmp.c        | 7 ++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
index 9eeed38c7e..3f53744897 100644
--- a/target/riscv/cpu_helper.c
+++ b/target/riscv/cpu_helper.c
@@ -362,7 +362,6 @@ static int get_physical_address_pmp(CPURISCVState *env, int *prot,
                                     int mode)
 {
     pmp_priv_t pmp_priv;
-    target_ulong tlb_size_pmp = 0;
 
     if (!riscv_feature(env, RISCV_FEATURE_PMP)) {
         *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
@@ -377,9 +376,7 @@ static int get_physical_address_pmp(CPURISCVState *env, int *prot,
 
     *prot = pmp_priv_to_page_prot(pmp_priv);
     if (tlb_size != NULL) {
-        if (pmp_is_range_in_tlb(env, addr & ~(*tlb_size - 1), &tlb_size_pmp)) {
-            *tlb_size = tlb_size_pmp;
-        }
+        pmp_is_range_in_tlb(env, addr & ~(*tlb_size - 1), tlb_size);
     }
 
     return TRANSLATE_SUCCESS;
diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index 190ff59fab..ca38087574 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -625,7 +625,8 @@ bool pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
 {
     int i;
     target_ulong val;
-    target_ulong tlb_ea = (tlb_sa + TARGET_PAGE_SIZE - 1);
+    target_ulong tlb_ea = (tlb_sa + *tlb_size - 1);
+    target_ulong old_size = *tlb_size;
 
     if (pmp_get_num_rules(env) == 0) {
         return false;
@@ -634,13 +635,13 @@ bool pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
     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) {
+            if (*tlb_size > val) {
                 *tlb_size = val;
             }
         }
     }
 
-    if (*tlb_size != 0) {
+    if (*tlb_size != old_size) {
         return true;
     }
 
-- 
2.25.1

[PATCH v2 2/5] target/riscv: Give a more generic size for tlb

[LIU Zhiwei]

As the caller has given a tlb size parameter, we should use it
to keep pace with it.

Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>
---
 target/riscv/cpu_helper.c | 5 +----
 target/riscv/pmp.c        | 7 ++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
index 9eeed38c7e..3f53744897 100644
--- a/target/riscv/cpu_helper.c
+++ b/target/riscv/cpu_helper.c
@@ -362,7 +362,6 @@ static int get_physical_address_pmp(CPURISCVState *env, int *prot,
                                     int mode)
 {
     pmp_priv_t pmp_priv;
-    target_ulong tlb_size_pmp = 0;
 
     if (!riscv_feature(env, RISCV_FEATURE_PMP)) {
         *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
@@ -377,9 +376,7 @@ static int get_physical_address_pmp(CPURISCVState *env, int *prot,
 
     *prot = pmp_priv_to_page_prot(pmp_priv);
     if (tlb_size != NULL) {
-        if (pmp_is_range_in_tlb(env, addr & ~(*tlb_size - 1), &tlb_size_pmp)) {
-            *tlb_size = tlb_size_pmp;
-        }
+        pmp_is_range_in_tlb(env, addr & ~(*tlb_size - 1), tlb_size);
     }
 
     return TRANSLATE_SUCCESS;
diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index 190ff59fab..ca38087574 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -625,7 +625,8 @@ bool pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
 {
     int i;
     target_ulong val;
-    target_ulong tlb_ea = (tlb_sa + TARGET_PAGE_SIZE - 1);
+    target_ulong tlb_ea = (tlb_sa + *tlb_size - 1);
+    target_ulong old_size = *tlb_size;
 
     if (pmp_get_num_rules(env) == 0) {
         return false;
@@ -634,13 +635,13 @@ bool pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
     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) {
+            if (*tlb_size > val) {
                 *tlb_size = val;
             }
         }
     }
 
-    if (*tlb_size != 0) {
+    if (*tlb_size != old_size) {
         return true;
     }
 
-- 
2.25.1

[PATCH v2 3/5] target/riscv: Discard return value for pmp_is_range_in_tlb

[LIU Zhiwei]

Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>
---
 target/riscv/pmp.c | 11 ++---------
 target/riscv/pmp.h |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index ca38087574..4850a9cc5d 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -620,16 +620,15 @@ static target_ulong pmp_get_tlb_size(CPURISCVState *env, int pmp_index,
  * Check is there a PMP entry which 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,
+void 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 + *tlb_size - 1);
-    target_ulong old_size = *tlb_size;
 
     if (pmp_get_num_rules(env) == 0) {
-        return false;
+        return;
     }
 
     for (i = 0; i < MAX_RISCV_PMPS; i++) {
@@ -640,12 +639,6 @@ bool pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
             }
         }
     }
-
-    if (*tlb_size != old_size) {
-        return true;
-    }
-
-    return false;
 }
 
 /*
diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h
index a9a0b363a7..69395472f9 100644
--- a/target/riscv/pmp.h
+++ b/target/riscv/pmp.h
@@ -71,7 +71,7 @@ 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 privs, pmp_priv_t *allowed_privs,
     target_ulong mode);
-bool pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
+void pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
                          target_ulong *tlb_size);
 void pmp_update_rule_addr(CPURISCVState *env, uint32_t pmp_index);
 void pmp_update_rule_nums(CPURISCVState *env);
-- 
2.25.1

[PATCH v2 3/5] target/riscv: Discard return value for pmp_is_range_in_tlb

[LIU Zhiwei]

Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>
---
 target/riscv/pmp.c | 11 ++---------
 target/riscv/pmp.h |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index ca38087574..4850a9cc5d 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -620,16 +620,15 @@ static target_ulong pmp_get_tlb_size(CPURISCVState *env, int pmp_index,
  * Check is there a PMP entry which 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,
+void 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 + *tlb_size - 1);
-    target_ulong old_size = *tlb_size;
 
     if (pmp_get_num_rules(env) == 0) {
-        return false;
+        return;
     }
 
     for (i = 0; i < MAX_RISCV_PMPS; i++) {
@@ -640,12 +639,6 @@ bool pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
             }
         }
     }
-
-    if (*tlb_size != old_size) {
-        return true;
-    }
-
-    return false;
 }
 
 /*
diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h
index a9a0b363a7..69395472f9 100644
--- a/target/riscv/pmp.h
+++ b/target/riscv/pmp.h
@@ -71,7 +71,7 @@ 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 privs, pmp_priv_t *allowed_privs,
     target_ulong mode);
-bool pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
+void pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
                          target_ulong *tlb_size);
 void pmp_update_rule_addr(CPURISCVState *env, uint32_t pmp_index);
 void pmp_update_rule_nums(CPURISCVState *env);
-- 
2.25.1

[PATCH v2 4/5] target/riscv: Rename pmp_is_range_in_tlb

[LIU Zhiwei]

Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>
---
 target/riscv/cpu_helper.c | 2 +-
 target/riscv/pmp.c        | 2 +-
 target/riscv/pmp.h        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
index 3f53744897..cf8109197d 100644
--- a/target/riscv/cpu_helper.c
+++ b/target/riscv/cpu_helper.c
@@ -376,7 +376,7 @@ static int get_physical_address_pmp(CPURISCVState *env, int *prot,
 
     *prot = pmp_priv_to_page_prot(pmp_priv);
     if (tlb_size != NULL) {
-        pmp_is_range_in_tlb(env, addr & ~(*tlb_size - 1), tlb_size);
+        pmp_adjust_tlb_size(env, addr & ~(*tlb_size - 1), tlb_size);
     }
 
     return TRANSLATE_SUCCESS;
diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index 4850a9cc5d..19baf87384 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -620,7 +620,7 @@ static target_ulong pmp_get_tlb_size(CPURISCVState *env, int pmp_index,
  * Check is there a PMP entry which range covers this page. If so,
  * try to find the minimum granularity for the TLB size.
  */
-void pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
+void pmp_adjust_tlb_size(CPURISCVState *env, hwaddr tlb_sa,
                          target_ulong *tlb_size)
 {
     int i;
diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h
index 69395472f9..600ac65d08 100644
--- a/target/riscv/pmp.h
+++ b/target/riscv/pmp.h
@@ -71,7 +71,7 @@ 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 privs, pmp_priv_t *allowed_privs,
     target_ulong mode);
-void pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
+void pmp_adjust_tlb_size(CPURISCVState *env, hwaddr tlb_sa,
                          target_ulong *tlb_size);
 void pmp_update_rule_addr(CPURISCVState *env, uint32_t pmp_index);
 void pmp_update_rule_nums(CPURISCVState *env);
-- 
2.25.1

[PATCH v2 4/5] target/riscv: Rename pmp_is_range_in_tlb

[LIU Zhiwei]

Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>
---
 target/riscv/cpu_helper.c | 2 +-
 target/riscv/pmp.c        | 2 +-
 target/riscv/pmp.h        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
index 3f53744897..cf8109197d 100644
--- a/target/riscv/cpu_helper.c
+++ b/target/riscv/cpu_helper.c
@@ -376,7 +376,7 @@ static int get_physical_address_pmp(CPURISCVState *env, int *prot,
 
     *prot = pmp_priv_to_page_prot(pmp_priv);
     if (tlb_size != NULL) {
-        pmp_is_range_in_tlb(env, addr & ~(*tlb_size - 1), tlb_size);
+        pmp_adjust_tlb_size(env, addr & ~(*tlb_size - 1), tlb_size);
     }
 
     return TRANSLATE_SUCCESS;
diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index 4850a9cc5d..19baf87384 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -620,7 +620,7 @@ static target_ulong pmp_get_tlb_size(CPURISCVState *env, int pmp_index,
  * Check is there a PMP entry which range covers this page. If so,
  * try to find the minimum granularity for the TLB size.
  */
-void pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
+void pmp_adjust_tlb_size(CPURISCVState *env, hwaddr tlb_sa,
                          target_ulong *tlb_size)
 {
     int i;
diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h
index 69395472f9..600ac65d08 100644
--- a/target/riscv/pmp.h
+++ b/target/riscv/pmp.h
@@ -71,7 +71,7 @@ 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 privs, pmp_priv_t *allowed_privs,
     target_ulong mode);
-void pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
+void pmp_adjust_tlb_size(CPURISCVState *env, hwaddr tlb_sa,
                          target_ulong *tlb_size);
 void pmp_update_rule_addr(CPURISCVState *env, uint32_t pmp_index);
 void pmp_update_rule_nums(CPURISCVState *env);
-- 
2.25.1

[PATCH v2 5/5] target/riscv: Modify return and parameter type for pmp_adjust_tlb_size

[LIU Zhiwei]

Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>
---
 target/riscv/cpu_helper.c |  3 ++-
 target/riscv/pmp.c        | 13 +++++++------
 target/riscv/pmp.h        |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
index cf8109197d..45e29e6c01 100644
--- a/target/riscv/cpu_helper.c
+++ b/target/riscv/cpu_helper.c
@@ -376,7 +376,8 @@ static int get_physical_address_pmp(CPURISCVState *env, int *prot,
 
     *prot = pmp_priv_to_page_prot(pmp_priv);
     if (tlb_size != NULL) {
-        pmp_adjust_tlb_size(env, addr & ~(*tlb_size - 1), tlb_size);
+        *tlb_size = pmp_adjust_tlb_size(env, addr & ~(*tlb_size - 1),
+                                        *tlb_size);
     }
 
     return TRANSLATE_SUCCESS;
diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index 19baf87384..726974c97c 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -620,25 +620,26 @@ static target_ulong pmp_get_tlb_size(CPURISCVState *env, int pmp_index,
  * Check is there a PMP entry which range covers this page. If so,
  * try to find the minimum granularity for the TLB size.
  */
-void pmp_adjust_tlb_size(CPURISCVState *env, hwaddr tlb_sa,
-                         target_ulong *tlb_size)
+target_ulong pmp_adjust_tlb_size(CPURISCVState *env, hwaddr tlb_sa,
+                                 target_ulong tlb_size)
 {
     int i;
     target_ulong val;
-    target_ulong tlb_ea = (tlb_sa + *tlb_size - 1);
+    target_ulong tlb_ea = (tlb_sa + tlb_size - 1);
 
     if (pmp_get_num_rules(env) == 0) {
-        return;
+        return tlb_size;
     }
 
     for (i = 0; i < MAX_RISCV_PMPS; i++) {
         val = pmp_get_tlb_size(env, i, tlb_sa, tlb_ea);
         if (val) {
-            if (*tlb_size > val) {
-                *tlb_size = val;
+            if (tlb_size > val) {
+                tlb_size = val;
             }
         }
     }
+    return tlb_size;
 }
 
 /*
diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h
index 600ac65d08..c110fb796b 100644
--- a/target/riscv/pmp.h
+++ b/target/riscv/pmp.h
@@ -71,8 +71,8 @@ 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 privs, pmp_priv_t *allowed_privs,
     target_ulong mode);
-void pmp_adjust_tlb_size(CPURISCVState *env, hwaddr tlb_sa,
-                         target_ulong *tlb_size);
+target_ulong pmp_adjust_tlb_size(CPURISCVState *env, hwaddr tlb_sa,
+                                 target_ulong tlb_size);
 void pmp_update_rule_addr(CPURISCVState *env, uint32_t pmp_index);
 void pmp_update_rule_nums(CPURISCVState *env);
 uint32_t pmp_get_num_rules(CPURISCVState *env);
-- 
2.25.1

[PATCH v2 5/5] target/riscv: Modify return and parameter type for pmp_adjust_tlb_size

[LIU Zhiwei]

Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>
---
 target/riscv/cpu_helper.c |  3 ++-
 target/riscv/pmp.c        | 13 +++++++------
 target/riscv/pmp.h        |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
index cf8109197d..45e29e6c01 100644
--- a/target/riscv/cpu_helper.c
+++ b/target/riscv/cpu_helper.c
@@ -376,7 +376,8 @@ static int get_physical_address_pmp(CPURISCVState *env, int *prot,
 
     *prot = pmp_priv_to_page_prot(pmp_priv);
     if (tlb_size != NULL) {
-        pmp_adjust_tlb_size(env, addr & ~(*tlb_size - 1), tlb_size);
+        *tlb_size = pmp_adjust_tlb_size(env, addr & ~(*tlb_size - 1),
+                                        *tlb_size);
     }
 
     return TRANSLATE_SUCCESS;
diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index 19baf87384..726974c97c 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -620,25 +620,26 @@ static target_ulong pmp_get_tlb_size(CPURISCVState *env, int pmp_index,
  * Check is there a PMP entry which range covers this page. If so,
  * try to find the minimum granularity for the TLB size.
  */
-void pmp_adjust_tlb_size(CPURISCVState *env, hwaddr tlb_sa,
-                         target_ulong *tlb_size)
+target_ulong pmp_adjust_tlb_size(CPURISCVState *env, hwaddr tlb_sa,
+                                 target_ulong tlb_size)
 {
     int i;
     target_ulong val;
-    target_ulong tlb_ea = (tlb_sa + *tlb_size - 1);
+    target_ulong tlb_ea = (tlb_sa + tlb_size - 1);
 
     if (pmp_get_num_rules(env) == 0) {
-        return;
+        return tlb_size;
     }
 
     for (i = 0; i < MAX_RISCV_PMPS; i++) {
         val = pmp_get_tlb_size(env, i, tlb_sa, tlb_ea);
         if (val) {
-            if (*tlb_size > val) {
-                *tlb_size = val;
+            if (tlb_size > val) {
+                tlb_size = val;
             }
         }
     }
+    return tlb_size;
 }
 
 /*
diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h
index 600ac65d08..c110fb796b 100644
--- a/target/riscv/pmp.h
+++ b/target/riscv/pmp.h
@@ -71,8 +71,8 @@ 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 privs, pmp_priv_t *allowed_privs,
     target_ulong mode);
-void pmp_adjust_tlb_size(CPURISCVState *env, hwaddr tlb_sa,
-                         target_ulong *tlb_size);
+target_ulong pmp_adjust_tlb_size(CPURISCVState *env, hwaddr tlb_sa,
+                                 target_ulong tlb_size);
 void pmp_update_rule_addr(CPURISCVState *env, uint32_t pmp_index);
 void pmp_update_rule_nums(CPURISCVState *env);
 uint32_t pmp_get_num_rules(CPURISCVState *env);
-- 
2.25.1

Re: [PATCH v2 1/5] target/riscv: Check PMP rules num before propagation

[Alistair Francis]

On Mon, Nov 22, 2021 at 9:15 PM LIU Zhiwei <zhiwei_liu@c-sky.com> wrote:
>
> When an address is in [0-4K) and no pmp rule configured, the tlb_size will
> be set to 1.
>
> This is caused by pmp_get_tlb_size return a value 1.
>
> if (pmp_sa >= tlb_sa && pmp_ea <= tlb_ea) {
>     return pmp_ea - pmp_sa + 1;
> }
>
> Here pmp_sa == 0 and pmp_ea == 0.
>
> Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  target/riscv/pmp.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
> index 54abf42583..190ff59fab 100644
> --- a/target/riscv/pmp.c
> +++ b/target/riscv/pmp.c
> @@ -627,6 +627,10 @@ bool pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
>      target_ulong val;
>      target_ulong tlb_ea = (tlb_sa + TARGET_PAGE_SIZE - 1);
>
> +    if (pmp_get_num_rules(env) == 0) {
> +        return false;
> +    }
> +
>      for (i = 0; i < MAX_RISCV_PMPS; i++) {
>          val = pmp_get_tlb_size(env, i, tlb_sa, tlb_ea);
>          if (val) {
> --
> 2.25.1
>
>

Re: [PATCH v2 1/5] target/riscv: Check PMP rules num before propagation

[Alistair Francis]

On Mon, Nov 22, 2021 at 9:15 PM LIU Zhiwei <zhiwei_liu@c-sky.com> wrote:
>
> When an address is in [0-4K) and no pmp rule configured, the tlb_size will
> be set to 1.
>
> This is caused by pmp_get_tlb_size return a value 1.
>
> if (pmp_sa >= tlb_sa && pmp_ea <= tlb_ea) {
>     return pmp_ea - pmp_sa + 1;
> }
>
> Here pmp_sa == 0 and pmp_ea == 0.
>
> Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  target/riscv/pmp.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
> index 54abf42583..190ff59fab 100644
> --- a/target/riscv/pmp.c
> +++ b/target/riscv/pmp.c
> @@ -627,6 +627,10 @@ bool pmp_is_range_in_tlb(CPURISCVState *env, hwaddr tlb_sa,
>      target_ulong val;
>      target_ulong tlb_ea = (tlb_sa + TARGET_PAGE_SIZE - 1);
>
> +    if (pmp_get_num_rules(env) == 0) {
> +        return false;
> +    }
> +
>      for (i = 0; i < MAX_RISCV_PMPS; i++) {
>          val = pmp_get_tlb_size(env, i, tlb_sa, tlb_ea);
>          if (val) {
> --
> 2.25.1
>
>

Re: [PATCH v2 0/5] Check PMP rules num before propagation

[LIU Zhiwei]

As I have found another similar error in PMP, and we can fix it at the 
same time. I have sent a patch named "target/riscv: Fix PMP propagation 
for tlb".

This patch set should be dropped.

Thanks,
Zhiwei

Drop this patch set.

On 2021/11/22 下午7:02, LIU Zhiwei wrote:
> In this patch set, fix pmp propagation to tlb and replace pmp_is_range_in_tlb
> with a more straightforward function pmp_adjust_tlb_size.
>
> v2:
>    move pmp rules num check to pmp_is_range_in_tlb
>    define pmp_adjust_tlb_size to replace pmp_is_range_in_tlb
>
>
> LIU Zhiwei (5):
>    target/riscv: Check PMP rules num before propagation
>    target/riscv: Give a more generic size for tlb
>    target/riscv: Discard return value for pmp_is_range_in_tlb
>    target/riscv: Rename pmp_is_range_in_tlb
>    target/riscv: Modify return and parameter type for pmp_adjust_tlb_size
>
>   target/riscv/cpu_helper.c |  6 ++----
>   target/riscv/pmp.c        | 21 ++++++++++-----------
>   target/riscv/pmp.h        |  4 ++--
>   3 files changed, 14 insertions(+), 17 deletions(-)
>

Re: [PATCH v2 0/5] Check PMP rules num before propagation

[LIU Zhiwei]

As I have found another similar error in PMP, and we can fix it at the 
same time. I have sent a patch named "target/riscv: Fix PMP propagation 
for tlb".

This patch set should be dropped.

Thanks,
Zhiwei

Drop this patch set.

On 2021/11/22 下午7:02, LIU Zhiwei wrote:
> In this patch set, fix pmp propagation to tlb and replace pmp_is_range_in_tlb
> with a more straightforward function pmp_adjust_tlb_size.
>
> v2:
>    move pmp rules num check to pmp_is_range_in_tlb
>    define pmp_adjust_tlb_size to replace pmp_is_range_in_tlb
>
>
> LIU Zhiwei (5):
>    target/riscv: Check PMP rules num before propagation
>    target/riscv: Give a more generic size for tlb
>    target/riscv: Discard return value for pmp_is_range_in_tlb
>    target/riscv: Rename pmp_is_range_in_tlb
>    target/riscv: Modify return and parameter type for pmp_adjust_tlb_size
>
>   target/riscv/cpu_helper.c |  6 ++----
>   target/riscv/pmp.c        | 21 ++++++++++-----------
>   target/riscv/pmp.h        |  4 ++--
>   3 files changed, 14 insertions(+), 17 deletions(-)
>