From patchwork Thu Apr 19 14:37:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 133815 Delivered-To: patch@linaro.org Received: by 10.80.173.174 with SMTP id a43csp881658edd; Thu, 19 Apr 2018 07:40:14 -0700 (PDT) X-Google-Smtp-Source: AIpwx49BZmCB+bcBO9+qPdFVBISx1qeS77IDXhBq0TXy8P5eLbimbdNuMIpngoqrEXbmGVrcJIGe X-Received: by 10.98.220.78 with SMTP id t75mr5445599pfg.139.1524148814122; Thu, 19 Apr 2018 07:40:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524148814; cv=none; d=google.com; s=arc-20160816; b=NjOvFPWSlBu+Qrf/8ohpY/e0sVJOlblcKFBaWxYE4en4IDLXw5LngnW4qKikpDMLnn lBrfsAVwCEoq5+/pxbDfNQ50l4PCLAjzIdrk1hT6J0HYH8cHIMO4vzgGS666V5UIj+8x BSWheo/kAcCD/E83N3U76QLVjrZMeQWFqQS0sAfFOzHAym5hhVY6TI1FSVxro2TcuS3L tjn/0cNZ0aQU4RHwfZCS9ELr5GkBo8CPLekd80kMDN27S7Yi8hnEjwvTAQsZx22wWNAv +GGme0YfRxaw0cUs4Yjzokk6YKEsLbm848d6OEpI0U4A9c42+xeBj+c3REiHRg3k/8Z+ 6O7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=hvATQR0ZrNPd7AeCP+oGY8WKaIOjWlIsVyUk7xk6D9w=; b=fVGxhtDe9wFcmoBBvMWj+NJXfpa72D+uq408lHCs6vVKL0iPwKpZc6S3aZV3yr8xbQ DXJ/nhtWyU5ZF+Ipq2Mf8i/aqbEZ7ak1mCrWqRWjryd24D8t6cuWYTtCdZcQihN2fd0C wZ0TLKbiOVNwtJGsgeEd/Z1xp5c+6QsCOWwDFD0qOkDH9o62tUzDSnF3WtteHg02AGIj sVnNgCJ9MPmQC3iOT7n7hYVghX1kmJnmtM7N+bKEjT9kOmVPmfcfQUjyzYdha3+qMzHa iEyWiXFIUXO9LshM2lO6Oun+ifMLkW7j3H5yb+GICMkgTMeXJuBm6wWIb78feDIQe3kM lUZg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r25si2323202pgu.219.2018.04.19.07.40.13; Thu, 19 Apr 2018 07:40:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753098AbeDSOkM (ORCPT + 29 others); Thu, 19 Apr 2018 10:40:12 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:33619 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753162AbeDSOjN (ORCPT ); Thu, 19 Apr 2018 10:39:13 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0LfRd3-1ecHfM2PYf-00p5MG; Thu, 19 Apr 2018 16:37:53 +0200 From: Arnd Bergmann To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , linux-api@vger.kernel.org, linux-arch@vger.kernel.org, libc-alpha@sourceware.org, tglx@linutronix.de, deepa.kernel@gmail.com, viro@zeniv.linux.org.uk, ebiederm@xmission.com, albert.aribaud@3adev.fr, linux-s390@vger.kernel.org, schwidefsky@de.ibm.com, x86@kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, linux-mips@linux-mips.org, jhogan@kernel.org, ralf@linux-mips.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org Subject: [PATCH v3 07/17] y2038: x86: Extend sysvipc data structures Date: Thu, 19 Apr 2018 16:37:27 +0200 Message-Id: <20180419143737.606138-8-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180419143737.606138-1-arnd@arndb.de> References: <20180419143737.606138-1-arnd@arndb.de> X-Provags-ID: V03:K1:kr5T3sYJMDxHLG6BCKgJMRLERUUnififeq+jqPm5HLCsBc3KKjJ LdmMBTyXs2Bch1x1+jTRkJgMg1oo6rer0Ofx3S09R6VjFPrBfZBVNn4bDXZJ9ZprRWsSrtL vmdN8MhR2khm3/N02qcosa3Eaqk02jJ/qbRE66FEPXOg3jLbiAtjgpdiZmyX4dQu5pXcxp+ zIq/c2Mgaknxi6xJpdciA== X-UI-Out-Filterresults: notjunk:1; V01:K0:GbQub4+8MnE=:y+JOVso3O/uAXnAGYxBtA5 HfAisuk1Y/lSUt0cybR2y3nSmZ4gVeW+f8FymwqiLAe92V1iF/c2eWYVq4sTZWM3Ab5j8afpw Xq/6yfKiZs7f8LWQnN87iHqxiREK0LclrBEfdKK+yf8BnOSTXUoWemzDz8QQI2q3YPpX51Are 3FMnWoNg+x63SCmDReXomvoHSNywfQC4Zdk8oN1nAh5b63Y7gZGBOv9mpg6ntlbDIcmi42qqA 1AQt5jpv/GFQd4k6OxSko8IL5ZugTJIWWpaP7givaIZIz6t1wsR14kuHnenaFKEqyjkOUsBrc n8ovl7Z8+QkV/4LCkYBl/BSdP5BEWWhPisw7lRo39s5UxeDtLIvJ2i92Lgqj2LBGOfKvuhFBb 9GzLIVQdXW/j7E7S146jAH9q6jHb8dvDuZ40DK3LG4H3Df+oNzB/cGcZQvyAc75S6iY6OWoLp vmMFAqCXP73DH+AgwHJ5JftQTUVmx/UALouNlWuwV1AHxqB+uyBIjaa0hdRMBxQvee/gJ4qQc Y/Oe9ZTjOpi7Xk1pCskgIaJyID4DLw0tWfsMSjaPpG162OcemGp+kCGh9DvAnPGzfH8/kpDUI I/BX5me2eywHqv0Z+YsmjU23fYzh42ovAIBdmHX3fP9ldmFfwlowcXn47TYcuvSjCSCgDBOjo dAb5LhSck1KqK+uinAPJhjxOpx8vKMaAVI4aZNrYpBmhRxpTbSLI7CGlwYU5RACeM/AW8nzOK cOFj3sMWWTAfDbeezHDxLS2BHne+YWwfiylVOA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This extends the x86 copy of the sysvipc data structures to deal with 32-bit user space that has 64-bit time_t and wants to see timestamps beyond 2038. Fortunately, x86 has padding for this purpose in all the data structures, so we can just add extra fields. With msgid64_ds and shmid64_ds, the data structure is identical to the asm-generic version, which we have already extended. For some reason however, the 64-bit version of semid64_ds ended up with extra padding, so I'm implementing the same approach as the asm-generic version here, by using separate fields for the upper and lower halves of the two timestamps. Signed-off-by: Arnd Bergmann --- arch/x86/include/asm/compat.h | 32 ++++++++++++++++---------------- arch/x86/include/uapi/asm/Kbuild | 5 ++++- arch/x86/include/uapi/asm/msgbuf.h | 1 - arch/x86/include/uapi/asm/sembuf.h | 11 ++++++++++- arch/x86/include/uapi/asm/shmbuf.h | 1 - 5 files changed, 30 insertions(+), 20 deletions(-) delete mode 100644 arch/x86/include/uapi/asm/msgbuf.h delete mode 100644 arch/x86/include/uapi/asm/shmbuf.h -- 2.9.0 diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h index 7cd314b71c51..fb97cf7c4137 100644 --- a/arch/x86/include/asm/compat.h +++ b/arch/x86/include/asm/compat.h @@ -134,10 +134,10 @@ struct compat_ipc64_perm { struct compat_semid64_ds { struct compat_ipc64_perm sem_perm; - compat_time_t sem_otime; - compat_ulong_t __unused1; - compat_time_t sem_ctime; - compat_ulong_t __unused2; + compat_ulong_t sem_otime; + compat_ulong_t sem_otime_high; + compat_ulong_t sem_ctime; + compat_ulong_t sem_ctime_high; compat_ulong_t sem_nsems; compat_ulong_t __unused3; compat_ulong_t __unused4; @@ -145,12 +145,12 @@ struct compat_semid64_ds { struct compat_msqid64_ds { struct compat_ipc64_perm msg_perm; - compat_time_t msg_stime; - compat_ulong_t __unused1; - compat_time_t msg_rtime; - compat_ulong_t __unused2; - compat_time_t msg_ctime; - compat_ulong_t __unused3; + compat_ulong_t msg_stime; + compat_ulong_t msg_stime_high; + compat_ulong_t msg_rtime; + compat_ulong_t msg_rtime_high; + compat_ulong_t msg_ctime; + compat_ulong_t msg_ctime_high; compat_ulong_t msg_cbytes; compat_ulong_t msg_qnum; compat_ulong_t msg_qbytes; @@ -163,12 +163,12 @@ struct compat_msqid64_ds { struct compat_shmid64_ds { struct compat_ipc64_perm shm_perm; compat_size_t shm_segsz; - compat_time_t shm_atime; - compat_ulong_t __unused1; - compat_time_t shm_dtime; - compat_ulong_t __unused2; - compat_time_t shm_ctime; - compat_ulong_t __unused3; + compat_ulong_t shm_atime; + compat_ulong_t shm_atime_high; + compat_ulong_t shm_dtime; + compat_ulong_t shm_dtime_high; + compat_ulong_t shm_ctime; + compat_ulong_t shm_ctime_high; compat_pid_t shm_cpid; compat_pid_t shm_lpid; compat_ulong_t shm_nattch; diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 322681622d1e..d1d883e304f7 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -2,7 +2,10 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += bpf_perf_event.h +generic-y += msgbuf.h +generic-y += poll.h +generic-y += shmbuf.h + generated-y += unistd_32.h generated-y += unistd_64.h generated-y += unistd_x32.h -generic-y += poll.h diff --git a/arch/x86/include/uapi/asm/msgbuf.h b/arch/x86/include/uapi/asm/msgbuf.h deleted file mode 100644 index 809134c644a6..000000000000 --- a/arch/x86/include/uapi/asm/msgbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/include/uapi/asm/sembuf.h b/arch/x86/include/uapi/asm/sembuf.h index cabd7476bd6c..89de6cd9f0a7 100644 --- a/arch/x86/include/uapi/asm/sembuf.h +++ b/arch/x86/include/uapi/asm/sembuf.h @@ -8,15 +8,24 @@ * between kernel and user space. * * Pad space is left for: - * - 64-bit time_t to solve y2038 problem * - 2 miscellaneous 32-bit values + * + * x86_64 and x32 incorrectly added padding here, so the structures + * are still incompatible with the padding on x86. */ struct semid64_ds { struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ +#ifdef __i386__ + unsigned long sem_otime; /* last semop time */ + unsigned long sem_otime_high; + unsigned long sem_ctime; /* last change time */ + unsigned long sem_ctime_high; +#else __kernel_time_t sem_otime; /* last semop time */ __kernel_ulong_t __unused1; __kernel_time_t sem_ctime; /* last change time */ __kernel_ulong_t __unused2; +#endif __kernel_ulong_t sem_nsems; /* no. of semaphores in array */ __kernel_ulong_t __unused3; __kernel_ulong_t __unused4; diff --git a/arch/x86/include/uapi/asm/shmbuf.h b/arch/x86/include/uapi/asm/shmbuf.h deleted file mode 100644 index 83c05fc2de38..000000000000 --- a/arch/x86/include/uapi/asm/shmbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include