From nobody Tue Dec 2 01:36:40 2025 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DC9B2F49E9; Sat, 22 Nov 2025 16:59:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763830799; cv=none; b=TiFWyivUyMzcjoxgC/ZsRWaQnbIR3jpdItBdlaTOxCBA3T6kptsgsxhD2VkFvhTaxb+pvT5XNWJMvzrdw1Y8kPk7Pg8Zwks85cQyXUZZLjEGLTTgRQvQSGX87P5qAluCK26fzZAfCoQIDnhsx33kSqxbKdlQVL6w8YHuSI3TocA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763830799; c=relaxed/simple; bh=bsQW4lHwKKOWdaZNmUTzPbVW4plm0Vc565vNPYmYsB0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QqEHEVN67SjPl/HUvT9Xk2ndMgrZcCoLsCovaBq9Wy5/OF186BHS10MXn8RltGgxkLNSBPpVFaHBpH5yPnNG3yOJhT1RTNmtw7KaFEGvVwfQxrlDxP8N3DQngevcMTltnX1UqzEgg+izz1KdRFnxFceUlDbXnMxiamNeolRXk/I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=NRLQt+wn; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="NRLQt+wn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1763830792; bh=bsQW4lHwKKOWdaZNmUTzPbVW4plm0Vc565vNPYmYsB0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NRLQt+wnRr0BSCzmD+FM+xl1op6CLbhMGA+FuNGp33DZjuamsY/bWjYMYVSHkOkXh zaLneOMB2+SKooa0chX3BxKxO89ODO9+MTxZmul4lu8oZTp8myUa4e+LCB4GXYXW3q S3ZAyIHGulR1KX9agMKq2FpbksnoH7+T5Zn61cYs= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sat, 22 Nov 2025 17:59:17 +0100 Subject: [PATCH v2 11/13] tools/nolibc: remove time conversions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251122-nolibc-uapi-types-v2-11-b814a43654f5@weissschuh.net> References: <20251122-nolibc-uapi-types-v2-0-b814a43654f5@weissschuh.net> In-Reply-To: <20251122-nolibc-uapi-types-v2-0-b814a43654f5@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1763830790; l=6491; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=bsQW4lHwKKOWdaZNmUTzPbVW4plm0Vc565vNPYmYsB0=; b=89Q/NKTm6FrBXMF50DdWZvKlnXbBwssaHeDF0IZ4DaE1a4310m0qPwArWJarZn0RSXyJmxwyB 9r7aJuKhDIcCT6yF2SgUruX6EUa+Z7iB8gBJM8AqUf0WyIkPMZdQ1jf X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= 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=C3=9Fschuh --- tools/include/nolibc/sys/timerfd.h | 20 ++---------- tools/include/nolibc/time.h | 64 ++++------------------------------= ---- 2 files changed, 8 insertions(+), 76 deletions(-) diff --git a/tools/include/nolibc/sys/timerfd.h b/tools/include/nolibc/sys/= timerfd.h index 66f779553d31..616fcfb416a9 100644 --- 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 =3D my_syscall2(__NR_timerfd_gettime64, fd, &kcurr_value); - __nolibc_timespec_kernel_to_user(&kcurr_value.it_interval, &curr_value->i= t_interval); - __nolibc_timespec_kernel_to_user(&kcurr_value.it_value, &curr_value->it_v= alue); - 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_val= ue); - __nolibc_timespec_user_to_kernel(&new_value->it_interval, &knew_value.it_= interval); - ret =3D 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_va= lue); - } - return ret; + return my_syscall4(__NR_timerfd_settime64, fd, flags, new_value, old_valu= e); #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 45df9b09d7b6..ab67f209c99f 100644 --- a/tools/include/nolibc/time.h +++ b/tools/include/nolibc/time.h @@ -18,20 +18,6 @@ #include #include =20 -static __inline__ -void __nolibc_timespec_user_to_kernel(const struct timespec *ts, struct __= kernel_timespec *kts) -{ - kts->tv_sec =3D ts->tv_sec; - kts->tv_nsec =3D ts->tv_nsec; -} - -static __inline__ -void __nolibc_timespec_kernel_to_user(const struct __kernel_timespec *kts,= struct timespec *ts) -{ - ts->tv_sec =3D kts->tv_sec; - ts->tv_nsec =3D 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 =3D 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 =3D 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, c= onst 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 =3D 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, rmt= p); #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 =3D my_syscall2(__NR_timer_gettime64, timerid, &kcurr_value); - __nolibc_timespec_kernel_to_user(&kcurr_value.it_interval, &curr_value->i= t_interval); - __nolibc_timespec_kernel_to_user(&kcurr_value.it_value, &curr_value->it_v= alue); - 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_val= ue); - __nolibc_timespec_user_to_kernel(&new_value->it_interval, &knew_value.it_= interval); - ret =3D my_syscall4(__NR_timer_settime64, timerid, flags, &knew_value, &k= old_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_va= lue); - } - return ret; + return my_syscall4(__NR_timer_settime64, timerid, flags, new_value, old_v= alue); #else return my_syscall4(__NR_timer_settime, timerid, flags, new_value, old_val= ue); #endif --=20 2.52.0