From patchwork Wed Apr 1 16:53:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 38702 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa2.hgst.iphmx.com (esa2.hgst.iphmx.com [68.232.143.124]) by sourceware.org (Postfix) with ESMTPS id 877A4385DC3E for ; Wed, 1 Apr 2020 17:02:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 877A4385DC3E IronPort-SDR: 4E2BLQQm25P/7G6zFNB+FXb2/Qoa8EbD2FyNk6b6agQbRX1uU9DGI2KocaXRbSvdUYxsLVFin5 S87GQD3gdNhnSxdkCPCheW+hjJMeRYwUHkI0D+k2y9cF2CelHs6bzXY+sYjBjIPVH2PgZ5gZht mxwIWuWDzpweckvnpZBca3FMws3Ruu7kH7Pm6hPZETlpP/2r4WxwwBBkihg/6rtocnV8wIT2A6 JiI0e5xtUEEXAps5+dOlhSA+oJ1ZEGO4xSrVjPGjX1gypqWpqM9HUxHbOl2hF2kXTEtiPQTEYy Xd8= X-URL-LookUp-ScanningError: 1 X-IronPort-AV: E=Sophos;i="5.72,332,1580745600"; d="scan'208";a="236579007" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 02 Apr 2020 01:01:23 +0800 IronPort-SDR: cbO0GkCdehPxWiftglLZ48wflniCXpamEWDpAc38RCzfv4hw/qhbc6B1c3cVg5GLHNJJPLNF7D W/tbmzhuVRhEwm3eELQ/fDEAFLlxnb9qZ8YmWDURwsVy9gUsMvISudO5/yIxfvMkkLiEJN1P7I Br9sl5HY8Y5zPfrux4XFkTI9c/pYs39yaXKYK3y7sI27NCYekxWRQkwVdVcWv1YjSPmZzkWI5f hwNhKpLbye10bL13zHEuozRfN7o6NsYkiuLANZeCXLSopRBSRwCUqNBi2WydLyKRF/9M9NlEpJ qCLGrFAwhwvSRkYjRst/1Y+J Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2020 09:52:29 -0700 IronPort-SDR: ebzX596XoP5n9XYPsLPIR2ElhFNHMYqQNtF+yLdVpIiLG2fIYYE/RESN4APvL5PQCTSWt5E2Iw z2EE56DaFeaC7H4V0tjf1r3ac79FSecxCibSkpOwiJWuUrtZLISTwNFBdB0uQN32x4i/B7AT2q xLh2Y3rQxN0Xfhg8uABRaT9F84H8vGyR4wZrkYxiXb9rv/UVi0aXZ1IYYwJQDvowJRpcwkGR2J PAac4EdFEhK4u1VBhUcUip+rfbgsF2N9jX0A7abje2VjLHo8UnxaUl/a76kQbzhr82MQetlTgV fv4= WDCIronportException: Internal Received: from cnf006887.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.55.14]) by uls-op-cesaip01.wdc.com with ESMTP; 01 Apr 2020 10:01:03 -0700 From: Alistair Francis To: libc-alpha@sourceware.org Cc: alistair23@gmail.com, Alistair Francis Subject: [PATCH v5 1/3] bits/sem.h: Split out struct semid_ds Date: Wed, 1 Apr 2020 09:53:06 -0700 Message-Id: <20200401165308.1913271-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401165308.1913271-1-alistair.francis@wdc.com> References: <20200401165308.1913271-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-25.4 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: Wed, 01 Apr 2020 17:02:51 -0000 Split out the struct semid_ds into it's own file. This will allow us to have architectures specify their own version. Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/Makefile | 1 + sysdeps/unix/sysv/linux/bits/sem.h | 24 +---------- .../sysv/linux/bits/types/struct_semid_ds.h | 43 +++++++++++++++++++ 3 files changed, 45 insertions(+), 23 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 60dc5cf9e5..bbf1d60fc6 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -92,6 +92,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \ bits/termios-baud.h bits/termios-c_cflag.h \ bits/termios-c_lflag.h bits/termios-tcflow.h \ bits/termios-misc.h \ + bits/types/struct_semid_ds.h \ bits/ipc-perm.h tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ diff --git a/sysdeps/unix/sysv/linux/bits/sem.h b/sysdeps/unix/sysv/linux/bits/sem.h index e0f4155c67..0d1813ec67 100644 --- a/sysdeps/unix/sysv/linux/bits/sem.h +++ b/sysdeps/unix/sysv/linux/bits/sem.h @@ -21,6 +21,7 @@ #include #include +#include /* Flags for `semop'. */ #define SEM_UNDO 0x1000 /* undo the operation on exit */ @@ -34,29 +35,6 @@ #define SETVAL 16 /* set semval */ #define SETALL 17 /* set all semval's */ - -#if __SEM_PAD_BEFORE_TIME -# define __SEM_PAD_TIME(NAME, RES) \ - __syscall_ulong_t __glibc_reserved ## RES; __time_t NAME -#elif __SEM_PAD_AFTER_TIME -# define __SEM_PAD_TIME(NAME, RES) \ - __time_t NAME; __syscall_ulong_t __glibc_reserved ## RES -#else -# define __SEM_PAD_TIME(NAME, RES) \ - __time_t NAME -#endif - -/* Data structure describing a set of semaphores. */ -struct semid_ds -{ - struct ipc_perm sem_perm; /* operation permission struct */ - __SEM_PAD_TIME (sem_otime, 1); /* last semop() time */ - __SEM_PAD_TIME (sem_ctime, 2); /* last time changed by semctl() */ - __syscall_ulong_t sem_nsems; /* number of semaphores in set */ - __syscall_ulong_t __glibc_reserved3; - __syscall_ulong_t __glibc_reserved4; -}; - /* The user should define a union like the following to use it for arguments for `semctl'. diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h new file mode 100644 index 0000000000..ba0719e77a --- /dev/null +++ b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h @@ -0,0 +1,43 @@ +/* Generic implementation of the semaphore struct semid_ds + Copyright (C) 1995-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 _SYS_SEM_H +# error "Never include directly; use instead." +#endif + +#if __SEM_PAD_BEFORE_TIME +# define __SEM_PAD_TIME(NAME, RES) \ + __syscall_ulong_t __glibc_reserved ## RES; __time_t NAME +#elif __SEM_PAD_AFTER_TIME +# define __SEM_PAD_TIME(NAME, RES) \ + __time_t NAME; __syscall_ulong_t __glibc_reserved ## RES +#else +# define __SEM_PAD_TIME(NAME, RES) \ + __time_t NAME +#endif + +/* Data structure describing a set of semaphores. */ +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __SEM_PAD_TIME (sem_otime, 1); /* last semop() time */ + __SEM_PAD_TIME (sem_ctime, 2); /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; From patchwork Wed Apr 1 16:53:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 38703 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa2.hgst.iphmx.com (esa2.hgst.iphmx.com [68.232.143.124]) by sourceware.org (Postfix) with ESMTPS id 0C0EA385E02B for ; Wed, 1 Apr 2020 17:02:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0C0EA385E02B IronPort-SDR: ZbUROzeBGCg4Z+FG0DdaD3blMwjPZqqyqkufBHjTxmSHtFLhDZzcUI28QLhkXSxlp6DPwQtIN7 8hZIHBcJ1srMPphbMa797/RP1ofGnllOT8q8qHzTI42xb/2jiuw8WeuxsvbObgGJvSzO91KERI ULnqFpApdyG0AwIq0cqncZjoYjth8S7bG4RkuL5/mLoG5Xm2RNHfiwIxslQiTyWKbI6LM8RD4h CBwBSmC55KIvvqtp+QQLkS/xcNjcnUKPtVT956ac5luFsPhgXyxXOwBGIDdgzus0+qDlsBMbaf 0V0= X-URL-LookUp-ScanningError: 1 X-IronPort-AV: E=Sophos;i="5.72,332,1580745600"; d="scan'208";a="236579008" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 02 Apr 2020 01:01:24 +0800 IronPort-SDR: /fTaC7RFLCR/TVu9gkcwBb8pf2eYOp9/uMIwRYnPtAsu+cS5CPnAvjDGU0MFuvxfMh50vnp0My DlEHzI4srT9YkAhVlhiXOf7gGJUEKsBPxvXPv67kVXm/NKRr2ZpGErAR45eHzmDaVTChe/9Paz kYvh722i4AEM4Zfaf+K41jy7DbeTB0oS23P/F1/eRVXmAH3ONSb8Rh7MXLS274sjMGDaM6gmAX GUhWpZnxjIDXY0FL+/8pja7aEeiCBtLBqewK0qUNhjvUOK9an5+ksy0Fifza9/PugVQw38Orbe 9EdPPgsqmXPATI2cHr810yJK Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2020 09:52:29 -0700 IronPort-SDR: QSok9NoEK3sVh9RIwpBcZQcr/j03MUhZ95+C3h9ZrU9l3hWdYAZ3PvPtrVpdDEM7GLI7HMg7St kS4UNhj+Sr+zYL0T8R9ZGwfiFlHNkAuMgzz5mCRq8Bge33ammukE4GMKcvfKhZGGucmmw9KY6M 7BgKgYkx+yw1qybvjWhXtJYDjvECKT6aWj0/mKErDG3hu7x8TpoIM8Z7RWKOZPFIezzk3DXs07 tOuJjAjSLrA+SNwsMuf6NCHt3kByx9LU3J++lu+z4hoFVVfujg9T/pJv0uw7jOOcT7bPyWU98H EWU= WDCIronportException: Internal Received: from cnf006887.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.55.14]) by uls-op-cesaip01.wdc.com with ESMTP; 01 Apr 2020 10:01:03 -0700 From: Alistair Francis To: libc-alpha@sourceware.org Cc: alistair23@gmail.com, Alistair Francis Subject: [PATCH v5 2/3] semctl: Remove the sem-pad.h file Date: Wed, 1 Apr 2020 09:53:07 -0700 Message-Id: <20200401165308.1913271-3-alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401165308.1913271-1-alistair.francis@wdc.com> References: <20200401165308.1913271-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-25.5 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: Wed, 01 Apr 2020 17:02:52 -0000 Remove the sem-pad.h file and instead have architectures override the struct semid_ds via the bits/types/struct_semid_ds.h file. Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/bits/sem-pad.h | 33 ------------- sysdeps/unix/sysv/linux/bits/sem.h | 2 +- .../sysv/linux/bits/types/struct_semid_ds.h | 29 ++++++------ .../linux/hppa/bits/types/struct_semid_ds.h | 46 +++++++++++++++++++ sysdeps/unix/sysv/linux/mips/bits/sem-pad.h | 24 ---------- .../bits/types/struct_semid_ds.h} | 20 +++++--- .../unix/sysv/linux/powerpc/bits/sem-pad.h | 26 ----------- .../powerpc/bits/types/struct_semid_ds.h | 46 +++++++++++++++++++ .../linux/sparc/bits/types/struct_semid_ds.h | 46 +++++++++++++++++++ sysdeps/unix/sysv/linux/x86/bits/sem-pad.h | 24 ---------- .../bits/types/struct_semid_ds.h} | 22 ++++++--- 12 files changed, 184 insertions(+), 136 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/bits/sem-pad.h create mode 100644 sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h delete mode 100644 sysdeps/unix/sysv/linux/mips/bits/sem-pad.h rename sysdeps/unix/sysv/linux/{sparc/bits/sem-pad.h => mips/bits/types/struct_semid_ds.h} (56%) delete mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h create mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h create mode 100644 sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h delete mode 100644 sysdeps/unix/sysv/linux/x86/bits/sem-pad.h rename sysdeps/unix/sysv/linux/{hppa/bits/sem-pad.h => x86/bits/types/struct_semid_ds.h} (52%) diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index bbf1d60fc6..84ed4344d3 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -86,7 +86,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \ bits/siginfo-arch.h bits/siginfo-consts-arch.h \ bits/procfs.h bits/procfs-id.h bits/procfs-extra.h \ bits/procfs-prregset.h bits/mman-map-flags-generic.h \ - bits/msq-pad.h bits/sem-pad.h bits/shmlba.h bits/shm-pad.h \ + bits/msq-pad.h bits/shmlba.h bits/shm-pad.h \ bits/termios-struct.h bits/termios-c_cc.h \ bits/termios-c_iflag.h bits/termios-c_oflag.h \ bits/termios-baud.h bits/termios-c_cflag.h \ diff --git a/sysdeps/unix/sysv/linux/bits/sem-pad.h b/sysdeps/unix/sysv/linux/bits/sem-pad.h deleted file mode 100644 index 566ce039cc..0000000000 --- a/sysdeps/unix/sysv/linux/bits/sem-pad.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Define where padding goes in struct semid_ds. Generic version. - Copyright (C) 2018-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 _SYS_SEM_H -# error "Never use directly; include instead." -#endif - -#include - -/* On most architectures, padding goes after time fields for 32-bit - systems and is omitted for 64-bit systems. Some architectures pad - before time fields instead, or omit padding despite being 32-bit, - or include it despite being 64-bit. This must match the layout - used for struct semid64_ds in , as glibc does not do - layout conversions for this structure. */ - -#define __SEM_PAD_AFTER_TIME (__TIMESIZE == 32) -#define __SEM_PAD_BEFORE_TIME 0 diff --git a/sysdeps/unix/sysv/linux/bits/sem.h b/sysdeps/unix/sysv/linux/bits/sem.h index 0d1813ec67..ba1169fdb3 100644 --- a/sysdeps/unix/sysv/linux/bits/sem.h +++ b/sysdeps/unix/sysv/linux/bits/sem.h @@ -20,7 +20,7 @@ #endif #include -#include +#include #include /* Flags for `semop'. */ diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h index ba0719e77a..659db85db8 100644 --- a/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h +++ b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h @@ -20,24 +20,27 @@ # error "Never include directly; use instead." #endif -#if __SEM_PAD_BEFORE_TIME -# define __SEM_PAD_TIME(NAME, RES) \ - __syscall_ulong_t __glibc_reserved ## RES; __time_t NAME -#elif __SEM_PAD_AFTER_TIME -# define __SEM_PAD_TIME(NAME, RES) \ - __time_t NAME; __syscall_ulong_t __glibc_reserved ## RES -#else -# define __SEM_PAD_TIME(NAME, RES) \ - __time_t NAME -#endif - /* Data structure describing a set of semaphores. */ +#if __TIMESIZE == 32 +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __time_t sem_otime; /* last semop() time */ + __syscall_ulong_t __glibc_reserved1; + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t __glibc_reserved2; + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#else struct semid_ds { struct ipc_perm sem_perm; /* operation permission struct */ - __SEM_PAD_TIME (sem_otime, 1); /* last semop() time */ - __SEM_PAD_TIME (sem_ctime, 2); /* last time changed by semctl() */ + __time_t sem_otime; /* last semop() time */ + __time_t sem_ctime; /* last time changed by semctl() */ __syscall_ulong_t sem_nsems; /* number of semaphores in set */ __syscall_ulong_t __glibc_reserved3; __syscall_ulong_t __glibc_reserved4; }; +#endif diff --git a/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h new file mode 100644 index 0000000000..fbc26ef2ca --- /dev/null +++ b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h @@ -0,0 +1,46 @@ +/* HPPA implementation of the semaphore struct semid_ds + Copyright (C) 1995-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 _SYS_SEM_H +# error "Never include directly; use instead." +#endif + +/* Data structure describing a set of semaphores. */ +#if __TIMESIZE == 32 +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t __glibc_reserved1; + __time_t sem_otime; /* last semop() time */ + __syscall_ulong_t __glibc_reserved2; + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#else +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __time_t sem_otime; /* last semop() time */ + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif diff --git a/sysdeps/unix/sysv/linux/mips/bits/sem-pad.h b/sysdeps/unix/sysv/linux/mips/bits/sem-pad.h deleted file mode 100644 index 4c581f7694..0000000000 --- a/sysdeps/unix/sysv/linux/mips/bits/sem-pad.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Define where padding goes in struct semid_ds. MIPS version. - Copyright (C) 2018-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 _SYS_SEM_H -# error "Never use directly; include instead." -#endif - -#define __SEM_PAD_AFTER_TIME 0 -#define __SEM_PAD_BEFORE_TIME 0 diff --git a/sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h b/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h similarity index 56% rename from sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h rename to sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h index 5f4e214d12..8954209a29 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h +++ b/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h @@ -1,5 +1,5 @@ -/* Define where padding goes in struct semid_ds. SPARC version. - Copyright (C) 2018-2020 Free Software Foundation, Inc. +/* MIPS implementation of the semaphore struct semid_ds + Copyright (C) 1995-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 @@ -17,10 +17,16 @@ . */ #ifndef _SYS_SEM_H -# error "Never use directly; include instead." +# error "Never include directly; use instead." #endif -#include - -#define __SEM_PAD_AFTER_TIME 0 -#define __SEM_PAD_BEFORE_TIME (__TIMESIZE == 32) +/* Data structure describing a set of semaphores. */ +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __time_t sem_otime; /* last semop() time */ + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h b/sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h deleted file mode 100644 index 42d8827906..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Define where padding goes in struct semid_ds. PowerPC version. - Copyright (C) 2018-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 _SYS_SEM_H -# error "Never use directly; include instead." -#endif - -#include - -#define __SEM_PAD_AFTER_TIME 0 -#define __SEM_PAD_BEFORE_TIME (__TIMESIZE == 32) diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h new file mode 100644 index 0000000000..d393141808 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h @@ -0,0 +1,46 @@ +/* PowerPC implementation of the semaphore struct semid_ds + Copyright (C) 1995-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 _SYS_SEM_H +# error "Never include directly; use instead." +#endif + +/* Data structure describing a set of semaphores. */ +#if __TIMESIZE == 32 +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t __glibc_reserved1; + __time_t sem_otime; /* last semop() time */ + __syscall_ulong_t __glibc_reserved2; + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#else +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __time_t sem_otime; /* last semop() time */ + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif diff --git a/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h new file mode 100644 index 0000000000..84c7a9022a --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h @@ -0,0 +1,46 @@ +/* Sparc implementation of the semaphore struct semid_ds + Copyright (C) 1995-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 _SYS_SEM_H +# error "Never include directly; use instead." +#endif + +/* Data structure describing a set of semaphores. */ +#if __TIMESIZE == 32 +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t __glibc_reserved1; + __time_t sem_otime; /* last semop() time */ + __syscall_ulong_t __glibc_reserved2; + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#else +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __time_t sem_otime; /* last semop() time */ + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif diff --git a/sysdeps/unix/sysv/linux/x86/bits/sem-pad.h b/sysdeps/unix/sysv/linux/x86/bits/sem-pad.h deleted file mode 100644 index 102e226997..0000000000 --- a/sysdeps/unix/sysv/linux/x86/bits/sem-pad.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Define where padding goes in struct semid_ds. x86 version. - Copyright (C) 2018-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 _SYS_SEM_H -# error "Never use directly; include instead." -#endif - -#define __SEM_PAD_AFTER_TIME 1 -#define __SEM_PAD_BEFORE_TIME 0 diff --git a/sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h b/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h similarity index 52% rename from sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h rename to sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h index ee0332325b..22f0645f85 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h +++ b/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h @@ -1,5 +1,5 @@ -/* Define where padding goes in struct semid_ds. HPPA version. - Copyright (C) 2018-2020 Free Software Foundation, Inc. +/* Sparc implementation of the semaphore struct semid_ds + Copyright (C) 1995-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 @@ -17,10 +17,18 @@ . */ #ifndef _SYS_SEM_H -# error "Never use directly; include instead." +# error "Never include directly; use instead." #endif -#include - -#define __SEM_PAD_AFTER_TIME 0 -#define __SEM_PAD_BEFORE_TIME (__TIMESIZE == 32) +/* Data structure describing a set of semaphores. */ +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __time_t sem_otime; /* last semop() time */ + __syscall_ulong_t __glibc_reserved1; + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t __glibc_reserved2; + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; From patchwork Wed Apr 1 16:53:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 38704 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa2.hgst.iphmx.com (esa2.hgst.iphmx.com [68.232.143.124]) by sourceware.org (Postfix) with ESMTPS id A6222385DC3E for ; Wed, 1 Apr 2020 17:02:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A6222385DC3E IronPort-SDR: QkPEBxQkPuthB2u4Y3HCfLmtcvzhENITh+27A8G/f+tlrxtl6HjCZgbjQ0XLvZ1WAsc61MLKnD F32biEhJlH/z+OwNs47/xEqrYd5kYTBUZ22cnV93Pg4whAgWhNeIuZfnb3WP4jJ5xtx9eeMlVz HPvEVPCEDPi2DaRvD7ESnf0hMovCKTmdo5i/VzDx075FzItq3MkFaPv6Q/H9VWBHOvww1pytuo 1fCl65SRvJQnbfj0JP49x2fCxeewnS1vruxgn/Orx4GT4f/v2wnOQeIf7QO23joxAuCH8PnALS vRs= X-URL-LookUp-ScanningError: 1 X-IronPort-AV: E=Sophos;i="5.72,332,1580745600"; d="scan'208";a="236579012" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 02 Apr 2020 01:01:24 +0800 IronPort-SDR: 0M9FkrABAoGNoXqM4Yw7fcuQ1B2RsJpO2+ZTs0Gh50q2roNfwpd04u3e8g4BaUI77doEZDES24 WHfHckWTEmlicQmMedWV8DkC3nYYdGX5Dh/K6oNrDHZxOpnNJW7keLV+//q6Nn7cFI7U7XPvEC SmtR6ZsFxI41BXe1I/N/ZA8sjfYALLHz25QjAjlxRktJ1UvgH6Wk/8+nrJDcLwiA/KJ1fQfMv8 86AajF5XLxRQhRZ3i2zwMyCnYgJG5EGR/VRLWwW8A99ZY4dz4OxcpB0/DLkvJE4SsAoGxTpbKB 8fUstx3/Z8btHgSaCvlUlGyj Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2020 09:52:30 -0700 IronPort-SDR: QsBSu1A/HZnHlKX00m/mMeA0CmUXIPjED9KWQjvbyzCgnhwX4yoFvrWWuyiAuqmUew4p2IKLtM N+X8Um7B9nmkA/y4Xt8ioGb6XHHBlXJkgk2fFoBE/K1DIgscNpfuPwwph5e3NqLLf0ZRtbDpNG SeUIbCrRYgtLTHgZ96sc/NP9lF2vTthNWEttYwoBc1Mt77KF47mwk9jhqGiIxiQgcX91SwyUmB 5kMYlfILj08qytMg8Qes92Yrmk1wHQUUlC8Odt4Bxt/73w/xlGgnh1nSFmOysNw6GOVDa3pk0A rgc= WDCIronportException: Internal Received: from cnf006887.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.55.14]) by uls-op-cesaip01.wdc.com with ESMTP; 01 Apr 2020 10:01:03 -0700 From: Alistair Francis To: libc-alpha@sourceware.org Cc: alistair23@gmail.com, Alistair Francis Subject: [PATCH v5 3/3] sysv: linux: Pass 64-bit version of semctl syscall Date: Wed, 1 Apr 2020 09:53:08 -0700 Message-Id: <20200401165308.1913271-4-alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401165308.1913271-1-alistair.francis@wdc.com> References: <20200401165308.1913271-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-25.6 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: Wed, 01 Apr 2020 17:02:54 -0000 The semctl_syscall() function passes a union semun to the kernel. The union includes struct semid_ds as a member. On 32-bit architectures the Linux kernel provides a *_high version of the 32-bit sem_otime and sem_ctime values. These can be combined to get a 64-bit version of the time. This patch adjusts the struct semid_ds to support the *_high versions of sem_otime and sem_ctime. For 32-bit systems with a 64-bit time_t this can be used to get a 64-bit time from the two 32-bit values. Due to allignment differences between 64-bit and 32-bit variables we also need to set nsems to ensure it's correct. --- .../unix/sysv/linux/hppa/struct__semid_ds32.h | 32 +++++++++++++++++++ .../unix/sysv/linux/mips/struct__semid_ds32.h | 30 +++++++++++++++++ .../sysv/linux/powerpc/struct__semid_ds32.h | 32 +++++++++++++++++++ sysdeps/unix/sysv/linux/semctl.c | 30 ++++++++++++++--- .../sysv/linux/sparc/struct__semid_ds32.h | 32 +++++++++++++++++++ sysdeps/unix/sysv/linux/struct__semid_ds32.h | 32 +++++++++++++++++++ .../unix/sysv/linux/x86/struct__semid_ds32.h | 32 +++++++++++++++++++ 7 files changed, 216 insertions(+), 4 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/hppa/struct__semid_ds32.h create mode 100644 sysdeps/unix/sysv/linux/mips/struct__semid_ds32.h create mode 100644 sysdeps/unix/sysv/linux/powerpc/struct__semid_ds32.h create mode 100644 sysdeps/unix/sysv/linux/sparc/struct__semid_ds32.h create mode 100644 sysdeps/unix/sysv/linux/struct__semid_ds32.h create mode 100644 sysdeps/unix/sysv/linux/x86/struct__semid_ds32.h diff --git a/sysdeps/unix/sysv/linux/hppa/struct__semid_ds32.h b/sysdeps/unix/sysv/linux/hppa/struct__semid_ds32.h new file mode 100644 index 0000000000..db78794e8c --- /dev/null +++ b/sysdeps/unix/sysv/linux/hppa/struct__semid_ds32.h @@ -0,0 +1,32 @@ +/* HPPA implementation of the semaphore struct __semid_ds32 + Copyright (C) 1995-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 + . */ + +#if __WORDSIZE == 32 +/* This is the "new" y2038 types defined after the 5.1 kernel. It allows + * the kernel to use {o,c}time{_high} values to support a 64-bit time_t. */ +struct __semid_ds32 { + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t sem_otime_high; /* last semop() time high */ + __syscall_ulong_t sem_otime; /* last semop() time */ + __syscall_ulong_t sem_ctime_high; /* last time changed by semctl() high */ + __syscall_ulong_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif diff --git a/sysdeps/unix/sysv/linux/mips/struct__semid_ds32.h b/sysdeps/unix/sysv/linux/mips/struct__semid_ds32.h new file mode 100644 index 0000000000..d3eb47611c --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/struct__semid_ds32.h @@ -0,0 +1,30 @@ +/* MIPS implementation of the semaphore struct __semid_ds32 + Copyright (C) 1995-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 + . */ + +#if __WORDSIZE == 32 +/* This is the "new" y2038 types defined after the 5.1 kernel. It allows + * the kernel to use {o,c}time{_high} values to support a 64-bit time_t. */ +struct __semid_ds32 { + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t sem_otime; /* last semop time */ + __syscall_ulong_t sem_ctime; /* last change time */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t sem_otime_high; + __syscall_ulong_t sem_ctime_high; +}; +#endif diff --git a/sysdeps/unix/sysv/linux/powerpc/struct__semid_ds32.h b/sysdeps/unix/sysv/linux/powerpc/struct__semid_ds32.h new file mode 100644 index 0000000000..7ba6b852f1 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/struct__semid_ds32.h @@ -0,0 +1,32 @@ +/* PowerPC implementation of the semaphore struct __semid_ds32 + Copyright (C) 1995-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 + . */ + +#if __WORDSIZE == 32 +/* This is the "new" y2038 types defined after the 5.1 kernel. It allows + * the kernel to use {o,c}time{_high} values to support a 64-bit time_t. */ +struct __semid_ds32 { + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t sem_otime_high; /* last semop() time high */ + __syscall_ulong_t sem_otime; /* last semop() time */ + __syscall_ulong_t sem_ctime_high; /* last time changed by semctl() high */ + __syscall_ulong_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c index 30571af49f..b0e4d828ed 100644 --- a/sysdeps/unix/sysv/linux/semctl.c +++ b/sysdeps/unix/sysv/linux/semctl.c @@ -22,6 +22,7 @@ #include #include #include +#include #include /* For __kernel_mode_t. */ /* Define a `union semun' suitable for Linux here. */ @@ -29,6 +30,9 @@ union semun { int val; /* value for SETVAL */ struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */ +#if __WORDSIZE == 32 + struct __semid_ds32 *buf32; /* 32-bit buffer for IPC_STAT */ +#endif unsigned short int *array; /* array for GETALL & SETALL */ struct seminfo *__buf; /* buffer for IPC_INFO */ }; @@ -44,13 +48,31 @@ union semun static int semctl_syscall (int semid, int semnum, int cmd, union semun arg) { + int ret; #ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS - return INLINE_SYSCALL_CALL (semctl, semid, semnum, cmd | __IPC_64, - arg.array); + ret = INLINE_SYSCALL_CALL (semctl, semid, semnum, cmd | __IPC_64, + arg.array); #else - return INLINE_SYSCALL_CALL (ipc, IPCOP_semctl, semid, semnum, cmd | __IPC_64, - SEMCTL_ARG_ADDRESS (arg)); + ret = INLINE_SYSCALL_CALL (ipc, IPCOP_semctl, semid, semnum, cmd | __IPC_64, + SEMCTL_ARG_ADDRESS (arg)); #endif + +#if (__WORDSIZE == 32 && __TIMESIZE == 64 \ + && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE == 32)) + if (ret == 0 && (cmd == IPC_STAT || cmd == SEM_STAT || cmd == SEM_STAT_ANY)) + { + struct semid_ds temp_ds = (struct semid_ds) { + .sem_perm = arg.buf32->sem_perm, + .sem_nsems = arg.buf32->sem_nsems, + .sem_otime = (arg.buf32->sem_otime + | ((time_t) arg.buf32->sem_otime_high << 32)), + .sem_ctime = (arg.buf32->sem_ctime + | ((time_t) arg.buf32->sem_ctime_high << 32)), + }; + *arg.buf = temp_ds; + } +#endif + return ret; } int diff --git a/sysdeps/unix/sysv/linux/sparc/struct__semid_ds32.h b/sysdeps/unix/sysv/linux/sparc/struct__semid_ds32.h new file mode 100644 index 0000000000..c39d65d710 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/struct__semid_ds32.h @@ -0,0 +1,32 @@ +/* Sparc implementation of the semaphore struct __semid_ds32 + Copyright (C) 1995-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 + . */ + +#if __WORDSIZE == 32 +/* This is the "new" y2038 types defined after the 5.1 kernel. It allows + * the kernel to use {o,c}time{_high} values to support a 64-bit time_t. */ +struct __semid_ds32 { + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t sem_otime_high; /* last semop() time high */ + __syscall_ulong_t sem_otime; /* last semop() time */ + __syscall_ulong_t sem_ctime_high; /* last time changed by semctl() high */ + __syscall_ulong_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif diff --git a/sysdeps/unix/sysv/linux/struct__semid_ds32.h b/sysdeps/unix/sysv/linux/struct__semid_ds32.h new file mode 100644 index 0000000000..c82bf01bf3 --- /dev/null +++ b/sysdeps/unix/sysv/linux/struct__semid_ds32.h @@ -0,0 +1,32 @@ +/* Generic implementation of the semaphore struct __semid_ds32 + Copyright (C) 1995-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 + . */ + +#if __WORDSIZE == 32 +/* This is the "new" y2038 types defined after the 5.1 kernel. It allows + * the kernel to use {o,c}time{_high} values to support a 64-bit time_t. */ +struct __semid_ds32 { + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t sem_otime; /* last semop() time */ + __syscall_ulong_t sem_otime_high; /* last semop() time high */ + __syscall_ulong_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_ctime_high; /* last time changed by semctl() high */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif diff --git a/sysdeps/unix/sysv/linux/x86/struct__semid_ds32.h b/sysdeps/unix/sysv/linux/x86/struct__semid_ds32.h new file mode 100644 index 0000000000..4e4ab26661 --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86/struct__semid_ds32.h @@ -0,0 +1,32 @@ +/* Sparc implementation of the semaphore struct __semid_ds32 + Copyright (C) 1995-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 + . */ + +#ifdef __i386__ +/* This is the "new" y2038 types defined after the 5.1 kernel. It allows + * the kernel to use {o,c}time{_high} values to support a 64-bit time_t. */ +struct __semid_ds32 { + struct ipc_perm sem_perm; /* operation permission struct */ + __syscall_ulong_t sem_otime; /* last semop() time */ + __syscall_ulong_t sem_otime_high; /* last semop() time high */ + __syscall_ulong_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t sem_ctime_high; /* last time changed by semctl() high */ + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#endif