diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-06-30 09:20:48 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-07-09 12:05:40 -0300 |
commit | 3283f711132eaadc4f04bd8c1d84c910c29ba066 (patch) | |
tree | e9cd65cd30a76935b035f9921517013b203021eb /sysdeps/unix/sysv/linux/powerpc | |
parent | 915b9fe3124d87ff1734c902c0d36b5eac7688ff (diff) | |
download | glibc-3283f711132eaadc4f04bd8c1d84c910c29ba066.tar.gz glibc-3283f711132eaadc4f04bd8c1d84c910c29ba066.tar.xz glibc-3283f711132eaadc4f04bd8c1d84c910c29ba066.zip |
sysv: linux: Add 64-bit time_t variant for msgctl
To provide a y2038 safe interface a new symbol __msgctl64 is added and __msgctl is change to call it instead (it adds some extra buffer coping for the 32 bit time_t implementation). Two new structures are added: 1. kernel_msqid64_ds: used internally only on 32-bit architectures to issue the syscall. A handful of architectures (hppa, i386, mips, powerpc32, and sparc32) require specific implementations due to their kernel ABI. 2. msqid_ds64: this is only for __TIMESIZE != 64 to use along with the 64-bit msgctl. It is different than the kernel struct because the exported 64-bit time_t might require different alignment depending on the architecture ABI. So the resulting implementation does: 1. For 64-bit architectures it assumes msqid_ds already contains 64-bit time_t fields and will result in just the __msgctl symbol using the __msgctl64 code. The msgid_ds argument is passed as-is to the syscall. 2. For 32-bit architectures with default 64-bit time_t (newer ABIs such riscv32 or arc), it will also result in only one exported symbol but with the required high/low time handling. 3. Finally for 32-bit architecture with both 32-bit and 64-bit time_t support we follow the already set way to provide one symbol with 64-bit time_t support and implement the 32-bit time_t support using the 64-bit time_t. The default 32-bit symbol will allocate and copy the msqid_ds over multiple buffers, but this should be deprecated in favor of the __msgctl64 anyway. Checked on i686-linux-gnu and x86_64-linux-gnu. I also did some sniff tests on powerpc, powerpc64, mips, mips64, armhf, sparcv9, and sparc64. Tested-by: Carlos O'Donell <carlos@redhat.com> Reviewed-by: Carlos O'Donell <carlos@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Tested-by: Alistair Francis <alistair.francis@wdc.com>
Diffstat (limited to 'sysdeps/unix/sysv/linux/powerpc')
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/struct_kernel_msqid64_ds.h | 18 |
2 files changed, 21 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h index 4ae2fbcbdc..35cc51f733 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_msqid_ds.h @@ -26,11 +26,11 @@ struct msqid_ds { struct ipc_perm msg_perm; /* structure describing operation permission */ #if __TIMESIZE == 32 - unsigned long int __glibc_reserved1; + unsigned long int __msg_stime_high; __time_t msg_stime; /* time of last msgsnd command */ - unsigned long int __glibc_reserved2; + unsigned long int __msg_rtime_high; __time_t msg_rtime; /* time of last msgsnd command */ - unsigned long int __glibc_reserved3; + unsigned long int __msg_ctime_high; __time_t msg_ctime; /* time of last change */ #else __time_t msg_stime; /* time of last msgsnd command */ diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/struct_kernel_msqid64_ds.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/struct_kernel_msqid64_ds.h new file mode 100644 index 0000000000..69a63ee27a --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/struct_kernel_msqid64_ds.h @@ -0,0 +1,18 @@ +/* Analogous to kernel struct msqid64_ds used on msgctl. */ +struct kernel_msqid64_ds +{ + struct ipc_perm msg_perm; + unsigned long msg_stime_high; + unsigned long msg_stime; + unsigned long msg_rtime_high; + unsigned long msg_rtime; + unsigned long msg_ctime_high; + unsigned long msg_ctime; + unsigned long msg_cbytes; + unsigned long msg_qnum; + unsigned long msg_qbytes; + __pid_t msg_lspid; + __pid_t msg_lrpid; + unsigned long __unused1; + unsigned long __unused2; +}; |