tools/nolibc: remove time conversions

Now that 'struct timespec' and 'struct __kernel_timespec' are
compatible, the conversions are not necessary anymore.
The same holds true for 'struct itimerspec' and 'struct
__kernel_itimerspec'.

Remove the conversions.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Acked-by: Willy Tarreau <w@1wt.eu>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20251220-nolibc-uapi-types-v3-11-c662992f75d7@weissschuh.net

diff --git a/tools/include/nolibc/sys/timerfd.h b/tools/include/nolibc/sys/timerfd.h
index 66f779553d31d146eed1466457ab5f07c590691f..616fcfb416a9d53d2536358b70f387d00d1e21f6 100644 (file)
--- a/tools/include/nolibc/sys/timerfd.h
+++ b/tools/include/nolibc/sys/timerfd.h
@@ -33,13 +33,7 @@ static __attribute__((unused))
 int sys_timerfd_gettime(int fd, struct itimerspec *curr_value)
 {
 #if defined(__NR_timerfd_gettime64)
-       struct __kernel_itimerspec kcurr_value;
-       int ret;
-
-       ret = my_syscall2(__NR_timerfd_gettime64, fd, &kcurr_value);
-       __nolibc_timespec_kernel_to_user(&kcurr_value.it_interval, &curr_value->it_interval);
-       __nolibc_timespec_kernel_to_user(&kcurr_value.it_value, &curr_value->it_value);
-       return ret;
+       return my_syscall2(__NR_timerfd_gettime64, fd, curr_value);
 #else
        return my_syscall2(__NR_timerfd_gettime, fd, curr_value);
 #endif
@@ -57,17 +51,7 @@ int sys_timerfd_settime(int fd, int flags,
                        const struct itimerspec *new_value, struct itimerspec *old_value)
 {
 #if defined(__NR_timerfd_settime64)
-       struct __kernel_itimerspec knew_value, kold_value;
-       int ret;
-
-       __nolibc_timespec_user_to_kernel(&new_value->it_value, &knew_value.it_value);
-       __nolibc_timespec_user_to_kernel(&new_value->it_interval, &knew_value.it_interval);
-       ret = my_syscall4(__NR_timerfd_settime64, fd, flags, &knew_value, &kold_value);
-       if (old_value) {
-               __nolibc_timespec_kernel_to_user(&kold_value.it_interval, &old_value->it_interval);
-               __nolibc_timespec_kernel_to_user(&kold_value.it_value, &old_value->it_value);
-       }
-       return ret;
+       return my_syscall4(__NR_timerfd_settime64, fd, flags, new_value, old_value);
 #else
        return my_syscall4(__NR_timerfd_settime, fd, flags, new_value, old_value);
 #endif

diff --git a/tools/include/nolibc/time.h b/tools/include/nolibc/time.h
index 45df9b09d7b61f599d610b676889b38b6a08f865..ab67f209c99fec9086381539a53d90292c01ab4f 100644 (file)
--- a/tools/include/nolibc/time.h
+++ b/tools/include/nolibc/time.h
@@ -18,20 +18,6 @@
 #include <linux/signal.h>
 #include <linux/time.h>
 
-static __inline__
-void __nolibc_timespec_user_to_kernel(const struct timespec *ts, struct __kernel_timespec *kts)
-{
-       kts->tv_sec = ts->tv_sec;
-       kts->tv_nsec = ts->tv_nsec;
-}
-
-static __inline__
-void __nolibc_timespec_kernel_to_user(const struct __kernel_timespec *kts, struct timespec *ts)
-{
-       ts->tv_sec = kts->tv_sec;
-       ts->tv_nsec = kts->tv_nsec;
-}
-
 /*
  * int clock_getres(clockid_t clockid, struct timespec *res);
  * int clock_gettime(clockid_t clockid, struct timespec *tp);
@@ -44,13 +30,7 @@ static __attribute__((unused))
 int sys_clock_getres(clockid_t clockid, struct timespec *res)
 {
 #if defined(__NR_clock_getres_time64)
-       struct __kernel_timespec kres;
-       int ret;
-
-       ret = my_syscall2(__NR_clock_getres_time64, clockid, &kres);
-       if (res)
-               __nolibc_timespec_kernel_to_user(&kres, res);
-       return ret;
+       return my_syscall2(__NR_clock_getres_time64, clockid, res);
 #else
        return my_syscall2(__NR_clock_getres, clockid, res);
 #endif
@@ -66,13 +46,7 @@ static __attribute__((unused))
 int sys_clock_gettime(clockid_t clockid, struct timespec *tp)
 {
 #if defined(__NR_clock_gettime64)
-       struct __kernel_timespec ktp;
-       int ret;
-
-       ret = my_syscall2(__NR_clock_gettime64, clockid, &ktp);
-       if (tp)
-               __nolibc_timespec_kernel_to_user(&ktp, tp);
-       return ret;
+       return my_syscall2(__NR_clock_gettime64, clockid, tp);
 #else
        return my_syscall2(__NR_clock_gettime, clockid, tp);
 #endif
@@ -88,10 +62,7 @@ static __attribute__((unused))
 int sys_clock_settime(clockid_t clockid, struct timespec *tp)
 {
 #if defined(__NR_clock_settime64)
-       struct __kernel_timespec ktp;
-
-       __nolibc_timespec_user_to_kernel(tp, &ktp);
-       return my_syscall2(__NR_clock_settime64, clockid, &ktp);
+       return my_syscall2(__NR_clock_settime64, clockid, tp);
 #else
        return my_syscall2(__NR_clock_settime, clockid, tp);
 #endif
@@ -108,14 +79,7 @@ int sys_clock_nanosleep(clockid_t clockid, int flags, const struct timespec *rqt
                        struct timespec *rmtp)
 {
 #if defined(__NR_clock_nanosleep_time64)
-       struct __kernel_timespec krqtp, krmtp;
-       int ret;
-
-       __nolibc_timespec_user_to_kernel(rqtp, &krqtp);
-       ret = my_syscall4(__NR_clock_nanosleep_time64, clockid, flags, &krqtp, &krmtp);
-       if (rmtp)
-               __nolibc_timespec_kernel_to_user(&krmtp, rmtp);
-       return ret;
+       return my_syscall4(__NR_clock_nanosleep_time64, clockid, flags, rqtp, rmtp);
 #else
        return my_syscall4(__NR_clock_nanosleep, clockid, flags, rqtp, rmtp);
 #endif
@@ -190,13 +154,7 @@ static __attribute__((unused))
 int sys_timer_gettime(timer_t timerid, struct itimerspec *curr_value)
 {
 #if defined(__NR_timer_gettime64)
-       struct __kernel_itimerspec kcurr_value;
-       int ret;
-
-       ret = my_syscall2(__NR_timer_gettime64, timerid, &kcurr_value);
-       __nolibc_timespec_kernel_to_user(&kcurr_value.it_interval, &curr_value->it_interval);
-       __nolibc_timespec_kernel_to_user(&kcurr_value.it_value, &curr_value->it_value);
-       return ret;
+       return my_syscall2(__NR_timer_gettime64, timerid, curr_value);
 #else
        return my_syscall2(__NR_timer_gettime, timerid, curr_value);
 #endif
@@ -213,17 +171,7 @@ int sys_timer_settime(timer_t timerid, int flags,
                      const struct itimerspec *new_value, struct itimerspec *old_value)
 {
 #if defined(__NR_timer_settime64)
-       struct __kernel_itimerspec knew_value, kold_value;
-       int ret;
-
-       __nolibc_timespec_user_to_kernel(&new_value->it_value, &knew_value.it_value);
-       __nolibc_timespec_user_to_kernel(&new_value->it_interval, &knew_value.it_interval);
-       ret = my_syscall4(__NR_timer_settime64, timerid, flags, &knew_value, &kold_value);
-       if (old_value) {
-               __nolibc_timespec_kernel_to_user(&kold_value.it_interval, &old_value->it_interval);
-               __nolibc_timespec_kernel_to_user(&kold_value.it_value, &old_value->it_value);
-       }
-       return ret;
+       return my_syscall4(__NR_timer_settime64, timerid, flags, new_value, old_value);
 #else
        return my_syscall4(__NR_timer_settime, timerid, flags, new_value, old_value);
 #endif