| Message ID | 20230808093434.2059-1-zhiwei_liu@linux.alibaba.com |
|---|---|
| State | New |
| Headers | show |
| Series | linux-user/riscv: Use abi_ulong for target_ucontext | expand |
On 8/8/23 06:34, LIU Zhiwei wrote: > We should not use types dependend on host arch for target_ucontext. > This bug is found when run rv32 applications. > > Signed-off-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com> > --- Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > linux-user/riscv/signal.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/linux-user/riscv/signal.c b/linux-user/riscv/signal.c > index eaa168199a..ff8634a272 100644 > --- a/linux-user/riscv/signal.c > +++ b/linux-user/riscv/signal.c > @@ -38,8 +38,8 @@ struct target_sigcontext { > }; /* cf. riscv-linux:arch/riscv/include/uapi/asm/ptrace.h */ > > struct target_ucontext { > - unsigned long uc_flags; > - struct target_ucontext *uc_link; > + abi_ulong uc_flags; > + abi_ulong uc_link; > target_stack_t uc_stack; > target_sigset_t uc_sigmask; > uint8_t __unused[1024 / 8 - sizeof(target_sigset_t)];
On 8/8/23 02:34, LIU Zhiwei wrote: > We should not use types dependend on host arch for target_ucontext. > This bug is found when run rv32 applications. > > Signed-off-by: LIU Zhiwei<zhiwei_liu@linux.alibaba.com> > --- > linux-user/riscv/signal.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 8/8/23 11:34, LIU Zhiwei wrote: > We should not use types dependend on host arch for target_ucontext. > This bug is found when run rv32 applications. > > Signed-off-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com> > --- > linux-user/riscv/signal.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/linux-user/riscv/signal.c b/linux-user/riscv/signal.c > index eaa168199a..ff8634a272 100644 > --- a/linux-user/riscv/signal.c > +++ b/linux-user/riscv/signal.c > @@ -38,8 +38,8 @@ struct target_sigcontext { > }; /* cf. riscv-linux:arch/riscv/include/uapi/asm/ptrace.h */ > > struct target_ucontext { > - unsigned long uc_flags; > - struct target_ucontext *uc_link; > + abi_ulong uc_flags; Correct. > + abi_ulong uc_link; Isn't it 'abi_ptr uc_link' instead? > target_stack_t uc_stack; > target_sigset_t uc_sigmask; > uint8_t __unused[1024 / 8 - sizeof(target_sigset_t)];
On 2023/8/10 18:48, Philippe Mathieu-Daudé wrote: > On 8/8/23 11:34, LIU Zhiwei wrote: >> We should not use types dependend on host arch for target_ucontext. >> This bug is found when run rv32 applications. >> >> Signed-off-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com> >> --- >> linux-user/riscv/signal.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/linux-user/riscv/signal.c b/linux-user/riscv/signal.c >> index eaa168199a..ff8634a272 100644 >> --- a/linux-user/riscv/signal.c >> +++ b/linux-user/riscv/signal.c >> @@ -38,8 +38,8 @@ struct target_sigcontext { >> }; /* cf. riscv-linux:arch/riscv/include/uapi/asm/ptrace.h */ >> struct target_ucontext { >> - unsigned long uc_flags; >> - struct target_ucontext *uc_link; >> + abi_ulong uc_flags; > > Correct. > >> + abi_ulong uc_link; > > Isn't it 'abi_ptr uc_link' instead? Thanks, I think abi_ptr is better. As RISC-V doesn't has similar ABI as sparc32plus(64bit long but 32bit space address). It is also right here. And many arches use the abi_ulong for uc_link, such as ARM. I will send a v2 patch. Zhiwei > >> target_stack_t uc_stack; >> target_sigset_t uc_sigmask; >> uint8_t __unused[1024 / 8 - sizeof(target_sigset_t)]; > >
diff --git a/linux-user/riscv/signal.c b/linux-user/riscv/signal.c index eaa168199a..ff8634a272 100644 --- a/linux-user/riscv/signal.c +++ b/linux-user/riscv/signal.c @@ -38,8 +38,8 @@ struct target_sigcontext { }; /* cf. riscv-linux:arch/riscv/include/uapi/asm/ptrace.h */ struct target_ucontext { - unsigned long uc_flags; - struct target_ucontext *uc_link; + abi_ulong uc_flags; + abi_ulong uc_link; target_stack_t uc_stack; target_sigset_t uc_sigmask; uint8_t __unused[1024 / 8 - sizeof(target_sigset_t)];
We should not use types dependend on host arch for target_ucontext. This bug is found when run rv32 applications. Signed-off-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com> --- linux-user/riscv/signal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)