* [PATCH] linux-user: implement the semtimedop syscall
@ 2020-07-13 10:05 Andreas Schwab
2020-07-13 16:18 ` Laurent Vivier
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Schwab @ 2020-07-13 10:05 UTC (permalink / raw)
To: Laurent Vivier; +Cc: qemu-devel
Signed-off-by: Andreas Schwab <schwab@suse.de>
---
linux-user/syscall.c | 32 +++++++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 9ec03a889d..7c0f5b83ff 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3877,23 +3877,37 @@ 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)
+static inline abi_long do_semtimedop(int semid, abi_long ptr, unsigned nsops,
+ abi_long timeout)
{
struct sembuf sops[nsops];
+ struct timespec ts, *pts;
abi_long ret;
if (target_to_host_sembuf(sops, ptr, nsops))
return -TARGET_EFAULT;
+ if (timeout) {
+ pts = &ts;
+ if (target_to_host_timespec(pts, timeout)) {
+ return -TARGET_EFAULT;
+ }
+ } else {
+ pts = NULL;
+ }
+
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, nsops, 0, sops, pts));
}
#endif
+ if (!is_error(ret) && timeout) {
+ ret = host_to_target_timespec(timeout, pts);
+ }
return ret;
}
@@ -4371,7 +4385,11 @@ 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:
+ ret = do_semtimedop(first, ptr, second, third);
break;
case IPCOP_semget:
@@ -9683,7 +9701,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:
--
2.26.2
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] linux-user: implement the semtimedop syscall
2020-07-13 10:05 [PATCH] linux-user: implement the semtimedop syscall Andreas Schwab
@ 2020-07-13 16:18 ` Laurent Vivier
0 siblings, 0 replies; 2+ messages in thread
From: Laurent Vivier @ 2020-07-13 16:18 UTC (permalink / raw)
To: Andreas Schwab; +Cc: qemu-devel
Thank you but we have already a series pending to fix that:
https://patchew.org/QEMU/20200626124612.58593-1-mkysel@tachyum.com/
Laurent
Le 13/07/2020 à 12:05, Andreas Schwab a écrit :
> Signed-off-by: Andreas Schwab <schwab@suse.de>
> ---
> linux-user/syscall.c | 32 +++++++++++++++++++++++++++-----
> 1 file changed, 27 insertions(+), 5 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 9ec03a889d..7c0f5b83ff 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -3877,23 +3877,37 @@ 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)
> +static inline abi_long do_semtimedop(int semid, abi_long ptr, unsigned nsops,
> + abi_long timeout)
> {
> struct sembuf sops[nsops];
> + struct timespec ts, *pts;
> abi_long ret;
>
> if (target_to_host_sembuf(sops, ptr, nsops))
> return -TARGET_EFAULT;
>
> + if (timeout) {
> + pts = &ts;
> + if (target_to_host_timespec(pts, timeout)) {
> + return -TARGET_EFAULT;
> + }
> + } else {
> + pts = NULL;
> + }
> +
> 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, nsops, 0, sops, pts));
> }
> #endif
> + if (!is_error(ret) && timeout) {
> + ret = host_to_target_timespec(timeout, pts);
> + }
> return ret;
> }
>
> @@ -4371,7 +4385,11 @@ 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:
> + ret = do_semtimedop(first, ptr, second, third);
> break;
>
> case IPCOP_semget:
> @@ -9683,7 +9701,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:
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-13 16:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-13 10:05 [PATCH] linux-user: implement the semtimedop syscall Andreas Schwab
2020-07-13 16:18 ` Laurent Vivier
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.