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 EB16C384843F for ; Mon, 14 Jun 2021 14:52:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EB16C384843F Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-126-1yyI4T9SO5WmzEyK58HU7Q-1; Mon, 14 Jun 2021 10:52:04 -0400 X-MC-Unique: 1yyI4T9SO5WmzEyK58HU7Q-1 Received: by mail-qv1-f69.google.com with SMTP id 10-20020a0562140d4ab0290247bb35d2c3so5458827qvr.22 for ; Mon, 14 Jun 2021 07:52:04 -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=mWPjd5cvMdOyBMQ5tJi+LFujjPobYR12wJFrAOosSJo=; b=M2mcXx1qxM6+rNKNbbL/bzBJXkhxF5DsxgwToATV7xNxVHy08HkoAGNUaPnrdUqIpg JOFwta6ebbNUVL1qp5qcDcU1Fef3toyLA002E7JdUolOHOMYiDSkSwyFYQm6sY8SNn2z Q9zDC98FZmKpXg+wlrQ+Q1+dpq7exUern44OTzxfBRzRh0/Kol6CtHV9dmOE9cAybYq0 T7o2mrTIy7yFPLhzq6U8L71k9dCMEmLf/Fnlp5TxOiievUF5Cr6HQ165WMWFvvP2+Nq2 cI/fkxDhpXyvwqtreeuwlc6P61kP2jXYhcjXeoCJ+tDvOUlM5WB5S6CVCoTjUiMF8sjw i3NA== X-Gm-Message-State: AOAM5336wauAFmb//T0V0CBuPrYJXCHlPeaWzv7KCapfRp1iJQjqQq9v +tW34VkkzETvZy9n69dRZt5Q8INt07tZ6oOXRf9SEsZ99XgRkmV0ahZfor6OVtEyB0i147q9MfZ Uivxe0ajTemHRgBlHRxBn X-Received: by 2002:ad4:4426:: with SMTP id e6mr19048201qvt.46.1623682324270; Mon, 14 Jun 2021 07:52:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKnpDTsbA9F26bA4sPu6KIaNbiv/Vgzos4qfiGOjXl5+FbDDjEoQWc+Cjm3buScAjRlplljA== X-Received: by 2002:ad4:4426:: with SMTP id e6mr19048186qvt.46.1623682323950; Mon, 14 Jun 2021 07:52:03 -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 p13sm10171834qkg.80.2021.06.14.07.52.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Jun 2021 07:52:03 -0700 (PDT) Subject: Re: [PATCH v3 13/24] y2038: Use a common definition for msqid_ds To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20210607203613.282543-1-adhemerval.zanella@linaro.org> <20210607203613.282543-14-adhemerval.zanella@linaro.org> From: Carlos O'Donell Organization: Red Hat Message-ID: Date: Mon, 14 Jun 2021 10:52:02 -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-14-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:09 -0000 On 6/7/21 4:36 PM, Adhemerval Zanella wrote: > From: Lukasz Majewski > > Instead of replicate the same definitions from struct_msqid64_ds.h > on the multiple struct_msqid_ds.h, use a common header which is included > when required (struct_msqid64_ds_helper.h). > > The __USE_TIME_BITS64 is not defined internally yet, although the > internal header is used when building the 64-bit stat implementations. 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_msqid64_ds.h | 10 +------ > .../bits/types/struct_msqid64_ds_helper.h | 30 +++++++++++++++++++ > .../sysv/linux/bits/types/struct_msqid_ds.h | 12 ++++++-- > .../linux/hppa/bits/types/struct_msqid_ds.h | 12 ++++++-- > .../linux/mips/bits/types/struct_msqid_ds.h | 18 +++++++---- > .../powerpc/bits/types/struct_msqid_ds.h | 12 ++++++-- > .../linux/sparc/bits/types/struct_msqid_ds.h | 12 ++++++-- > 8 files changed, 81 insertions(+), 28 deletions(-) > create mode 100644 sysdeps/unix/sysv/linux/bits/types/struct_msqid64_ds_helper.h > > diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile > index c343d8c7d0..6715a4b623 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -101,7 +101,8 @@ sysdep_headers += sys/mount.h sys/acct.h \ > bits/types/struct_shmid_ds.h \ > bits/ipc-perm.h \ > bits/struct_stat.h \ > - bits/struct_stat_time64_helper.h > + bits/struct_stat_time64_helper.h \ > + bits/types/struct_msqid64_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_msqid64_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_msqid64_ds.h > index 43e8cd7cfc..992734914a 100644 > --- a/sysdeps/unix/sysv/linux/bits/types/struct_msqid64_ds.h > +++ b/sysdeps/unix/sysv/linux/bits/types/struct_msqid64_ds.h > @@ -25,14 +25,6 @@ > #else > struct __msqid64_ds > { > - struct ipc_perm msg_perm; /* structure describing operation permission */ > - __time64_t msg_stime; /* time of last msgsnd command */ > - __time64_t msg_rtime; /* time of last msgsnd command */ > - __time64_t msg_ctime; /* time of last change */ > - __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */ > - msgqnum_t msg_qnum; /* number of messages currently on queue */ > - msglen_t msg_qbytes; /* max number of bytes allowed on queue */ > - __pid_t msg_lspid; /* pid of last msgsnd() */ > - __pid_t msg_lrpid; /* pid of last msgrcv() */ > +# include > }; > #endif > diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_msqid64_ds_helper.h b/sysdeps/unix/sysv/linux/bits/types/struct_msqid64_ds_helper.h > new file mode 100644 > index 0000000000..58da9f223b > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/bits/types/struct_msqid64_ds_helper.h > @@ -0,0 +1,30 @@ > +/* Common definitions for struct msqid_ds with 64-bit time. > + Copyright (C) 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 __msqid64_ds. */ > + struct ipc_perm msg_perm; /* structure describing operation permission */ > + __time64_t msg_stime; /* time of last msgsnd command */ > + __time64_t msg_rtime; /* time of last msgsnd command */ > + __time64_t msg_ctime; /* time of last change */ > + __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */ > + msgqnum_t msg_qnum; /* number of messages currently on queue */ > + msglen_t msg_qbytes; /* max number of bytes allowed on queue */ > + __pid_t msg_lspid; /* pid of last msgsnd() */ > + __pid_t msg_lrpid; /* pid of last msgrcv() */ > + unsigned long int __glibc_reserved4; > + unsigned long int __glibc_reserved5; OK. Adds reserved entries. Matches kernel. > diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h > index 1ed041ae30..ae10a48452 100644 > --- a/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h > +++ b/sysdeps/unix/sysv/linux/bits/types/struct_msqid_ds.h > @@ -20,23 +20,28 @@ > # error "Never use directly; include instead." > #endif > > +#include > + > /* Structure of record for one message inside the kernel. > The type `struct msg' is opaque. */ > struct msqid_ds > { > +#ifdef __USE_TIME_BITS64 > +# include > +#else > struct ipc_perm msg_perm; /* structure describing operation permission */ > -#if __TIMESIZE == 32 > +# if __TIMESIZE == 32 > __time_t msg_stime; /* time of last msgsnd command */ > unsigned long int __msg_stime_high; > __time_t msg_rtime; /* time of last msgsnd command */ > unsigned long int __msg_rtime_high; > __time_t msg_ctime; /* time of last change */ > unsigned long int __msg_ctime_high; > -#else > +# else > __time_t msg_stime; /* time of last msgsnd command */ > __time_t msg_rtime; /* time of last msgsnd command */ > __time_t msg_ctime; /* time of last change */ > -#endif > +# endif > __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */ > msgqnum_t msg_qnum; /* number of messages currently on queue */ > msglen_t msg_qbytes; /* max number of bytes allowed on queue */ > @@ -44,4 +49,5 @@ struct msqid_ds > __pid_t msg_lrpid; /* pid of last msgrcv() */ > __syscall_ulong_t __glibc_reserved4; > __syscall_ulong_t __glibc_reserved5; > +#endif > }; > diff --git a/sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h > index d943edeb78..5b82dd7f5e 100644 > --- a/sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h > +++ b/sysdeps/unix/sysv/linux/hppa/bits/types/struct_msqid_ds.h > @@ -20,23 +20,28 @@ > # error "Never use directly; include instead." > #endif > > +#include > + > /* Structure of record for one message inside the kernel. > The type `struct msg' is opaque. */ > struct msqid_ds > { > +#ifdef __USE_TIME_BITS64 > +# include > +#else > struct ipc_perm msg_perm; /* structure describing operation permission */ > -#if __TIMESIZE == 32 > +# if __TIMESIZE == 32 > unsigned long int __msg_stime_high; > __time_t msg_stime; /* time of last msgsnd command */ > unsigned long int __msg_rtime_high; > __time_t msg_rtime; /* time of last msgsnd command */ > unsigned long int __msg_ctime_high; > __time_t msg_ctime; /* time of last change */ > -#else > +# else > __time_t msg_stime; /* time of last msgsnd command */ > __time_t msg_rtime; /* time of last msgsnd command */ > __time_t msg_ctime; /* time of last change */ > -#endif > +# endif > __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */ > msgqnum_t msg_qnum; /* number of messages currently on queue */ > msglen_t msg_qbytes; /* max number of bytes allowed on queue */ > @@ -44,4 +49,5 @@ struct msqid_ds > __pid_t msg_lrpid; /* pid of last msgrcv() */ > __syscall_ulong_t __glibc_reserved4; > __syscall_ulong_t __glibc_reserved5; > +#endif > }; > diff --git a/sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h > index bdca5e5fe2..00c1804245 100644 > --- a/sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h > +++ b/sysdeps/unix/sysv/linux/mips/bits/types/struct_msqid_ds.h > @@ -20,32 +20,37 @@ > # error "Never use directly; include instead." > #endif > > +#include > + > /* Structure of record for one message inside the kernel. > The type `struct msg' is opaque. */ > struct msqid_ds > { > +#ifdef __USE_TIME_BITS64 > +# include > +#else > struct ipc_perm msg_perm; /* structure describing operation permission */ > -#if __TIMESIZE == 32 > -# ifdef __MIPSEL__ > +# if __TIMESIZE == 32 > +# ifdef __MIPSEL__ > __time_t msg_stime; /* time of last msgsnd command */ > unsigned long int __msg_stime_high; > __time_t msg_rtime; /* time of last msgsnd command */ > unsigned long int __msg_rtime_high; > __time_t msg_ctime; /* time of last change */ > unsigned long int __msg_ctime_high; > -# else > +# else > unsigned long int __msg_stime_high; > __time_t msg_stime; /* time of last msgsnd command */ > unsigned long int __msg_rtime_high; > __time_t msg_rtime; /* time of last msgsnd command */ > unsigned long int __msg_ctime_high; > __time_t msg_ctime; /* time of last change */ > -# endif > -#else > +# endif > +# else > __time_t msg_stime; /* time of last msgsnd command */ > __time_t msg_rtime; /* time of last msgsnd command */ > __time_t msg_ctime; /* time of last change */ > -#endif > +# endif > __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */ > msgqnum_t msg_qnum; /* number of messages currently on queue */ > msglen_t msg_qbytes; /* max number of bytes allowed on queue */ > @@ -53,4 +58,5 @@ struct msqid_ds > __pid_t msg_lrpid; /* pid of last msgrcv() */ > __syscall_ulong_t __glibc_reserved4; > __syscall_ulong_t __glibc_reserved5; > +#endif > }; > 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 72842ed747..8c296d2342 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 > @@ -20,23 +20,28 @@ > # error "Never use directly; include instead." > #endif > > +#include > + > /* Structure of record for one message inside the kernel. > The type `struct msg' is opaque. */ > struct msqid_ds > { > +#ifdef __USE_TIME_BITS64 > +# include > +#else > struct ipc_perm msg_perm; /* structure describing operation permission */ > -#if __TIMESIZE == 32 > +# if __TIMESIZE == 32 > unsigned long int __msg_stime_high; > __time_t msg_stime; /* time of last msgsnd command */ > unsigned long int __msg_rtime_high; > __time_t msg_rtime; /* time of last msgsnd command */ > unsigned long int __msg_ctime_high; > __time_t msg_ctime; /* time of last change */ > -#else > +# else > __time_t msg_stime; /* time of last msgsnd command */ > __time_t msg_rtime; /* time of last msgsnd command */ > __time_t msg_ctime; /* time of last change */ > -#endif > +# endif > __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */ > msgqnum_t msg_qnum; /* number of messages currently on queue */ > msglen_t msg_qbytes; /* max number of bytes allowed on queue */ > @@ -44,4 +49,5 @@ struct msqid_ds > __pid_t msg_lrpid; /* pid of last msgrcv() */ > __syscall_ulong_t __glibc_reserved4; > __syscall_ulong_t __glibc_reserved5; > +#endif > }; > diff --git a/sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h > index 22e1839de1..3c1b68ccc0 100644 > --- a/sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h > +++ b/sysdeps/unix/sysv/linux/sparc/bits/types/struct_msqid_ds.h > @@ -20,23 +20,28 @@ > # error "Never use directly; include instead." > #endif > > +#include > + > /* Structure of record for one message inside the kernel. > The type `struct msg' is opaque. */ > struct msqid_ds > { > +#ifdef __USE_TIME_BITS64 > +# include > +#else > struct ipc_perm msg_perm; /* structure describing operation permission */ > -#if __TIMESIZE == 32 > +# if __TIMESIZE == 32 > unsigned long int __msg_stime_high; > __time_t msg_stime; /* time of last msgsnd command */ > unsigned long int __msg_rtime_high; > __time_t msg_rtime; /* time of last msgsnd command */ > unsigned long int __msg_ctime_high; > __time_t msg_ctime; /* time of last change */ > -#else > +# else > __time_t msg_stime; /* time of last msgsnd command */ > __time_t msg_rtime; /* time of last msgsnd command */ > __time_t msg_ctime; /* time of last change */ > -#endif > +# endif > __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */ > msgqnum_t msg_qnum; /* number of messages currently on queue */ > msglen_t msg_qbytes; /* max number of bytes allowed on queue */ > @@ -44,4 +49,5 @@ struct msqid_ds > __pid_t msg_lrpid; /* pid of last msgrcv() */ > __syscall_ulong_t __glibc_reserved4; > __syscall_ulong_t __glibc_reserved5; > +#endif > }; > -- Cheers, Carlos.