RISC-V: Modularize common match conditions for trigger
v3 cover RISC-V: Modularize common match conditions for trigger
According to latest RISC-V Debug specification version 1.0 [1], the enabled privilege levels of the trigger is common match conditions for all the types of the trigger.
This series modularize the code for checking the privilege levels of type 2/3/6 triggers by implementing functions trigger_common_match() and trigger_priv_match().
Additional match conditions, such as CSR tcontrol and textra, can be further implemented into trigger_common_match() in the future.
[1]: https://github.com/riscv/riscv-debug-spec/releases/tag/1.0.0-rc1-asciidoc
Changes from v2:
- Explicitly mention the targeting version of RISC-V Debug Spec.
Changes from v1:
- Fix typo
- Add commit description for changing behavior of looping the triggers when we check type 2 triggers.
Alvin Chang (4):
target/riscv: Add functions for common matching conditions of trigger target/riscv: Apply modularized matching conditions for breakpoint target/riscv: Apply modularized matching conditions for watchpoint target/riscv: Apply modularized matching conditions for icount trigger
target/riscv/debug.c | 124 +++++++++++++++++++++++++++++-------------- 1 file changed, 83 insertions(+), 41 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/4 target/riscv: Add functions for common matching conditions of trigger
According to RISC-V Debug specification version 1.0 [1], there are several common matching conditions before firing a trigger, including the enabled privilege levels of the trigger.
This commit adds trigger_common_match() to prepare the common matching conditions for the type 2/3/6 triggers. For now, we just implement trigger_priv_match() to check if the enabled privilege levels of the trigger match CPU's current privilege level.
[1]: https://github.com/riscv/riscv-debug-spec/releases/tag/1.0.0-rc1-asciidoc
--- target/riscv/debug.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)
target/riscv/debug.c +70 -0
@@ -241,6 +241,76 @@ static void do_trigger_action(CPURISCVState *env, target_ulong trigger_index) } } +/* +* Check the privilege level of specific trigger matches CPU's current privilege +* level. +*/ +static bool trigger_priv_match (CPURISCVState *env,trigger_type_t type, +int trigger_index) +{ +target_ulong ctrl = env->tdata1[trigger_index]; + +switch (type) { +case TRIGGER_TYPE_AD_MATCH : +/* type 2 trigger cannot be fired in VU/VS mode */ +if (env->virt_enabled) { +return false; + } +/* check U/S/M bit against current privilege level */ +if ((ctrl >>3 ) &BIT (env->priv)) { +return true; + } +break ; +case TRIGGER_TYPE_AD_MATCH6 : +if (env->virt_enabled) { +/* check VU/VS bit against current privilege level */ +if ((ctrl >>23 ) &BIT (env->priv)) { +return true; + } + }else { +/* check U/S/M bit against current privilege level */ +if ((ctrl >>3 ) &BIT (env->priv)) { +return true; + } + } +break ; +case TRIGGER_TYPE_INST_CNT : +if (env->virt_enabled) { +/* check VU/VS bit against current privilege level */ +if ((ctrl >>25 ) &BIT (env->priv)) { +return true; + } + }else { +/* check U/S/M bit against current privilege level */ +if ((ctrl >>6 ) &BIT (env->priv)) { +return true; + } + } +break ; +case TRIGGER_TYPE_INT : +case TRIGGER_TYPE_EXCP : +case TRIGGER_TYPE_EXT_SRC : +qemu_log_mask (LOG_UNIMP ,"trigger type: %d is not supported\n" , type); +break ; +case TRIGGER_TYPE_NO_EXIST : +case TRIGGER_TYPE_UNAVAIL : +qemu_log_mask (LOG_GUEST_ERROR ,"trigger type: %d does not exist\n" , + type); +break ; +default : +g_assert_not_reached (); + } + +return false; +} + +/* Common matching conditions for all types of the triggers. */ +static bool trigger_common_match (CPURISCVState *env,trigger_type_t type, +int trigger_index) +{ +return trigger_priv_match (env, type, trigger_index); +} +/* type 2 trigger */ static uint32_t type2_breakpoint_size (CPURISCVState *env,target_ulong ctrl)
Signature · 1 line
2.34.1
PATCH v3 2/4 target/riscv: Apply modularized matching conditions for breakpoint
In reply to Alvin Chang viaWe have implemented trigger_common_match(), which checks if the enabled privilege levels of the trigger match CPU's current privilege level. Remove the related code in riscv_cpu_debug_check_breakpoint() and invoke trigger_common_match() to check the privilege levels of the type 2 and type 6 triggers for the breakpoints.
This commit also changes the behavior of looping the triggers. In previous implementation, if we have a type 2 trigger and env->virt_enabled is true, we directly return false to stop the loop. Now we keep looping all the triggers until we find a matched trigger.
Only the execution bit and the executed PC should be futher checked in riscv_cpu_debug_check_breakpoint().
--- target/riscv/debug.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-)
target/riscv/debug.c +6 -20
@@ -855,21 +855,17 @@ bool riscv_cpu_debug_check_breakpoint(CPUState *cs)for (i =0 ; i <RV_MAX_TRIGGERS ; i++) { trigger_type =get_trigger_type (env, i); +if (!trigger_common_match (env, trigger_type, i)) { +continue ; + } +switch (trigger_type) {case TRIGGER_TYPE_AD_MATCH : -/* type 2 trigger cannot be fired in VU/VS mode */ -if (env->virt_enabled) { -return false; - } - ctrl = env->tdata1[i]; pc = env->tdata2[i];if ((ctrl &TYPE2_EXEC ) && (bp->pc == pc)) { -/* check U/S/M bit against current privilege level */ -if ((ctrl >>3 ) &BIT (env->priv)) { -return true; - } +return true; }break ;case TRIGGER_TYPE_AD_MATCH6 :
@@ -877,17 +873,7 @@ bool riscv_cpu_debug_check_breakpoint(CPUState *cs) pc = env->tdata2[i];if ((ctrl &TYPE6_EXEC ) && (bp->pc == pc)) { -if (env->virt_enabled) { -/* check VU/VS bit against current privilege level */ -if ((ctrl >>23 ) &BIT (env->priv)) { -return true; - } - }else { -/* check U/S/M bit against current privilege level */ -if ((ctrl >>3 ) &BIT (env->priv)) { -return true; - } - } +return true; }break ;default :
Signature · 1 line
2.34.1
PATCH v3 3/4 target/riscv: Apply modularized matching conditions for watchpoint
In reply to Alvin Chang viaWe have implemented trigger_common_match(), which checks if the enabled privilege levels of the trigger match CPU's current privilege level. Remove the related code in riscv_cpu_debug_check_watchpoint() and invoke trigger_common_match() to check the privilege levels of the type 2 and type 6 triggers for the watchpoints.
This commit also changes the behavior of looping the triggers. In previous implementation, if we have a type 2 trigger and env->virt_enabled is true, we directly return false to stop the loop. Now we keep looping all the triggers until we find a matched trigger.
Only load/store bits and loaded/stored address should be further checked in riscv_cpu_debug_check_watchpoint().
--- target/riscv/debug.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-)
target/riscv/debug.c +6 -20
@@ -899,13 +899,12 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp)for (i =0 ; i <RV_MAX_TRIGGERS ; i++) { trigger_type =get_trigger_type (env, i); +if (!trigger_common_match (env, trigger_type, i)) { +continue ; + } +switch (trigger_type) {case TRIGGER_TYPE_AD_MATCH : -/* type 2 trigger cannot be fired in VU/VS mode */ -if (env->virt_enabled) { -return false; - } - ctrl = env->tdata1[i]; addr = env->tdata2[i]; flags =0 ;
@@ -918,10 +917,7 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp) }if ((wp->flags & flags) && (wp->vaddr == addr)) { -/* check U/S/M bit against current privilege level */ -if ((ctrl >>3 ) &BIT (env->priv)) { -return true; - } +return true; }break ;case TRIGGER_TYPE_AD_MATCH6 :
@@ -937,17 +933,7 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp) }if ((wp->flags & flags) && (wp->vaddr == addr)) { -if (env->virt_enabled) { -/* check VU/VS bit against current privilege level */ -if ((ctrl >>23 ) &BIT (env->priv)) { -return true; - } - }else { -/* check U/S/M bit against current privilege level */ -if ((ctrl >>3 ) &BIT (env->priv)) { -return true; - } - } +return true; }break ;default :
Signature · 1 line
2.34.1
PATCH v3 4/4 target/riscv: Apply modularized matching conditions for icount trigger
In reply to Alvin Chang viaWe have implemented trigger_common_match(), which checks if the enabled privilege levels of the trigger match CPU's current privilege level. We can invoke trigger_common_match() to check the privilege levels of the type 3 triggers.
--- target/riscv/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/riscv/debug.c +1 -1
@@ -624,7 +624,7 @@ void helper_itrigger_match(CPURISCVState *env)if (get_trigger_type (env, i) !=TRIGGER_TYPE_INST_CNT ) {continue ; } -if (check_itrigger_priv (env, i)) { +if (!trigger_common_match (env,TRIGGER_TYPE_INST_CNT , i)) {continue ; } count =itrigger_get_count (env, i);
Signature · 1 line
2.34.1
Quoted 2 lines · Alvin Chang via
According to latest RISC-V Debug specification version 1.0 [1], the
The issue here is that we really only support the "debug" spec. That's the 0.13 version of the spec.
We do also support bits of the 1.0 spec, but those should be changed to be hidden behind the new extension flags like "Sdtrig"
I think this patch still applies to the 0.13 version though. Do you mind changing this to target the 0.13 version of the spec instead?
Ideally we can then support the new Sdtrig extension in the future
Alistair
Quoted 33 lines
enabled privilege levels of the trigger is common match conditions for all the types of the trigger.
This series modularize the code for checking the privilege levels of type 2/3/6 triggers by implementing functions
trigger_common_match()andtrigger_priv_match().Additional match conditions, such as CSR tcontrol and textra, can be further implemented into
trigger_common_match()in the future.[1]: https://github.com/riscv/riscv-debug-spec/releases/tag/1.0.0-rc1-asciidoc
Changes from v2:
- Explicitly mention the targeting version of RISC-V Debug Spec.Changes from v1:
- Fix typo
- Add commit description for changing behavior of looping the triggers when we check type 2 triggers.Alvin Chang (4):
target/riscv: Add functions for common matching conditions of trigger target/riscv: Apply modularized matching conditions for breakpoint target/riscv: Apply modularized matching conditions for watchpoint target/riscv: Apply modularized matching conditions for icount triggertarget/riscv/debug.c | 124 +++++++++++++++++++++++++++++-------------- 1 file changed, 83 insertions(+), 41 deletions(-)--
2.34.1
Hi Alistair,
Quoted 17 lines
-----Original Message-----
From: Alistair Francis <[email protected]>
Sent: Tuesday, February 27, 2024 8:02 AM
To: Alvin Che-Chia Chang(張哲嘉) <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v3 0/4] RISC-V: Modularize common match conditions for trigger[EXTERNAL MAIL 外部信件]
Quoted 2 lines · Alvin Chang via
According to latest RISC-V Debug specification version 1.0 [1], the
Quoted 8 lines
The issue here is that we really only support the "debug" spec. That's the 0.13 version of the spec.
We do also support bits of the 1.0 spec, but those should be changed to be hidden behind the new extension flags like "Sdtrig"
I think this patch still applies to the 0.13 version though. Do you mind changing this to target the 0.13 version of the spec instead?
I have changed it to target 0.13
Please see patch v4, thanks!
Sincerely,
Alvin Chang
Quoted 42 lines
Ideally we can then support the new Sdtrig extension in the future
Alistair
Quoted 37 lines
enabled privilege levels of the trigger is common match conditions for all the types of the trigger.
This series modularize the code for checking the privilege levels of type 2/3/6 triggers by implementing functions
trigger_common_match()andtrigger_priv_match().Additional match conditions, such as CSR tcontrol and textra, can be further implemented into
trigger_common_match()in the future.[1]:
https://github.com/riscv/riscv-debug-spec/releases/tag/1.0.0-rc1-ascii
docChanges from v2:
- Explicitly mention the targeting version of RISC-V Debug Spec.Changes from v1:
- Fix typo
- Add commit description for changing behavior of looping the triggers when we check type 2 triggers.Alvin Chang (4):
target/riscv: Add functions for common matching conditions of trigger target/riscv: Apply modularized matching conditions for breakpoint target/riscv: Apply modularized matching conditions for watchpoint target/riscv: Apply modularized matching conditions for icount
triggertarget/riscv/debug.c | 124 +++++++++++++++++++++++++++++-------------- 1 file changed, 83 insertions(+), 41 deletions(-)--
2.34.1
CONFIDENTIALITY NOTICE:
This e-mail (and its attachments) may contain confidential and legally privileged information or information protected from disclosure. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the information contained herein is strictly prohibited. In this case, please immediately notify the sender by return e-mail, delete the message (and any accompanying documents) and destroy all printed hard copies. Thank you for your cooperation.
Copyright ANDES TECHNOLOGY CORPORATION - All Rights Reserved.