From: Arnd Bergmann <arnd@arndb.de>
To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org
Cc: 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, zackw@panix.com, noloader@gmail.com,
Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH v4 02/16] y2038: x86: Extend sysvipc data structures
Date: Wed, 25 Apr 2018 17:05:52 +0200 [thread overview]
Message-ID: <20180425150606.954771-2-arnd@arndb.de> (raw)
In-Reply-To: <20180425132242.1500539-1-arnd@arndb.de>
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 <arnd@arndb.de>
---
arch/x86/include/asm/compat.h | 32 ++++++++++++++++----------------
arch/x86/include/uapi/asm/sembuf.h | 11 ++++++++++-
2 files changed, 26 insertions(+), 17 deletions(-)
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/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;
--
2.9.0
next prev parent reply other threads:[~2018-04-25 15:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-25 13:22 [GIT PULL, PATCH v4 00/16] y2038: IPC system call conversion Arnd Bergmann
2018-04-25 15:05 ` [PATCH v4 01/16] y2038: asm-generic: Extend sysvipc data structures Arnd Bergmann
2018-04-25 15:05 ` Arnd Bergmann [this message]
2018-04-25 15:05 ` [PATCH v4 03/16] y2038: alpha: Remove unneeded ipc uapi header files Arnd Bergmann
2018-04-25 15:05 ` [PATCH v4 04/16] y2038: ia64: " Arnd Bergmann
2018-04-25 15:05 ` [PATCH v4 05/16] y2038: s390: " Arnd Bergmann
2018-04-25 15:05 ` [PATCH v4 06/16] y2038: arm64: Extend sysvipc compat data structures Arnd Bergmann
2018-04-25 15:05 ` [PATCH v4 07/16] y2038: mips: Extend sysvipc " Arnd Bergmann
2018-04-25 15:05 ` [PATCH v4 08/16] y2038: parisc: " Arnd Bergmann
2018-04-25 15:05 ` [PATCH v4 09/16] y2038: sparc: " Arnd Bergmann
2018-04-25 15:06 ` [PATCH v4 10/16] y2038: powerpc: " Arnd Bergmann
2018-04-25 15:06 ` [PATCH v4 11/16] y2038: xtensa: " Arnd Bergmann
2018-04-25 15:06 ` [PATCH v4 12/16] y2038: ipc: Use ktime_get_real_seconds consistently Arnd Bergmann
2018-04-25 15:06 ` [PATCH v4 13/16] y2038: ipc: Report long times to user space Arnd Bergmann
2018-04-25 15:06 ` [PATCH v4 14/16] y2038: ipc: Use __kernel_timespec Arnd Bergmann
2018-04-25 15:06 ` [PATCH v4 15/16] y2038: ipc: Enable COMPAT_32BIT_TIME Arnd Bergmann
2018-04-25 15:06 ` [PATCH v4 16/16] 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=20180425150606.954771-2-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=noloader@gmail.com \
--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 \
--cc=zackw@panix.com \
/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 NNTP newsgroup(s).