From: Arnd Bergmann <arnd@arndb.de>
To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
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 05/17] y2038: arm64: Extend sysvipc compat data structures
Date: Thu, 19 Apr 2018 14:39:00 -0000 [thread overview]
Message-ID: <20180419143737.606138-6-arnd@arndb.de> (raw)
In-Reply-To: <20180419143737.606138-1-arnd@arndb.de>
Both 32-bit amd 64-bit ARM use the asm-generic header files for their
sysvipc data structures, so no special care is needed to make those
work beyond y2038, with the one exception of compat mode: Since there
is no asm-generic definition of the compat mode IPC structures, ARM64
provides its own copy, and we make those match the changes in the native
asm-generic header files.
There is sufficient padding in these data structures to extend all
timestamps to 64 bit, but on big-endian ARM kernels, the padding
is in the wrong place, so the C library has to ensure it reassembles
a 64-bit time_t correctly.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm64/include/asm/compat.h | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h
index 0030f79808b3..1a037b94eba1 100644
--- a/arch/arm64/include/asm/compat.h
+++ b/arch/arm64/include/asm/compat.h
@@ -181,10 +181,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;
@@ -192,12 +192,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;
@@ -210,12 +210,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;
--
2.9.0
next prev parent reply other threads:[~2018-04-19 14:39 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 14:38 [PATCH v3 00/17] y2038: Convert IPC syscalls Arnd Bergmann
2018-04-19 14:38 ` [PATCH v3 03/17] y2038: ia64: Remove unneeded ipc uapi header files Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 13/17] y2038: ipc: Report long times to user space Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 12/17] y2038: ipc: Use ktime_get_real_seconds consistently Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 10/17] y2038: powerpc: Extend sysvipc data structures Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 15/17] y2038: ipc: Enable COMPAT_32BIT_TIME Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 11/17] y2038: xtensa: Extend sysvipc data structures Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 07/17] y2038: x86: " Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 17/17] y2038: compat: Move common compat types to asm-generic/compat.h Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 08/17] y2038: parisc: Extend sysvipc data structures Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 02/17] y2038: alpha: Remove unneeded ipc uapi header files Arnd Bergmann
2018-04-19 14:39 ` Arnd Bergmann [this message]
2018-04-19 14:39 ` [PATCH v3 14/17] y2038: ipc: Use __kernel_timespec Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 06/17] y2038: mips: Extend sysvipc data structures Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 04/17] y2038: s390: Remove unneeded ipc uapi header files Arnd Bergmann
[not found] ` <20180420075407.GA7119@osiris>
2018-04-20 7:58 ` Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 09/17] y2038: sparc: Extend sysvipc data structures Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 01/17] y2038: asm-generic: " Arnd Bergmann
2018-04-19 15:01 ` Eric W. Biederman
2018-04-19 15:20 ` Arnd Bergmann
2018-04-19 21:24 ` Arnd Bergmann
2018-04-19 22:14 ` Eric W. Biederman
2018-04-20 8:54 ` Arnd Bergmann
2018-04-20 13:06 ` [PATCH] x86: ipc: fix x32 version of shmid64_ds and msqid64_ds Arnd Bergmann
[not found] ` <CAH8yC8mnfNnG86kgjnfwiZJ0=qN+w=5PVcLcxddaJdDtYbSanA@mail.gmail.com>
2018-04-20 14:38 ` Arnd Bergmann
2018-04-22 12:38 ` H.J. Lu
2018-04-22 20:17 ` Arnd Bergmann
2018-04-19 15:31 ` [PATCH v3 01/17] y2038: asm-generic: Extend sysvipc data structures Zack Weinberg
2018-04-19 15:51 ` Arnd Bergmann
2018-04-19 14:39 ` [PATCH v3 16/17] y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180419143737.606138-6-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=albert.aribaud@3adev.fr \
--cc=catalin.marinas@arm.com \
--cc=deepa.kernel@gmail.com \
--cc=ebiederm@xmission.com \
--cc=jhogan@kernel.org \
--cc=libc-alpha@sourceware.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=ralf@linux-mips.org \
--cc=schwidefsky@de.ibm.com \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
--cc=y2038@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).