From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x330.google.com (mail-ot1-x330.google.com [IPv6:2607:f8b0:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id 88A5B385AC33 for ; Mon, 5 Sep 2022 17:10:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 88A5B385AC33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-ot1-x330.google.com with SMTP id y25-20020a056830109900b0063b3c1fe018so6529435oto.2 for ; Mon, 05 Sep 2022 10:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date; bh=7L6Gke+h8adBo0/IZ0tqvj+P6u92Vc/l15BZGrhCilo=; b=bjFrlNKVdZBcNB32UL0oCP4aPlxdtWYnvLTlxIFxFPhO9zR2M/V5xKbKmvJjqGcU/7 zNMjgRg4vWtcBAzTMx6sxYlwa6VHKoc7oyY3ckT3sNLl/3vc6J78xsem6mYT4Uac469p drgwEwWZQsqmnKURghTf/BZPQ4L1SdYxvuZVyGj2eQzGFo5UZm86gRGFvm/imLag/IVA 2N+9NVyx0B2Xo7uW2Q7BggiRUpOK01pZ40l2kXhGUSLya0V9p+Q/SACLiEc+FKsgfEpD D/mYvOO7QPcPPkgj/eaG5NOrVSeeTEA/ZsO2cw3x5rnKC/wcNJ927iyzcTDaQhXl9t6I 83YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=7L6Gke+h8adBo0/IZ0tqvj+P6u92Vc/l15BZGrhCilo=; b=M3bcNcCRRZAVnfwap0kJWN7cftqLug3aDCaS8Bd/TdUTBh9g0adojFOjd98h2q3CS7 2FPM25VPdC3ChZGpCSL5iZtlkd4eqy+dlAjX5QEsHNySys82HRPEMOeZUoUEqPamMDQx CyjjzB/80x/t/4l72HJEqgffKruKkEvfaX1j6qMoMKCMaCas8UGT0+c5PUs/WhF2LgiS 8QROb0QTJiKNxJ8uWg5L+REwlUNmFTtUif3BVXrVRqdK4xPmBItFGdSLkgo/0D2JzC8I 1GlHPu4wGHXsnle6ZvXh+THDm2UsUcFU8f4dzLY3JArU3TJjSimztiP1CALGSCdJyBSx vELA== X-Gm-Message-State: ACgBeo0DarkPRRNOSANL8FA1P38xHw5oN07/AJtbjY82R60sUb7OYt/B NOXrA9jWN7nazguxL9ZKmmOTP/L0J7Czqw== X-Google-Smtp-Source: AA6agR7u872+cv0RNKzRnto2kjujqhP11/TpRNZdSFWH7rEJLxb0r0+zthrfQeB5164nV94Xp+VtCQ== X-Received: by 2002:a9d:70d6:0:b0:63b:46cd:96dd with SMTP id w22-20020a9d70d6000000b0063b46cd96ddmr10360104otj.141.1662397847622; Mon, 05 Sep 2022 10:10:47 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:dfed:168f:3c48:ec1f:784d]) by smtp.gmail.com with ESMTPSA id w9-20020a056830280900b00638a1c49383sm4704722otu.78.2022.09.05.10.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 10:10:47 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org, John Paul Adrian Glaubitz , "Andreas K . Huettel" Subject: [PATCH v2] m68k: Enforce 4-byte alignment on internal locks (BZ #29537) Date: Mon, 5 Sep 2022 14:10:43 -0300 Message-Id: <20220905171043.1097209-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,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: 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 diff --git a/sysdeps/generic/libc-lock-arch.h b/sysdeps/generic/libc-lock-arch.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 /* 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 /* 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; 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 -- 2.34.1