Message ID | 20200626124612.58593-3-mkysel@tachyum.com |
---|---|
State | New |
Headers | show |
Series | linux-user: support of semtimedop syscall | expand |
Le 26/06/2020 à 14:46, Matus Kysel a écrit : > We should add support of semtimedop syscall as new version of glibc > 2.31 uses semop based on semtimedop > (commit: https://gitlab.com/freedesktop-sdk/mirrors/sourceware/glibc/-/commit/765cdd0bffd77960ae852104fc4ea5edcdb8aed3 ). > > Signed-off-by: Matus Kysel <mkysel@tachyum.com> > --- > linux-user/syscall.c | 58 +++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 52 insertions(+), 6 deletions(-) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 990412733b..538a7e673c 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -1232,7 +1232,8 @@ static inline abi_long copy_to_user_timeval64(abi_ulong target_tv_addr, > defined(TARGET_NR_pselect6) || defined(TARGET_NR_pselect6) || \ > defined(TARGET_NR_nanosleep) || defined(TARGET_NR_clock_settime) || \ > defined(TARGET_NR_utimensat) || defined(TARGET_NR_mq_timedsend) || \ > - defined(TARGET_NR_mq_timedreceive) > + defined(TARGET_NR_mq_timedreceive) || defined(TARGET_NR_ipc) || \ > + defined(TARGET_NR_semop) || defined(TARGET_NR_semtimedop) > static inline abi_long target_to_host_timespec(struct timespec *host_ts, > abi_ulong target_addr) > { > @@ -3880,25 +3881,53 @@ static inline abi_long target_to_host_sembuf(struct sembuf *host_sembuf, > return 0; > } > > -static inline abi_long do_semop(int semid, abi_long ptr, unsigned nsops) > +#if defined(TARGET_NR_ipc) || defined(TARGET_NR_semop) || \ > + defined(TARGET_NR_semtimedop) > + > +/* > + * This macro is required to handle the s390 variants, which passes the > + * arguments in a different order than default. > + */ > +#ifdef __s390x__ > +#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \ > + (__nsops), (__timeout), (__sops) > +#else > +#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \ > + (__nsops), 0, (__sops), (__timeout) > +#endif > + > +static inline abi_long do_semtimedop(int semid, > + abi_long ptr, > + unsigned nsops, > + abi_long timeout) > { > struct sembuf sops[nsops]; > + struct timespec ts, *pts = NULL; > abi_long ret; > > + if (timeout) { > + pts = &ts; > + if (target_to_host_timespec(pts, timeout)) { > + return -TARGET_EFAULT; > + } > + } > + > if (target_to_host_sembuf(sops, ptr, nsops)) > return -TARGET_EFAULT; > > ret = -TARGET_ENOSYS; > #ifdef __NR_semtimedop > - ret = get_errno(safe_semtimedop(semid, sops, nsops, NULL)); > + ret = get_errno(safe_semtimedop(semid, sops, nsops, pts)); > #endif > #ifdef __NR_ipc > if (ret == -TARGET_ENOSYS) { > - ret = get_errno(safe_ipc(IPCOP_semtimedop, semid, nsops, 0, sops, 0)); > + ret = get_errno(safe_ipc(IPCOP_semtimedop, semid, > + SEMTIMEDOP_IPC_ARGS(nsops, sops, (long)pts))); > } > #endif > return ret; > } > +#endif > > struct target_msqid_ds > { > @@ -4393,7 +4422,20 @@ static abi_long do_ipc(CPUArchState *cpu_env, > > switch (call) { > case IPCOP_semop: > - ret = do_semop(first, ptr, second); > + ret = do_semtimedop(first, ptr, second, 0); > + break; > + case IPCOP_semtimedop: > + /* > + * The s390 sys_ipc variant has only five parameters instead of six > + * (as for default variant) and the only difference is the handling of > + * SEMTIMEDOP where on s390 the third parameter is used as a pointer > + * to a struct timespec where the generic variant uses fifth parameter. > + */ > +#if defined(TARGET_S390X) > + ret = do_semtimedop(first, ptr, second, third); > +#else > + ret = do_semtimedop(first, ptr, second, fifth); > +#endif > break; > > case IPCOP_semget: > @@ -9644,7 +9686,11 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, > #endif > #ifdef TARGET_NR_semop > case TARGET_NR_semop: > - return do_semop(arg1, arg2, arg3); > + return do_semtimedop(arg1, arg2, arg3, 0); > +#endif > +#ifdef TARGET_NR_semtimedop > + case TARGET_NR_semtimedop: > + return do_semtimedop(arg1, arg2, arg3, arg4); > #endif > #ifdef TARGET_NR_semctl > case TARGET_NR_semctl: > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Le 26/06/2020 à 14:46, Matus Kysel a écrit : > We should add support of semtimedop syscall as new version of glibc > 2.31 uses semop based on semtimedop > (commit: https://gitlab.com/freedesktop-sdk/mirrors/sourceware/glibc/-/commit/765cdd0bffd77960ae852104fc4ea5edcdb8aed3 ). > > Signed-off-by: Matus Kysel <mkysel@tachyum.com> > --- > linux-user/syscall.c | 58 +++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 52 insertions(+), 6 deletions(-) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 990412733b..538a7e673c 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -1232,7 +1232,8 @@ static inline abi_long copy_to_user_timeval64(abi_ulong target_tv_addr, > defined(TARGET_NR_pselect6) || defined(TARGET_NR_pselect6) || \ > defined(TARGET_NR_nanosleep) || defined(TARGET_NR_clock_settime) || \ > defined(TARGET_NR_utimensat) || defined(TARGET_NR_mq_timedsend) || \ > - defined(TARGET_NR_mq_timedreceive) > + defined(TARGET_NR_mq_timedreceive) || defined(TARGET_NR_ipc) || \ > + defined(TARGET_NR_semop) || defined(TARGET_NR_semtimedop) > static inline abi_long target_to_host_timespec(struct timespec *host_ts, > abi_ulong target_addr) > { > @@ -3880,25 +3881,53 @@ static inline abi_long target_to_host_sembuf(struct sembuf *host_sembuf, > return 0; > } > > -static inline abi_long do_semop(int semid, abi_long ptr, unsigned nsops) > +#if defined(TARGET_NR_ipc) || defined(TARGET_NR_semop) || \ > + defined(TARGET_NR_semtimedop) > + > +/* > + * This macro is required to handle the s390 variants, which passes the > + * arguments in a different order than default. > + */ > +#ifdef __s390x__ > +#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \ > + (__nsops), (__timeout), (__sops) > +#else > +#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \ > + (__nsops), 0, (__sops), (__timeout) > +#endif > + > +static inline abi_long do_semtimedop(int semid, > + abi_long ptr, > + unsigned nsops, > + abi_long timeout) > { > struct sembuf sops[nsops]; > + struct timespec ts, *pts = NULL; > abi_long ret; > > + if (timeout) { > + pts = &ts; > + if (target_to_host_timespec(pts, timeout)) { > + return -TARGET_EFAULT; > + } > + } > + > if (target_to_host_sembuf(sops, ptr, nsops)) > return -TARGET_EFAULT; > > ret = -TARGET_ENOSYS; > #ifdef __NR_semtimedop > - ret = get_errno(safe_semtimedop(semid, sops, nsops, NULL)); > + ret = get_errno(safe_semtimedop(semid, sops, nsops, pts)); > #endif > #ifdef __NR_ipc > if (ret == -TARGET_ENOSYS) { > - ret = get_errno(safe_ipc(IPCOP_semtimedop, semid, nsops, 0, sops, 0)); > + ret = get_errno(safe_ipc(IPCOP_semtimedop, semid, > + SEMTIMEDOP_IPC_ARGS(nsops, sops, (long)pts))); > } > #endif > return ret; > } > +#endif > > struct target_msqid_ds > { > @@ -4393,7 +4422,20 @@ static abi_long do_ipc(CPUArchState *cpu_env, > > switch (call) { > case IPCOP_semop: > - ret = do_semop(first, ptr, second); > + ret = do_semtimedop(first, ptr, second, 0); > + break; > + case IPCOP_semtimedop: > + /* > + * The s390 sys_ipc variant has only five parameters instead of six > + * (as for default variant) and the only difference is the handling of > + * SEMTIMEDOP where on s390 the third parameter is used as a pointer > + * to a struct timespec where the generic variant uses fifth parameter. > + */ > +#if defined(TARGET_S390X) > + ret = do_semtimedop(first, ptr, second, third); > +#else > + ret = do_semtimedop(first, ptr, second, fifth); > +#endif > break; > > case IPCOP_semget: > @@ -9644,7 +9686,11 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, > #endif > #ifdef TARGET_NR_semop > case TARGET_NR_semop: > - return do_semop(arg1, arg2, arg3); > + return do_semtimedop(arg1, arg2, arg3, 0); > +#endif > +#ifdef TARGET_NR_semtimedop > + case TARGET_NR_semtimedop: > + return do_semtimedop(arg1, arg2, arg3, arg4); > #endif > #ifdef TARGET_NR_semctl > case TARGET_NR_semctl: > I have merged PATH 1 and 2 and applied to my linux-user-for-5.1 branch. Thanks, Laurent
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 990412733b..538a7e673c 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1232,7 +1232,8 @@ static inline abi_long copy_to_user_timeval64(abi_ulong target_tv_addr, defined(TARGET_NR_pselect6) || defined(TARGET_NR_pselect6) || \ defined(TARGET_NR_nanosleep) || defined(TARGET_NR_clock_settime) || \ defined(TARGET_NR_utimensat) || defined(TARGET_NR_mq_timedsend) || \ - defined(TARGET_NR_mq_timedreceive) + defined(TARGET_NR_mq_timedreceive) || defined(TARGET_NR_ipc) || \ + defined(TARGET_NR_semop) || defined(TARGET_NR_semtimedop) static inline abi_long target_to_host_timespec(struct timespec *host_ts, abi_ulong target_addr) { @@ -3880,25 +3881,53 @@ static inline abi_long target_to_host_sembuf(struct sembuf *host_sembuf, return 0; } -static inline abi_long do_semop(int semid, abi_long ptr, unsigned nsops) +#if defined(TARGET_NR_ipc) || defined(TARGET_NR_semop) || \ + defined(TARGET_NR_semtimedop) + +/* + * This macro is required to handle the s390 variants, which passes the + * arguments in a different order than default. + */ +#ifdef __s390x__ +#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \ + (__nsops), (__timeout), (__sops) +#else +#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \ + (__nsops), 0, (__sops), (__timeout) +#endif + +static inline abi_long do_semtimedop(int semid, + abi_long ptr, + unsigned nsops, + abi_long timeout) { struct sembuf sops[nsops]; + struct timespec ts, *pts = NULL; abi_long ret; + if (timeout) { + pts = &ts; + if (target_to_host_timespec(pts, timeout)) { + return -TARGET_EFAULT; + } + } + if (target_to_host_sembuf(sops, ptr, nsops)) return -TARGET_EFAULT; ret = -TARGET_ENOSYS; #ifdef __NR_semtimedop - ret = get_errno(safe_semtimedop(semid, sops, nsops, NULL)); + ret = get_errno(safe_semtimedop(semid, sops, nsops, pts)); #endif #ifdef __NR_ipc if (ret == -TARGET_ENOSYS) { - ret = get_errno(safe_ipc(IPCOP_semtimedop, semid, nsops, 0, sops, 0)); + ret = get_errno(safe_ipc(IPCOP_semtimedop, semid, + SEMTIMEDOP_IPC_ARGS(nsops, sops, (long)pts))); } #endif return ret; } +#endif struct target_msqid_ds { @@ -4393,7 +4422,20 @@ static abi_long do_ipc(CPUArchState *cpu_env, switch (call) { case IPCOP_semop: - ret = do_semop(first, ptr, second); + ret = do_semtimedop(first, ptr, second, 0); + break; + case IPCOP_semtimedop: + /* + * The s390 sys_ipc variant has only five parameters instead of six + * (as for default variant) and the only difference is the handling of + * SEMTIMEDOP where on s390 the third parameter is used as a pointer + * to a struct timespec where the generic variant uses fifth parameter. + */ +#if defined(TARGET_S390X) + ret = do_semtimedop(first, ptr, second, third); +#else + ret = do_semtimedop(first, ptr, second, fifth); +#endif break; case IPCOP_semget: @@ -9644,7 +9686,11 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, #endif #ifdef TARGET_NR_semop case TARGET_NR_semop: - return do_semop(arg1, arg2, arg3); + return do_semtimedop(arg1, arg2, arg3, 0); +#endif +#ifdef TARGET_NR_semtimedop + case TARGET_NR_semtimedop: + return do_semtimedop(arg1, arg2, arg3, arg4); #endif #ifdef TARGET_NR_semctl case TARGET_NR_semctl:
We should add support of semtimedop syscall as new version of glibc 2.31 uses semop based on semtimedop (commit: https://gitlab.com/freedesktop-sdk/mirrors/sourceware/glibc/-/commit/765cdd0bffd77960ae852104fc4ea5edcdb8aed3 ). Signed-off-by: Matus Kysel <mkysel@tachyum.com> --- linux-user/syscall.c | 58 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 6 deletions(-)