Re: [PATCH v4 2/3] linux-user/syscall: Add support for clock_gettime64/clock_settime64

[Laurent Vivier]

Le 04/03/2020 à 01:44, Alistair Francis a écrit :
> Add support for the clock_gettime64/clock_settime64 syscalls. Currently
> we only support these syscalls when running on 64-bit hosts.
> 
> Signed-off-by: Alistair Francis <address@hidden>
> ---
>  linux-user/syscall.c | 43 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 43 insertions(+)
> 
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index c000fb07c5..82468e018d 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -1236,6 +1236,22 @@ static inline abi_long target_to_host_timespec(struct 
> timespec *host_ts,
>  }
>  #endif
>  
> +#if defined(TARGET_NR_clock_settime64) && HOST_LONG_BITS == 64

Remove the "HOST_LONG_BITS == 64"

> +static inline abi_long target_to_host_timespec64(struct timespec *host_ts,
> +                                                 abi_ulong target_addr)
> +{
> +    struct target_timespec *target_ts;

Use target__kernel_timespec that uses 64bit fields.

target_timespec uses long, and on 32bit archs it's a 32bit field (and
_time64 syscalls are only available on 32bit archs).


> +
> +    if (!lock_user_struct(VERIFY_READ, target_ts, target_addr, 1)) {
> +        return -TARGET_EFAULT;
> +    }
> +    __get_user(host_ts->tv_sec, &target_ts->tv_sec);
> +    __get_user(host_ts->tv_nsec, &target_ts->tv_nsec);
> +    unlock_user_struct(target_ts, target_addr, 0);
> +    return 0;
> +}
> +#endif
> +
>  static inline abi_long host_to_target_timespec(abi_ulong target_addr,
>                                                 struct timespec *host_ts)
>  {
> @@ -11465,6 +11481,20 @@ static abi_long do_syscall1(void *cpu_env, int num, 
> abi_long arg1,
>          return ret;
>      }
>  #endif
> +#ifdef TARGET_NR_clock_settime64
> +# if HOST_LONG_BITS == 64

Remove this check ...

> +    case TARGET_NR_clock_settime64:
> +    {
> +        struct timespec ts;
> +
> +        ret = target_to_host_timespec64(&ts, arg2);

.. and if your host is 64bit or is using _time64 syscall the field of
timespec would be 64bit and clock_settime uses the _time64 syscall.
In the other case (32bit clock_settime()), the fields will be rounded
(it will work until year 2038...) :)

> +        if (!is_error(ret)) {
> +            ret = get_errno(clock_settime(arg1, &ts));
> +        }
> +        return ret;
> +    }
> +# endif
> +#endif
>  #ifdef TARGET_NR_clock_gettime
>      case TARGET_NR_clock_gettime:
>      {
> @@ -11476,6 +11506,19 @@ static abi_long do_syscall1(void *cpu_env, int num, 
> abi_long arg1,
>          return ret;
>      }
>  #endif
> +#ifdef TARGET_NR_clock_gettime64
> +# if HOST_LONG_BITS == 64

ditto

> +    case TARGET_NR_clock_gettime64:
> +    {
> +        struct timespec ts;
> +        ret = get_errno(clock_gettime(arg1, &ts));
> +        if (!is_error(ret)) {
> +            ret = host_to_target_timespec64(arg2, &ts);
> +        }
> +        return ret;
> +    }
> +# endif
> +#endif
>  #ifdef TARGET_NR_clock_getres
>      case TARGET_NR_clock_getres:
>      {
> 

Thanks,
Laurent