From patchwork Fri Dec 10 22:02:13 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: 48808 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 03A993857C72 for ; Fri, 10 Dec 2021 22:02:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 03A993857C72 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1639173761; bh=Oj4RjsCtBX3bWLdqnuTu8CoY2kVprGvu9+mbU/ZG3hc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ij1kawMuQqjrv1qXJ99bzLULAJbRdAkkooCupuNChdqfz4rk97UJvco//AzRXpUGK GnhoSoqviXqKBJQNy1tocyfnyOU/812ul/JMLhvnjS/WtB7tBOPNYCzquJ4qAQAgVd OMk0hXiMuSr5mbme9sEi4uN9Y91h1rgd3OJZKYMQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by sourceware.org (Postfix) with ESMTPS id 487DD3858D3C for ; Fri, 10 Dec 2021 22:02:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 487DD3858D3C Received: by mail-pl1-x62f.google.com with SMTP id y7so7203323plp.0 for ; Fri, 10 Dec 2021 14:02:19 -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=Oj4RjsCtBX3bWLdqnuTu8CoY2kVprGvu9+mbU/ZG3hc=; b=oorCiqIdKpI0fa7hkobBhLTmcWkPRvGSyq/tj1L1NH/kntWdlmeqowTz2tFC0szKLf 2hG4st4EtJEFgy2kmDuyiTQeGfGtVC1CgecX82QU4mIHseBz7oJvEjOxxq+3bXw8dx2r oj/nvo9RnGDGg4FlrDxcZ3zt6EBGlGjGCl8D52EkPpbzmPZ0A1Hn+AxJ/sE9Lg2B/Wnu 5rNDjeWf1wq9QTBDJqLowMIllYPudxo7vgravx29wzeemCRQ2goMDjIQO9soMkDed4hn Z1JNy1s5d+bk0oNF+EElpQzFf4X/0JPUKLRdcer9r7+lmuu1tWPCBEjuXa/0VyDgSTC2 yRRA== X-Gm-Message-State: AOAM5307uwcRm61wlnGfIZcffLxuVTUsuX+d+PAMSDMW+nOk6szE4RVL Ccg3mE4p4ciG95vaPvM7QRGwu6I5Ihw= X-Google-Smtp-Source: ABdhPJzpN5xJrbjhPeSvQcRhraE3PrIfOHmD9zSQx4xJ0oo/qR48Ngn/iAFDwrni3M/les1GVwl6FQ== X-Received: by 2002:a17:902:6b46:b0:142:8470:862e with SMTP id g6-20020a1709026b4600b001428470862emr78761396plt.49.1639173738323; Fri, 10 Dec 2021 14:02:18 -0800 (PST) Received: from gnu-cfl-2.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id a13sm4444207pfv.66.2021.12.10.14.02.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 14:02:18 -0800 (PST) Received: from gnu-tgl-2.localdomain (gnu-tgl-2 [192.168.1.34]) by gnu-cfl-2.localdomain (Postfix) with ESMTPS id 3EB6142145A; Fri, 10 Dec 2021 14:02:17 -0800 (PST) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id 7343E300350; Fri, 10 Dec 2021 14:02:13 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2] Check alignment of PT_LOAD segment only if possible Date: Fri, 10 Dec 2021 14:02:13 -0800 Message-Id: <20211210220213.3285838-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 | 26 ++++++++++++++++++++++++++ configure.ac | 11 +++++++++++ elf/Makefile | 15 ++++++++++----- 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/configure b/configure index e4d013907c..37259efce7 100755 --- a/configure +++ b/configure @@ -6817,6 +6817,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