diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-06-30 14:08:22 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-07-09 12:05:47 -0300 |
commit | ffd178c651b827f24acead02284abbb12f3f723b (patch) | |
tree | 46ffd4d41f6d03a69ba1062db46afab9cebc5d81 /sysdeps/unix/sysv/linux/powerpc | |
parent | 7929d779850aaaf9fd2377ed0945fb53f60dee63 (diff) | |
download | glibc-ffd178c651b827f24acead02284abbb12f3f723b.tar.gz glibc-ffd178c651b827f24acead02284abbb12f3f723b.tar.xz glibc-ffd178c651b827f24acead02284abbb12f3f723b.zip |
sysv: linux: Add 64-bit time_t variant for shmctl
To provide a y2038 safe interface a new symbol __shmctl64 is added and __shmctl is change to call it instead (it adds some extra buffer copying for the 32 bit time_t implementation). Two new structures are added: 1. kernel_shmid64_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. shmid_ds64: this is only for __TIMESIZE != 64 to use along with the 64-bit shmctl. 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 shmid_ds already contains 64-bit time_t fields and will result in just the __shmctl symbol using the __shmctl64 code. The shmid_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 of the 64-bit one. The default 32-bit symbol will allocate and copy the shmid_ds over multiple buffers, but this should be deprecated in favor of the __shmctl64 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. Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Tested-by: Alistair Francis <alistair.francis@wdc.com> Tested-by: Carlos O'Donell <carlos@redhat.com> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/unix/sysv/linux/powerpc')
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/bits/types/struct_shmid_ds.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/struct_kernel_shmid64_ds.h | 18 |
2 files changed, 21 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_shmid_ds.h b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_shmid_ds.h index b0816fb16a..39b3e5fd3e 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_shmid_ds.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_shmid_ds.h @@ -25,11 +25,11 @@ struct shmid_ds { struct ipc_perm shm_perm; /* operation permission struct */ #if __TIMESIZE == 32 - unsigned long int __glibc_reserved1; + unsigned long int __shm_atime_high; __time_t shm_atime; /* time of last shmat() */ - unsigned long int __glibc_reserved2; + unsigned long int __shm_dtime_high; __time_t shm_dtime; /* time of last shmdt() */ - unsigned long int __glibc_reserved3; + unsigned long int __shm_ctime_high; __time_t shm_ctime; /* time of last change by shmctl() */ unsigned long int __glibc_reserved4; #else diff --git a/sysdeps/unix/sysv/linux/powerpc/struct_kernel_shmid64_ds.h b/sysdeps/unix/sysv/linux/powerpc/struct_kernel_shmid64_ds.h new file mode 100644 index 0000000000..ae3f3987ac --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/struct_kernel_shmid64_ds.h @@ -0,0 +1,18 @@ +/* Analogous to kernel struct shmid64_ds used on shmctl. */ +struct kernel_shmid64_ds +{ + struct ipc_perm shm_perm; + unsigned long int shm_atime_high; + unsigned long int shm_atime; + unsigned long int shm_dtime_high; + unsigned long int shm_dtime; + unsigned long int shm_ctime_high; + unsigned long int shm_ctime; + unsigned long int __ununsed1; + size_t shm_segsz; + __pid_t shm_cpid; + __pid_t shm_lpid; + unsigned long int shm_nattch; + unsigned long int __unused2; + unsigned long int __unused3; +}; |