* [PATCH] target/arm: Fix pauth_check_trap vs SEL2
@ 2022-03-15 2:12 Richard Henderson
2022-03-15 11:01 ` Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Richard Henderson @ 2022-03-15 2:12 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-arm
When arm_is_el2_enabled was introduced, we missed
updating pauth_check_trap.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/788
Fixes: e6ef0169264b ("target/arm: use arm_is_el2_enabled() where applicable")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/pauth_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c
index cd6df18150..739aa520dd 100644
--- a/target/arm/pauth_helper.c
+++ b/target/arm/pauth_helper.c
@@ -390,7 +390,7 @@ static void QEMU_NORETURN pauth_trap(CPUARMState *env, int target_el,
static void pauth_check_trap(CPUARMState *env, int el, uintptr_t ra)
{
- if (el < 2 && arm_feature(env, ARM_FEATURE_EL2)) {
+ if (el < 2 && arm_is_el2_enabled(env)) {
uint64_t hcr = arm_hcr_el2_eff(env);
bool trap = !(hcr & HCR_API);
if (el == 0) {
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] target/arm: Fix pauth_check_trap vs SEL2
2022-03-15 2:12 [PATCH] target/arm: Fix pauth_check_trap vs SEL2 Richard Henderson
@ 2022-03-15 11:01 ` Philippe Mathieu-Daudé
2022-03-15 15:06 ` Rémi Denis-Courmont
2022-03-15 18:04 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-03-15 11:01 UTC (permalink / raw)
To: Richard Henderson, qemu-devel, Rémi Denis-Courmont; +Cc: qemu-arm
Cc'ing Rémi
On 15/3/22 03:12, Richard Henderson wrote:
> When arm_is_el2_enabled was introduced, we missed
> updating pauth_check_trap.
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/788
> Fixes: e6ef0169264b ("target/arm: use arm_is_el2_enabled() where applicable")
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> target/arm/pauth_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c
> index cd6df18150..739aa520dd 100644
> --- a/target/arm/pauth_helper.c
> +++ b/target/arm/pauth_helper.c
> @@ -390,7 +390,7 @@ static void QEMU_NORETURN pauth_trap(CPUARMState *env, int target_el,
>
> static void pauth_check_trap(CPUARMState *env, int el, uintptr_t ra)
> {
> - if (el < 2 && arm_feature(env, ARM_FEATURE_EL2)) {
> + if (el < 2 && arm_is_el2_enabled(env)) {
> uint64_t hcr = arm_hcr_el2_eff(env);
> bool trap = !(hcr & HCR_API);
> if (el == 0) {
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] target/arm: Fix pauth_check_trap vs SEL2
2022-03-15 2:12 [PATCH] target/arm: Fix pauth_check_trap vs SEL2 Richard Henderson
2022-03-15 11:01 ` Philippe Mathieu-Daudé
@ 2022-03-15 15:06 ` Rémi Denis-Courmont
2022-03-15 18:04 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Rémi Denis-Courmont @ 2022-03-15 15:06 UTC (permalink / raw)
To: qemu-devel, qemu-arm, Richard Henderson
Le tiistaina 15. maaliskuuta 2022, 4.12.05 EET Richard Henderson a écrit :
> When arm_is_el2_enabled was introduced, we missed
> updating pauth_check_trap.
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/788
> Fixes: e6ef0169264b ("target/arm: use arm_is_el2_enabled() where
> applicable") Signed-off-by: Richard Henderson
> <richard.henderson@linaro.org>
> ---
> target/arm/pauth_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c
> index cd6df18150..739aa520dd 100644
> --- a/target/arm/pauth_helper.c
> +++ b/target/arm/pauth_helper.c
> @@ -390,7 +390,7 @@ static void QEMU_NORETURN pauth_trap(CPUARMState *env,
> int target_el,
>
> static void pauth_check_trap(CPUARMState *env, int el, uintptr_t ra)
> {
> - if (el < 2 && arm_feature(env, ARM_FEATURE_EL2)) {
> + if (el < 2 && arm_is_el2_enabled(env)) {
> uint64_t hcr = arm_hcr_el2_eff(env);
> bool trap = !(hcr & HCR_API);
> if (el == 0) {
Ack.
--
Rémi Denis-Courmont
http://www.remlab.net/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] target/arm: Fix pauth_check_trap vs SEL2
2022-03-15 2:12 [PATCH] target/arm: Fix pauth_check_trap vs SEL2 Richard Henderson
2022-03-15 11:01 ` Philippe Mathieu-Daudé
2022-03-15 15:06 ` Rémi Denis-Courmont
@ 2022-03-15 18:04 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2022-03-15 18:04 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-arm, qemu-devel
On Tue, 15 Mar 2022 at 02:12, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> When arm_is_el2_enabled was introduced, we missed
> updating pauth_check_trap.
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/788
> Fixes: e6ef0169264b ("target/arm: use arm_is_el2_enabled() where applicable")
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> target/arm/pauth_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-15 18:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-15 2:12 [PATCH] target/arm: Fix pauth_check_trap vs SEL2 Richard Henderson
2022-03-15 11:01 ` Philippe Mathieu-Daudé
2022-03-15 15:06 ` Rémi Denis-Courmont
2022-03-15 18:04 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).