From patchwork Mon Feb 3 18:31:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 37660 Received: (qmail 25640 invoked by alias); 3 Feb 2020 18:38:50 -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 25524 invoked by uid 89); 3 Feb 2020 18:38:49 -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=voluntary, 3350, 1345 X-HELO: esa3.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=1580755126; x=1612291126; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7SW9wkKLWtuvA7WNbeOWSL1yeLO1HPNs/I1B5H7C/Co=; b=horNLlSAQ6eah2ISxqVo3FX076c0ZVab62FgQ9RT7ugpThEoUuQ1NiVh 5NbbRn76gP8dRPKINNwg2u/ld6NJP3dJ721NTNJuKIsZr995InKtsgYId wwr/sFLSOHld99wJKTi23dUebYRTDeotzc2hPZ+o3pr1Hpbo0k84ifq2Y Tciva5YsWoW7mgkAqclB+BnClFV9pPm21PZAxWgbX5yW+sDYwTtIdKLYq IMoQcLK14fu418XVy5xwobdZESKWoIPoh071l6Q8BJeBCp3lQliGlpALB CZM4C7svVusTOKbCD7VAayoyWxP6szfaDCkGs8Ii1HBVWfLUHmohnqHdI Q==; IronPort-SDR: +1mYskKMmDcV6j9gC8iMOvqaEqV9Wu5EYPnhmxt3y35CJ3bkdCmcLUni90w4mr3qKOn3dcX6Z2 dZlST3fpc1zT6ZNKEQd0myW54TKyDTNVAKKSi2MTWPwW7D4rLSANcHJSMTwoJ5qp1KcTU392/K pYFuUT3TFDhOk+qcDvG2qshlCD6EJMhkwUMb3Vl6yc5mRkpeM4zM78Td87688tsdkcqBpWshqW oYKwgbU4wq8s4DZ/KIlXqXkLfPNr3Q5oMXfqoluEIR8E/Rg0ZnGPE7su91xsaznEvlWDIRJDPG sfM= IronPort-SDR: yJ0oTiq+rnIKebPubi2u9TP7qeSOcKN9rxqElIUxzYkXCiPPutTFVwkoGlsJMxwQ4EyCJMDehM pwY4WStNeZ6b28RpUANOW7RtPRY2r01f7xVD4orLaa85KS6zDX8BNAv6BiIDEpKtArQ/KhpOXg xVmssH2gDXbiW09Zs6Z4OZ6pMMlAnH07rRMTZR/RZis1dOJfVZU7nQ5e1zAlZUI1n3/HpWtnAf PutNmjPLKTSivNTDROH8/1l9we9jIhvJHJ7h7iEbTUdIOPZDqnvVqsgZaKje1kPFl9Han1SkP4 +Wx9J4PaSKfmY5VTiRM5nReX IronPort-SDR: 1N47Nki1hA83ejr7T3pveuCwjOzbVK/s7vECJ3ORJtZ5/DffRJv8QN6WD5C6vfqN2yFLo7N2e7 XlFUOoeWq5ot8Ka9sk2VELRf97Ocjt3SRgobadLrWPreQeyWyC4NV0lrL+BJSA7XmKJXL/GxMh n8DvfDf6Br6qjDKLuzqivO4/zP/m0YZ8upRGpbJvxxzkHEkYIKwtyUQQyshr+GyAL28WQBX4Ug ISnXRlIJd80He6e8kMvualmEwtnbbgDQaiLO8gNrXw0PwN2pqWQZHGkkVk+A+Ia+ioBU9mVEzD 3Wk= WDCIronportException: Internal From: Alistair Francis To: libc-alpha@sourceware.org Cc: alistair23@gmail.com, lukma@denx.de, Alistair Francis Subject: [PATCH 6/6] linux: Use 32-bit time_t for rusage Date: Mon, 3 Feb 2020 10:31:53 -0800 Message-Id: <20200203183153.11635-7-alistair.francis@wdc.com> In-Reply-To: <20200203183153.11635-1-alistair.francis@wdc.com> References: <20200203183153.11635-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. This means that all 32-bit architectures with a 64-bit time_t will be able to use this generic implementation. This code is based on similar code in alpha, but adjusted to pass the 32-bit time_t to the kernel. We can't directly call __wait4 as it expects a struct rusage but we have to pass in and use a struct rusage32. The same appies to __getrusage. --- include/sys/resource.h | 6 ++ .../linux/generic/wordsize-32/getrusage.c | 52 ++++++++++++ .../linux/generic/wordsize-32/tv32-compat.h | 47 +++++++++++ .../sysv/linux/generic/wordsize-32/wait4.c | 83 +++++++++++++++++++ 4 files changed, 188 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/getrusage.c create mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/wait4.c diff --git a/include/sys/resource.h b/include/sys/resource.h index 9d604dfe3e..fcba56303a 100644 --- a/include/sys/resource.h +++ b/include/sys/resource.h @@ -134,5 +134,11 @@ 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 +#else +extern int __getrusage64 (enum __rusage_who who, struct __rusage64 *usage); +#endif #endif #endif diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/getrusage.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/getrusage.c new file mode 100644 index 0000000000..a495cc6c8b --- /dev/null +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/getrusage.c @@ -0,0 +1,52 @@ +/* getrusage -- get the rusage struct. Linux/tv32 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 + +int +__getrusage64 (enum __rusage_who who, struct __rusage64 *usage) +{ + struct __rusage32 usage32; + if (INLINE_SYSCALL_CALL (getrusage, who, &usage32) == -1) + return -1; + + rusage32_to_rusage64 (&usage32, usage); + return 0; +} + +#if __TIMESIZE != 64 +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/generic/wordsize-32/tv32-compat.h b/sysdeps/unix/sysv/linux/generic/wordsize-32/tv32-compat.h index 4eb6f216ea..c2231f042f 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/tv32-compat.h +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/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/generic/wordsize-32/wait4.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/wait4.c new file mode 100644 index 0000000000..ae42b2ecbb --- /dev/null +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/wait4.c @@ -0,0 +1,83 @@ +/* wait4 -- wait for process to change state. Linux/RV32/tv32 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 + +pid_t +__wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage) +{ + struct __rusage32 usage32; + idtype_t idtype = P_PID; + + if (pid < -1) + { + idtype = P_PGID; + pid *= -1; + } + else if (pid == -1) + idtype = P_ALL; + else if (pid == 0) + idtype = P_PGID; + + options |= WEXITED; + + siginfo_t infop; + if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, &usage32) < 0) + return -1; + + if (stat_loc) + { + switch (infop.si_code) + { + case CLD_EXITED: + *stat_loc = W_EXITCODE (infop.si_status, 0); + break; + case CLD_DUMPED: + *stat_loc = WCOREFLAG | infop.si_status; + break; + case CLD_KILLED: + *stat_loc = infop.si_status; + break; + case CLD_TRAPPED: + case CLD_STOPPED: + *stat_loc = W_STOPCODE (infop.si_status); + break; + case CLD_CONTINUED: + *stat_loc = __W_CONTINUED; + break; + default: + *stat_loc = 0; + break; + } + } + + if (usage != NULL) + { + struct __rusage64 usage64; + rusage32_to_rusage64 (&usage32, &usage64); + rusage64_to_rusage (&usage64, usage); + } + + return infop.si_pid; +} + +libc_hidden_def (__wait4); +weak_alias (__wait4, wait4)