From patchwork Tue Jan 9 19:30:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1884614 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=PPmYaTwK; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T8gzB04Vmz1yPh for ; Wed, 10 Jan 2024 06:31:34 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F339538582BC for ; Tue, 9 Jan 2024 19:31:31 +0000 (GMT) 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 09FD23858284 for ; Tue, 9 Jan 2024 19:30:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 09FD23858284 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 09FD23858284 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::636 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704828649; cv=none; b=wfWDjzVXn7nrkDJA55vVMGXvTarlP/LpJkM/WI9/zeENE4S21oDI7xOAU5m1upA+eoBIEB8YyoegaEroJnCqXhVZ4DRsHctEDKDIYDgK5x6PjHd5NSLcdvjYNmdubFG9i/PkPbHab2e/jkAe1wQrodICX7illVetUkw5CbS03pI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704828649; c=relaxed/simple; bh=6zQYMXUKRNEazB2tW1gbM532/swO6yav4uoJhDqQL9c=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=D/6RIt8AQkLt/EnCyAl4klyHFBzvkOAOECzFTMBMraaP/NntJn58Pe29h/YIt0REPLVN97RG05YxRlvIvR9t08ufviLa5f8hVU9sJ9LgOf4pzRxn4467yF3hQS7dxE3kPwnRdy/i84oMOLOrVvt7s7+ze0QKsqqNiUxx0isTFZM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1d44200b976so17009505ad.2 for ; Tue, 09 Jan 2024 11:30:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704828644; x=1705433444; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cPcps9uuzX3SINcJEnjw9DWnrLswevBrQRdhfYc/zC8=; b=PPmYaTwKeX3HhQB2Yey88PZXj/hIz1Tsvm9AyhI7PDV8Jxk28k3bD38aXOhAkhsvtp C51z4229jicvXQj01vjpqRJysJaZGPqTK6HHJAYVwbwFR6SDzcc0AYkjeHOVYDMsb9Rd JKD1SoAbKQx0FzuZCsGACU4lpJWMHi8lvhjZCRlAFR5O6CnDohLksTxbTvtF+0dm7/vQ 4gkr/RZ4cnoiD+0NzGN0rRCebHnT0JXlT9IMnFFawLg5ZEbn3pwWvc/77LxFz8QSK59w NL3KEM1WWM2UzYpeoN7BW52r309kB7TwN3hDYxrR5uOdAVNf+Qvq4dqY6hebWU2cRsET I1fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704828644; x=1705433444; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cPcps9uuzX3SINcJEnjw9DWnrLswevBrQRdhfYc/zC8=; b=ZM8CUxIBQ15aerBnonnALiJ2HoDhEwvEGNuHo6Bg/vvm1Cd5DrH0zhhuTfOi6oZ89C xfhYEjCobYagiF5TdlrTCLhNBQr+HUKyFrHU/SvVxjbASeQ8sblE1VUik1+6q5gBplgN ymlcttTNySZLkSUn3zCympd8OsGG1fH6lq5jGI1pVc0KpBI/khC/IkfX81h8kNWJo8Pg VQnM5uY7wdTffEHkN/nW/UL2ASg0ofw8vOT/BOmGCUdpZjneU5hwXBD/YmVyMJrUOqUV qpI5Blx8Pas6lqRODoTH+GNpJs5bZpduJ9rFYjB/yf446vRPCWa0zLunLWy0mSGDGboQ nt1w== X-Gm-Message-State: AOJu0Yzq/sOaIPNfbae1vahcBKTjraL/T3wYhSchAW8Jlf+IGU2rUe6o i1JZdb1dSsdxVVJKdI0HUig= X-Google-Smtp-Source: AGHT+IH9jrj5kQNZQlHywCn9ODZPN+CgG4ie7MFJUZJwX9O5Hnq70mAUD5pxziQOO0GAnw2h2aeoVg== X-Received: by 2002:a17:902:e801:b0:1d4:1956:80d4 with SMTP id u1-20020a170902e80100b001d4195680d4mr4032512plg.47.1704828643820; Tue, 09 Jan 2024 11:30:43 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.169.119]) by smtp.gmail.com with ESMTPSA id f12-20020a170902ab8c00b001d3ea8ad878sm2161596plr.290.2024.01.09.11.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 11:30:43 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 08769740676; Tue, 9 Jan 2024 11:30:42 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, goldstein.w.n@gmail.com Subject: [PATCH 1/4] x86: Move x86-64 shadow stack startup codes Date: Tue, 9 Jan 2024 11:30:38 -0800 Message-ID: <20240109193041.3987157-2-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240109193041.3987157-1-hjl.tools@gmail.com> References: <20240109193041.3987157-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3024.3 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Add sysdeps/i386/libc-start.h and move x86-64 shadow stack startup codes to sysdeps/x86_64/libc-start.h --- sysdeps/i386/libc-start.h | 25 +++++++++++++++++++++++++ sysdeps/{x86 => x86_64}/libc-start.h | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 sysdeps/i386/libc-start.h rename sysdeps/{x86 => x86_64}/libc-start.h (98%) diff --git a/sysdeps/i386/libc-start.h b/sysdeps/i386/libc-start.h new file mode 100644 index 0000000000..c9b7d3614e --- /dev/null +++ b/sysdeps/i386/libc-start.h @@ -0,0 +1,25 @@ +/* i386 definitions for libc main startup. + Copyright (C) 2018-2024 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 + . */ + +#ifndef SHARED +# define ARCH_SETUP_IREL() apply_irel () +# define ARCH_APPLY_IREL() +# ifndef ARCH_SETUP_TLS +# define ARCH_SETUP_TLS() __libc_setup_tls () +# endif +#endif /* !SHARED */ diff --git a/sysdeps/x86/libc-start.h b/sysdeps/x86_64/libc-start.h similarity index 98% rename from sysdeps/x86/libc-start.h rename to sysdeps/x86_64/libc-start.h index c3cc05888d..63fef17029 100644 --- a/sysdeps/x86/libc-start.h +++ b/sysdeps/x86_64/libc-start.h @@ -1,4 +1,4 @@ -/* X86 definitions for libc main startup. +/* x86-64 definitions for libc main startup. Copyright (C) 2018-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. From patchwork Tue Jan 9 19:30:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1884613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=SWK59VGP; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T8gys3n8wz1yPh for ; Wed, 10 Jan 2024 06:31:17 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 41AB23858025 for ; Tue, 9 Jan 2024 19:31:15 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by sourceware.org (Postfix) with ESMTPS id AFD74385842F for ; Tue, 9 Jan 2024 19:30:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AFD74385842F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AFD74385842F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704828648; cv=none; b=QoYdSKLT0QAFMXnRcA4jkiP9Rt3N+pYwAuNf4RJ25kL2ZorrUexzKtw7UGtzX3USk5Wk5xo+HnyACJlX4ABqPczt4JjJxpltU5iKWZT/uq12sseSq0xCWnZH+PBxWywMRcNwGY2iwzoqWqI1fJ32GjgzzGU9DGlf8IUG1Fp5YI4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704828648; c=relaxed/simple; bh=VzQSm+uImmRP3litAItMF9qjw1tn9X/4NNtBFiZGnSc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=p4IKCY4SivPNaEMB7NAFpFM2s1T6lzr9e+mnx4jeD4+Z/7kldqMpDygVQK9FEhSChJIDFRboBkNwQkz/wVaRQNkYfjHd2DN2Mr+e6BTngQQwPMeSOXjcR91ZMQf3nKFj9sxa2TF/NYxJbmJuEQ8V21Qk0bvbpeUaOEzV8BAabZ8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1d3e8a51e6bso26884795ad.3 for ; Tue, 09 Jan 2024 11:30:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704828644; x=1705433444; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U2yt2VhxmMHBPCFxLMh/zvO20Iaoo8z8hJXUKxV2NWo=; b=SWK59VGPXcv1mwHbmVVVG0XMjP5KFhZ2jmIFDLgwnyFWPwDwlFzZGSo+Fn+Ovtga8b MMH1S8lTxwR6wh0v6Mz1bkQoROK389h9P6K/RI5O3QLSKhKx9xMTh5ZiFXTT3xsckrnL yw8oHSnQVp0zcazH+ArNO7EQbsItvpwCkL8KuMLc56/uprNFCPX1VbbmcLe/snCQ6TXM /fBf2ZAbH6ANfmNndnEWvR7z92tVomQNrt1fVRleaAJumeWFahOonfC4CDg7y26OV9ZY Cfj+fpDOJEQq7hxkF0lq6157Tnii5JVRc7VU+t+s5BQs3VGkO2Ll4o7pCjHP4jHbTWhB fXog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704828644; x=1705433444; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U2yt2VhxmMHBPCFxLMh/zvO20Iaoo8z8hJXUKxV2NWo=; b=MplTVpd5Xn+PLh1GOau8/mkqzIlAle1zpa8yU712gU+ASiiHHpA2yYWHcsParqAJMx LI/kq0AuOBjKSISofo0MPeLQNhZ7IVZixXWjlEUigp7aiVSrKUPmROQTbGw3OGBBD3k9 b5zzsj+9hJuPJ4/E97vc2qs/YMpLh925DkN3dxxbzO3gn+mIP9YbSp5faDpAspuvjURM qKG7w4H/XFPkpOOyhp/zNVvgxXPWw2+zo3OpHA6yOICpGluJDrkZGk1yu8M9dBfGs4Ef Gzv6Rgjwl2hAA7zN28nWGdoRN05QEMUyKNevVhE4cehLJqTZMleUJrgoy/AjosexeUuU h5iw== X-Gm-Message-State: AOJu0YwBFad1pPUcXMw+BmgchI9Dfgywwz7RV7TVjtopLe72T/9OK1ly HJVGfOEj1dMTLFS2IoiT3Do= X-Google-Smtp-Source: AGHT+IHhF0frR6GYpiitsx7Lw+XNiuM0IhMmpHI9RKZyuEfCkS1+4C93KpPzZLmnRJ0EtHNoSt2ZlQ== X-Received: by 2002:a17:902:7c92:b0:1d3:e135:7891 with SMTP id y18-20020a1709027c9200b001d3e1357891mr5885726pll.102.1704828643550; Tue, 09 Jan 2024 11:30:43 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.169.119]) by smtp.gmail.com with ESMTPSA id w10-20020a170902904a00b001d05bb77b43sm2154913plz.19.2024.01.09.11.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 11:30:43 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 1330E740677; Tue, 9 Jan 2024 11:30:42 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, goldstein.w.n@gmail.com Subject: [PATCH 2/4] x86-64/cet: Move dl-cet.[ch] to x86_64 directories Date: Tue, 9 Jan 2024 11:30:39 -0800 Message-ID: <20240109193041.3987157-3-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240109193041.3987157-1-hjl.tools@gmail.com> References: <20240109193041.3987157-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3024.3 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Since CET is only enabled for x86-64, move dl-cet.[ch] to x86_64 directories. Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/x86/dl-cet.h | 63 ------------------------- sysdeps/unix/sysv/linux/x86_64/dl-cet.h | 47 +++++++++++++++++- sysdeps/{x86 => x86_64}/dl-cet.c | 0 3 files changed, 46 insertions(+), 64 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/x86/dl-cet.h rename sysdeps/{x86 => x86_64}/dl-cet.c (100%) diff --git a/sysdeps/unix/sysv/linux/x86/dl-cet.h b/sysdeps/unix/sysv/linux/x86/dl-cet.h deleted file mode 100644 index c10773ab0e..0000000000 --- a/sysdeps/unix/sysv/linux/x86/dl-cet.h +++ /dev/null @@ -1,63 +0,0 @@ -/* Linux/x86 CET initializers function. - Copyright (C) 2018-2024 Free Software Foundation, Inc. - - 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 - -static __always_inline int -dl_cet_disable_cet (unsigned int cet_feature) -{ - if (cet_feature != GNU_PROPERTY_X86_FEATURE_1_SHSTK) - return -1; - long long int kernel_feature = ARCH_SHSTK_SHSTK; - return (int) INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_DISABLE, - kernel_feature); -} - -static __always_inline int -dl_cet_lock_cet (unsigned int cet_feature) -{ - if (cet_feature != GNU_PROPERTY_X86_FEATURE_1_SHSTK) - return -1; - /* Lock all SHSTK features. */ - long long int kernel_feature = -1; - return (int) INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_LOCK, - kernel_feature); -} - -static __always_inline unsigned int -dl_cet_get_cet_status (void) -{ - unsigned long long kernel_feature; - unsigned int status = 0; - if (INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_STATUS, - &kernel_feature) == 0) - { - if ((kernel_feature & ARCH_SHSTK_SHSTK) != 0) - status = GNU_PROPERTY_X86_FEATURE_1_SHSTK; - } - return status; -} - -/* Enable shadow stack with a macro to avoid shadow stack underflow. */ -#define ENABLE_X86_CET(cet_feature) \ - if ((cet_feature & GNU_PROPERTY_X86_FEATURE_1_SHSTK)) \ - { \ - long long int kernel_feature = ARCH_SHSTK_SHSTK; \ - INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_ENABLE, \ - kernel_feature); \ - } diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-cet.h b/sysdeps/unix/sysv/linux/x86_64/dl-cet.h index c89dd6bd42..94e9b9aa86 100644 --- a/sysdeps/unix/sysv/linux/x86_64/dl-cet.h +++ b/sysdeps/unix/sysv/linux/x86_64/dl-cet.h @@ -15,8 +15,53 @@ License along with the GNU C Library; if not, see . */ +#include +#include #include -#include_next + +static __always_inline int +dl_cet_disable_cet (unsigned int cet_feature) +{ + if (cet_feature != GNU_PROPERTY_X86_FEATURE_1_SHSTK) + return -1; + long long int kernel_feature = ARCH_SHSTK_SHSTK; + return (int) INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_DISABLE, + kernel_feature); +} + +static __always_inline int +dl_cet_lock_cet (unsigned int cet_feature) +{ + if (cet_feature != GNU_PROPERTY_X86_FEATURE_1_SHSTK) + return -1; + /* Lock all SHSTK features. */ + long long int kernel_feature = -1; + return (int) INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_LOCK, + kernel_feature); +} + +static __always_inline unsigned int +dl_cet_get_cet_status (void) +{ + unsigned long long kernel_feature; + unsigned int status = 0; + if (INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_STATUS, + &kernel_feature) == 0) + { + if ((kernel_feature & ARCH_SHSTK_SHSTK) != 0) + status = GNU_PROPERTY_X86_FEATURE_1_SHSTK; + } + return status; +} + +/* Enable shadow stack with a macro to avoid shadow stack underflow. */ +#define ENABLE_X86_CET(cet_feature) \ + if ((cet_feature & GNU_PROPERTY_X86_FEATURE_1_SHSTK)) \ + { \ + long long int kernel_feature = ARCH_SHSTK_SHSTK; \ + INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_ENABLE, \ + kernel_feature); \ + } #define X86_STRINGIFY_1(x) #x #define X86_STRINGIFY(x) X86_STRINGIFY_1 (x) diff --git a/sysdeps/x86/dl-cet.c b/sysdeps/x86_64/dl-cet.c similarity index 100% rename from sysdeps/x86/dl-cet.c rename to sysdeps/x86_64/dl-cet.c From patchwork Tue Jan 9 19:30:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1884610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=UEva4fdn; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T8gyj3rdpz1yPh for ; Wed, 10 Jan 2024 06:31:09 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 83547385C32C for ; Tue, 9 Jan 2024 19:31:07 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by sourceware.org (Postfix) with ESMTPS id 23E2B3858288 for ; Tue, 9 Jan 2024 19:30:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 23E2B3858288 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 23E2B3858288 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::630 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704828648; cv=none; b=QYphwKi0rUC42KlorXKcWkUe5Wqh8EQ2HtvXiAxMHnKrjaV0y5hCZ6T5ETfQDoegzc7HcW0kkqOTfy+K0rqrT3ZBJGbne995Q9FU4NTSIQ2OeLcvQXc41m0pYHhNgzhjAhtaO0yhRPdc8UeBv2aA0XpMQQT1aW0MfrXJ3Wj1m6g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704828648; c=relaxed/simple; bh=KkImigWzfENbvZU5zKWs32HwY0WJtK/jzwDEsUNKZgg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=XuhynBOYfA9Ufk1buVOacfi7IBsWfqeP1oM5lsrttH3abr9JlvY1lkG0N7420/UB31Fya3x3DMLTv/vnAbdpnBe2xDhdBt7AnHdmdu6sH4irobKi0zeTWwHT5+vXcYSqtGcf2lHAbfxAbQbfTzTR1LqZoRdCjfbY4SGWda1326U= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1d4ab4e65aeso28145695ad.0 for ; Tue, 09 Jan 2024 11:30:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704828645; x=1705433445; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AixZYWaDfYhBUlT04+Hg9ubTR/MnAweIJKimN1ifR2Y=; b=UEva4fdnczqS6b5ki9iXAVyRjz4AF3KLdlG541SO4tLFDO28y6QO/FxDrOiHkX09iC dFDq6oWY+gk0YEPO28yvVy/8Lkm+iT5H5GcgLRzZN8KQCgw5ljjVmBhzbwybOe8nDKz+ VNCDAMaCy9dWOoVOMMqn8ro52VNgGvFZjpWs6mmx5or3iuTMHO7XeD+x9eanXfJ2ABUA LEzOuW4evvLFyVT/3DhEOJPx6jZoTfNt26nZu8RAIz9iuHQQ2RzeZyfHwRL64WM51fa8 5Z/Rkv3+5rK5ZblDig/vVGOw/CmX34E0whQ+TrKsxfHyWa6O13amj1C+SImY6qnGxq5M k3Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704828645; x=1705433445; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AixZYWaDfYhBUlT04+Hg9ubTR/MnAweIJKimN1ifR2Y=; b=UQi3bVXCXu8wrkfvcgHMEqrHo2DgDwuIaTtDWTDaNlHigcuXZOCEkkjpr7W1aDEkzu oB71tstDa7wHQsyX4uwLcSpxyhhR5lLOttfRbTEU0p1dZjrOQbqqHNsQb1xUOVDQcuk1 hmNTHWHje9ts1wL4v5e4VhYbRuFQ+B6zkI0vaGjfPAvGNrvt/QiAGFXou/y2bUnixH3F 1m4cc0AKXYzmz22BqLEtRAuz4Y4YJmZx1mAKXSLqhpm40X4IoVV51lUHXXTGEcjvaWgo /aIZgH1s8FOy468uae1SuY4YdOlSkmMhB29TiRU6mJ6xUKf2FU3a8cdb9glZr2c3zZrc w2lg== X-Gm-Message-State: AOJu0YwvC2Ym6jomYVoHKAcIQYu8+30SVzkJGbshlajpqHHEVH8nbD2J LWlLIMQBkjprqkg8StxLKio= X-Google-Smtp-Source: AGHT+IEMz/z3NAE+Yq7UgTyHeY419Onl8qRtcCaotOxATN5bt8iUoT9fW8dLpn7wMrFUnggeDXTVIA== X-Received: by 2002:a17:903:a4f:b0:1d4:e024:f172 with SMTP id mn15-20020a1709030a4f00b001d4e024f172mr1362515plb.54.1704828644849; Tue, 09 Jan 2024 11:30:44 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.169.119]) by smtp.gmail.com with ESMTPSA id jw23-20020a170903279700b001d538b6517asm2151616plb.230.2024.01.09.11.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 11:30:43 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 1DEDA740678; Tue, 9 Jan 2024 11:30:42 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, goldstein.w.n@gmail.com Subject: [PATCH 3/4] x86-64/cet: Move check-cet.awk to x86_64 Date: Tue, 9 Jan 2024 11:30:40 -0800 Message-ID: <20240109193041.3987157-4-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240109193041.3987157-1-hjl.tools@gmail.com> References: <20240109193041.3987157-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3024.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org --- sysdeps/x86_64/Makefile | 2 +- sysdeps/{x86 => x86_64}/check-cet.awk | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sysdeps/{x86 => x86_64}/check-cet.awk (100%) Reviewed-by: Adhemerval Zanella diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index 98f0e04f90..abb8b354af 100644 --- a/sysdeps/x86_64/Makefile +++ b/sysdeps/x86_64/Makefile @@ -468,7 +468,7 @@ $(cet-built-dso:=.note): %.note: % mv -f $@T $@ common-generated += $(cet-built-dso:$(common-objpfx)%=%.note) -$(objpfx)check-cet.out: $(..)sysdeps/x86/check-cet.awk \ +$(objpfx)check-cet.out: $(..)/sysdeps/x86_64/check-cet.awk \ $(cet-built-dso:=.note) LC_ALL=C $(AWK) -f $^ > $@; \ $(evaluate-test) diff --git a/sysdeps/x86/check-cet.awk b/sysdeps/x86_64/check-cet.awk similarity index 100% rename from sysdeps/x86/check-cet.awk rename to sysdeps/x86_64/check-cet.awk From patchwork Tue Jan 9 19:30:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1884612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=jfb0Zq1a; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T8gym37v2z1yPh for ; Wed, 10 Jan 2024 06:31:12 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 39EC5385DC05 for ; Tue, 9 Jan 2024 19:31:10 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oo1-xc33.google.com (mail-oo1-xc33.google.com [IPv6:2607:f8b0:4864:20::c33]) by sourceware.org (Postfix) with ESMTPS id ABA5B3858422 for ; Tue, 9 Jan 2024 19:30:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ABA5B3858422 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org ABA5B3858422 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::c33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704828648; cv=none; b=jYbhGVN1tnBQ0ko5NUvssuHqSUD3p4blFHbwUXWUl5QJwzzMfESLNxJPJOo6Ae/qz5liYH2DQJ3n3snKe2uOIuG/xpzraB3gMWx99azJ0AXsldxcpykPjmUviJ1sVQrIPtiDPnHAljova/9uyXNC7F4aSvV+nKJRfzMlL85J94s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704828648; c=relaxed/simple; bh=6lPSOV3hGsbznbmW1yTCyd/Vyb2utcXOyl1aS1VVtVc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=oyjfcGcTK1oPD1moQFqS9VZMBC2oHgjuXyAE/eKi0RO/qQyrRuNJ+Vi/xs1mA9qiDyN0AbQNF3EFPOffKrtJOSdn1Op6IemsYmsabseYpHqsbEX0m/8ML3OS5W9ARO88UQVDWO603rCs4kR1v342mwCq2XGO/NEYG1rdrkjWwO8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oo1-xc33.google.com with SMTP id 006d021491bc7-5986cb7bb61so893052eaf.2 for ; Tue, 09 Jan 2024 11:30:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704828644; x=1705433444; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=h4AFz9E1A2/1JUAa2IAysXPuA/93IlduVmuf4uuulMY=; b=jfb0Zq1aycCq4Ndu8z+MxbNZD4SWaqkhJyvK/hN4FR38eDbvwY3lbk5bqAooCYYfdU KhWcGlAKIpELC6h2ru1LqDZih5qRZgBvUF8t8FLQFajGgQFjp9qso/yqYu4ro7n+kU9T i1kvhzyTPL8yPt1E2g/ol5ss0ny/5uOUkbdg6gNlKP791Hdt4H+RhQ1+SUkSL7cERDLh GYLdv8Wfj9IHVDl18kytaFTpb9N4BCyykY2gTir5scU8RIECNkWnvaT5QIp5NiDacohv CIBLYvmipFnECqSoLXNnUfHeI84zzn90qs9DcE5khQa4/2F6cdrmFFuWEJhVra25AZuS IA1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704828644; x=1705433444; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h4AFz9E1A2/1JUAa2IAysXPuA/93IlduVmuf4uuulMY=; b=i9wfWQs/eq8zfTlBLXgQvJOpNn5sGqBGtBfxhdEcrniZgEeRldaKZ7Fx9SXltRkXiN MkrhAEOP8pdtchoRaPbppxud63ueQyP5DFjtK/vCy5YFDX9aPV1g6AQmuu0i5t1gAr6u aGJdY2rwFCcgkrAdz5W+VcPsROrethsUPu0c82F/innmasrV4kHECbcpKakpLNj+ccdf 9yh9H2xysp7PUdk30Qf6kFbesXQ0Nd7UEPYV/bF52xPweTzaKQtOup4DXhUKDoy7U+Pm T8E8XEETsbMkYe9wVbcUGrPGDJC3FHcmDK7b3tpcROhNB1KRK8Vz9hWr9VG1F7Qcn+Iu G/uQ== X-Gm-Message-State: AOJu0Yy3Wm3Z+Za/25k3GKsIJWFRY+YcZvfRvXdxY0Gb8d4UiGXgK63l bzhTQXZjbIZgQfU/S99L181503Mm5wc= X-Google-Smtp-Source: AGHT+IGIP8f5NvGSkVI6U4I3AB6ECNNHeXOYbQ2egt94B07wTX0RBDlNyfMU6kOdIKuXNB1zM8hnyg== X-Received: by 2002:a05:6358:7018:b0:170:ec2e:4367 with SMTP id 24-20020a056358701800b00170ec2e4367mr3334467rwo.1.1704828643721; Tue, 09 Jan 2024 11:30:43 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.169.119]) by smtp.gmail.com with ESMTPSA id d10-20020a056a00198a00b006db00cb78a8sm2088579pfl.179.2024.01.09.11.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 11:30:43 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 28CAD740679; Tue, 9 Jan 2024 11:30:42 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, goldstein.w.n@gmail.com Subject: [PATCH 4/4] i386: Remove CET support bits Date: Tue, 9 Jan 2024 11:30:41 -0800 Message-ID: <20240109193041.3987157-5-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240109193041.3987157-1-hjl.tools@gmail.com> References: <20240109193041.3987157-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3024.3 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org 1. Remove _dl_runtime_resolve_shstk and _dl_runtime_profile_shstk. 2. Move CET offsets from x86 cpu-features-offsets.sym to x86-64 features-offsets.sym. 3. Rename x86 cet-control.h to x86-64 feature-control.h since it is only for x86-64 and also used for PLT rewrite. 4. Add x86-64 ldsodefs.h to include feature-control.h. 5. Change TUNABLE_CALLBACK (set_plt_rewrite) to x86-64 only. 6. Move x86 dl-procruntime.c to x86-64. Reviewed-by: Adhemerval Zanella --- sysdeps/i386/dl-machine.h | 11 +-- sysdeps/i386/dl-trampoline.S | 69 ------------------- sysdeps/unix/sysv/linux/x86_64/dl-cet.h | 2 +- sysdeps/x86/cpu-features-offsets.sym | 2 - sysdeps/x86/cpu-features.c | 4 +- sysdeps/x86/ldsodefs.h | 1 - sysdeps/x86_64/Makefile | 2 +- sysdeps/{x86 => x86_64}/dl-procruntime.c | 2 +- sysdeps/x86_64/dl-trampoline.S | 1 + .../feature-control.h} | 0 sysdeps/x86_64/features-offsets.sym | 6 ++ sysdeps/x86_64/ldsodefs.h | 26 +++++++ 12 files changed, 41 insertions(+), 85 deletions(-) rename sysdeps/{x86 => x86_64}/dl-procruntime.c (97%) rename sysdeps/{x86/cet-control.h => x86_64/feature-control.h} (100%) create mode 100644 sysdeps/x86_64/features-offsets.sym create mode 100644 sysdeps/x86_64/ldsodefs.h diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index c69ae165ac..fc1ef96587 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -65,9 +65,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], extern void _dl_runtime_profile (Elf32_Word) attribute_hidden; extern void _dl_runtime_resolve_shstk (Elf32_Word) attribute_hidden; extern void _dl_runtime_profile_shstk (Elf32_Word) attribute_hidden; - /* Check if SHSTK is enabled by kernel. */ - bool shstk_enabled - = (GL(dl_x86_feature_1) & GNU_PROPERTY_X86_FEATURE_1_SHSTK) != 0; if (l->l_info[DT_JMPREL] && lazy) { @@ -95,9 +92,7 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], #ifdef SHARED if (__glibc_unlikely (profile)) { - got[2] = (shstk_enabled - ? (Elf32_Addr) &_dl_runtime_profile_shstk - : (Elf32_Addr) &_dl_runtime_profile); + got[2] = (Elf32_Addr) &_dl_runtime_profile; if (GLRO(dl_profile) != NULL && _dl_name_match_p (GLRO(dl_profile), l)) @@ -109,9 +104,7 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], #endif /* This function will get called to fix up the GOT entry indicated by the offset on the stack, and then jump to the resolved address. */ - got[2] = (shstk_enabled - ? (Elf32_Addr) &_dl_runtime_resolve_shstk - : (Elf32_Addr) &_dl_runtime_resolve); + got[2] = (Elf32_Addr) &_dl_runtime_resolve; } return lazy; diff --git a/sysdeps/i386/dl-trampoline.S b/sysdeps/i386/dl-trampoline.S index 2632020145..6c14d463b6 100644 --- a/sysdeps/i386/dl-trampoline.S +++ b/sysdeps/i386/dl-trampoline.S @@ -44,76 +44,7 @@ _dl_runtime_resolve: cfi_endproc .size _dl_runtime_resolve, .-_dl_runtime_resolve -# The SHSTK compatible version. - .text - .globl _dl_runtime_resolve_shstk - .type _dl_runtime_resolve_shstk, @function - cfi_startproc - .align 16 -_dl_runtime_resolve_shstk: - cfi_adjust_cfa_offset (8) - pushl %eax # Preserve registers otherwise clobbered. - cfi_adjust_cfa_offset (4) - pushl %edx - cfi_adjust_cfa_offset (4) - movl 12(%esp), %edx # Copy args pushed by PLT in register. Note - movl 8(%esp), %eax # that `fixup' takes its parameters in regs. - call _dl_fixup # Call resolver. - movl (%esp), %edx # Get register content back. - movl %eax, %ecx # Store the function address. - movl 4(%esp), %eax # Get register content back. - addl $16, %esp # Adjust stack: PLT1 + PLT2 + %eax + %edx - cfi_adjust_cfa_offset (-16) - jmp *%ecx # Jump to function address. - cfi_endproc - .size _dl_runtime_resolve_shstk, .-_dl_runtime_resolve_shstk - #if !defined PROF && defined SHARED -# The SHSTK compatible version. - .globl _dl_runtime_profile_shstk - .type _dl_runtime_profile_shstk, @function - cfi_startproc - .align 16 -_dl_runtime_profile_shstk: - cfi_adjust_cfa_offset (8) - pushl %esp - cfi_adjust_cfa_offset (4) - addl $8, (%esp) # Account for the pushed PLT data - pushl %ebp - cfi_adjust_cfa_offset (4) - pushl %eax # Preserve registers otherwise clobbered. - cfi_adjust_cfa_offset (4) - pushl %ecx - cfi_adjust_cfa_offset (4) - pushl %edx - cfi_adjust_cfa_offset (4) - movl %esp, %ecx - subl $8, %esp - cfi_adjust_cfa_offset (8) - movl $-1, 4(%esp) - leal 4(%esp), %edx - movl %edx, (%esp) - pushl %ecx # Address of the register structure - cfi_adjust_cfa_offset (4) - movl 40(%esp), %ecx # Load return address - movl 36(%esp), %edx # Copy args pushed by PLT in register. Note - movl 32(%esp), %eax # that `fixup' takes its parameters in regs. - call _dl_profile_fixup # Call resolver. - cfi_adjust_cfa_offset (-8) - movl (%esp), %edx - testl %edx, %edx - jns 1f - movl 4(%esp), %edx # Get register content back. - movl %eax, %ecx # Store the function address. - movl 12(%esp), %eax # Get register content back. - # Adjust stack: PLT1 + PLT2 + %esp + %ebp + %eax + %ecx + %edx - # + free. - addl $32, %esp - cfi_adjust_cfa_offset (-32) - jmp *%ecx # Jump to function address. - cfi_endproc - .size _dl_runtime_profile_shstk, .-_dl_runtime_profile_shstk - .globl _dl_runtime_profile .type _dl_runtime_profile, @function cfi_startproc diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-cet.h b/sysdeps/unix/sysv/linux/x86_64/dl-cet.h index 94e9b9aa86..a00c7ee662 100644 --- a/sysdeps/unix/sysv/linux/x86_64/dl-cet.h +++ b/sysdeps/unix/sysv/linux/x86_64/dl-cet.h @@ -17,7 +17,7 @@ #include #include -#include +#include static __always_inline int dl_cet_disable_cet (unsigned int cet_feature) diff --git a/sysdeps/x86/cpu-features-offsets.sym b/sysdeps/x86/cpu-features-offsets.sym index 5429f60632..6a8fd29813 100644 --- a/sysdeps/x86/cpu-features-offsets.sym +++ b/sysdeps/x86/cpu-features-offsets.sym @@ -2,6 +2,4 @@ #include -RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET offsetof (struct rtld_global_ro, _dl_x86_cpu_features) XSAVE_STATE_SIZE_OFFSET offsetof (struct cpu_features, xsave_state_size) -RTLD_GLOBAL_DL_X86_FEATURE_1_OFFSET offsetof (struct rtld_global, _dl_x86_feature_1) diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index 9ca307f521..46bdaffbc2 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -27,7 +27,7 @@ extern void TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *) attribute_hidden; -#ifdef SHARED +#if defined SHARED && defined __x86_64__ static void TUNABLE_CALLBACK (set_plt_rewrite) (tunable_val_t *valp) { @@ -1125,8 +1125,10 @@ no_cpuid: #endif #ifdef SHARED +# ifdef __x86_64__ TUNABLE_GET (plt_rewrite, tunable_val_t *, TUNABLE_CALLBACK (set_plt_rewrite)); +# endif #else /* NB: In libc.a, call init_cacheinfo. */ init_cacheinfo (); diff --git a/sysdeps/x86/ldsodefs.h b/sysdeps/x86/ldsodefs.h index b2a6d71513..50dc81c022 100644 --- a/sysdeps/x86/ldsodefs.h +++ b/sysdeps/x86/ldsodefs.h @@ -61,7 +61,6 @@ struct La_x32_retval; struct La_x86_64_retval *, \ const char *) -#include #include_next #endif diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index abb8b354af..10a253e4f1 100644 --- a/sysdeps/x86_64/Makefile +++ b/sysdeps/x86_64/Makefile @@ -10,7 +10,7 @@ LDFLAGS-rtld += -Wl,-z,nomark-plt endif ifeq ($(subdir),csu) -gen-as-const-headers += link-defines.sym +gen-as-const-headers += features-offsets.sym link-defines.sym endif ifeq ($(subdir),gmon) diff --git a/sysdeps/x86/dl-procruntime.c b/sysdeps/x86_64/dl-procruntime.c similarity index 97% rename from sysdeps/x86/dl-procruntime.c rename to sysdeps/x86_64/dl-procruntime.c index 15b3d0d878..7078581778 100644 --- a/sysdeps/x86/dl-procruntime.c +++ b/sysdeps/x86_64/dl-procruntime.c @@ -1,4 +1,4 @@ -/* Data for processor runtime information. x86 version. +/* Data for processor runtime information. x86-64 version. Copyright (C) 2018-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S index 4c1ba5c9af..b2e7e0f69b 100644 --- a/sysdeps/x86_64/dl-trampoline.S +++ b/sysdeps/x86_64/dl-trampoline.S @@ -19,6 +19,7 @@ #include #include #include +#include #include #include diff --git a/sysdeps/x86/cet-control.h b/sysdeps/x86_64/feature-control.h similarity index 100% rename from sysdeps/x86/cet-control.h rename to sysdeps/x86_64/feature-control.h diff --git a/sysdeps/x86_64/features-offsets.sym b/sysdeps/x86_64/features-offsets.sym new file mode 100644 index 0000000000..9e4be3393a --- /dev/null +++ b/sysdeps/x86_64/features-offsets.sym @@ -0,0 +1,6 @@ +#define SHARED 1 + +#include + +RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET offsetof (struct rtld_global_ro, _dl_x86_cpu_features) +RTLD_GLOBAL_DL_X86_FEATURE_1_OFFSET offsetof (struct rtld_global, _dl_x86_feature_1) diff --git a/sysdeps/x86_64/ldsodefs.h b/sysdeps/x86_64/ldsodefs.h new file mode 100644 index 0000000000..0f468ddf5b --- /dev/null +++ b/sysdeps/x86_64/ldsodefs.h @@ -0,0 +1,26 @@ +/* Run-time dynamic linker data structures for loaded ELF shared objects. + x86-64 version. + Copyright (C) 2024 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 + . */ + +#ifndef _X86_64_LDSODEFS_H +#define _X86_64_LDSODEFS_H 1 + +#include +#include_next + +#endif