From patchwork Mon May 24 13:06:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 43556 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 67F293891C3D; Mon, 24 May 2021 13:06:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 67F293891C3D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1621861615; bh=zzSPFNYAYs1EB0KmIYMHHOSqSJ2l4GoTCedq6UmAflA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Fd+9mkk5LBC94y0oYImWlX/vZiIhV+V4L985An1cOlFq8nwCFPdTJ6zKkYOA4+q4N l/JOec4bxG2Y2dLP4zMnfSmAIBstMysggmM1kVB+A78PVky5VRai0cncQbHK4Sk0F9 kD+KhshtnfQmTJsOk05NbDg40AY8xlVhLwxTSn18= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by sourceware.org (Postfix) with ESMTPS id 276C43891C39 for ; Mon, 24 May 2021 13:06:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 276C43891C39 Received: by mail-pg1-x536.google.com with SMTP id l70so20066436pga.1 for ; Mon, 24 May 2021 06:06:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=zzSPFNYAYs1EB0KmIYMHHOSqSJ2l4GoTCedq6UmAflA=; b=VbK+P4frpAyqZriPaKAWOurOT+v0Fzr++Ij1AFdL6emExrA0vPzEp+BEaEQc/KErRl X+oXjMremNQzR5SeCqkNZ3pTqXjrwK8X/Mbei9H79D5xfw93F/DsMntTKUaZ7VD8Q/5U CzY9CbQa/rjJRwtnbg77wftMgMM6GlcIGXpm3PoRRWA6OEpUkz1ZhMLy8+sFHAz8xkg3 f5OPRzcQ0BsyKvNheXcAf4KZc8dx98VzB/5ybOY5JUQxfO/TEFkcSVnJaVTLlLJjBy+P ErKy81EtyYk6Xy0K17Ad3SBZotrBDBhyUDaz02Ip6HqjdXj4AmovMgKnlq3Ecy0zDoo6 WwQQ== X-Gm-Message-State: AOAM530F0PCq74YBX3ZYnl4eYytWcojsTRwPW91wGJ8qYcv72Su+7dRx ReLvwkPFp/wO5pJdd8HMCtUvGS8+8OI= X-Google-Smtp-Source: ABdhPJyNm+P0eYtNuFPm8jYHgEd0xgqfK936t/b36qSswtgNpYdjOx1IhJncqneGMhtMAoA6bkm9JA== X-Received: by 2002:a65:4608:: with SMTP id v8mr13388279pgq.435.1621861609665; Mon, 24 May 2021 06:06:49 -0700 (PDT) Received: from gnu-cfl-2.localdomain ([172.56.38.102]) by smtp.gmail.com with ESMTPSA id ci2sm10207431pjb.56.2021.05.24.06.06.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 06:06:48 -0700 (PDT) Received: from gnu-cfl-2.. (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 55298C0137 for ; Mon, 24 May 2021 06:06:47 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2] Properly check stack alignment [BZ #27901] Date: Mon, 24 May 2021 06:06:47 -0700 Message-Id: <20210524130647.737409-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3035.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, 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-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 1. Replace if ((((uintptr_t) &_d) & (__alignof (double) - 1)) != 0) which may be optimized by compiler, with int __attribute__ ((weak, noclone, noinline)) is_aligned (void *p, int align) { return (((uintptr_t) p) & (align - 1)) != 0; } 2. Add TEST_STACK_ALIGN_INIT to TEST_STACK_ALIGN. 3. Add a common TEST_STACK_ALIGN_INIT to check 16-byte stack alignment for both i386 and x86-64. 4. Update powerpc to use TEST_STACK_ALIGN_INIT. Reviewed-by: Carlos O'Donell --- sysdeps/generic/tst-stack-align.h | 40 ++++++++++++++++--------- sysdeps/i386/i686/tst-stack-align.h | 44 --------------------------- sysdeps/i386/tst-stack-align.h | 41 ------------------------- sysdeps/powerpc/tst-stack-align.h | 27 +++++------------ sysdeps/x86/tst-stack-align.h | 28 ++++++++++++++++++ sysdeps/x86_64/tst-stack-align.h | 46 ----------------------------- 6 files changed, 61 insertions(+), 165 deletions(-) delete mode 100644 sysdeps/i386/i686/tst-stack-align.h delete mode 100644 sysdeps/i386/tst-stack-align.h create mode 100644 sysdeps/x86/tst-stack-align.h delete mode 100644 sysdeps/x86_64/tst-stack-align.h diff --git a/sysdeps/generic/tst-stack-align.h b/sysdeps/generic/tst-stack-align.h index b41f9d3c12..6f7c4260b5 100644 --- a/sysdeps/generic/tst-stack-align.h +++ b/sysdeps/generic/tst-stack-align.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2003-2021 Free Software Foundation, Inc. +/* Check stack alignment. Generic version. + Copyright (C) 2003-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 @@ -18,17 +19,28 @@ #include #include +int +__attribute__ ((weak, noclone, noinline)) +is_aligned (void *p, int align) +{ + return (((uintptr_t) p) & (align - 1)) != 0; +} + +#ifndef TEST_STACK_ALIGN_INIT +# define TEST_STACK_ALIGN_INIT() 0 +#endif + #define TEST_STACK_ALIGN() \ - ({ \ - double _d = 12.0; \ - long double _ld = 15.0; \ - int _ret = 0; \ - printf ("double: %g %p %zu\n", _d, &_d, __alignof (double)); \ - if ((((uintptr_t) &_d) & (__alignof (double) - 1)) != 0) \ - _ret = 1; \ - \ - printf ("ldouble: %Lg %p %zu\n", _ld, &_ld, __alignof (long double)); \ - if ((((uintptr_t) &_ld) & (__alignof (long double) - 1)) != 0) \ - _ret = 1; \ - _ret; \ - }) + ({ \ + double _d = 12.0; \ + long double _ld = 15.0; \ + int _ret = TEST_STACK_ALIGN_INIT (); \ + \ + printf ("double: %g %p %zu\n", _d, &_d, __alignof (double)); \ + _ret += is_aligned (&_d, __alignof (double)); \ + \ + printf ("ldouble: %Lg %p %zu\n", _ld, &_ld, \ + __alignof (long double)); \ + _ret += is_aligned (&_ld, __alignof (long double)); \ + _ret; \ + }) diff --git a/sysdeps/i386/i686/tst-stack-align.h b/sysdeps/i386/i686/tst-stack-align.h deleted file mode 100644 index fc3852ea5d..0000000000 --- a/sysdeps/i386/i686/tst-stack-align.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright (C) 2003-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 - . */ - -#include -#include -#ifndef __SSE__ -#include_next -#else -#include - -#define TEST_STACK_ALIGN() \ - ({ \ - __m128 _m; \ - double _d = 12.0; \ - long double _ld = 15.0; \ - int _ret = 0; \ - printf ("__m128: %p %zu\n", &_m, __alignof (__m128)); \ - if ((((uintptr_t) &_m) & (__alignof (__m128) - 1)) != 0) \ - _ret = 1; \ - \ - printf ("double: %g %p %zu\n", _d, &_d, __alignof (double)); \ - if ((((uintptr_t) &_d) & (__alignof (double) - 1)) != 0) \ - _ret = 1; \ - \ - printf ("ldouble: %Lg %p %zu\n", _ld, &_ld, __alignof (long double)); \ - if ((((uintptr_t) &_ld) & (__alignof (long double) - 1)) != 0) \ - _ret = 1; \ - _ret; \ - }) -#endif diff --git a/sysdeps/i386/tst-stack-align.h b/sysdeps/i386/tst-stack-align.h deleted file mode 100644 index 7891e9a03e..0000000000 --- a/sysdeps/i386/tst-stack-align.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (C) 2004-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 - . */ - -#include -#include - -typedef struct { int i[4]; } int_al16 __attribute__((aligned (16))); - -#define TEST_STACK_ALIGN() \ - ({ \ - int_al16 _m; \ - double _d = 12.0; \ - long double _ld = 15.0; \ - int _ret = 0; \ - printf ("int_al16: %p %zu\n", &_m, __alignof (int_al16)); \ - if ((((uintptr_t) &_m) & (__alignof (int_al16) - 1)) != 0) \ - _ret = 1; \ - \ - printf ("double: %g %p %zu\n", _d, &_d, __alignof (double)); \ - if ((((uintptr_t) &_d) & (__alignof (double) - 1)) != 0) \ - _ret = 1; \ - \ - printf ("ldouble: %Lg %p %zu\n", _ld, &_ld, __alignof (long double)); \ - if ((((uintptr_t) &_ld) & (__alignof (long double) - 1)) != 0) \ - _ret = 1; \ - _ret; \ - }) diff --git a/sysdeps/powerpc/tst-stack-align.h b/sysdeps/powerpc/tst-stack-align.h index 2b4a3671b4..be055b0385 100644 --- a/sysdeps/powerpc/tst-stack-align.h +++ b/sysdeps/powerpc/tst-stack-align.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2005-2021 Free Software Foundation, Inc. +/* Check stack alignment. PowerPC version. + Copyright (C) 2005-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 @@ -15,10 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include -#include - -#define TEST_STACK_ALIGN() \ +#define TEST_STACK_ALIGN_INIT() \ ({ \ /* Altivec __vector int etc. needs 16byte aligned stack. \ Instead of using altivec.h here, use aligned attribute instead. */ \ @@ -27,20 +25,9 @@ int _i __attribute__((aligned (16))); \ int _j[3]; \ } _s = { ._i = 18, ._j[0] = 19, ._j[1] = 20, ._j[2] = 21 }; \ - double _d = 12.0; \ - long double _ld = 15.0; \ - int _ret = 0; \ printf ("__vector int: { %d, %d, %d, %d } %p %zu\n", _s._i, _s._j[0], \ _s._j[1], _s._j[2], &_s, __alignof (_s)); \ - if ((((uintptr_t) &_s) & (__alignof (_s) - 1)) != 0) \ - _ret = 1; \ - \ - printf ("double: %g %p %zu\n", _d, &_d, __alignof (double)); \ - if ((((uintptr_t) &_d) & (__alignof (double) - 1)) != 0) \ - _ret = 1; \ - \ - printf ("ldouble: %Lg %p %zu\n", _ld, &_ld, __alignof (long double)); \ - if ((((uintptr_t) &_ld) & (__alignof (long double) - 1)) != 0) \ - _ret = 1; \ - _ret; \ - }) + is_aligned (&_s, __alignof (_s)); \ + }) + +#include_next diff --git a/sysdeps/x86/tst-stack-align.h b/sysdeps/x86/tst-stack-align.h new file mode 100644 index 0000000000..578d5c4a80 --- /dev/null +++ b/sysdeps/x86/tst-stack-align.h @@ -0,0 +1,28 @@ +/* Check stack alignment. X86 version. + 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 + . */ + +typedef struct { int i[16]; } int_al16 __attribute__((aligned (16))); + +#define TEST_STACK_ALIGN_INIT() \ + ({ \ + int_al16 _m; \ + printf ("int_al16: %p %zu\n", &_m, __alignof (int_al16)); \ + is_aligned (&_m, __alignof (int_al16)); \ + }) + +#include_next diff --git a/sysdeps/x86_64/tst-stack-align.h b/sysdeps/x86_64/tst-stack-align.h deleted file mode 100644 index b3f93f7cab..0000000000 --- a/sysdeps/x86_64/tst-stack-align.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright (C) 2003-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 - . */ - -#include -#include - -#define TEST_STACK_ALIGN() \ - ({ \ - /* AMD64 ABI mandates 16byte aligned stack. \ - Unfortunately, current GCC doesn't support __int128 or __float128 \ - types, so use aligned attribute instead. */ \ - struct _S \ - { \ - int _i __attribute__((aligned (16))); \ - int _pad[3]; \ - } _s = { ._i = 18 }; \ - double _d = 12.0; \ - long double _ld = 15.0; \ - int _ret = 0; \ - printf ("__int128: %d %p %zu\n", _s._i, &_s, __alignof (_s)); \ - if ((((uintptr_t) &_s) & (__alignof (_s) - 1)) != 0) \ - _ret = 1; \ - \ - printf ("double: %g %p %zu\n", _d, &_d, __alignof (double)); \ - if ((((uintptr_t) &_d) & (__alignof (double) - 1)) != 0) \ - _ret = 1; \ - \ - printf ("ldouble: %Lg %p %zu\n", _ld, &_ld, __alignof (long double)); \ - if ((((uintptr_t) &_ld) & (__alignof (long double) - 1)) != 0) \ - _ret = 1; \ - _ret; \ - })