Skip to contentSkip to conversation

Update kernel uabi header files for x32

PATCH In review H.J. Lu 6 participants 31 messages Dec 27, 2013 – Nov 24, 2015

Subsystems (3)
lore
Share & tools
lore

H.J. Lu

author
#0 lore raw

cover Update kernel uabi header files for x32

X32 uses the same kernel system call interface as x86-64 for many system calls. However, "long" is 64-bit for x86-64 and is 32-bit for x32. Where long or unsigned long are used in struct types for such system calls, they are wrong for x32. __kernel_[u]long_t is [unsigned] long for all ABIs other than x32. I am submitting 8 patches to replace long or unsigned long with __kernel_[u]long_t so that those struct types can be used with x32 system calls.

H.J. Lu (8):
Use __kernel_long_t in struct timex
Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h> Use __kernel_ulong_t in uapi struct ipc64_perm Use __kernel_long_t in struct msgbuf
Use __kernel_ulong_t in struct msqid64_ds
Use __kernel_ulong_t in x86 struct semid64_ds Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info Use __kernel_long_t in struct mq_attr

 arch/x86/include/uapi/asm/sembuf.h | 10 ++++-----
 include/uapi/asm-generic/ipcbuf.h  |  5 +++++
 include/uapi/asm-generic/msgbuf.h  | 19 +++++++++++-----
 include/uapi/asm-generic/shmbuf.h  | 36 +++++++++++++++++++++--------
 include/uapi/linux/mqueue.h        | 18 ++++++++++-----
 include/uapi/linux/msg.h           |  8 +++++--
 include/uapi/linux/resource.h      | 26 +++++++++++++++++++--
 include/uapi/linux/shm.h           | 14 +++++++++---
 include/uapi/linux/timex.h         | 46 +++++++++++++++++++++++++++++++-------
 9 files changed, 143 insertions(+), 39 deletions(-)
Signature · 1 line
1.8.4.2
author
#1 lore raw

PATCH 1/8 Use __kernel_long_t in struct timex

X32 adjtimex system call is the same as x86-64 adjtimex system call, which uses 64-bit integer for long in struct timex. But x32 long is 32 bit. This patch replaces long in struct timex with __kernel_long_t.

---
 include/uapi/linux/timex.h | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)
include/uapi/linux/timex.h +17 -17
index a7ea81f..92685d8 100644
@@ -63,27 +63,27 @@
  */
 struct timex {
 	unsigned int modes;	/* mode selector */
-	long offset;		/* time offset (usec) */
-	long freq;		/* frequency offset (scaled ppm) */
-	long maxerror;		/* maximum error (usec) */
-	long esterror;		/* estimated error (usec) */
+	__kernel_long_t offset;	/* time offset (usec) */
+	__kernel_long_t freq;	/* frequency offset (scaled ppm) */
+	__kernel_long_t maxerror;/* maximum error (usec) */
+	__kernel_long_t esterror;/* estimated error (usec) */
 	int status;		/* clock command/status */
-	long constant;		/* pll time constant */
-	long precision;		/* clock precision (usec) (read only) */
-	long tolerance;		/* clock frequency tolerance (ppm)
-				 * (read only)
-				 */
+	__kernel_long_t constant;/* pll time constant */
+	__kernel_long_t precision;/* clock precision (usec) (read only) */
+	__kernel_long_t tolerance;/* clock frequency tolerance (ppm)
+				   * (read only)
+				   */
 	struct timeval time;	/* (read only, except for ADJ_SETOFFSET) */
-	long tick;		/* (modified) usecs between clock ticks */
+	__kernel_long_t tick;	/* (modified) usecs between clock ticks */
 
-	long ppsfreq;           /* pps frequency (scaled ppm) (ro) */
-	long jitter;            /* pps jitter (us) (ro) */
+	__kernel_long_t ppsfreq;/* pps frequency (scaled ppm) (ro) */
+	__kernel_long_t jitter; /* pps jitter (us) (ro) */
 	int shift;              /* interval duration (s) (shift) (ro) */
-	long stabil;            /* pps stability (scaled ppm) (ro) */
-	long jitcnt;            /* jitter limit exceeded (ro) */
-	long calcnt;            /* calibration intervals (ro) */
-	long errcnt;            /* calibration errors (ro) */
-	long stbcnt;            /* stability limit exceeded (ro) */
+	__kernel_long_t stabil;            /* pps stability (scaled ppm) (ro) */
+	__kernel_long_t jitcnt; /* jitter limit exceeded (ro) */
+	__kernel_long_t calcnt; /* calibration intervals (ro) */
+	__kernel_long_t errcnt; /* calibration errors (ro) */
+	__kernel_long_t stbcnt; /* stability limit exceeded (ro) */
 
 	int tai;		/* TAI offset (ro) */
 
Signature · 1 line
1.8.4.2
#2 lore raw

[tip:x86/x32] uapi: Use __kernel_long_t in struct timex

uapi: Use __kernel_long_t in struct timex
Commit-ID:  7fb30128527a4220f181c2867edd9ac178175a87
Gitweb:     http://git.kernel.org/tip/7fb30128527a4220f181c2867edd9ac178175a87
Author:     H.J. Lu <[email protected]>
AuthorDate: Fri, 27 Dec 2013 14:14:17 -0800
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 20 Jan 2014 14:44:05 -0800

uapi: Use __kernel_long_t in struct timex

x32 adjtimex system call is the same as x86-64 adjtimex system call, which uses 64-bit integer for long in struct timex. But x32 long is 32 bit. This patch replaces long in struct timex with __kernel_long_t.

---
 include/uapi/linux/timex.h | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)
