From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 6E81B3894C24 for ; Mon, 14 Jun 2021 14:52:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6E81B3894C24 Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-318-qwC-owMAOVGzDVZ7orrrCA-1; Mon, 14 Jun 2021 10:52:06 -0400 X-MC-Unique: qwC-owMAOVGzDVZ7orrrCA-1 Received: by mail-qt1-f197.google.com with SMTP id r17-20020ac842510000b02902456ec03025so7599612qtm.3 for ; Mon, 14 Jun 2021 07:52:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=grJ5KdYEl367VSarYIekZ0HfPKCv3RwjOQASEXzdviM=; b=Zz3h59PMhSL9cvzWYnH3mP419RMy4kWtmhFIw0rhoex2hrtcGes327PqShj9SeXht2 TfHp7Y8HVavCbtWAO3wlMG3fMzl+rwvHVsE5lYKZpNzxgpw9e8l8vrxRAw5HBFTf+sOo zdwO/yb5K73xM7v8j10bq4J0cW/Lh++2RMs0KYWT8D2HdzhTBZKEDASrww6SDYtoSDAL 33ikmPQR/Uii4wh/AbtmltzzJo8Kz+N3wX9Hi3fkMKcssafDgaLkn7yVO0VfLBn5gVbx YoABRFZRjSmiFe9OuBlg3iadDVjHR3zYXevTR1LqIqMfAiTzaWmg8b9a3EU083f0KN+0 I7+A== X-Gm-Message-State: AOAM5339Zjr38FpICVbbci5zYwMec3eC/IhbNYWGLDVAYbBI/RvS158I wOBnM6kPm7Ir+ZDwTiIF0+aZhMxApZaxVNTOmqWQkDStFb5sU5x8hoaWTmd1cczcFhqlNpKLiDV HHzmoaoKQNu7YVg0EDIFZ X-Received: by 2002:a05:620a:22ab:: with SMTP id p11mr16309588qkh.250.1623682326548; Mon, 14 Jun 2021 07:52:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfuPKTgQ4tMCFJE8hm4311sA8SbPmNf4P7srmhpKXBrOYRjm3GXsE6iCmGuvd3wn3u8be/rQ== X-Received: by 2002:a05:620a:22ab:: with SMTP id p11mr16309563qkh.250.1623682326258; Mon, 14 Jun 2021 07:52:06 -0700 (PDT) Received: from [192.168.1.16] (198-84-214-74.cpe.teksavvy.com. [198.84.214.74]) by smtp.gmail.com with ESMTPSA id g2sm10107768qtb.63.2021.06.14.07.52.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Jun 2021 07:52:05 -0700 (PDT) Subject: Re: [PATCH v3 14/24] y2038: Use a common definition for semid_ds To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20210607203613.282543-1-adhemerval.zanella@linaro.org> <20210607203613.282543-15-adhemerval.zanella@linaro.org> From: Carlos O'Donell Organization: Red Hat Message-ID: Date: Mon, 14 Jun 2021 10:52:04 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210607203613.282543-15-adhemerval.zanella@linaro.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2021 14:52:10 -0000 On 6/7/21 4:36 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. No regressions on x86_64 and i686 and reviewed resulting ABI for correctness. Reviewed-by: Carlos O'Donell Tested-by: carlos O'Donell > --- > sysdeps/unix/sysv/linux/Makefile | 3 ++- > .../sysv/linux/bits/types/struct_semid64_ds.h | 5 +--- > .../bits/types/struct_semid64_ds_helper.h | 25 +++++++++++++++++++ > .../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, 61 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 6715a4b623..b6abcb1365 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 > > 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 > }; > #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..e6592e6c3f > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/bits/types/struct_semid64_ds_helper.h > @@ -0,0 +1,25 @@ > +/* 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 > + . */ > + > + /* 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 */ > + unsigned long int __glibc_reserved3; > + unsigned long int __glibc_reserved4; OK. Includes serverd entries for the kernel. > 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 > +#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 > +#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 > +#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 > +#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 > +#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 > +#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.