target/riscv: throw debug exception before page fault
v3 cover target/riscv: throw debug exception before page fault
Hi,
In this new version, in patch 2, we're using the address 'size' val from riscv_cpu_tlb_fill() instead of infering it from the CPU XLEN.
No other changes made. Patches based on master.
Changes from v2:
- patch 2:
- use 'size' instead of infering wp_len using the CPU XLEN
- v2 link: https://lore.kernel.org/qemu-riscv/[email protected]/
Daniel Henrique Barboza (2):
target/riscv/debug.c: use wp size = 4 for 32-bit CPUs target/riscv: throw debug exception before page fault
target/riscv/cpu_helper.c | 18 ++++++++++++++++++ target/riscv/debug.c | 6 ++++-- 2 files changed, 22 insertions(+), 2 deletions(-)
Signature · 1 line
2.47.1
PATCH v3 1/2 target/riscv/debug.c: use wp size = 4 for 32-bit CPUs
The mcontrol select bit (19) is always zero, meaning our triggers will always match virtual addresses. In this condition, if the user does not specify a size for the trigger, the access size defaults to XLEN.
At this moment we're using def_size = 8 regardless of CPU XLEN. Use def_size = 4 in case we're running 32 bits.
--- target/riscv/debug.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
target/riscv/debug.c +4 -2
@@ -478,7 +478,7 @@ static void type2_breakpoint_insert(CPURISCVState *env, target_ulong index)bool enabled =type2_breakpoint_enabled (ctrl);CPUState *cs =env_cpu (env);int flags =BP_CPU |BP_STOP_BEFORE_ACCESS ; -uint32_t size; +uint32_t size, def_size;if (!enabled) {return ;
@@ -501,7 +501,9 @@ static void type2_breakpoint_insert(CPURISCVState *env, target_ulong index)cpu_watchpoint_insert (cs, addr, size, flags, &env->cpu_watchpoint[index]); }else { -cpu_watchpoint_insert (cs, addr,8 , flags, + def_size =riscv_cpu_mxl (env) ==MXL_RV64 ?8 :4 ; + +cpu_watchpoint_insert (cs, addr, def_size, flags, &env->cpu_watchpoint[index]); } }
Signature · 1 line
2.47.1
Re: [PATCH v3 1/2] target/riscv/debug.c: use wp size = 4 for 32-bit CPUs
Quoted 27 lines · Daniel Henrique Barboza
The mcontrol select bit (19) is always zero, meaning our triggers will always match virtual addresses. In this condition, if the user does not specify a size for the trigger, the access size defaults to XLEN.
At this moment we're using
def_size= 8 regardless of CPU XLEN. Usedef_size= 4 in case we're running 32 bits.Fixes 95799e36c1 ("target/riscv: Add initial support for the Sdtrig extension")Signed-off-by Daniel Henrique Barboza <[email protected]>--- target/riscv/debug.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)target/riscv/debug.c +1
-1@@ -478,7 +478,7 @@ static void type2_breakpoint_insert(CPURISCVState *env, target_ulong index)bool enabled =type2_breakpoint_enabled (ctrl);CPUState *cs =env_cpu (env);int flags =BP_CPU |BP_STOP_BEFORE_ACCESS ; -uint32_t size; +uint32_t size, def_size;if (!enabled) {return ;
target/riscv/debug.c static void type2_breakpoint_insert(CPURISCVState *env, target_ulong index) · line 504
Quoted 5 lines
target/riscv/debug.c +1
-1@@ -501,7 +501,9 @@ static void type2_breakpoint_insert(CPURISCVState *env, target_ulong index)cpu_watchpoint_insert (cs, addr, size, flags, &env->cpu_watchpoint[index]); }else { - cpu_watchpoint_insert(cs, addr, 8, flags, + def_size =riscv_cpu_mxl (env) ==MXL_RV64 ?8 :4 ;
Re: [PATCH v3 1/2] target/riscv/debug.c: use wp size = 4 for 32-bit CPUs
In reply to Daniel Henrique BarbozaQuoted 10 lines · Daniel Henrique Barboza
The mcontrol select bit (19) is always zero, meaning our triggers will always match virtual addresses. In this condition, if the user does not specify a size for the trigger, the access size defaults to XLEN.
At this moment we're using
def_size= 8 regardless of CPU XLEN. Usedef_size= 4 in case we're running 32 bits.Fixes 95799e36c1 ("target/riscv: Add initial support for the Sdtrig extension")Signed-off-by Daniel Henrique Barboza <[email protected]>
Alistair
Quoted 32 lines
--- target/riscv/debug.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)target/riscv/debug.c +4
-3@@ -478,7 +478,7 @@ static void type2_breakpoint_insert(CPURISCVState *env, target_ulong index)bool enabled =type2_breakpoint_enabled (ctrl);CPUState *cs =env_cpu (env);int flags =BP_CPU |BP_STOP_BEFORE_ACCESS ; -uint32_t size; +uint32_t size, def_size;if (!enabled) {return ;@@ -501,7 +501,9 @@ static void type2_breakpoint_insert(CPURISCVState *env, target_ulong index)cpu_watchpoint_insert (cs, addr, size, flags, &env->cpu_watchpoint[index]); }else { -cpu_watchpoint_insert (cs, addr,8 , flags, + def_size =riscv_cpu_mxl (env) ==MXL_RV64 ?8 :4 ; + +cpu_watchpoint_insert (cs, addr, def_size, flags, &env->cpu_watchpoint[index]); } } --2.47.1
PATCH v3 2/2 target/riscv: throw debug exception before page fault
In reply to Daniel Henrique BarbozaIn the RISC-V privileged ISA section 3.1.15 table 15, it is determined that a debug exception that is triggered from a load/store has a higher priority than a possible fault that this access might trigger.
This is not the case ATM as shown in [1]. Adding a breakpoint in an address that deliberately will fault is causing a load page fault instead of a debug exception. The reason is that we're throwing in the page fault as soon as the fault occurs (end of riscv_cpu_tlb_fill(), raise_mmu_exception()), not allowing the installed watchpoints to trigger.
Call cpu_check_watchpoint() in the page fault path to search and execute any watchpoints that might exist for the address, never returning back to the fault path. If no watchpoints are found cpu_check_watchpoint() will return and we'll fall-through the regular path to raise_mmu_exception().
[1] https://gitlab.com/qemu-project/qemu/-/issues/2627
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2627
--- target/riscv/cpu_helper.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
target/riscv/cpu_helper.c +18 -0
@@ -27,6 +27,7 @@#include "exec/page-protection.h" #include "instmap.h" #include "tcg/tcg-op.h" +#include "hw/core/tcg-cpu-ops.h" #include "trace.h" #include "semihosting/common-semi.h" #include "system/cpu-timers.h"
@@ -1708,6 +1709,23 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size, }else if (probe) {return false; }else { +int wp_access =0 ; + +if (access_type ==MMU_DATA_LOAD ) { + wp_access |=BP_MEM_READ ; + }else if (access_type ==MMU_DATA_STORE ) { + wp_access |=BP_MEM_WRITE ; + } + +/* +* If a watchpoint isn't found for 'addr' this will +* be a no-op and we'll resume the mmu_exception path. +* Otherwise we'll throw a debug exception and execution +* will continue elsewhere. +*/ +cpu_check_watchpoint (cs, address, size,MEMTXATTRS_UNSPECIFIED , + wp_access, retaddr); +raise_mmu_exception (env, address, access_type, pmp_violation, first_stage_error, two_stage_lookup, two_stage_indirect_error);
Signature · 1 line
2.47.1
Quoted 17 lines · Daniel Henrique Barboza
In the RISC-V privileged ISA section 3.1.15 table 15, it is determined that a debug exception that is triggered from a load/store has a higher priority than a possible fault that this access might trigger.
This is not the case ATM as shown in [1]. Adding a breakpoint in an address that deliberately will fault is causing a load page fault instead of a debug exception. The reason is that we're throwing in the page fault as soon as the fault occurs (end of
riscv_cpu_tlb_fill(),raise_mmu_exception()), not allowing the installed watchpoints to trigger.Call
cpu_check_watchpoint()in the page fault path to search and execute any watchpoints that might exist for the address, never returning back to the fault path. If no watchpoints are foundcpu_check_watchpoint()will return and we'll fall-through the regular path toraise_mmu_exception().
Quoted 7 lines
[1]https://gitlab.com/qemu-project/qemu/-/issues/2627
Resolves:https://gitlab.com/qemu-project/qemu/-/issues/2627
Signed-off-by Daniel Henrique Barboza<[email protected]>--- target/riscv/cpu_helper.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
r~
Quoted 18 lines · Daniel Henrique Barboza
In the RISC-V privileged ISA section 3.1.15 table 15, it is determined that a debug exception that is triggered from a load/store has a higher priority than a possible fault that this access might trigger.
This is not the case ATM as shown in [1]. Adding a breakpoint in an address that deliberately will fault is causing a load page fault instead of a debug exception. The reason is that we're throwing in the page fault as soon as the fault occurs (end of
riscv_cpu_tlb_fill(),raise_mmu_exception()), not allowing the installed watchpoints to trigger.Call
cpu_check_watchpoint()in the page fault path to search and execute any watchpoints that might exist for the address, never returning back to the fault path. If no watchpoints are foundcpu_check_watchpoint()will return and we'll fall-through the regular path toraise_mmu_exception().
Quoted 4 lines
[1] https://gitlab.com/qemu-project/qemu/-/issues/2627
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2627
Signed-off-by Daniel Henrique Barboza <[email protected]>
Alistair
Quoted 44 lines
--- target/riscv/cpu_helper.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)target/riscv/cpu_helper.c +18
-1@@ -27,6 +27,7 @@#include "exec/page-protection.h" #include "instmap.h" #include "tcg/tcg-op.h" +#include "hw/core/tcg-cpu-ops.h" #include "trace.h" #include "semihosting/common-semi.h" #include "system/cpu-timers.h" @@ -1708,6 +1709,23 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size, }else if (probe) {return false; }else { +int wp_access =0 ; + +if (access_type ==MMU_DATA_LOAD ) { + wp_access |=BP_MEM_READ ; + }else if (access_type ==MMU_DATA_STORE ) { + wp_access |=BP_MEM_WRITE ; + } + +/* +* If a watchpoint isn't found for 'addr' this will +* be a no-op and we'll resume the mmu_exception path. +* Otherwise we'll throw a debug exception and execution +* will continue elsewhere. +*/ +cpu_check_watchpoint (cs, address, size,MEMTXATTRS_UNSPECIFIED , + wp_access, retaddr); +raise_mmu_exception (env, address, access_type, pmp_violation, first_stage_error, two_stage_lookup, two_stage_indirect_error); --2.47.1
Alistair Francis
AppliedQuoted 8 lines · Daniel Henrique Barboza
Hi,
In this new version, in patch 2, we're using the address 'size' val from
riscv_cpu_tlb_fill()instead of infering it from the CPU XLEN.No other changes made. Patches based on master.
Quoted 8 lines
Changes from v2:
- patch 2:
- use 'size' instead of inferingwp_lenusing the CPU XLEN
- v2 link: https://lore.kernel.org/qemu-riscv/[email protected]/Daniel Henrique Barboza (2):
target/riscv/debug.c: use wp size = 4 for 32-bit CPUs target/riscv: throw debug exception before page fault
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 9 lines
target/riscv/cpu_helper.c | 18 ++++++++++++++++++ target/riscv/debug.c | 6 ++++-- 2 files changed, 22 insertions(+), 2 deletions(-)--
2.47.1
Quoted 7 lines · Daniel Henrique Barboza
Hi,
In this new version, in patch 2, we're using the address 'size' val from
riscv_cpu_tlb_fill()instead of infering it from the CPU XLEN.No other changes made. Patches based on master.
Quoted 8 lines
Changes from v2:
- patch 2:
- use 'size' instead of inferingwp_lenusing the CPU XLEN
- v2 link: https://lore.kernel.org/qemu-riscv/[email protected]/Daniel Henrique Barboza (2):
target/riscv/debug.c: use wp size = 4 for 32-bit CPUs target/riscv: throw debug exception before page fault
Hi!
Is this a qemu-stable material?
If yes, is it worth to pick it up for older stable series (currently active series are 7.2 and 8.2)?
Please keep Cc: qemu-stable@ for fixes which should be picked up for the stable series.
Thanks,
/mjt
Quoted 14 lines · Michael Tokarev
Quoted 12 lines · Daniel Henrique Barboza
Hi,
In this new version, in patch 2, we're using the address 'size' val from
riscv_cpu_tlb_fill()instead of infering it from the CPU XLEN.No other changes made. Patches based on master.
Changes from v2:
- patch 2:
- use 'size' instead of inferingwp_lenusing the CPU XLEN
- v2 link: https://lore.kernel.org/qemu-riscv/[email protected]/
Quoted 7 lines
Quoted 3 lines
Daniel Henrique Barboza (2):
target/riscv/debug.c: use wp size = 4 for 32-bit CPUs target/riscv: throw debug exception before page faultHi!
Is this a qemu-stable material?
Yes
Quoted 3 lines
If yes, is it worth to pick it up for older stable series (currently active series are 7.2 and 8.2)?
If it applies then it probably is
Quoted 3 lines
Please keep Cc: qemu-stable@ for fixes which should be picked up for the stable series.
Sorry, I always forget :(
Alistair
Quoted 5 lines
Thanks,
/mjt