From patchwork Thu Mar 26 16:37:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 38631 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by sourceware.org (Postfix) with ESMTPS id 0A524385E023 for ; Thu, 26 Mar 2020 16:45:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0A524385E023 IronPort-SDR: m0XW43DVDsTqTAjdMZHcWmfoQwvQxvPTWbB9fhFWeA4iVtE9SMSOn5IDkLgQ00gKug2zWcND95 qZqzjzWCl9LL50TSV4LhpBZXro8/HZg6TDFWc4lR/8YgsCIyfGF68dibI4GqXS+rOW2aF0J4M+ gRxgUbpyndQPs7RDSBZRabNXL5uHmJIokrMr/g0XIYa1WjXczMIla6znVu7UQQcaBcrgQEvYPb clhRmWxxGrrMG/fi9mRwAi3Q7kAsCHVnJcnP44AEFGTOKS28jaLOgdWl5zOPp2xOcfy+2DM4R/ 2dU= X-IronPort-AV: E=Sophos;i="5.72,309,1580745600"; d="scan'208";a="134027533" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 27 Mar 2020 00:45:02 +0800 IronPort-SDR: DA2KHFS6mCBRYNOstS/Ae/wXZenTfCWIULGXGFSgwjnOcXV66QbreXUGod5P7rNT9m7IR6uEWQ xQ67Tm5ZC1Sbg4LpDADmlIgFV/0ov4h+AoinIQzwyaLwh+i2rDC2GR4/vya1s4MDV+8DVlDFuu iYvmgYNTMmPtK0l56cs+5B1HpayjSmMrQuAGPtkVEUCy+QYOG+aqphRiiUcX9LRtO8vmKoZyML PdmrLSfY3XPLxk4fiUzA1Fx3JCyUbrDXdYSo9bvjIfQZdye4ayG8aadiw0J5GwIGbYRO01JihJ XHvCB7Ftp9PCUxGJKe/Fgi1/ 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; 26 Mar 2020 09:36:04 -0700 IronPort-SDR: oYPE+b41q7eWHNdPNM6RQTHKwIeCxZuuFz6TyeP9ktWSGRJCUbgqyxLpYcS/4LnwBPL9iRxXuG W0NmN9ONIuPD61MSy6pHOQOXvZq6Rsqnl6GgjGxNSGnxf4eQLtNMFpW3FjesI088LN0ikz+i2b De8zvzJCwpaP/1O1T7RsLFhX5MRxISzOznhzQG5KncovQXSyVxNE0uT1nWH/qOT2Oe6ErW/sEp 0PLDBR6L87HqZe5lt40qrScDQ+4RdVmg2Saqc9+pY35sToE5PS2SUYQT5oUZr790M3fGBhwwYP 2uo= WDCIronportException: Internal Received: from lpt-shen-j.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.54.198]) by uls-op-cesaip02.wdc.com with ESMTP; 26 Mar 2020 09:45:01 -0700 From: Alistair Francis To: libc-alpha@sourceware.org Cc: Vineet.Gupta1@synopsys.com, alistair23@gmail.com, Alistair Francis Subject: [PATCH v4 3/3] sysv: linux: Pass 64-bit version of semctl syscall Date: Thu, 26 Mar 2020 09:37:24 -0700 Message-Id: <20200326163724.377351-4-alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200326163724.377351-1-alistair.francis@wdc.com> References: <20200326163724.377351-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-25.3 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, 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: Thu, 26 Mar 2020 16:45:06 -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. --- sysdeps/unix/sysv/linux/bits/semid_ds_t.h | 15 ++++++++++++ .../unix/sysv/linux/hppa/bits/semid_ds_t.h | 15 ++++++++++++ .../unix/sysv/linux/mips/bits/semid_ds_t.h | 13 ++++++++++ .../unix/sysv/linux/powerpc/bits/semid_ds_t.h | 15 ++++++++++++ sysdeps/unix/sysv/linux/semctl.c | 24 +++++++++++++++---- .../unix/sysv/linux/sparc/bits/semid_ds_t.h | 15 ++++++++++++ sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h | 15 ++++++++++++ 7 files changed, 108 insertions(+), 4 deletions(-) diff --git a/sysdeps/unix/sysv/linux/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/bits/semid_ds_t.h index d9d902ed0d..b135301356 100644 --- a/sysdeps/unix/sysv/linux/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/bits/semid_ds_t.h @@ -20,6 +20,21 @@ # error "Never include directly; use instead." #endif +#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 + /* Data structure describing a set of semaphores. */ #if __TIMESIZE == 32 struct semid_ds diff --git a/sysdeps/unix/sysv/linux/hppa/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/hppa/bits/semid_ds_t.h index 39c0e53f38..3613c5ec94 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/semid_ds_t.h @@ -20,6 +20,21 @@ # error "Never include directly; use instead." #endif +#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 + /* Data structure describing a set of semaphores. */ #if __TIMESIZE == 32 struct semid_ds diff --git a/sysdeps/unix/sysv/linux/mips/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/mips/bits/semid_ds_t.h index 1ab16492dd..e26906a67f 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/mips/bits/semid_ds_t.h @@ -20,6 +20,19 @@ # error "Never include directly; use instead." #endif +#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 + /* Data structure describing a set of semaphores. */ struct semid_ds { diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/powerpc/bits/semid_ds_t.h index 79b4cba939..ec2ff552eb 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/semid_ds_t.h @@ -20,6 +20,21 @@ # error "Never include directly; use instead." #endif +#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 + /* Data structure describing a set of semaphores. */ #if __TIMESIZE == 32 struct semid_ds diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c index 30571af49f..38c2fc6545 100644 --- a/sysdeps/unix/sysv/linux/semctl.c +++ b/sysdeps/unix/sysv/linux/semctl.c @@ -29,6 +29,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 +47,26 @@ 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 + if (ret == 0 && cmd == IPC_STAT) + { + arg.buf->sem_nsems = arg.buf32->sem_nsems; + arg.buf->sem_otime = arg.buf32->sem_otime | + ((time_t) arg.buf32->sem_otime_high << 32); + arg.buf->sem_ctime = arg.buf32->sem_ctime | + ((time_t) arg.buf32->sem_ctime_high << 32); + } +#endif + return ret; } int diff --git a/sysdeps/unix/sysv/linux/sparc/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/sparc/bits/semid_ds_t.h index f8de676e79..b08fb8a79e 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/semid_ds_t.h @@ -20,6 +20,21 @@ # error "Never include directly; use instead." #endif +#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 + /* Data structure describing a set of semaphores. */ #if __TIMESIZE == 32 struct semid_ds diff --git a/sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h b/sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h index 42694069d5..c7b9adce88 100644 --- a/sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h +++ b/sysdeps/unix/sysv/linux/x86/bits/semid_ds_t.h @@ -20,6 +20,21 @@ # error "Never include directly; use instead." #endif +#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 + /* Data structure describing a set of semaphores. */ struct semid_ds {