From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 709AD38582B9 for ; Wed, 14 Sep 2022 18:57:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 709AD38582B9 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org From: "Andreas K. Huettel" To: libc-alpha@sourceware.org, John Paul Adrian Glaubitz , Adhemerval Zanella Subject: Re: [PATCH v2] m68k: Enforce 4-byte alignment on internal locks (BZ #29537) Date: Wed, 14 Sep 2022 20:56:39 +0200 Message-ID: <2146628.hkbZ0PkbqX@noumea> Organization: Gentoo Linux In-Reply-To: <20220905171043.1097209-1-adhemerval.zanella@linaro.org> References: <20220905171043.1097209-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1813126.LH7GnMWURc"; micalg="pgp-sha256"; protocol="application/pgp-signature" X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,KAM_SHORT,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE,URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --nextPart1813126.LH7GnMWURc Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="iso-8859-1"; protected-headers="v1" From: "Andreas K. Huettel" Date: Wed, 14 Sep 2022 20:56:39 +0200 Message-ID: <2146628.hkbZ0PkbqX@noumea> Organization: Gentoo Linux In-Reply-To: <20220905171043.1097209-1-adhemerval.zanella@linaro.org> References: <20220905171043.1097209-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Works fine for me too. Tested-by: Andreas K. Huettel Am Montag, 5. September 2022, 19:10:43 CEST schrieb Adhemerval Zanella: > A new internal definition, __LIBC_LOCK_ALIGNMENT, is used to force > the 4-byte alignment only for m68k, other architecture keep the > natural alignment of the type used internally (and hppa does not > require 16-byte alignment for kernel-assisted CAS). > --- > sysdeps/generic/libc-lock-arch.h | 25 +++++++++++++++++++ > sysdeps/nptl/libc-lock.h | 8 +++++- > sysdeps/nptl/libc-lockP.h | 3 ++- > sysdeps/unix/sysv/linux/m68k/libc-lock-arch.h | 25 +++++++++++++++++++ > 4 files changed, 59 insertions(+), 2 deletions(-) > create mode 100644 sysdeps/generic/libc-lock-arch.h > create mode 100644 sysdeps/unix/sysv/linux/m68k/libc-lock-arch.h >=20 > diff --git a/sysdeps/generic/libc-lock-arch.h b/sysdeps/generic/libc-lock= =2Darch.h > new file mode 100644 > index 0000000000..4713b30a8a > --- /dev/null > +++ b/sysdeps/generic/libc-lock-arch.h > @@ -0,0 +1,25 @@ > +/* Private libc-internal arch-specific definitions. Generic version. > + Copyright (C) 2022 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; see the file COPYING.LIB. If > + not, see . */ > + > +#ifndef _LIBC_LOCK_ARCH_H > +#define _LIBC_LOCK_ARCH_H > + > +/* The default definition uses the natural alignment from the lock type.= */ > +#define __LIBC_LOCK_ALIGNMENT > + > +#endif > diff --git a/sysdeps/nptl/libc-lock.h b/sysdeps/nptl/libc-lock.h > index 5af476c48b..63b3f3d75c 100644 > --- a/sysdeps/nptl/libc-lock.h > +++ b/sysdeps/nptl/libc-lock.h > @@ -22,6 +22,7 @@ > #include > #define __need_NULL > #include > +#include > =20 > =20 > /* Mutex type. */ > @@ -29,7 +30,12 @@ > # if (!IS_IN (libc) && !IS_IN (libpthread)) || !defined _LIBC > typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t; > # else > -typedef struct { int lock; int cnt; void *owner; } __libc_lock_recursive= _t; > +typedef struct > +{ > + int lock __LIBC_LOCK_ALIGNMENT; > + int cnt; > + void *owner; > +} __libc_lock_recursive_t; > # endif > #else > typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; > diff --git a/sysdeps/nptl/libc-lockP.h b/sysdeps/nptl/libc-lockP.h > index d3a6837fd2..425f514c5c 100644 > --- a/sysdeps/nptl/libc-lockP.h > +++ b/sysdeps/nptl/libc-lockP.h > @@ -32,9 +32,10 @@ > ld.so might be used on old kernels with a different libc.so. */ > #include > #include > +#include > =20 > /* Mutex type. */ > -typedef int __libc_lock_t; > +typedef int __libc_lock_t __LIBC_LOCK_ALIGNMENT; > typedef struct { pthread_mutex_t mutex; } __rtld_lock_recursive_t; > typedef pthread_rwlock_t __libc_rwlock_t; > =20 > diff --git a/sysdeps/unix/sysv/linux/m68k/libc-lock-arch.h b/sysdeps/unix= /sysv/linux/m68k/libc-lock-arch.h > new file mode 100644 > index 0000000000..1844bbaf6f > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/m68k/libc-lock-arch.h > @@ -0,0 +1,25 @@ > +/* Private libc-internal arch-specific definitions. m68k version. > + Copyright (C) 2022 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; see the file COPYING.LIB. If > + not, see . */ > + > +#ifndef _LIBC_LOCK_ARCH_H > +#define _LIBC_LOCK_ARCH_H > + > +/* Linux enforces 4-bytes alignment on futex inputs. */ > +#define __LIBC_LOCK_ALIGNMENT __attribute__ ((__aligned__ (4))) > + > +#endif >=20 =2D-=20 Andreas K. H=FCttel dilfridge@gentoo.org Gentoo Linux developer=20 (council, qa, toolchain, base-system, perl, libreoffice) --nextPart1813126.LH7GnMWURc Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE/Rnm0xsZLuTcY+rT3CsWIV7VQSoFAmMiI+cACgkQ3CsWIV7V QSoznQ//RgF2mi7paUhFV02NcE5Oa7wCAmi6W6j8yojw8y39Ouy4qN3HnBIpS+hx tCkTeWeHeMHKHGSFFO9Vs2EG6AckgQJuN7QqFWaC/tuMCd93pYfd73PDVCdR3uTK mvziawEfNyAv1aty+oOwudDAbeWQW6mLa+7uHw+knqm+KaQp8sePrcEJa78PXWmS Tb+RQjewBIl7azkbnFsqzuujerxLMTqqiNFqzyDAj+NS+RyrC76geC0S/hLVGSST M9l3yToZeSAwIAO4BubzGV0923RtPjM9iBAOmyMhzyQGAfK9iONszHIXS8omt7cy YZdGIrP7vnH1NZyfiD76LFgF6iGlUeckWjJ3O68l48sM0400liCpNmVE5mTFSQp8 x78WGxooKaKlhsb5FBMZDuHn0gH7MUBkrqwbNSwOutJ6oetaeYDkphPcNbmO34UL +yijFpeNOVAzBxWmyVovWApeTrpFO64AMv6byTsETwDUCR1KX/IyVSLQE6aXWTIO tBAQTuq0RWv+zhecVolHNMJXs7TeOU69VXfFDMphv9vpuoJ9rfClVcaE4Gq3/Jll H2dwqalpFqN5Wrn99gfS5fKfmRIGha0aTQI45MuqsHUAG7iL4tWgoO28s6NYAl/m 73KEFgjci5RSTly9p1a4OON9+jE8HaI0+CRvr1zkvAb0IQ97lF0= =QB5A -----END PGP SIGNATURE----- --nextPart1813126.LH7GnMWURc--