From: Carlos O'Donell <carlos@redhat.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org
Subject: Re: [PATCH v2 15/25] y2038: Use a common definition for semid_ds
Date: Fri, 4 Jun 2021 15:38:21 -0400 [thread overview]
Message-ID: <6d1e06b6-fd95-29c5-f4bc-2a4ba7608de6@redhat.com> (raw)
In-Reply-To: <20210518205613.1487824-16-adhemerval.zanella@linaro.org>
On 5/18/21 4:56 PM, Adhemerval Zanella wrote:
> Instead of replicate the same definitions from struct_semid64_ds.h
> on the multiple struct_semid_ds.h, use a common header which is included
> when required (struct_semid64_ds_helper.h).
>
> The __USE_TIME_BITS64 is not defined internally yet, although the
> internal header is used when building the 64-bit semctl implementation.
Requesting a v3 please.
Similar to 14/25, we should add the __glibc_reserved* members to the
structure to preserve maximum compatibility with the kernel structure.
The original struct semid_ds is 64 bytes on i686 with high-low time pairs
and only 56 bytes in the 64-bit time_t version. With the two reserved
members added back it's 64 bytes in both ABIs.
We could add some static asserts if we really want to be thorough about
the alignment of __time64_t.
> ---
> sysdeps/unix/sysv/linux/Makefile | 3 ++-
> .../sysv/linux/bits/types/struct_semid64_ds.h | 5 +---
> .../bits/types/struct_semid64_ds_helper.h | 23 +++++++++++++++++++
> .../sysv/linux/bits/types/struct_semid_ds.h | 10 +++++---
> .../linux/hppa/bits/types/struct_semid_ds.h | 4 ++++
> .../linux/mips/bits/types/struct_semid_ds.h | 4 ++++
> .../powerpc/bits/types/struct_semid_ds.h | 10 +++++---
> .../linux/sparc/bits/types/struct_semid_ds.h | 10 +++++---
> .../linux/x86/bits/types/struct_semid_ds.h | 4 ++++
> 9 files changed, 59 insertions(+), 14 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h
>
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 193b7c46b9..b599c423ed 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -102,7 +102,8 @@ sysdep_headers += sys/mount.h sys/acct.h \
> bits/ipc-perm.h \
> bits/struct_stat.h \
> bits/struct_stat_time64_helper.h \
> - bits/types/struct_msqid64_ds_helper.h
> + bits/types/struct_msqid64_ds_helper.h \
> + bits/types/struct_semid64_ds_helper.h
OK. Add helper.
>
> tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
> tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \
> diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds.h
> index 7263e50bbf..adaee3eb9e 100644
> --- a/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds.h
> +++ b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds.h
> @@ -25,9 +25,6 @@
> #else
> struct __semid64_ds
> {
> - struct ipc_perm sem_perm; /* operation permission struct */
> - __time64_t sem_otime; /* last semop() time */
> - __time64_t sem_ctime; /* last time changed by semctl() */
> - __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> +# include <bits/types/struct_semid64_ds_helper.h>
OK. Use helper.
> };
> #endif
> diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h
> new file mode 100644
> index 0000000000..ea60b671f1
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h
> @@ -0,0 +1,23 @@
> +/* Common definitions for struct semid_ds with 64 bit time.
> + Copyright (C) 2020-2021 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> + /* Content of internal __semid64_ds. */
> + struct ipc_perm sem_perm; /* operation permission struct */
> + __time64_t sem_otime; /* last semop() time */
> + __time64_t sem_ctime; /* last time changed by semctl() */
> + __syscall_ulong_t sem_nsems; /* number of semaphores in set */
Definitions look good.
Needs __glibc_reserved3 and __glibc_reserved4.
> diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h
> index 2f32fa500e..a7b2c9022e 100644
> --- a/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h
> +++ b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h
> @@ -23,17 +23,21 @@
> /* Data structure describing a set of semaphores. */
> struct semid_ds
> {
> +#ifdef __USE_TIME_BITS64
> +# include <bits/types/struct_semid64_ds_helper.h>
OK. Use in new abi.
> +#else
> struct ipc_perm sem_perm; /* operation permission struct */
> -#if __TIMESIZE == 32
> +# if __TIMESIZE == 32
> __time_t sem_otime; /* last semop() time */
> __syscall_ulong_t __sem_otime_high;
> __time_t sem_ctime; /* last time changed by semctl() */
> __syscall_ulong_t __sem_ctime_high;
> -#else
> +# else
> __time_t sem_otime;
> __time_t sem_ctime;
> -#endif
> +# endif
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> __syscall_ulong_t __glibc_reserved3;
> __syscall_ulong_t __glibc_reserved4;
> +#endif
> };
> diff --git a/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h
> index 16a9735e7b..5067fb1572 100644
> --- a/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h
> +++ b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_semid_ds.h
> @@ -23,6 +23,9 @@
> /* Data structure describing a set of semaphores. */
> struct semid_ds
> {
> +#ifdef __USE_TIME_BITS64
> +# include <bits/types/struct_semid64_ds_helper.h>
OK. Use helper.
> +#else
> struct ipc_perm sem_perm; /* operation permission struct */
> __syscall_ulong_t __sem_otime_high;
> __time_t sem_otime; /* last semop() time */
> @@ -31,4 +34,5 @@ struct semid_ds
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> __syscall_ulong_t __glibc_reserved3;
> __syscall_ulong_t __glibc_reserved4;
> +#endif
> };
> diff --git a/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h
> index 73587ea634..ee9a1e5e61 100644
> --- a/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h
> +++ b/sysdeps/unix/sysv/linux/mips/bits/types/struct_semid_ds.h
> @@ -23,10 +23,14 @@
> /* Data structure describing a set of semaphores. */
> struct semid_ds
> {
> +#ifdef __USE_TIME_BITS64
> +# include <bits/types/struct_semid64_ds_helper.h>
OK. Use helper.
> +#else
> struct ipc_perm sem_perm; /* operation permission struct */
> __time_t sem_otime; /* last semop() time */
> __time_t sem_ctime; /* last time changed by semctl() */
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> __syscall_ulong_t __sem_otime_high;
> __syscall_ulong_t __sem_ctime_high;
> +#endif
> };
> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h
> index 8fdbc5d776..0c080fed61 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/types/struct_semid_ds.h
> @@ -23,17 +23,21 @@
> /* Data structure describing a set of semaphores. */
> struct semid_ds
> {
> +#ifdef __USE_TIME_BITS64
> +# include <bits/types/struct_semid64_ds_helper.h>
OK. Use helper.
> +#else
> struct ipc_perm sem_perm; /* operation permission struct */
> -#if __TIMESIZE == 32
> +# if __TIMESIZE == 32
> __syscall_ulong_t __sem_otime_high;
> __time_t sem_otime; /* last semop() time */
> __syscall_ulong_t __sem_ctime_high;
> __time_t sem_ctime; /* last time changed by semctl() */
> -#else
> +# else
> __time_t sem_otime; /* last semop() time */
> __time_t sem_ctime; /* last time changed by semctl() */
> -#endif
> +# endif
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> __syscall_ulong_t __glibc_reserved3;
> __syscall_ulong_t __glibc_reserved4;
> +#endif
> };
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h
> index 6b9b3639b2..76810427f6 100644
> --- a/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_semid_ds.h
> @@ -23,17 +23,21 @@
> /* Data structure describing a set of semaphores. */
> struct semid_ds
> {
> +#ifdef __USE_TIME_BITS64
> +# include <bits/types/struct_semid64_ds_helper.h>
OK. Use helper.
> +#else
> struct ipc_perm sem_perm; /* operation permission struct */
> -#if __TIMESIZE == 32
> +# if __TIMESIZE == 32
> __syscall_ulong_t __sem_otime_high;
> __time_t sem_otime; /* last semop() time */
> __syscall_ulong_t __sem_ctime_high;
> __time_t sem_ctime; /* last time changed by semctl() */
> -#else
> +# else
> __time_t sem_otime; /* last semop() time */
> __time_t sem_ctime; /* last time changed by semctl() */
> -#endif
> +# endif
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> __syscall_ulong_t __glibc_reserved3;
> __syscall_ulong_t __glibc_reserved4;
> +#endif
> };
> diff --git a/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h
> index 90f03b2407..affd38b6bd 100644
> --- a/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h
> +++ b/sysdeps/unix/sysv/linux/x86/bits/types/struct_semid_ds.h
> @@ -23,6 +23,9 @@
> /* Data structure describing a set of semaphores. */
> struct semid_ds
> {
> +#ifdef __USE_TIME_BITS64
> +# include <bits/types/struct_semid64_ds_helper.h>
OK. Use helper.
> +#else
> struct ipc_perm sem_perm; /* operation permission struct */
> __time_t sem_otime; /* last semop() time */
> __syscall_ulong_t __sem_otime_high;
> @@ -31,4 +34,5 @@ struct semid_ds
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> __syscall_ulong_t __glibc_reserved3;
> __syscall_ulong_t __glibc_reserved4;
> +#endif
> };
>
--
Cheers,
Carlos.
next prev parent reply other threads:[~2021-06-04 19:38 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 20:55 [PATCH v2 00/25] Add 64 bit time support on legacy ABIs Adhemerval Zanella
2021-05-18 20:55 ` [PATCH v2 01/25] linux: mips: Split libpthread.abilist in n32 and n64 Adhemerval Zanella
2021-05-19 8:24 ` Lukasz Majewski
2021-05-20 6:38 ` Florian Weimer
2021-05-20 10:43 ` Adhemerval Zanella
2021-06-04 19:29 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 02/25] linux: mips: Split librt.abilist " Adhemerval Zanella
2021-05-19 8:25 ` Lukasz Majewski
2021-06-04 19:29 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 03/25] linux: mips: Split libanl.abilist " Adhemerval Zanella
2021-05-19 8:25 ` Lukasz Majewski
2021-06-04 19:30 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 04/25] linux: s390: Add libanl.abilist in s390 and s390x Adhemerval Zanella
2021-05-19 8:26 ` Lukasz Majewski
2021-06-04 19:30 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 05/25] linux: Add fallback for 64-bit time_t SO_{RCV, SND}TIMEO Adhemerval Zanella
2021-05-19 8:36 ` [PATCH v2 05/25] linux: Add fallback for 64-bit time_t SO_{RCV,SND}TIMEO Lukasz Majewski
2021-05-20 6:44 ` [PATCH v2 05/25] linux: Add fallback for 64-bit time_t SO_{RCV, SND}TIMEO Florian Weimer
2021-05-20 18:01 ` Adhemerval Zanella
2021-05-21 18:37 ` Florian Weimer
2021-05-21 19:17 ` Adhemerval Zanella
2021-06-04 19:30 ` [PATCH v2 05/25] linux: Add fallback for 64-bit time_t SO_{RCV,SND}TIMEO Carlos O'Donell
2021-06-07 17:52 ` Adhemerval Zanella
2021-05-18 20:55 ` [PATCH v2 06/25] linux: Add fallback for 64-bit time_t SO_TIMESTAMP{NS} Adhemerval Zanella
2021-05-19 8:50 ` Lukasz Majewski
2021-05-20 6:50 ` Florian Weimer
2021-05-20 18:46 ` Adhemerval Zanella
2021-05-21 18:38 ` Florian Weimer
2021-05-21 19:02 ` Adhemerval Zanella
2021-06-04 19:30 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 07/25] linux: Add recvvmsg " Adhemerval Zanella
2021-05-19 9:02 ` Lukasz Majewski
2021-06-04 19:30 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 08/25] y2038: Add __USE_TIME_BITS64 support for time_t Adhemerval Zanella
2021-05-19 9:02 ` Lukasz Majewski
2021-06-04 19:30 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 09/25] y2038: Add __USE_TIME_BITS64 support for struct timeval Adhemerval Zanella
2021-05-19 9:03 ` Lukasz Majewski
2021-06-04 19:31 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 10/25] y2038: Add __USE_TIME_BITS64 support for struct timespec Adhemerval Zanella
2021-05-19 9:03 ` Lukasz Majewski
2021-06-04 19:31 ` Carlos O'Donell
2021-05-18 20:55 ` [PATCH v2 11/25] y2038: Add __USE_TIME_BITS64 support for struct utimbuf Adhemerval Zanella
2021-05-19 9:04 ` Lukasz Majewski
2021-06-04 19:31 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 12/25] y2038: linux: Add __USE_TIME_BITS64 support for struct timex Adhemerval Zanella
2021-05-19 9:04 ` Lukasz Majewski
2021-06-04 19:31 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 13/25] y2038: Use a common definition for stat Adhemerval Zanella
2021-06-04 19:37 ` Carlos O'Donell
2021-06-07 18:07 ` Adhemerval Zanella
2021-05-18 20:56 ` [PATCH v2 14/25] y2038: Use a common definition for msqid_ds Adhemerval Zanella
2021-06-04 19:38 ` Carlos O'Donell
2021-06-07 18:29 ` Adhemerval Zanella
2021-05-18 20:56 ` [PATCH v2 15/25] y2038: Use a common definition for semid_ds Adhemerval Zanella
2021-05-19 9:09 ` Lukasz Majewski
2021-06-04 19:38 ` Carlos O'Donell [this message]
2021-06-07 18:46 ` Adhemerval Zanella
2021-05-18 20:56 ` [PATCH v2 16/25] y2038: Use a common definition for shmid_ds Adhemerval Zanella
2021-05-19 9:09 ` Lukasz Majewski
2021-06-04 19:38 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 17/25] y2038: Add __USE_TIME_BITS64 support for socket-constants.h Adhemerval Zanella
2021-05-19 9:13 ` Lukasz Majewski
2021-06-04 19:38 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 18/25] time: Add 64 bit time support for getdate Adhemerval Zanella
2021-05-19 9:15 ` Lukasz Majewski
2021-06-04 19:38 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 19/25] y2038: Add support for 64 bit time on legacy ABIs Adhemerval Zanella
2021-05-19 9:18 ` Lukasz Majewski
2021-05-20 6:58 ` Florian Weimer
2021-05-20 10:37 ` Adhemerval Zanella
2021-06-04 19:38 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 20/25] posix: Add glob64 with 64 bit time_t support Adhemerval Zanella
2021-05-19 10:44 ` Lukasz Majewski
2021-06-04 19:39 ` Carlos O'Donell
2021-06-07 18:52 ` Adhemerval Zanella
2021-05-18 20:56 ` [PATCH v2 21/25] io: Add fts64 " Adhemerval Zanella
2021-05-19 10:50 ` Lukasz Majewski
2021-06-04 19:39 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 22/25] io: Add ftw64 " Adhemerval Zanella
2021-05-19 10:57 ` Lukasz Majewski
2021-06-04 19:39 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 23/25] libsupport: Add 64 bit time_t support for time functions Adhemerval Zanella
2021-05-19 11:00 ` Lukasz Majewski
2021-06-04 19:39 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 24/25] libsupport: Add 64 bit time_t support for stat functions Adhemerval Zanella
2021-05-19 11:04 ` Lukasz Majewski
2021-06-04 19:39 ` Carlos O'Donell
2021-05-18 20:56 ` [PATCH v2 25/25] y2038: Add test coverage Adhemerval Zanella
2021-05-19 11:08 ` Lukasz Majewski
2021-06-04 19:39 ` Carlos O'Donell
2021-06-04 19:29 ` [PATCH v2 00/25] Add 64 bit time support on legacy ABIs Carlos O'Donell
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=6d1e06b6-fd95-29c5-f4bc-2a4ba7608de6@redhat.com \
--to=carlos@redhat.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.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).