[v2] linux-user/s390x: some signal fixes

[PATCH v2 10/15] linux-user/s390x: Set psw.mask properly for the signal handler

Posted by Richard Henderson 4 years, 9 months ago

Note that PSW_ADDR_{64,32} are called PSW_MASK_{EA,BA}
in the kernel source.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/s390x/signal.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c
index 64a9eab097..17f617c655 100644
--- a/linux-user/s390x/signal.c
+++ b/linux-user/s390x/signal.c
@@ -162,6 +162,9 @@ void setup_frame(int sig, struct target_sigaction *ka,
 
     /* Set up registers for signal handler */
     env->regs[15] = frame_addr;
+    /* Force default amode and default user address space control. */
+    env->psw.mask = PSW_MASK_64 | PSW_MASK_32 | PSW_ASC_PRIMARY
+                  | (env->psw.mask & ~PSW_MASK_ASC);
     env->psw.addr = ka->_sa_handler;
 
     env->regs[2] = sig; //map_signal(sig);
@@ -215,6 +218,9 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
 
     /* Set up registers for signal handler */
     env->regs[15] = frame_addr;
+    /* Force default amode and default user address space control. */
+    env->psw.mask = PSW_MASK_64 | PSW_MASK_32 | PSW_ASC_PRIMARY
+                  | (env->psw.mask & ~PSW_MASK_ASC);
     env->psw.addr = ka->_sa_handler;
 
     env->regs[2] = sig; //map_signal(sig);
-- 
2.25.1

Re: [PATCH v2 10/15] linux-user/s390x: Set psw.mask properly for the signal handler

Posted by David Hildenbrand 4 years, 9 months ago

On 28.04.21 21:34, Richard Henderson wrote:
> Note that PSW_ADDR_{64,32} are called PSW_MASK_{EA,BA}
> in the kernel source.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   linux-user/s390x/signal.c | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c
> index 64a9eab097..17f617c655 100644
> --- a/linux-user/s390x/signal.c
> +++ b/linux-user/s390x/signal.c
> @@ -162,6 +162,9 @@ void setup_frame(int sig, struct target_sigaction *ka,
>   
>       /* Set up registers for signal handler */
>       env->regs[15] = frame_addr;
> +    /* Force default amode and default user address space control. */
> +    env->psw.mask = PSW_MASK_64 | PSW_MASK_32 | PSW_ASC_PRIMARY
> +                  | (env->psw.mask & ~PSW_MASK_ASC);
>       env->psw.addr = ka->_sa_handler;
>   
>       env->regs[2] = sig; //map_signal(sig);
> @@ -215,6 +218,9 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
>   
>       /* Set up registers for signal handler */
>       env->regs[15] = frame_addr;
> +    /* Force default amode and default user address space control. */
> +    env->psw.mask = PSW_MASK_64 | PSW_MASK_32 | PSW_ASC_PRIMARY
> +                  | (env->psw.mask & ~PSW_MASK_ASC);
>       env->psw.addr = ka->_sa_handler;
>   
>       env->regs[2] = sig; //map_signal(sig);
> 

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Thanks,

David / dhildenb