From patchwork Wed Apr 25 13:22: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: 134292 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp861811lji; Wed, 25 Apr 2018 06:23:03 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/R9LCvX9yM4kDHkH0GIJf+34YleOXbRMFbT33aoqJIW9Ns2djn+/uojI5U1mDRVek4LH/0 X-Received: by 10.99.124.1 with SMTP id x1mr23120668pgc.286.1524662583682; Wed, 25 Apr 2018 06:23:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524662583; cv=none; d=google.com; s=arc-20160816; b=RKtubiSZiiYwkR+iBGtwhr0sjTJPvvGgsbYmci6CcPrvlqX8LySi0YnoykdrJSWRgt ttb5n0dX0oZPYR05uuIi46rsupYsQfMxAEc+K1GZFP0XLfnpLe9TPC6ufGt0fUP4wTlU MibUEs3UVufULTF5ctyiXFJtGM/S0Warv24n4WFtpoZuPtK9AK+0+PJUcnR8I6GTP20j unfOU++62/EJTVZMiEtBbialrk5KXdennFFrkR06TmsYhyiMgwu9bXiIUYqyvjXCWyQb ax0PWYjGXM+PZXB0b3nSTkNhOy278kzqsTdDeu+iAGDrWMR3i9uPiNEyLO1JNQ7Tedq8 X5mg== 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=n21C6+7DXqa1/UHMo9GxpKf5rBOCrpEgn9YzE+CmHpc=; b=GZOro7OO4OoIVRbIcJm163urjfAgC/iyJf0A2wR3sc1BcXfMdyeDuUmuSGSPAkRYN/ vYG74jR6TRP6J+HFIeIYNVG2rwmOwMQGm4imC/g+WXQCJgff1VvlrrFR4hAZAq+fvQZ5 7+6xxRdHuVTshbYxWmiPV1eZFI4g6msTkX+ti7GkJ+GK46YL79B4VKyJBiiNBl2cF6SM mVnsAgiqKC1sdLo6ILEttZe45W9Y+ZpTj0HlW/UCdW/PPJzuauKepTFSi8rZt13WfUe9 R6b02EtpGo44bD5yYPdhCv2CVhjbfk7eeFNojOaN8CBe3Njjd9Okor479x9Dm8qtf1r/ gdMw== 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 m22-v6si16009597plk.214.2018.04.25.06.23.03; Wed, 25 Apr 2018 06:23:03 -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 S1754157AbeDYNXA (ORCPT + 29 others); Wed, 25 Apr 2018 09:23:00 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:56069 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751705AbeDYNW6 (ORCPT ); Wed, 25 Apr 2018 09:22:58 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0MN4u0-1fHx9d18bA-006enf; Wed, 25 Apr 2018 15:22:57 +0200 From: Arnd Bergmann To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann Subject: [PATCH v4 01/16] y2038: asm-generic: Extend sysvipc data structures Date: Wed, 25 Apr 2018 15:22:27 +0200 Message-Id: <20180425132242.1500539-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180425132242.1500539-1-arnd@arndb.de> References: <20180425132242.1500539-1-arnd@arndb.de> X-Provags-ID: V03:K1:QYCyxVRnoRy9Hk+2mwz9zq6aFgwoNeCl8lDL4XVuUCMPE/0uhxN n99QW50Laoqg1E1HKit2mh5UFVdQv8/NQH0uYMYsjEM3F3ImxHRvDtbTumsqQ0UzcF3bvBL kISTXKq4ck2yoMRo7zzmxjQOc9pf/jYVKwfElHbnln9aYsEQ8IqAIt6p6+XpJfTABB6i2d8 iOyNSU89+FcaMlLaIq2lQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:P+y59aTOQAY=:QGdylhjntopVQpGbRpgfee OhWVAIlXIfpWTsCrzyWuPb0JAwz+a3fNRYHAmp8y7Yj0tzzN4AzSz/YyJvr/essCqnM8V+oiR mAINpuWvP72bxZ7mzO6yneyjjwIJN/fNz6YxGedh4KWWVb5pSyQiquBmjKBu9YyhC6pniDEOe zQqgAQEuwLowveB0MJtkCjoT+duEGb5AOWJtB1zeK63vFWsNO7KFkUE4fIMG4E7CTbD2AIAVl HkTagn8wVYt3D21JR3QOk9PcYj/ToMFGT8epOxUT1YFJneH1aqEk3wIMJWM/GUxHfDSEw4xJG 77f4bZMgIvNkT66trv9l5vpDzaFss2SOusAld++o4Z2Pu6DiGUHChNC5m+XfOWgjuh/65RDW6 PmE1pbTPCTPmCu7ZN3njLMkJVDMyHerhiAkw14Q2Ylm+dx0g5al8wKZ4oeT3LofZt6RtVECxj B9AzqHlwJ//HppACRKIlD/3QwYC/51BzQSYQSrdyQNkIP/X8hDzlqfWH+vL/Y3Zm+gHm7EVei 8xPSiuMcVjyYGulbNi5Xe1L1yvzqj+z+JvHBUw37x/lA/r98dJRre5gFhBZv651ogpfWvLb55 5IP16zFDjdFiuPiqg2KuxjJV0FQVK+bWUx7ovmpp+HZZqxUZmWjN/O8ZTp9NKHisWNOsbzlkl 7PtRRjI+GrocLUhhGH6IbiDlWJTEoy0xrSns/SCugS0TvigSyWCHtg0vM3jD+Iv1DSthu47TI t8pGZB4/gPYIyP8nxBRz4pOx/subK1lLTZPdwA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Most architectures now use the asm-generic copy of the sysvipc data structures (msqid64_ds, semid64_ds, shmid64_ds), which use 32-bit __kernel_time_t on 32-bit architectures but have padding behind them to allow extending the type to 64-bit. Unfortunately, that fails on all big-endian architectures, which have the padding on the wrong side. As so many of them get it wrong, we decided to not bother even trying to fix it up when we introduced the asm-generic copy. Instead we always use the padding word now to provide the upper 32 bits of the seconds value, regardless of the endianess. A libc implementation on a typical big-endian system can deal with this by providing its own copy of the structure definition to user space, and swapping the two 32-bit words before returning from the semctl/shmctl/msgctl system calls. Note that msqid64_ds and shmid64_ds were broken on x32 since commit f4b4aae18288 ("x86/headers/uapi: Fix __BITS_PER_LONG value for x32 builds"). I have sent a separate fix for that, but as we no longer have to worry about x32 here, I no longer worry about x32 here and use 'unsigned long' instead of __kernel_ulong_t. Signed-off-by: Arnd Bergmann --- include/uapi/asm-generic/msgbuf.h | 27 +++++++++++++------------- include/uapi/asm-generic/sembuf.h | 26 +++++++++++++++---------- include/uapi/asm-generic/shmbuf.h | 41 +++++++++++++++++++-------------------- 3 files changed, 49 insertions(+), 45 deletions(-) -- 2.9.0 diff --git a/include/uapi/asm-generic/msgbuf.h b/include/uapi/asm-generic/msgbuf.h index fb306ebdb36f..9fe4881557cb 100644 --- a/include/uapi/asm-generic/msgbuf.h +++ b/include/uapi/asm-generic/msgbuf.h @@ -18,31 +18,30 @@ * On big-endian systems, the padding is in the wrong place. * * Pad space is left for: - * - 64-bit time_t to solve y2038 problem * - 2 miscellaneous 32-bit values */ struct msqid64_ds { struct ipc64_perm msg_perm; +#if __BITS_PER_LONG == 64 __kernel_time_t msg_stime; /* last msgsnd time */ -#if __BITS_PER_LONG != 64 - unsigned long __unused1; -#endif __kernel_time_t msg_rtime; /* last msgrcv time */ -#if __BITS_PER_LONG != 64 - unsigned long __unused2; -#endif __kernel_time_t msg_ctime; /* last change time */ -#if __BITS_PER_LONG != 64 - unsigned long __unused3; +#else + unsigned long msg_stime; /* last msgsnd time */ + unsigned long msg_stime_high; + unsigned long msg_rtime; /* last msgrcv time */ + unsigned long msg_rtime_high; + unsigned long msg_ctime; /* last change time */ + unsigned long msg_ctime_high; #endif - __kernel_ulong_t msg_cbytes; /* current number of bytes on queue */ - __kernel_ulong_t msg_qnum; /* number of messages in queue */ - __kernel_ulong_t msg_qbytes; /* max number of bytes on queue */ + unsigned long msg_cbytes; /* current number of bytes on queue */ + unsigned long msg_qnum; /* number of messages in queue */ + unsigned long msg_qbytes; /* max number of bytes on queue */ __kernel_pid_t msg_lspid; /* pid of last msgsnd */ __kernel_pid_t msg_lrpid; /* last receive pid */ - __kernel_ulong_t __unused4; - __kernel_ulong_t __unused5; + unsigned long __unused4; + unsigned long __unused5; }; #endif /* __ASM_GENERIC_MSGBUF_H */ diff --git a/include/uapi/asm-generic/sembuf.h b/include/uapi/asm-generic/sembuf.h index cbf9cfe977d6..0bae010f1b64 100644 --- a/include/uapi/asm-generic/sembuf.h +++ b/include/uapi/asm-generic/sembuf.h @@ -13,23 +13,29 @@ * everyone just ended up making identical copies without specific * optimizations, so we may just as well all use the same one. * - * 64 bit architectures typically define a 64 bit __kernel_time_t, + * 64 bit architectures use a 64-bit __kernel_time_t here, while + * 32 bit architectures have a pair of unsigned long values. * so they do not need the first two padding words. - * On big-endian systems, the padding is in the wrong place. * - * Pad space is left for: - * - 64-bit time_t to solve y2038 problem - * - 2 miscellaneous 32-bit values + * On big-endian systems, the padding is in the wrong place for + * historic reasons, so user space has to reconstruct a time_t + * value using + * + * user_semid_ds.sem_otime = kernel_semid64_ds.sem_otime + + * ((long long)kernel_semid64_ds.sem_otime_high << 32) + * + * Pad space is left for 2 miscellaneous 32-bit values */ struct semid64_ds { struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ +#if __BITS_PER_LONG == 64 __kernel_time_t sem_otime; /* last semop time */ -#if __BITS_PER_LONG != 64 - unsigned long __unused1; -#endif __kernel_time_t sem_ctime; /* last change time */ -#if __BITS_PER_LONG != 64 - unsigned long __unused2; +#else + unsigned long sem_otime; /* last semop time */ + unsigned long sem_otime_high; + unsigned long sem_ctime; /* last change time */ + unsigned long sem_ctime_high; #endif unsigned long sem_nsems; /* no. of semaphores in array */ unsigned long __unused3; diff --git a/include/uapi/asm-generic/shmbuf.h b/include/uapi/asm-generic/shmbuf.h index 2b6c3bb97f97..e504422fc501 100644 --- a/include/uapi/asm-generic/shmbuf.h +++ b/include/uapi/asm-generic/shmbuf.h @@ -19,42 +19,41 @@ * * * Pad space is left for: - * - 64-bit time_t to solve y2038 problem * - 2 miscellaneous 32-bit values */ struct shmid64_ds { struct ipc64_perm shm_perm; /* operation perms */ size_t shm_segsz; /* size of segment (bytes) */ +#if __BITS_PER_LONG == 64 __kernel_time_t shm_atime; /* last attach time */ -#if __BITS_PER_LONG != 64 - unsigned long __unused1; -#endif __kernel_time_t shm_dtime; /* last detach time */ -#if __BITS_PER_LONG != 64 - unsigned long __unused2; -#endif __kernel_time_t shm_ctime; /* last change time */ -#if __BITS_PER_LONG != 64 - unsigned long __unused3; +#else + unsigned long shm_atime; /* last attach time */ + unsigned long shm_atime_high; + unsigned long shm_dtime; /* last detach time */ + unsigned long shm_dtime_high; + unsigned long shm_ctime; /* last change time */ + unsigned long shm_ctime_high; #endif __kernel_pid_t shm_cpid; /* pid of creator */ __kernel_pid_t shm_lpid; /* pid of last operator */ - __kernel_ulong_t shm_nattch; /* no. of current attaches */ - __kernel_ulong_t __unused4; - __kernel_ulong_t __unused5; + unsigned long shm_nattch; /* no. of current attaches */ + unsigned long __unused4; + unsigned long __unused5; }; struct shminfo64 { - __kernel_ulong_t shmmax; - __kernel_ulong_t shmmin; - __kernel_ulong_t shmmni; - __kernel_ulong_t shmseg; - __kernel_ulong_t shmall; - __kernel_ulong_t __unused1; - __kernel_ulong_t __unused2; - __kernel_ulong_t __unused3; - __kernel_ulong_t __unused4; + unsigned long shmmax; + unsigned long shmmin; + unsigned long shmmni; + unsigned long shmseg; + unsigned long shmall; + unsigned long __unused1; + unsigned long __unused2; + unsigned long __unused3; + unsigned long __unused4; }; #endif /* __ASM_GENERIC_SHMBUF_H */