From patchwork Fri Feb 14 16:31:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 38071 Received: (qmail 67937 invoked by alias); 14 Feb 2020 16:39:30 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 63132 invoked by uid 89); 14 Feb 2020 16:38:32 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT autolearn=ham version=3.3.1 spammy=resident, archs X-HELO: esa6.hgst.iphmx.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1581698309; x=1613234309; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9el4sxdr5lMebAQreSN/FSbrlQqFGPvKb8VGDq8uCRw=; b=r0fLXJtV7THg0MIFPqj+jFkclCQfxlMjUWiTFOFtLUxryvkdjT6Yz95g qEA0FeJaDAsNd4HmEmnThOQXWIrelWR3mQ7ANGFzDWAwXdNxgBbON6vVH 8TeqgZsWKbvBDXDYMh9AK5TXoNufp/ZqDFY0I3RvFVhVkJrxwJl3zIloG keBPWCh0IJjpdMzBOz5ywkNvlbks3qmp0TlK9aNqCwJDMgT6LThTG3Dem L1GUua2bkQlpuhg5tXFBrrZWB5vjY7PjcbHDYZKJUVOEZnur2ipJkWUv+ b75VQzwIZle1r/wy/6OSClNTUkMO+g9HTretE6U+9wZO9P9LTafSYUnXT Q==; IronPort-SDR: RvZ4p/OSgyUJNPgIP9ttC3p7S8qD2DvNH7dhLjr8PeIygZ5y6IJJ8VywUav62fDunwi8Et5TLo lZkyerYqISp9lGHryfjtT94r8KoC6uXtoossrMkgkB0hqJDYleZcv1v/dX71eTXuKjkyItPNw/ hEEhGRF6eIZwPvMs+aQenKjNY7IAl0mQSYqRQ1vK49djw6CvIo3Llt3wJXSgrdzTeJQ5k2QGlx GQld7dnMjPnpAXa2Jvo+Y3u6YcSvcx/M5p8aq/L6HhaYgyRcR6XeLd7NVzxho/kgqBmSQckpAJ WE8= IronPort-SDR: qopg99JkUNVy8ImApC1fyr9j8eEx5jf3OrDwviB4rMJ5OKzDqqYx/4+rxXsMnQBTaBRQGYtz9L NDn5SnQAzTWO151IjNTXBbIC+6fxekS6CQTziQQ27IyAkXyBkBGl/j6WSwVjATpzaadsq3HNR6 8TmHEl2UOA5dPe18maA0MnCd0DHtDokHASqrnoQdDHLrfurRYLDywsWTaa5i4OFz6tSnEW9lwX Ggj2k9HkJCttRQfwsc+kQnwoIZ7ycr82lnMH4q0dqV9Dm+7JpOSRrvWDlten3pYjNS1vIT1vAx dmlpkGaoxZ0HIuAQ8uLILZl3 IronPort-SDR: edtccDOB5Tud1r+eKU2JhZEaXP7HGI35mgL44SWCmWryAWhwMo3RhVgTLqNtXIzYFa/qK+yJyR +yflIA2UwLMOsI4q2FwyVyWhnSGKoi61bXyyaDEUF7+m8ezk37cCXIQ9P7qVprJa/+3aWfQf5f GuMuPcoUJzzhytKeh8ybj5uJVxq4hSdVTM4jcsn7bSH7Yj9EICym/L6GveMg2V4hqSw+1hJPOd jT7mqOykGuXF2xGdGUTIB/X3D2c5s1ET5ng6sb/aDHsJRzsAeGGOKbC4qAn/gYCNQp36D152Rn +TI= WDCIronportException: Internal From: Alistair Francis To: libc-alpha@sourceware.org Cc: alistair23@gmail.com, Alistair Francis Subject: [PATCH v3 7/8] linux: Use long time_t for wait4/getrusage Date: Fri, 14 Feb 2020 08:31:33 -0800 Message-Id: <20200214163134.31601-8-alistair.francis@wdc.com> In-Reply-To: <20200214163134.31601-1-alistair.francis@wdc.com> References: <20200214163134.31601-1-alistair.francis@wdc.com> MIME-Version: 1.0 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. --- include/sys/resource.h | 10 +++++ sysdeps/unix/sysv/linux/getrusage.c | 58 +++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/tv32-compat.h | 47 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/wait4.c | 49 +++++++++++++++++++++- 4 files changed, 162 insertions(+), 2 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/getrusage.c diff --git a/include/sys/resource.h b/include/sys/resource.h index 9d604dfe3e..1a530fb62d 100644 --- a/include/sys/resource.h +++ b/include/sys/resource.h @@ -134,5 +134,15 @@ 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) +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/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 4eb6f216ea..c2231f042f 100644 --- a/sysdeps/unix/sysv/linux/tv32-compat.h +++ b/sysdeps/unix/sysv/linux/tv32-compat.h @@ -24,6 +24,7 @@ #include #include #include +#include /* Structures containing 'struct timeval' with 32-bit time_t. */ struct __itimerval32 @@ -32,4 +33,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..f4df1c3b99 100644 --- a/sysdeps/unix/sysv/linux/wait4.c +++ b/sysdeps/unix/sysv/linux/wait4.c @@ -18,14 +18,30 @@ #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) + struct __rusage32 usage32; idtype_t idtype = P_PID; if (pid < -1) @@ -41,7 +57,12 @@ __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) +# else + if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, &usage32) < 0) +# endif return -1; if (stat_loc) @@ -70,8 +91,13 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage) } } +# if __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 == 0 + if (usage != NULL) + rusage32_to_rusage64 (&usage32, usage); +# endif + 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,24 @@ __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 } +libc_hidden_def (__wait4_time64) + +#if __TIMESIZE != 64 +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; +} libc_hidden_def (__wait4); +#endif weak_alias (__wait4, wait4)