include/uapi/linux/timex.h +17 -17
index a7ea81f..92685d8 100644
@@ -63,27 +63,27 @@
  */
 struct timex {
 	unsigned int modes;	/* mode selector */
-	long offset;		/* time offset (usec) */
-	long freq;		/* frequency offset (scaled ppm) */
-	long maxerror;		/* maximum error (usec) */
-	long esterror;		/* estimated error (usec) */
+	__kernel_long_t offset;	/* time offset (usec) */
+	__kernel_long_t freq;	/* frequency offset (scaled ppm) */
+	__kernel_long_t maxerror;/* maximum error (usec) */
+	__kernel_long_t esterror;/* estimated error (usec) */
 	int status;		/* clock command/status */
-	long constant;		/* pll time constant */
-	long precision;		/* clock precision (usec) (read only) */
-	long tolerance;		/* clock frequency tolerance (ppm)
-				 * (read only)
-				 */
+	__kernel_long_t constant;/* pll time constant */
+	__kernel_long_t precision;/* clock precision (usec) (read only) */
+	__kernel_long_t tolerance;/* clock frequency tolerance (ppm)
+				   * (read only)
+				   */
 	struct timeval time;	/* (read only, except for ADJ_SETOFFSET) */
-	long tick;		/* (modified) usecs between clock ticks */
+	__kernel_long_t tick;	/* (modified) usecs between clock ticks */
 
-	long ppsfreq;           /* pps frequency (scaled ppm) (ro) */
-	long jitter;            /* pps jitter (us) (ro) */
+	__kernel_long_t ppsfreq;/* pps frequency (scaled ppm) (ro) */
+	__kernel_long_t jitter; /* pps jitter (us) (ro) */
 	int shift;              /* interval duration (s) (shift) (ro) */
-	long stabil;            /* pps stability (scaled ppm) (ro) */
-	long jitcnt;            /* jitter limit exceeded (ro) */
-	long calcnt;            /* calibration intervals (ro) */
-	long errcnt;            /* calibration errors (ro) */
-	long stbcnt;            /* stability limit exceeded (ro) */
+	__kernel_long_t stabil;            /* pps stability (scaled ppm) (ro) */
+	__kernel_long_t jitcnt; /* jitter limit exceeded (ro) */
+	__kernel_long_t calcnt; /* calibration intervals (ro) */
+	__kernel_long_t errcnt; /* calibration errors (ro) */
+	__kernel_long_t stbcnt; /* stability limit exceeded (ro) */
 
 	int tai;		/* TAI offset (ro) */
 
author
#3 lore raw

PATCH 2/8 Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h>

In reply to H.J. Lu

Both x32 and x86-64 use the same struct rusage and struct rlimit for system calls. But x32 log is 32-bit. This patch change uapi <linux/resource.h> to use __kernel_long_t in struct rusage and __kernel_ulong_t in and struct rlimit.

---
 include/uapi/linux/resource.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
include/uapi/linux/resource.h +16 -16
index e0ed284..36fb3b5 100644
@@ -23,25 +23,25 @@
 struct	rusage {
 	struct timeval ru_utime;	/* user time used */
 	struct timeval ru_stime;	/* system time used */
-	long	ru_maxrss;		/* maximum resident set size */
-	long	ru_ixrss;		/* integral shared memory size */
-	long	ru_idrss;		/* integral unshared data size */
-	long	ru_isrss;		/* integral unshared stack size */
-	long	ru_minflt;		/* page reclaims */
-	long	ru_majflt;		/* page faults */
-	long	ru_nswap;		/* swaps */
-	long	ru_inblock;		/* block input operations */
-	long	ru_oublock;		/* block output operations */
-	long	ru_msgsnd;		/* messages sent */
-	long	ru_msgrcv;		/* messages received */
-	long	ru_nsignals;		/* signals received */
-	long	ru_nvcsw;		/* voluntary context switches */
-	long	ru_nivcsw;		/* involuntary " */
+	__kernel_long_t	ru_maxrss;	/* maximum resident set size */
+	__kernel_long_t	ru_ixrss;	/* integral shared memory size */
+	__kernel_long_t	ru_idrss;	/* integral unshared data size */
+	__kernel_long_t	ru_isrss;	/* integral unshared stack size */
+	__kernel_long_t	ru_minflt;	/* page reclaims */
+	__kernel_long_t	ru_majflt;	/* page faults */
+	__kernel_long_t	ru_nswap;	/* swaps */
+	__kernel_long_t	ru_inblock;	/* block input operations */
+	__kernel_long_t	ru_oublock;	/* block output operations */
+	__kernel_long_t	ru_msgsnd;	/* messages sent */
+	__kernel_long_t	ru_msgrcv;	/* messages received */
+	__kernel_long_t	ru_nsignals;	/* signals received */
+	__kernel_long_t	ru_nvcsw;	/* voluntary context switches */
+	__kernel_long_t	ru_nivcsw;	/* involuntary " */
 };
 
 struct rlimit {
-	unsigned long	rlim_cur;
-	unsigned long	rlim_max;
+	__kernel_ulong_t	rlim_cur;
+	__kernel_ulong_t	rlim_max;
 };
 
 #define RLIM64_INFINITY		(~0ULL)
Signature · 1 line
1.8.4.2
#4 lore raw

[tip:x86/x32] uapi: Use __kernel_long_t/__kernel_ulong_t in < linux/resource.h>

uapi: Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h>
Commit-ID:  b684bfedc94d4b2efff09dc499a9985321c482f5
Gitweb:     http://git.kernel.org/tip/b684bfedc94d4b2efff09dc499a9985321c482f5
Author:     H.J. Lu <[email protected]>
AuthorDate: Fri, 27 Dec 2013 14:14:18 -0800
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 20 Jan 2014 14:44:17 -0800

uapi: Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h>

Both x32 and x86-64 use the same struct rusage and struct rlimit for system calls. But x32 log is 32-bit. This patch change uapi <linux/resource.h> to use __kernel_long_t in struct rusage and __kernel_ulong_t in and struct rlimit.

---
 include/uapi/linux/resource.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
include/uapi/linux/resource.h +16 -16
index e0ed284..36fb3b5 100644
@@ -23,25 +23,25 @@
 struct	rusage {
 	struct timeval ru_utime;	/* user time used */
 	struct timeval ru_stime;	/* system time used */
-	long	ru_maxrss;		/* maximum resident set size */
-	long	ru_ixrss;		/* integral shared memory size */
-	long	ru_idrss;		/* integral unshared data size */
-	long	ru_isrss;		/* integral unshared stack size */
-	long	ru_minflt;		/* page reclaims */
-	long	ru_majflt;		/* page faults */
-	long	ru_nswap;		/* swaps */
-	long	ru_inblock;		/* block input operations */
-	long	ru_oublock;		/* block output operations */
-	long	ru_msgsnd;		/* messages sent */
-	long	ru_msgrcv;		/* messages received */
-	long	ru_nsignals;		/* signals received */
-	long	ru_nvcsw;		/* voluntary context switches */
-	long	ru_nivcsw;		/* involuntary " */
+	__kernel_long_t	ru_maxrss;	/* maximum resident set size */
+	__kernel_long_t	ru_ixrss;	/* integral shared memory size */
+	__kernel_long_t	ru_idrss;	/* integral unshared data size */
+	__kernel_long_t	ru_isrss;	/* integral unshared stack size */
+	__kernel_long_t	ru_minflt;	/* page reclaims */
+	__kernel_long_t	ru_majflt;	/* page faults */
+	__kernel_long_t	ru_nswap;	/* swaps */
+	__kernel_long_t	ru_inblock;	/* block input operations */
+	__kernel_long_t	ru_oublock;	/* block output operations */
+	__kernel_long_t	ru_msgsnd;	/* messages sent */
+	__kernel_long_t	ru_msgrcv;	/* messages received */
+	__kernel_long_t	ru_nsignals;	/* signals received */
+	__kernel_long_t	ru_nvcsw;	/* voluntary context switches */
+	__kernel_long_t	ru_nivcsw;	/* involuntary " */
 };
 
 struct rlimit {
-	unsigned long	rlim_cur;
-	unsigned long	rlim_max;
+	__kernel_ulong_t	rlim_cur;
+	__kernel_ulong_t	rlim_max;
 };
 
 #define RLIM64_INFINITY		(~0ULL)
author
#5 lore raw

PATCH 3/8 Use __kernel_ulong_t in uapi struct ipc64_perm

In reply to H.J. Lu

X32 IPC system call is the same as x86-64 IPC system call, which uses 64-bit integer for unsigned long in struct ipc64_perm. But x32 long is 32 bit. This patch replaces unsigned long in uapi struct ipc64_perm with __kernel_ulong_t.

---
 include/uapi/asm-generic/ipcbuf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/asm-generic/ipcbuf.h +2 -2
index 76982b2..3dbcc1e 100644
@@ -27,8 +27,8 @@ struct ipc64_perm {
 	unsigned char		__pad1[4 - sizeof(__kernel_mode_t)];
 	unsigned short		seq;
 	unsigned short		__pad2;
-	unsigned long		__unused1;
-	unsigned long		__unused2;
+	__kernel_ulong_t	__unused1;
+	__kernel_ulong_t	__unused2;
 };
 
 #endif /* __ASM_GENERIC_IPCBUF_H */
Signature · 1 line
1.8.4.2
#6 lore raw

[tip:x86/x32] uapi, asm-generic: Use __kernel_ulong_t in uapi struct ipc64_perm

uapi, asm-generic: Use __kernel_ulong_t in uapi struct ipc64_perm
Commit-ID:  071ed2456f79722d0a54f51717e66aacbc7a5d26
Gitweb:     http://git.kernel.org/tip/071ed2456f79722d0a54f51717e66aacbc7a5d26
Author:     H.J. Lu <[email protected]>
AuthorDate: Fri, 27 Dec 2013 14:14:19 -0800
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 20 Jan 2014 14:44:35 -0800

uapi, asm-generic: Use __kernel_ulong_t in uapi struct ipc64_perm

x32 IPC system call is the same as x86-64 IPC system call, which uses 64-bit integer for unsigned long in struct ipc64_perm. But x32 long is 32 bit. This patch replaces unsigned long in uapi struct ipc64_perm with __kernel_ulong_t.

---
 include/uapi/asm-generic/ipcbuf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/asm-generic/ipcbuf.h +2 -2
index 76982b2..3dbcc1e 100644
@@ -27,8 +27,8 @@ struct ipc64_perm {
 	unsigned char		__pad1[4 - sizeof(__kernel_mode_t)];
 	unsigned short		seq;
 	unsigned short		__pad2;
-	unsigned long		__unused1;
-	unsigned long		__unused2;
+	__kernel_ulong_t	__unused1;
+	__kernel_ulong_t	__unused2;
 };
 
 #endif /* __ASM_GENERIC_IPCBUF_H */
author
#7 lore raw

PATCH 4/8 Use __kernel_long_t in struct msgbuf

In reply to H.J. Lu

X32 msgsnd/msgrcv system calls are the same as x86-64 msgsnd/msgrcv system calls, which use 64-bit integer for long in struct msgbuf . But x32 long is 32 bit. This patch replaces long in struct msgbuf with __kernel_long_t.

---
 include/uapi/linux/msg.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/msg.h +2 -2
index 22d95c6..a703755 100644
@@ -34,8 +34,8 @@ struct msqid_ds {
 
 /* message buffer for msgsnd and msgrcv calls */
 struct msgbuf {
-	long mtype;         /* type of message */
-	char mtext[1];      /* message text */
+	__kernel_long_t mtype;          /* type of message */
+	char mtext[1];                  /* message text */
 };
 
 /* buffer for msgctl calls IPC_INFO, MSG_INFO */
Signature · 1 line
1.8.4.2
#8 lore raw

[tip:x86/x32] uapi: Use __kernel_long_t in struct msgbuf

uapi: Use __kernel_long_t in struct msgbuf
Commit-ID:  443d5670f77aab121cb95f45da60f0aad390bcb5
Gitweb:     http://git.kernel.org/tip/443d5670f77aab121cb95f45da60f0aad390bcb5
Author:     H.J. Lu <[email protected]>
AuthorDate: Fri, 27 Dec 2013 14:14:20 -0800
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 20 Jan 2014 14:44:50 -0800

uapi: Use __kernel_long_t in struct msgbuf

x32 msgsnd/msgrcv system calls are the same as x86-64 msgsnd/msgrcv system calls, which use 64-bit integer for long in struct msgbuf . But x32 long is 32 bit. This patch replaces long in struct msgbuf with __kernel_long_t.

---
 include/uapi/linux/msg.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/msg.h +2 -2
index 22d95c6..a703755 100644
@@ -34,8 +34,8 @@ struct msqid_ds {
 
 /* message buffer for msgsnd and msgrcv calls */
 struct msgbuf {
-	long mtype;         /* type of message */
-	char mtext[1];      /* message text */
+	__kernel_long_t mtype;          /* type of message */
+	char mtext[1];                  /* message text */
 };
 
 /* buffer for msgctl calls IPC_INFO, MSG_INFO */
author
#9 lore raw

PATCH 5/8 Use __kernel_ulong_t in struct msqid64_ds

In reply to H.J. Lu

Both x32 and x86-64 use the same struct msqid64_ds for system calls. But x32 long is 32-bit. This patch replaces unsigned long with __kernel_ulong_t in struct msqid64_ds.

---
 include/uapi/asm-generic/msgbuf.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
include/uapi/asm-generic/msgbuf.h +5 -5
index aec850d..f55ecc4 100644
@@ -35,13 +35,13 @@ struct msqid64_ds {
 #if __BITS_PER_LONG != 64
 	unsigned long	__unused3;
 #endif
-	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_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 */
 	__kernel_pid_t msg_lspid;	/* pid of last msgsnd */
 	__kernel_pid_t msg_lrpid;	/* last receive pid */
-	unsigned long  __unused4;
-	unsigned long  __unused5;
+	__kernel_ulong_t __unused4;
+	__kernel_ulong_t __unused5;
 };
 
 #endif /* __ASM_GENERIC_MSGBUF_H */
Signature · 1 line
1.8.4.2
#10 lore raw

[tip:x86/x32] uapi: Use __kernel_ulong_t in struct msqid64_ds

uapi: Use __kernel_ulong_t in struct msqid64_ds
Commit-ID:  b9cd5ca22d6739c61655d4fcf8b29669d5d177a3
Gitweb:     http://git.kernel.org/tip/b9cd5ca22d6739c61655d4fcf8b29669d5d177a3
Author:     H.J. Lu <[email protected]>
AuthorDate: Fri, 27 Dec 2013 14:14:21 -0800
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 20 Jan 2014 14:45:01 -0800

uapi: Use __kernel_ulong_t in struct msqid64_ds

Both x32 and x86-64 use the same struct msqid64_ds for system calls. But x32 long is 32-bit. This patch replaces unsigned long with __kernel_ulong_t in struct msqid64_ds.

---
 include/uapi/asm-generic/msgbuf.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
include/uapi/asm-generic/msgbuf.h +5 -5
index aec850d..f55ecc4 100644
@@ -35,13 +35,13 @@ struct msqid64_ds {
 #if __BITS_PER_LONG != 64
 	unsigned long	__unused3;
 #endif
-	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_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 */
 	__kernel_pid_t msg_lspid;	/* pid of last msgsnd */
 	__kernel_pid_t msg_lrpid;	/* last receive pid */
-	unsigned long  __unused4;
-	unsigned long  __unused5;
+	__kernel_ulong_t __unused4;
+	__kernel_ulong_t __unused5;
 };
 
 #endif /* __ASM_GENERIC_MSGBUF_H */
author
#11 lore raw

PATCH 6/8 Use __kernel_ulong_t in x86 struct semid64_ds

In reply to H.J. Lu

Both x32 and x86-64 use the same struct semid64_ds for system calls. But x32 long is 32-bit. This patch replaces unsigned long with __kernel_ulong_t in x86 struct semid64_ds.

---
 arch/x86/include/uapi/asm/sembuf.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/include/uapi/asm/sembuf.h +5 -5
index ee50c80..cc2d6a3 100644
@@ -13,12 +13,12 @@
 struct semid64_ds {
 	struct ipc64_perm sem_perm;	/* permissions .. see ipc.h */
 	__kernel_time_t	sem_otime;	/* last semop time */
-	unsigned long	__unused1;
+	__kernel_ulong_t __unused1;
 	__kernel_time_t	sem_ctime;	/* last change time */
-	unsigned long	__unused2;
-	unsigned long	sem_nsems;	/* no. of semaphores in array */
-	unsigned long	__unused3;
-	unsigned long	__unused4;
+	__kernel_ulong_t __unused2;
+	__kernel_ulong_t sem_nsems;	/* no. of semaphores in array */
+	__kernel_ulong_t __unused3;
+	__kernel_ulong_t __unused4;
 };
 
 #endif /* _ASM_X86_SEMBUF_H */
Signature · 1 line
1.8.4.2
#12 lore raw

[tip:x86/x32] x86, uapi, x32: Use __kernel_ulong_t in x86 struct semid64_ds

x86, uapi, x32: Use __kernel_ulong_t in x86 struct semid64_ds
Commit-ID:  386916598e901e406c1f1fc801ade2646a1e8137
Gitweb:     http://git.kernel.org/tip/386916598e901e406c1f1fc801ade2646a1e8137
Author:     H.J. Lu <[email protected]>
AuthorDate: Fri, 27 Dec 2013 14:14:22 -0800
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 20 Jan 2014 14:45:13 -0800

x86, uapi, x32: Use __kernel_ulong_t in x86 struct semid64_ds

Both x32 and x86-64 use the same struct semid64_ds for system calls. But x32 long is 32-bit. This patch replaces unsigned long with __kernel_ulong_t in x86 struct semid64_ds.

---
 arch/x86/include/uapi/asm/sembuf.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/include/uapi/asm/sembuf.h +5 -5
index ee50c80..cc2d6a3 100644
@@ -13,12 +13,12 @@
 struct semid64_ds {
 	struct ipc64_perm sem_perm;	/* permissions .. see ipc.h */
 	__kernel_time_t	sem_otime;	/* last semop time */
-	unsigned long	__unused1;
+	__kernel_ulong_t __unused1;
 	__kernel_time_t	sem_ctime;	/* last change time */
-	unsigned long	__unused2;
-	unsigned long	sem_nsems;	/* no. of semaphores in array */
-	unsigned long	__unused3;
-	unsigned long	__unused4;
+	__kernel_ulong_t __unused2;
+	__kernel_ulong_t sem_nsems;	/* no. of semaphores in array */
+	__kernel_ulong_t __unused3;
+	__kernel_ulong_t __unused4;
 };
 
 #endif /* _ASM_X86_SEMBUF_H */
author
#13 lore raw

PATCH 7/8 Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info

In reply to H.J. Lu

Both x32 and x86-64 use the same struct shmid64_ds/shminfo64/shm_info for system calls. But x32 long is 32-bit. This patch replaces unsigned long with __kernel_ulong_t in struct shmid64_ds/shminfo64/shm_info.

---
 include/uapi/asm-generic/shmbuf.h | 24 ++++++++++++------------
 include/uapi/linux/shm.h          | 10 +++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)
include/uapi/asm-generic/shmbuf.h +12 -12
index 5768fa6..7e9fb2f 100644
@@ -39,21 +39,21 @@ struct shmid64_ds {
 #endif
 	__kernel_pid_t		shm_cpid;	/* pid of creator */
 	__kernel_pid_t		shm_lpid;	/* pid of last operator */
-	unsigned long		shm_nattch;	/* no. of current attaches */
-	unsigned long		__unused4;
-	unsigned long		__unused5;
+	__kernel_ulong_t	shm_nattch;	/* no. of current attaches */
+	__kernel_ulong_t	__unused4;
+	__kernel_ulong_t	__unused5;
 };
 
 struct shminfo64 {
-	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;
+	__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;
 };
 
 #endif /* __ASM_GENERIC_SHMBUF_H */
include/uapi/linux/shm.h +5 -5
index ec36fa1..78b6941 100644
@@ -68,11 +68,11 @@ struct	shminfo {
 
 struct shm_info {
 	int used_ids;
-	unsigned long shm_tot;	/* total allocated shm */
-	unsigned long shm_rss;	/* total resident shm */
-	unsigned long shm_swp;	/* total swapped shm */
-	unsigned long swap_attempts;
-	unsigned long swap_successes;
+	__kernel_ulong_t shm_tot;	/* total allocated shm */
+	__kernel_ulong_t shm_rss;	/* total resident shm */
+	__kernel_ulong_t shm_swp;	/* total swapped shm */
+	__kernel_ulong_t swap_attempts;
+	__kernel_ulong_t swap_successes;
 };
 
 
Signature · 1 line
1.8.4.2
#14 lore raw

[tip:x86/x32] uapi: Use __kernel_ulong_t in shmid64_ds/shminfo64/ shm_info

uapi: Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info
Commit-ID:  f8dcdf0130d3ba34f8f7531af7c45616efe1e32e
Gitweb:     http://git.kernel.org/tip/f8dcdf0130d3ba34f8f7531af7c45616efe1e32e
Author:     H.J. Lu <[email protected]>
AuthorDate: Fri, 27 Dec 2013 14:14:23 -0800
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 20 Jan 2014 14:45:25 -0800

uapi: Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info

Both x32 and x86-64 use the same struct shmid64_ds/shminfo64/shm_info for system calls. But x32 long is 32-bit. This patch replaces unsigned long with __kernel_ulong_t in struct shmid64_ds/shminfo64/shm_info.

---
 include/uapi/asm-generic/shmbuf.h | 24 ++++++++++++------------
 include/uapi/linux/shm.h          | 10 +++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)
include/uapi/asm-generic/shmbuf.h +12 -12
index 5768fa6..7e9fb2f 100644
@@ -39,21 +39,21 @@ struct shmid64_ds {
 #endif
 	__kernel_pid_t		shm_cpid;	/* pid of creator */
 	__kernel_pid_t		shm_lpid;	/* pid of last operator */
-	unsigned long		shm_nattch;	/* no. of current attaches */
-	unsigned long		__unused4;
-	unsigned long		__unused5;
+	__kernel_ulong_t	shm_nattch;	/* no. of current attaches */
+	__kernel_ulong_t	__unused4;
+	__kernel_ulong_t	__unused5;
 };
 
 struct shminfo64 {
-	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;
+	__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;
 };
 
 #endif /* __ASM_GENERIC_SHMBUF_H */
include/uapi/linux/shm.h +5 -5
index ec36fa1..78b6941 100644
@@ -68,11 +68,11 @@ struct	shminfo {
 
 struct shm_info {
 	int used_ids;
-	unsigned long shm_tot;	/* total allocated shm */
-	unsigned long shm_rss;	/* total resident shm */
-	unsigned long shm_swp;	/* total swapped shm */
-	unsigned long swap_attempts;
-	unsigned long swap_successes;
+	__kernel_ulong_t shm_tot;	/* total allocated shm */
+	__kernel_ulong_t shm_rss;	/* total resident shm */
+	__kernel_ulong_t shm_swp;	/* total swapped shm */
+	__kernel_ulong_t swap_attempts;
+	__kernel_ulong_t swap_successes;
 };
 
 
author
#15 lore raw

PATCH 8/8 Use __kernel_long_t in struct mq_attr

In reply to H.J. Lu

Both x32 and x86-64 use the same struct mq_attr for system calls. But x32 long is 32-bit. This patch replaces long with __kernel_long_t in struct mq_attr.

---
 include/uapi/linux/mqueue.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
include/uapi/linux/mqueue.h +5 -5
index 8b5a796..d0a2b8e 100644
@@ -23,11 +23,11 @@
 #define MQ_BYTES_MAX	819200
 
 struct mq_attr {
-	long	mq_flags;	/* message queue flags			*/
-	long	mq_maxmsg;	/* maximum number of messages		*/
-	long	mq_msgsize;	/* maximum message size			*/
-	long	mq_curmsgs;	/* number of messages currently queued	*/
-	long	__reserved[4];	/* ignored for input, zeroed for output */
+	__kernel_long_t	mq_flags;	/* message queue flags			*/
+	__kernel_long_t	mq_maxmsg;	/* maximum number of messages		*/
+	__kernel_long_t	mq_msgsize;	/* maximum message size			*/
+	__kernel_long_t	mq_curmsgs;	/* number of messages currently queued	*/
+	__kernel_long_t	__reserved[4];	/* ignored for input, zeroed for output */
 };
 
 /*
Signature · 1 line
1.8.4.2
#16 lore raw

[tip:x86/x32] uapi: Use __kernel_long_t in struct mq_attr

uapi: Use __kernel_long_t in struct mq_attr
Commit-ID:  63159f5dcccb3858d88aaef800c4ee0eb4cc8577
Gitweb:     http://git.kernel.org/tip/63159f5dcccb3858d88aaef800c4ee0eb4cc8577
Author:     H.J. Lu <[email protected]>
AuthorDate: Fri, 27 Dec 2013 14:14:24 -0800
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 20 Jan 2014 14:45:33 -0800

uapi: Use __kernel_long_t in struct mq_attr

Both x32 and x86-64 use the same struct mq_attr for system calls. But x32 long is 32-bit. This patch replaces long with __kernel_long_t in struct mq_attr.

---
 include/uapi/linux/mqueue.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
include/uapi/linux/mqueue.h +5 -5
index 8b5a796..d0a2b8e 100644
@@ -23,11 +23,11 @@
 #define MQ_BYTES_MAX	819200
 
 struct mq_attr {
-	long	mq_flags;	/* message queue flags			*/
-	long	mq_maxmsg;	/* maximum number of messages		*/
-	long	mq_msgsize;	/* maximum message size			*/
-	long	mq_curmsgs;	/* number of messages currently queued	*/
-	long	__reserved[4];	/* ignored for input, zeroed for output */
+	__kernel_long_t	mq_flags;	/* message queue flags			*/
+	__kernel_long_t	mq_maxmsg;	/* maximum number of messages		*/
+	__kernel_long_t	mq_msgsize;	/* maximum message size			*/
+	__kernel_long_t	mq_curmsgs;	/* number of messages currently queued	*/
+	__kernel_long_t	__reserved[4];	/* ignored for input, zeroed for output */
 };
 
 /*
#17 lore raw

Re: [PATCH 8/8] Use __kernel_long_t in struct mq_attr

In reply to H.J. Lu
Quoted 20 lines · H.J. Lu

Both x32 and x86-64 use the same struct mq_attr for system calls. But x32 long is 32-bit. This patch replaces long with __kernel_long_t in struct mq_attr.

---
 include/uapi/linux/mqueue.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
include/uapi/linux/mqueue.h +0 -3
index 8b5a796..d0a2b8e 100644
@@ -23,11 +23,11 @@
 #define MQ_BYTES_MAX	819200
 
 struct mq_attr {
-	long	mq_flags;	/* message queue flags			*/
-	long	mq_maxmsg;	/* maximum number of messages		*/
-	long	mq_msgsize;	/* maximum message size			*/

include/uapi/linux/mqueue.h line 33

Quoted 10 lines
include/uapi/linux/mqueue.h +5 -2
-	long	mq_curmsgs;	/* number of messages currently queued	*/
-	long	__reserved[4];	/* ignored for input, zeroed for output */
+	__kernel_long_t	mq_flags;	/* message queue flags			*/
+	__kernel_long_t	mq_maxmsg;	/* maximum number of messages		*/
+	__kernel_long_t	mq_msgsize;	/* maximum message size			*/
+	__kernel_long_t	mq_curmsgs;	/* number of messages currently queued	*/
+	__kernel_long_t	__reserved[4];	/* ignored for input, zeroed for output */
 };
 
 /*

This breaks userspace, please #include <linux/types.h> before using __kernel_long_t.

Signature · 1 line
ldv
#18 lore raw
In reply to H.J. Lu
Quoted 7 lines · H.J. Lu

X32 uses the same kernel system call interface as x86-64 for many system calls. However, "long" is 64-bit for x86-64 and is 32-bit for x32. Where long or unsigned long are used in struct types for such system calls, they are wrong for x32. __kernel_[u]long_t is [unsigned] long for all ABIs other than x32. I am submitting 8 patches to replace long or unsigned long with __kernel_[u]long_t so that those struct types can be used with x32 system calls.

Independent on how this fixes things, how does the kernel_long_t name here make any sense?

On x86-64 "kernel" long always is 64 bits wide. The userspace ABI long might be 32 or 64bits wide.

Currently kernel_long_t has almost no uses, so it might be a good time to fix the name, define the rules for it, and last but not least properly document the intent for thse types.

#19 lore raw
Quoted 11 lines · Christoph Hellwig

Independent on how this fixes things, how does the kernel_long_t name here make any sense?

On x86-64 "kernel" long always is 64 bits wide. The userspace ABI long might be 32 or 64bits wide.

Currently kernel_long_t has almost no uses, so it might be a good time to fix the name, define the rules for it, and last but not least properly document the intent for thse types.

The definition is "an integer type the same width as 'long' for the native kernel type for the ABI". If you have any suggestions for a better name, or for that matter, a better alternative, that would be genuinely appreciated...

-hpa

#20 lore raw
In reply to Christoph Hellwig
Quoted 12 lines · Christoph Hellwig
Quoted 7 lines · H.J. Lu

X32 uses the same kernel system call interface as x86-64 for many system calls. However, "long" is 64-bit for x86-64 and is 32-bit for x32. Where long or unsigned long are used in struct types for such system calls, they are wrong for x32. __kernel_[u]long_t is [unsigned] long for all ABIs other than x32. I am submitting 8 patches to replace long or unsigned long with __kernel_[u]long_t so that those struct types can be used with x32 system calls.

Independent on how this fixes things, how does the kernel_long_t name here make any sense?

Quoted 7 lines

On x86-64 "kernel" long always is 64 bits wide. The userspace ABI long might be 32 or 64bits wide.

Currently kernel_long_t has almost no uses, so it might be a good time to fix the name, define the rules for it, and last but not least properly document the intent for thse types.

This comment by Christoph was literally the only feedback on this patchset. The definition of __kernel_[u]long_t is "the size of 'long' for the native kernel for the ABI". H.J.'s patchset only affects x86 (specifically x86-64) since on all other platforms __kernel_[u]long_t is simply defined as long/unsigned long.

That being said, x32 is not the only ABI of this type. In particular, if the MIPS N32 and ARM64 ILP32 maintainers have suggestions which would make this work more applicable to them, it would be highly useful to receive any such feedback.

-hpa

#21 lore raw
Quoted 5 lines · H. Peter Anvin

This comment by Christoph was literally the only feedback on this patchset. The definition of __kernel_[u]long_t is "the size of 'long' for the native kernel for the ABI". H.J.'s patchset only affects x86 (specifically x86-64) since on all other platforms __kernel_[u]long_t is simply defined as long/unsigned long.

Btw, sorry for the delay in getting back yo your question. How about __abi_long_t or __kabi_long_t instead?

author
#22 lore raw
Quoted 10 lines · Christoph Hellwig
Quoted 5 lines · H. Peter Anvin

This comment by Christoph was literally the only feedback on this patchset. The definition of __kernel_[u]long_t is "the size of 'long' for the native kernel for the ABI". H.J.'s patchset only affects x86 (specifically x86-64) since on all other platforms __kernel_[u]long_t is simply defined as long/unsigned long.

Btw, sorry for the delay in getting back yo your question. How about __abi_long_t or __kabi_long_t instead?

FWIW, in glibc, we use __syscall_ulong_t/__syscall_ulong_t instead of __kernel_[u]long_t.

Signature · 1 line
H.J.
author
#23 lore raw
Quoted 8 lines · H.J. Lu
Quoted 7 lines · Christoph Hellwig
Quoted 5 lines · H. Peter Anvin

This comment by Christoph was literally the only feedback on this patchset. The definition of __kernel_[u]long_t is "the size of 'long' for the native kernel for the ABI". H.J.'s patchset only affects x86 (specifically x86-64) since on all other platforms __kernel_[u]long_t is simply defined as long/unsigned long.

Quoted 5 lines
Quoted 3 lines

Btw, sorry for the delay in getting back yo your question. How about __abi_long_t or __kabi_long_t instead?

FWIW, in glibc, we use __syscall_ulong_t/__syscall_ulong_t instead of

It should be __syscall_ulong_t/__syscall_slong_t.

Quoted 1 line

__kernel_[u]long_t.

Signature · 1 line
H.J.
#24 lore raw
In reply to H.J. Lu
Quoted 8 lines · H.J. Lu
Quoted 7 lines · Christoph Hellwig
Quoted 5 lines · H. Peter Anvin

This comment by Christoph was literally the only feedback on this patchset. The definition of __kernel_[u]long_t is "the size of 'long' for the native kernel for the ABI". H.J.'s patchset only affects x86 (specifically x86-64) since on all other platforms __kernel_[u]long_t is simply defined as long/unsigned long.

Quoted 7 lines
Quoted 3 lines

Btw, sorry for the delay in getting back yo your question. How about __abi_long_t or __kabi_long_t instead?

FWIW, in glibc, we use __syscall_ulong_t/__syscall_ulong_t instead of __kernel_[u]long_t.

Yes, but glibc defines its own headers and doesn't rely on the types exported from the kernel.

We could rename them all, but that would *definitely* seem like breaking the universe for no good reason.

-hpa

#25 lore raw
In reply to Christoph Hellwig
Quoted 10 lines · Christoph Hellwig
Quoted 5 lines · H. Peter Anvin

This comment by Christoph was literally the only feedback on this patchset. The definition of __kernel_[u]long_t is "the size of 'long' for the native kernel for the ABI". H.J.'s patchset only affects x86 (specifically x86-64) since on all other platforms __kernel_[u]long_t is simply defined as long/unsigned long.

Btw, sorry for the delay in getting back yo your question. How about __abi_long_t or __kabi_long_t instead?

__kernel_* is the namespace that we reserve for uabi symbols/types in user space. Changing the prefix would break that contract.

-hpa

#26 lore raw
In reply to H. Peter Anvin
Quoted 9 lines · H. Peter Anvin
Quoted 8 lines · Christoph Hellwig
Quoted 7 lines · H.J. Lu

X32 uses the same kernel system call interface as x86-64 for many system calls. However, "long" is 64-bit for x86-64 and is 32-bit for x32. Where long or unsigned long are used in struct types for such system calls, they are wrong for x32. __kernel_[u]long_t is [unsigned] long for all ABIs other than x32. I am submitting 8 patches to replace long or unsigned long with __kernel_[u]long_t so that those struct types can be used with x32 system calls.

Does this mean that you are changing the x32 ABI (or it hasn't been declared stable yet)?

Quoted 10 lines

This comment by Christoph was literally the only feedback on this patchset. The definition of __kernel_[u]long_t is "the size of 'long' for the native kernel for the ABI". H.J.'s patchset only affects x86 (specifically x86-64) since on all other platforms __kernel_[u]long_t is simply defined as long/unsigned long.

That being said, x32 is not the only ABI of this type. In particular, if the MIPS N32 and ARM64 ILP32 maintainers have suggestions which would make this work more applicable to them, it would be highly useful to receive any such feedback.

ILP32 for arm64 is still work in progress and subject to change. So far the preliminary ABI
(http://git.kernel.org/cgit/linux/kernel/git/cmarinas/linux-aarch64.git/log/?h=ilp32)
redefines kernel_(u)long_t is defined as (unsigned) long long. Most of the syscalls are 64-bit generic with ~23 routed to compat. I would like to simplify these further and even use native 64-bit signal handling but it requires some changes to generic structures.

I'll have a look at H.J.'s patches and give comments, they may come in handy.

Signature · 1 line
Catalin
author
#27 lore raw
Quoted 11 lines · Catalin Marinas
Quoted 9 lines · H. Peter Anvin
Quoted 8 lines · Christoph Hellwig
Quoted 7 lines · H.J. Lu

X32 uses the same kernel system call interface as x86-64 for many system calls. However, "long" is 64-bit for x86-64 and is 32-bit for x32. Where long or unsigned long are used in struct types for such system calls, they are wrong for x32. __kernel_[u]long_t is [unsigned] long for all ABIs other than x32. I am submitting 8 patches to replace long or unsigned long with __kernel_[u]long_t so that those struct types can be used with x32 system calls.

Quoted 2 lines

Does this mean that you are changing the x32 ABI (or it hasn't been declared stable yet)?

We don't change x32 ABI. Today kernel uabi header files are incompatible with x32 ABI in user space. My patches fix them so that they can be used in user space.

Signature · 1 line
H.J.
#28 lore raw
In reply to Catalin Marinas
Quoted 9 lines · Catalin Marinas

ILP32 for arm64 is still work in progress and subject to change. So far the preliminary ABI
(http://git.kernel.org/cgit/linux/kernel/git/cmarinas/linux-aarch64.git/log/?h=ilp32)
redefines kernel_(u)long_t is defined as (unsigned) long long. Most of the syscalls are 64-bit generic with ~23 routed to compat. I would like to simplify these further and even use native 64-bit signal handling but it requires some changes to generic structures.

That would be highly useful feedback.

-hpa

#29 lore raw
In reply to H.J. Lu
Quoted 8 lines · H.J. Lu

X32 uses the same kernel system call interface as x86-64 for many system calls. However, "long" is 64-bit for x86-64 and is 32-bit for x32. Where long or unsigned long are used in struct types for such system calls, they are wrong for x32. __kernel_[u]long_t is [unsigned] long for all ABIs other than x32. I am submitting 8 patches to replace long or unsigned long with __kernel_[u]long_t so that those struct types can be used with x32 system calls.

Quoted 10 lines

H.J. Lu (8):
Use __kernel_long_t in struct timex
Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h> Use __kernel_ulong_t in uapi struct ipc64_perm Use __kernel_long_t in struct msgbuf
Use __kernel_ulong_t in struct msqid64_ds
Use __kernel_ulong_t in x86 struct semid64_ds Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info Use __kernel_long_t in struct mq_attr

As Catalin indirectly pointed out, I had made a followup to the wrong version of the patchset (because I commented to Christoph's feedback.) This is threaded to the proper version (without unnecessary #if __BITS_PER_LONG.)

-hpa

#30 lore raw
Quoted 20 lines · H. Peter Anvin
Quoted 8 lines · H.J. Lu

X32 uses the same kernel system call interface as x86-64 for many system calls. However, "long" is 64-bit for x86-64 and is 32-bit for x32. Where long or unsigned long are used in struct types for such system calls, they are wrong for x32. __kernel_[u]long_t is [unsigned] long for all ABIs other than x32. I am submitting 8 patches to replace long or unsigned long with __kernel_[u]long_t so that those struct types can be used with x32 system calls.

Quoted 10 lines

H.J. Lu (8):
Use __kernel_long_t in struct timex
Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h> Use __kernel_ulong_t in uapi struct ipc64_perm Use __kernel_long_t in struct msgbuf
Use __kernel_ulong_t in struct msqid64_ds
Use __kernel_ulong_t in x86 struct semid64_ds Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info Use __kernel_long_t in struct mq_attr

Quoted 4 lines

As Catalin indirectly pointed out, I had made a followup to the wrong version of the patchset (because I commented to Christoph's feedback.) This is threaded to the proper version (without unnecessary #if __BITS_PER_LONG.)

From an arm64 ILP32 perspective (though still work in progress), the patches look fine. We'll continue the trend with similar changes to generic semid64_ds.

In case the series is not committed yet: