From patchwork Fri Dec 10 20:59:22 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: 48804 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 7637B3857C64 for ; Fri, 10 Dec 2021 20:59:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7637B3857C64 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1639169992; bh=C46oqRXPofzDxDDr5v4v8gaUKWu8BY8WR5SAxm5dwys=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=O0Pb48j0LmGcclfhx2GvPxgb7J+xZK+OeC/rBYWStjYsgNOWuLN2gTRbncsQfmrp7 wbyf8kIKoK8qEeQRINPWv0PZu6SJptaf8XcKw+rTi2Nm0a8R/HDzm+i2GkH1PhRaNB IimzOAib+aL8VWWSrZZez7NLL+OfCEtQSlrZRjXU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by sourceware.org (Postfix) with ESMTPS id 156B93858D3C for ; Fri, 10 Dec 2021 20:59:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 156B93858D3C Received: by mail-pl1-x636.google.com with SMTP id b13so7064621plg.2 for ; Fri, 10 Dec 2021 12:59:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=C46oqRXPofzDxDDr5v4v8gaUKWu8BY8WR5SAxm5dwys=; b=zj6QyDzDmS+91+dBMSuAZ0EsUihc2GhEru4o7ZBx6g1Jrg8OlfIm/Z2o0cuF3KyA4w pXI48QIDpijh2o2DeRoM9cZOxwfSNyeq7S+Cogw/s484QJQWjFYJDRH0A2danlJQv5Zm cq/yTAqr54Y+ZEA58GFpPffzczVrwFY+V0GIDr58cyaGeLR5EGYUygMzRcrLY9prLFNQ ZtyRzOIoIgx3Hj0+DB2uAxbJzwoNVuZL/xuV30HLwToU78dT/mNd0qtNU4fOnQ5LUa4t 6hx7656OJnAiczgBO3wAjXf6JimOOsaPZ0evhPH9q+5vGIjuu1tHgIc75Zs05Ag4yktC IxKg== X-Gm-Message-State: AOAM533EjvKobaiEQkXwxev3NhZKO+Ifpn+h9o0Ppu8zRCTDd266AMC9 iY7ZNp4hw5iO9blGgttKm6ifIWUo7Og= X-Google-Smtp-Source: ABdhPJxYRsG9FfMwUHFIUGVIImQCV5df1PcDDUJROoh2QDrv6lcuSnaA7qzU46AOjo6NTnVenB6kDw== X-Received: by 2002:a17:90b:38c1:: with SMTP id nn1mr26723138pjb.91.1639169968108; Fri, 10 Dec 2021 12:59:28 -0800 (PST) Received: from gnu-cfl-2.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id s21sm4276541pfk.3.2021.12.10.12.59.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 12:59:27 -0800 (PST) Received: from gnu-tgl-2.localdomain (gnu-tgl-2 [192.168.1.34]) by gnu-cfl-2.localdomain (Postfix) with ESMTPS id 78BBB421579; Fri, 10 Dec 2021 12:59:26 -0800 (PST) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id BDDE7300350; Fri, 10 Dec 2021 12:59:22 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] Check alignment of PT_LOAD segment only if possible Date: Fri, 10 Dec 2021 12:59:22 -0800 Message-Id: <20211210205922.2865613-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3029.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Add a configure check for 2MB variable alignment and check alignment of PT_LOAD segment only if 2MB variable alignment is supported. Tested with cross build to glibcs-alpha-linux-gnu. --- configure | 40 +++++++++++++++++++++++++++++++++++++++- configure.ac | 11 +++++++++++ elf/Makefile | 15 ++++++++++----- 3 files changed, 60 insertions(+), 6 deletions(-) diff --git a/configure b/configure index e4d013907c..9da30f428f 100755 --- a/configure +++ b/configure @@ -732,6 +732,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -845,6 +846,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1097,6 +1099,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1234,7 +1245,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1387,6 +1398,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -6817,6 +6829,32 @@ if test $libc_cv_builtin_trap = yes; then fi +# Check target support for 2MB variable alignment. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 2MB variable alignment" >&5 +$as_echo_n "checking for 2MB variable alignment... " >&6; } +if ${libc_cv_have_2MB_alignment+:} false; then : + $as_echo_n "(cached) " >&6 +else + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int foo __attribute__((aligned(0x200000))) = 1; + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + libc_cv_have_2MB_alignment=yes +else + libc_cv_have_2MB_alignment=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_have_2MB_alignment" >&5 +$as_echo "$libc_cv_have_2MB_alignment" >&6; } +config_vars="$config_vars +have-2MB-alignment = $libc_cv_have_2MB_alignment" + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/configure.ac b/configure.ac index a91a7f399c..57d4572c26 100644 --- a/configure.ac +++ b/configure.ac @@ -1726,6 +1726,17 @@ if test $libc_cv_builtin_trap = yes; then AC_DEFINE([HAVE_BUILTIN_TRAP]) fi +# Check target support for 2MB variable alignment. +AC_CACHE_CHECK([for 2MB variable alignment], + libc_cv_have_2MB_alignment, [ +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ +int foo __attribute__((aligned(0x200000))) = 1; +])], + [libc_cv_have_2MB_alignment=yes], + [libc_cv_have_2MB_alignment=no]) +]) +LIBC_CONFIG_VAR([have-2MB-alignment], [$libc_cv_have_2MB_alignment]) + dnl C++ feature tests. AC_LANG_PUSH([C++]) diff --git a/elf/Makefile b/elf/Makefile index fe42caeb0e..1bf77bc5ac 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -207,7 +207,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-tls4 tst-tls5 \ tst-tls10 tst-tls11 tst-tls12 tst-tls13 tst-tls14 tst-tls15 \ tst-tls16 tst-tls17 tst-tls18 tst-tls19 tst-tls-dlinfo \ - tst-align tst-align2 tst-align3 \ + tst-align tst-align2 \ tst-dlmodcount tst-dlopenrpath tst-deep1 \ tst-dlmopen1 tst-dlmopen3 tst-dlmopen4 \ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ @@ -241,9 +241,6 @@ tests-internal += loadtest unload unload2 circleload1 \ tests-container += tst-pldd tst-dlopen-tlsmodid-container \ tst-dlopen-self-container tst-preload-pthread-libc test-srcs = tst-pathopt -ifeq (yes,$(have-fpie)) -tests-pie += tst-align3 -endif selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null) ifneq ($(selinux-enabled),1) tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog @@ -305,7 +302,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ circlemod3 circlemod3a \ reldep8mod1 reldep8mod2 reldep8mod3 \ reldep9mod1 reldep9mod2 reldep9mod3 \ - tst-alignmod tst-alignmod2 tst-alignmod3 \ + tst-alignmod tst-alignmod2 \ $(modules-execstack-$(have-z-execstack)) \ tst-dlopenrpathmod tst-deep1mod1 tst-deep1mod2 tst-deep1mod3 \ tst-dlmopen1mod tst-auditmod1 \ @@ -418,6 +415,14 @@ endif modules-execstack-yes = tst-execstack-mod extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) +ifeq (yes,$(have-2MB-alignment)) +tests += tst-align3 +modules-names += tst-alignmod3 +ifeq (yes,$(have-fpie)) +tests-pie += tst-align3 +endif +endif + # filtmod1.so, tst-big-note-lib.so, tst-ro-dynamic-mod.so have special # rules. modules-names-nobuild := filtmod1 tst-big-note-lib tst-ro-dynamic-mod