target/riscv: Fix exception type when VU accesses supervisor CSRs
PATCH 1/1 target/riscv: Fix exception type when VU accesses supervisor CSRs
When supervisor CSRs are accessed from VU-mode, a virtual instruction exception should be raised instead of an illegal instruction.
--- target/riscv/csr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/riscv/csr.c +1 -1
@@ -5577,7 +5577,7 @@ static inline RISCVException riscv_csrrw_check(CPURISCVState *env, csr_priv =get_field (csrno,0x300 );if (!env->debugger && (effective_priv < csr_priv)) { -if (csr_priv == (PRV_S +1 ) && env->virt_enabled) { +if (csr_priv <= (PRV_S +1 ) && env->virt_enabled) {return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; }return RISCV_EXCP_ILLEGAL_INST ;
Signature · 1 line
2.20.1
FYI, the discussion about whether vs insn fault or illegal insn fault should be raised can be found from [1].
[1] https://lists.riscv.org/g/tech-privileged/message/2469
Quoted 26 lines · Xu Lu
When supervisor CSRs are accessed from VU-mode, a virtual instruction exception should be raised instead of an illegal instruction.
Fixes c1fbcecb3a (target/riscv: Fix csr number based privilege checking)Signed-off-by Xu Lu <[email protected]>--- target/riscv/csr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/riscv/csr.c +1
-2@@ -5577,7 +5577,7 @@ static inline RISCVException riscv_csrrw_check(CPURISCVState *env, csr_priv =get_field (csrno,0x300 );if (!env->debugger && (effective_priv < csr_priv)) { -if (csr_priv == (PRV_S +1 ) && env->virt_enabled) { +if (csr_priv <= (PRV_S +1 ) && env->virt_enabled) {return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; }return RISCV_EXCP_ILLEGAL_INST ; --2.20.1
Quoted 6 lines · Xu Lu
When supervisor CSRs are accessed from VU-mode, a virtual instruction exception should be raised instead of an illegal instruction.
Fixes c1fbcecb3a (target/riscv: Fix csr number based privilege checking)Signed-off-by Xu Lu <[email protected]>
LGTM.
Regards,
Anup
Quoted 20 lines
--- target/riscv/csr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/riscv/csr.c +1
-2@@ -5577,7 +5577,7 @@ static inline RISCVException riscv_csrrw_check(CPURISCVState *env, csr_priv =get_field (csrno,0x300 );if (!env->debugger && (effective_priv < csr_priv)) { -if (csr_priv == (PRV_S +1 ) && env->virt_enabled) { +if (csr_priv <= (PRV_S +1 ) && env->virt_enabled) {return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; }return RISCV_EXCP_ILLEGAL_INST ; --2.20.1
Quoted 14 lines · Xu Lu
When supervisor CSRs are accessed from VU-mode, a virtual instruction exception should be raised instead of an illegal instruction.
Fixes c1fbcecb3a (target/riscv: Fix csr number based privilege checking)Signed-off-by Xu Lu <[email protected]>--- target/riscv/csr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/riscv/csr.c +0
-0
target/riscv/csr.c static inline RISCVException riscv_csrrw_check(CPURISCVState *env, · line 5583
Quoted 8 lines
target/riscv/csr.c +1
-1@@ -5577,7 +5577,7 @@ static inline RISCVException riscv_csrrw_check(CPURISCVState *env, csr_priv =get_field (csrno,0x300 );if (!env->debugger && (effective_priv < csr_priv)) { -if (csr_priv == (PRV_S +1 ) && env->virt_enabled) { +if (csr_priv <= (PRV_S +1 ) && env->virt_enabled) {return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; }return RISCV_EXCP_ILLEGAL_INST ;
Thanks,
Nutty
Alistair Francis
AppliedQuoted 6 lines · Xu Lu
When supervisor CSRs are accessed from VU-mode, a virtual instruction exception should be raised instead of an illegal instruction.
Fixes c1fbcecb3a (target/riscv: Fix csr number based privilege checking)Signed-off-by Xu Lu <[email protected]>
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 21 lines
--- target/riscv/csr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/riscv/csr.c +1
-2@@ -5577,7 +5577,7 @@ static inline RISCVException riscv_csrrw_check(CPURISCVState *env, csr_priv =get_field (csrno,0x300 );if (!env->debugger && (effective_priv < csr_priv)) { -if (csr_priv == (PRV_S +1 ) && env->virt_enabled) { +if (csr_priv <= (PRV_S +1 ) && env->virt_enabled) {return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; }return RISCV_EXCP_ILLEGAL_INST ; --2.20.1