From patchwork Sat Mar 28 15:22:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 38650 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa3.hgst.iphmx.com (esa3.hgst.iphmx.com [216.71.153.141]) by sourceware.org (Postfix) with ESMTPS id 9D33E3885C1B for ; Sat, 28 Mar 2020 15:30:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9D33E3885C1B IronPort-SDR: UzT+oPh2yRO53gi0Ro4IY8EAyDDnoV0lv6xfCxRZdn5U3uGbaF1M5IpkkXfUutUPNOwUGBh8oH dS82kVl9BScMsnnRZmSWRlWaoTW60Mtdgcql3/gW/lOgg6uUSJkk24KAewXMJVFKNpVGph5gxd lJYTqUeQ4kwW5EkmSO5LroZMr8WSzzZmOS/DVwfzp6looJpP/pks8XRhoS17oQe550a07YnjtC xlN8QYUAEtEKgT2s0WqihEfU4GGhpiOUZiQ8swnRUMT/TY7WAFNaMSEGvH8XG9UmNzppJ3J8fg bAg= X-IronPort-AV: E=Sophos;i="5.72,316,1580745600"; d="scan'208";a="138142290" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 28 Mar 2020 23:30:30 +0800 IronPort-SDR: Mjn/Zo7E/kKYNH6RLvgE6m4vY1VnVb4PsDjx9hBuG+u/gBU6npcsVmPWvVt5CH258MW/M3rt/8 xAxaKO5KQRRb+zvlLFUu1SdxAKsX+K3QUizDCbGRAHQGtIFbEIeXELE74s9i9AP4EIHHeXfZ3A Rf+wCSB8pOzELrKTvtg56BVj4IHh2AM4kMxD1OAWwlDhd2aVEy+8NWxpJRHEF2e1xdhrBvKJXO 5/1ToSHIFNyUaLfKAHQclVvnRLtYqY8UhZrqxT2nJnzkW6RygB6UWl8NKu+PkYsJlss7/7h7qY kBrWHtykbY4k7tIN8OfBHLoP Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2020 08:21:29 -0700 IronPort-SDR: 73drwKj3P5NA12wKaPUwujAbNZo1crHZ2TZAHyiM7wPHOrQLa57zXLlvi7ELjmWLUZhV90Ev+J chk3uWKR/JypvCv9ehgv6LXP6XuI0GBlmyKZjQ76gjB56efmEdavNcFscXiPm9eBVkHN1cLlzr ufxvcgEhlkdTUKB0HlLnfUpiQOWhC98LmA6Yxs9pkfJMQQzftwQM/5D5G34IfvOcem4xY+B1UT seaXUomNAG6s/AFeblPaIyjstNSRFNsiPs1bV+55BqqSfxmvl9r+zqLNaeLP/4v5TTriaJt3lm Fy4= WDCIronportException: Internal Received: from wdapacbjl0003.my.asia.wdc.com (HELO risc6-mainframe.hgst.com) ([10.86.55.5]) by uls-op-cesaip02.wdc.com with ESMTP; 28 Mar 2020 08:30:29 -0700 From: Alistair Francis To: libc-alpha@sourceware.org Cc: Vineet.Gupta1@synopsys.com, alistair23@gmail.com, Alistair Francis , Lukasz Majewski Subject: [PATCH v6 4/5] linux: Use long time_t for wait4/getrusage Date: Sat, 28 Mar 2020 08:22:48 -0700 Message-Id: <20200328152249.972428-5-alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200328152249.972428-1-alistair.francis@wdc.com> References: <20200328152249.972428-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-26.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2020 15:30:36 -0000 The Linux kernel expects rusage to use a 32-bit time_t, even on archs with a 64-bit time_t (like RV32). To address this let's convert rusage to/from 32-bit and 64-bit to ensure the kernel always gets a 32-bit time_t. While we are converting these functions let's also convert them to be the y2038 safe versions. This means there is a *64 function that is called by a backwards compatible wrapper. Reviewed-by: Lukasz Majewski --- include/sys/resource.h | 11 +++++ sysdeps/unix/syscalls.list | 1 - sysdeps/unix/sysv/linux/getrusage.c | 58 +++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/tv32-compat.h | 47 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/wait4.c | 50 ++++++++++++++++++++++- 5 files changed, 164 insertions(+), 3 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/getrusage.c diff --git a/include/sys/resource.h b/include/sys/resource.h index 9d604dfe3e..64925f257c 100644 --- a/include/sys/resource.h +++ b/include/sys/resource.h @@ -134,5 +134,16 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage) extern int __setrlimit (enum __rlimit_resource __resource, const struct rlimit *__rlimits); libc_hidden_proto (__setrlimit); + +#if __TIMESIZE == 64 +# define __getrusage64 __getrusage +# define __wait4_time64 __wait4 +#else +extern int __getrusage64 (enum __rusage_who who, struct __rusage64 *usage); +libc_hidden_proto (__getrusage64) +extern pid_t __wait4_time64 (pid_t pid, int *stat_loc, int options, + struct __rusage64 *usage); +libc_hidden_proto (__wait4_time64) +#endif #endif #endif diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list index d249049d6e..01c4a0e6b1 100644 --- a/sysdeps/unix/syscalls.list +++ b/sysdeps/unix/syscalls.list @@ -29,7 +29,6 @@ getpeername - getpeername i:ibN __getpeername getpeername getpid - getpid Ei: __getpid getpid getpriority - getpriority i:ii __getpriority getpriority getrlimit - getrlimit i:ip __getrlimit getrlimit -getrusage - getrusage i:ip __getrusage getrusage getsockname - getsockname i:ibN __getsockname getsockname getsockopt - getsockopt i:iiiBN getsockopt getuid - getuid Ei: __getuid getuid diff --git a/sysdeps/unix/sysv/linux/getrusage.c b/sysdeps/unix/sysv/linux/getrusage.c new file mode 100644 index 0000000000..a4e382ed53 --- /dev/null +++ b/sysdeps/unix/sysv/linux/getrusage.c @@ -0,0 +1,58 @@ +/* getrusage -- get the rusage struct. Linux version. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include + +int +__getrusage64 (enum __rusage_who who, struct __rusage64 *usage) +{ +#if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 + return INLINE_SYSCALL_CALL (getrusage, who, usage); +#else + struct __rusage32 usage32; + if (INLINE_SYSCALL_CALL (getrusage, who, &usage32) == -1) + return -1; + + rusage32_to_rusage64 (&usage32, usage); + return 0; +#endif +} + +#if __TIMESIZE != 64 +libc_hidden_def (__getrusage64) +int +__getrusage (enum __rusage_who who, struct rusage *usage) +{ + int ret ; + struct __rusage64 usage64; + + ret = __getrusage64 (who, &usage64); + + if (ret != 0) + return ret; + + rusage64_to_rusage (&usage64, usage); + + return ret; +} +#endif +weak_alias (__getrusage, getrusage) diff --git a/sysdeps/unix/sysv/linux/tv32-compat.h b/sysdeps/unix/sysv/linux/tv32-compat.h index 061a3539e2..574284fc8e 100644 --- a/sysdeps/unix/sysv/linux/tv32-compat.h +++ b/sysdeps/unix/sysv/linux/tv32-compat.h @@ -20,6 +20,7 @@ #define _TV32_COMPAT_H 1 #include +#include /* Structures containing 'struct timeval' with 32-bit time_t. */ struct __itimerval32 @@ -28,4 +29,50 @@ struct __itimerval32 struct __timeval32 it_value; }; +struct __rusage32 +{ + struct __timeval32 ru_utime; /* user time used */ + struct __timeval32 ru_stime; /* system time used */ + long ru_maxrss; /* maximum resident set size */ + long ru_ixrss; /* integral shared memory size */ + long ru_idrss; /* integral unshared data size */ + long ru_isrss; /* integral unshared stack size */ + long ru_minflt; /* page reclaims */ + long ru_majflt; /* page faults */ + long ru_nswap; /* swaps */ + long ru_inblock; /* block input operations */ + long ru_oublock; /* block output operations */ + long ru_msgsnd; /* messages sent */ + long ru_msgrcv; /* messages received */ + long ru_nsignals; /* signals received */ + long ru_nvcsw; /* voluntary context switches */ + long ru_nivcsw; /* involuntary " */ +}; + +static inline void +rusage32_to_rusage64 (const struct __rusage32 *restrict r32, + struct __rusage64 *restrict r64) +{ + /* Make sure the entire output structure is cleared, including + padding and reserved fields. */ + memset (r64, 0, sizeof *r64); + + r64->ru_utime = valid_timeval32_to_timeval64 (r32->ru_utime); + r64->ru_stime = valid_timeval32_to_timeval64 (r32->ru_stime); + r64->ru_maxrss = r32->ru_maxrss; + r64->ru_ixrss = r32->ru_ixrss; + r64->ru_idrss = r32->ru_idrss; + r64->ru_isrss = r32->ru_isrss; + r64->ru_minflt = r32->ru_minflt; + r64->ru_majflt = r32->ru_majflt; + r64->ru_nswap = r32->ru_nswap; + r64->ru_inblock = r32->ru_inblock; + r64->ru_oublock = r32->ru_oublock; + r64->ru_msgsnd = r32->ru_msgsnd; + r64->ru_msgrcv = r32->ru_msgrcv; + r64->ru_nsignals = r32->ru_nsignals; + r64->ru_nvcsw = r32->ru_nvcsw; + r64->ru_nivcsw = r32->ru_nivcsw; +} + #endif /* tv32-compat.h */ diff --git a/sysdeps/unix/sysv/linux/wait4.c b/sysdeps/unix/sysv/linux/wait4.c index 3a8bed1169..d14bd4da27 100644 --- a/sysdeps/unix/sysv/linux/wait4.c +++ b/sysdeps/unix/sysv/linux/wait4.c @@ -18,13 +18,28 @@ #include #include +#include #include +#include pid_t -__wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage) +__wait4_time64 (pid_t pid, int *stat_loc, int options, struct __rusage64 *usage) { #ifdef __NR_wait4 +# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 return SYSCALL_CANCEL (wait4, pid, stat_loc, options, usage); +# else + struct __rusage32 usage32; + pid_t ret = SYSCALL_CANCEL (wait4, pid, stat_loc, options, &usage32); + + if (ret != 0) + return ret; + + if (usage != NULL) + rusage32_to_rusage64 (&usage32, usage); + + return ret; +# endif #elif defined (__ASSUME_WAITID_PID0_P_PGID) idtype_t idtype = P_PID; @@ -41,8 +56,19 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage) options |= WEXITED; siginfo_t infop; + +# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, usage) < 0) return -1; +# else + { + struct __rusage32 usage32; + if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, &usage32) < 0) + return -1; + if (usage != NULL) + rusage32_to_rusage64 (&usage32, usage); + } +# endif if (stat_loc) { @@ -71,7 +97,7 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage) } return infop.si_pid; -# else +#else /* Linux waitid prior kernel 5.4 does not support waiting for the current process. It is possible to emulate wait4 it by calling getpgid for PID 0, however, it would require an additional syscall and it is inherent @@ -81,5 +107,25 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage) # error "The kernel ABI does not provide a way to implement wait4" #endif } + +#if __TIMESIZE != 64 +libc_hidden_def (__wait4_time64) + +pid_t +__wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage) +{ + pid_t ret ; + struct __rusage64 usage64; + + ret = __wait4_time64 (pid, stat_loc, options, &usage64); + + if (ret != 0) + return ret; + + rusage64_to_rusage (&usage64, usage); + + return ret; +} +#endif libc_hidden_def (__wait4); weak_alias (__wait4, wait4)