From patchwork Sun Jan 12 10:33:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 37312 Received: (qmail 9630 invoked by alias); 12 Jan 2020 10:40:12 -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 9511 invoked by uid 89); 12 Jan 2020 10:40:11 -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= 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=1578825609; x=1610361609; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kmfqolkPpKLYMY4MhYTrgbyA11BKpRCGjcEwNuMRKUQ=; b=DhxTMx9MoS+tRxd+7i2BmMImhTtxZ9m4tevUAstrmkBW1oTzuMp8tPxX PoyzVr/ybl6iMUF+oIZEE//r/2McatsgTCvxM2kMXnZqCqNelW8zJQhC1 V4jExxPSGtzA9hlSZsOBthDcbupGOdk/i73mXUvmZ0BYs6vJd1yg1Bszn LBBPQdal2MDyoslYaz3BqWzntDKlFc54EUZ49zHmZ+ppacdzez64+AjV5 eAASVLyVyTVNFk4TE8huEzrIFlaLXzOMQD9T0KqjFbWY9p4eBz0wKrntP IVboIVutlMPOYZWAGHWSPy9l3trUo2JS2lZ8iMb0GKwQ4cNorPuCguq9t w==; IronPort-SDR: hLf1mFhxer1889LMKHJo+SbiMcTMjKLtOBS2pb2AiL5zeE77GZ+6yovdVlsTXYDDiK0qpIsisE +mOySHfw1U15GwlB8G9uetno82/71BSkQmhpMbg6QJPpRHkSXgQiQWBZ1YrdbqGNvNeDvgyEK1 YV3xXuZOqqhX9uzu3cN+WQYQxYdfhm6YIWua7G7AxmXxvy7NOCEWUuEb/Yo8iaPaXrsWR9CTVW 3vNOL6A2Xu8Ktyg9DRI/XPg5vrMm5dP7gDdUI2ws9IXyq02Lx1V6/Y/riBHp9RYVB0Ot/9BLSH 1wg= IronPort-SDR: b9Un86IT4BzZK3R01ePj53CVAxuXGKS3gWtAcsbdZ/JX9ZrGZvbDFze+OK0iRvRaH/VHyZsu6X 75eUQjKe0/u8MNDqoLjZa3QSpyq92Hjgw7lvt3aARNR+ZaR5ldaZMsVw3ukU+8tIT9jonYey1H 7+T3Ej2VcR1vizxLSSA/1Drk/JRB7G1VAKfzQbMRJ2cgSqqXn36s7shym2vNWQmWl/Ea1ZQh+C WS8xQvDKe0kOeenuW61sEiIVgrGTxhlxc97xc6Fem2N5tHdPZzDk/oOZCX0ezLoVQKjvQIi0ld znoRx3ZzlLdoe2I5z5EqKh+o IronPort-SDR: RD+db/2cFaavxMEgnePl7GaXR+p153Y39FaFTM9W1rflyJjmffiI4w4QyPfehpIvfS6dX2onlT TYB9tGwZ5sYfljnKM5ZJaJ9eugd6XsjuF3MCuMzFfv0VarK4H+xauNBAoJ+ul6Sy2lU9dY42yb FUj29kjtsRHARrEAvFr+ZFBOs8WzLpdWEYmHv/juUaJoTpgMWA1nms5WcZ5IDrZrrMfvHO+jFn Sac/rHvrkFMpQchiUzwdQR5PuD9O/oZ40a83+Ow3ErURx0UjkgP8JLc29qU9+XGhzSnkYme8aP GW8= WDCIronportException: Internal From: Alistair Francis To: libc-alpha@sourceware.org Cc: arnd@arndb.de, adhemerval.zanella@linaro.org, fweimer@redhat.com, joseph@codesourcery.com, palmerdabbelt@google.com, macro@wdc.com, zongbox@gmail.com, alistair.francis@wdc.com, alistair23@gmail.com Subject: [RFC v6 04/23] linux: Use 32-bit time_t for itimerval Date: Sun, 12 Jan 2020 02:33:41 -0800 Message-Id: <6fce89fec812352770884a62c6fa158890480e2a.1578824547.git.alistair.francis@wdc.com> In-Reply-To: References: MIME-Version: 1.0 The Linux kernel expects itimerval to use a 32-bit time_t, even on archs with a 64-bit time_t (like RV32). To address this let's convert itimerval 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 bsaed on similar code in alpha, but adjusted to pass the 32-bit time_t to the kernel. We can't directly call the __getitimer/__setitimer functions as they expect a struct itimerval but we need to pass in a struct itimerval32. --- .../linux/generic/wordsize-32/getitimer.c | 42 +++++++++++++++ .../linux/generic/wordsize-32/setitimer.c | 53 +++++++++++++++++++ .../linux/generic/wordsize-32/tv32-compat.h | 35 ++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/getitimer.c create mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/setitimer.c create mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/tv32-compat.h diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/getitimer.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/getitimer.c new file mode 100644 index 0000000000..b279acbc2e --- /dev/null +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/getitimer.c @@ -0,0 +1,42 @@ +/* getitimer -- Get the state of an interval timer. 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 + +int +__getitimer (__itimer_which_t which, struct itimerval *curr_value) +{ +#if __TIMESIZE == 64 + struct itimerval32 curr_value_32; + if (INLINE_SYSCALL_CALL (getitimer, which, &curr_value_32) == -1) + return -1; + + /* Write all fields of 'curr_value' regardless of overflow. */ + curr_value->it_interval + = valid_timeval_long_to_timeval64 (curr_value_32.it_interval); + curr_value->it_value + = valid_timeval_long_to_timeval64 (curr_value_32.it_value); + return 0; +#else + return INLINE_SYSCALL_CALL (getitimer, which, curr_value); +#endif +} + +weak_alias (__getitimer, getitimer) diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/setitimer.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/setitimer.c new file mode 100644 index 0000000000..807683ccae --- /dev/null +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/setitimer.c @@ -0,0 +1,53 @@ +/* getitimer -- Get the state of an interval timer. 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 + +int +__setitimer (__itimer_which_t which, + const struct itimerval *restrict new_value, + struct itimerval *restrict old_value) +{ +#if __TIMESIZE == 64 + struct itimerval32 new_value_32; + new_value_32.it_interval + = valid_timeval64_to_timeval_long (new_value->it_interval); + new_value_32.it_value + = valid_timeval64_to_timeval_long (new_value->it_value); + + if (old_value == NULL) + return INLINE_SYSCALL_CALL (setitimer, which, &new_value_32, NULL); + + struct itimerval32 old_value_32; + if (INLINE_SYSCALL_CALL (setitimer, which, &new_value_32, &old_value_32) == -1) + return -1; + + /* Write all fields of 'old_value' regardless of overflow. */ + old_value->it_interval + = valid_timeval_long_to_timeval64 (old_value_32.it_interval); + old_value->it_value + = valid_timeval_long_to_timeval64 (old_value_32.it_value); + return 0; +#else + return INLINE_SYSCALL_CALL (setitimer, which, new_value, old_value); +#endif +} + +weak_alias (__setitimer, setitimer) diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/tv32-compat.h b/sysdeps/unix/sysv/linux/generic/wordsize-32/tv32-compat.h new file mode 100644 index 0000000000..aa960a6632 --- /dev/null +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/tv32-compat.h @@ -0,0 +1,35 @@ +/* Compatibility definitions for `struct timeval' with 32-bit time_t. + 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 + . */ + +#ifndef _TV32_COMPAT_H +#define _TV32_COMPAT_H 1 + +#include + +#include +#include +#include + +/* Structures containing 'struct timeval' with 32-bit time_t. */ +struct itimerval32 +{ + struct __timeval_long it_interval; + struct __timeval_long it_value; +}; + +#endif /* tv32-compat.h */