From patchwork Sat Dec 16 16:53:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1876957 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=QUCy7jMy; 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 4Sssds5YCVz23p3 for ; Sun, 17 Dec 2023 03:55:13 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C8946384DB63 for ; Sat, 16 Dec 2023 16:55:11 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) by sourceware.org (Postfix) with ESMTPS id 4F6F938618B5 for ; Sat, 16 Dec 2023 16:53:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4F6F938618B5 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 4F6F938618B5 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::129 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702745613; cv=none; b=MIEq9Rm2UkhZtreHIvkg3lWC6BVB/+Yq7/S935dUvwGaoqB8g9zP/q3JiXRWhW9txPN1k36COPhxMcloAAlehnI3wqYXTXbzUkSkhmH+yGV8JFVsTRanr7UnkaHZbSggPEF84NVgKZjmBYgv9ZS/lgdFqjeFg4/UgmzXvelmbO4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702745613; c=relaxed/simple; bh=KX2fSxrjTF6s6Ez+Aa5GmAj9JT+RyqWT3g+LDi0f+7s=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=VQ8X+Xiz/IzBF5Oql6DX0u2GQU04m4+JsBQBqK38KAnrrPLNymL6D4YvdHMqJkEPPLZ+JByQ3+YwWTT0FRiMyLZ4yBT6aFcD4AJbxo0T92UAIPQRN7Vq63Nn9maElxy3y45ORid24TMFoCYszznyvlNkz/qjQ5Vtp/t6FDL09G0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x129.google.com with SMTP id e9e14a558f8ab-35d3846fac9so7135995ab.2 for ; Sat, 16 Dec 2023 08:53:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702745611; x=1703350411; 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=fIGpnDSOvb8+kLx20atWsEq+xk8/1qewdiCp1iFB/U0=; b=QUCy7jMyA+jHiim1FsKslmy6kMqhXK8aDcPs0CZWCt5PbS9bBTfCAslePMPHBWnhWe bmk6H3I36Xx6oWhY81Z9nGBNp7FBxBA3Av0Ki+JN9mCbV5+u9xn5Fp5tsSWmG1kIst6i 4SMVpgHIDowo40xJInwrnHmmshuZK9sIN2NxvsaFUrRT4IrTHb3HQqG0NGQ8apTEaFKJ L7Dirv0BDDKEWecY4PzYeoGi194Su8xqm42+kDcnsq6B/+x76GO8wGohUAM93e4Vvxox mSWE1ziaC3+Z0BEIzzt64OGmdM1V+cZkQ2FQwb4z9V5x+mj691f5g6Otfjmag3zh8kJw 6NhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702745611; x=1703350411; 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=fIGpnDSOvb8+kLx20atWsEq+xk8/1qewdiCp1iFB/U0=; b=XyYX8AsC9xj5gfot86d4ukXigc5SRKLdm0yG9D0DnMYMoaCuCMqXiwtZYrAhwulFp9 NhlZD8f/pX6FlxAbma/1g5/IAfGEp2lDbBbcTXjqL04j9X/Az79lzAGTvHAJyukMn9Cs gGe1SGhPxA+PXpZC1LKDMpqR/6302RqTW6/Lj3alRpbs2AnQ+fXE4rrOCeack1ntKPd1 VDPLxEwA+Hy4JL+cjVC3sIjbQJAuIGhkYFC7qfzTIYPc7ORGH3XQy7aNQserbnfd9Iz/ VEAFe7+8hbgifhgYXFMEZq53cJPq/5OyJ5mxsxx+NYJpmJx87Bh+5/73kiDCvfk5mymG SfvA== X-Gm-Message-State: AOJu0YyvgjSdCxokfo4REDOpC7AP4JS78TRA1piYzRnDcEGlso98ZXhh zB/o4hPkgqk0hZwwn+ovF+8= X-Google-Smtp-Source: AGHT+IGx+R9yqdTtUv46YnT9x2zzCr7KS5DkT115bl6c1tMKg3xT3DPwfJLIdNB41PF8ISbw7Ug7lw== X-Received: by 2002:a05:6e02:3105:b0:35f:9f3f:740a with SMTP id bg5-20020a056e02310500b0035f9f3f740amr2135901ilb.21.1702745611411; Sat, 16 Dec 2023 08:53:31 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.59.129.147]) by smtp.gmail.com with ESMTPSA id f13-20020a170902ce8d00b001d0cfd7f6b9sm3985853plg.54.2023.12.16.08.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:53:29 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 85A68740633; Sat, 16 Dec 2023 08:53:25 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: rick.p.edgecombe@intel.com Subject: [PATCH v2 05/16] x86/cet: Check CPU_FEATURE_ACTIVE when CET is disabled Date: Sat, 16 Dec 2023 08:53:14 -0800 Message-ID: <20231216165325.2584919-6-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216165325.2584919-1-hjl.tools@gmail.com> References: <20231216165325.2584919-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3024.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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 Verify that CPU_FEATURE_ACTIVE (SHSTK) works properly when CET is disabled. --- sysdeps/x86/Makefile | 5 +++++ sysdeps/x86/tst-cet-legacy-10a-static.c | 2 ++ sysdeps/x86/tst-cet-legacy-10a.c | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 sysdeps/x86/tst-cet-legacy-10a-static.c create mode 100644 sysdeps/x86/tst-cet-legacy-10a.c diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile index a41598adf9..23f3ac1430 100644 --- a/sysdeps/x86/Makefile +++ b/sysdeps/x86/Makefile @@ -156,10 +156,13 @@ tests += \ tst-cet-legacy-9-static \ tst-cet-legacy-10 \ tst-cet-legacy-10-static \ + tst-cet-legacy-10a \ + tst-cet-legacy-10a-static \ # tests tests-static += \ tst-cet-legacy-9-static \ tst-cet-legacy-10-static \ + tst-cet-legacy-10a-static \ # tests-static tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd) @@ -226,6 +229,8 @@ CFLAGS-tst-cet-legacy-mod-6c.c += -fcf-protection CFLAGS-tst-cet-legacy-7.c += -fcf-protection=none CFLAGS-tst-cet-legacy-10.c += -mshstk CFLAGS-tst-cet-legacy-10-static.c += -mshstk +CFLAGS-tst-cet-legacy-10a.c += -fcf-protection=none +CFLAGS-tst-cet-legacy-10a-static.c += -fcf-protection=none CFLAGS-tst-shstk-legacy-1a.c += -fcf-protection=none CFLAGS-tst-shstk-legacy-1a-static.c += -fcf-protection=none diff --git a/sysdeps/x86/tst-cet-legacy-10a-static.c b/sysdeps/x86/tst-cet-legacy-10a-static.c new file mode 100644 index 0000000000..05073a5d1e --- /dev/null +++ b/sysdeps/x86/tst-cet-legacy-10a-static.c @@ -0,0 +1,2 @@ +#pragma GCC target ("shstk") +#include "tst-cet-legacy-10.c" diff --git a/sysdeps/x86/tst-cet-legacy-10a.c b/sysdeps/x86/tst-cet-legacy-10a.c new file mode 100644 index 0000000000..05073a5d1e --- /dev/null +++ b/sysdeps/x86/tst-cet-legacy-10a.c @@ -0,0 +1,2 @@ +#pragma GCC target ("shstk") +#include "tst-cet-legacy-10.c"