From patchwork Wed Dec 6 17:19:58 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: 81533 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 6B991385734F for ; Wed, 6 Dec 2023 17:20:50 +0000 (GMT) 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 5EB68385842A for ; Wed, 6 Dec 2023 17:20:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5EB68385842A 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 5EB68385842A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701883217; cv=none; b=BeprAR2wV9hlRbD6+jW/DuunOS39J2HiZ5nQbwd9o7VOEeJFuNnXiooiXvPT6pMLV/2hWYXo02SB2TYSnGnvqTOZd2FvnzWXt5vqYa17eDQTJF2uHWLw+3i3qjbzLf7cGrh+9R1VT8dTZSvBuromgRJ/81sfecJ3DgKjH6Ok2SU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701883217; c=relaxed/simple; bh=o8x5M5AVfOtzugcvvDnZ60H12xeU9uueCjSjpH2ftZM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=JFxiZm/6Qf1ovgcp9jWDTUhvtYD2N4cUQ9OC96CeYjSUtOxVdBpfSenamqdbUcq25KJPWd5Igq04tGpDbYXOSBNTGVPjQnOwy0jxP+GLIX0bnJcBpoO5K4ZTe4/Px5Fo4O3qluiXhB/myW7dtw2Qfyc+DQCEboshe2zC0ZRfDjU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1d0897e99e0so26628315ad.3 for ; Wed, 06 Dec 2023 09:20:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701883215; x=1702488015; 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=Yor7DQPNWfZlkzKfxkVaOBO/MSsJWWmMQkcNtvrZLTM=; b=Rk3TxPqlRkTTEr/xghW/uTfgfoJ5pOTHh1UCWbX21MaOdlcEReni3UmiOvmko4tR99 IfxZiXC1ZXbL95NtCg7gaRYHiNxWrmjoD7jwaIhZ47fajDDORB0j5JN+q/PGy5lqu5d7 KpQtiR6lQVk3FjDtiOVCaboLfy/3VXZwdgztj9bBIxyxfNgblqcgNEo/oSTqyxo9oLgG oXefwFEh73xFWg7Kk2/eWLu5rBZw9izLiXukeSO92jKDUUp+RcZ968dBC6u/gCtfGTcP OhHJWGq71tu0blxwaax/ddTAG1KjOiVZJojlttLPWW9ecqhrFU2L5KKHbjLGA4fvzGs0 9Hjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701883215; x=1702488015; 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=Yor7DQPNWfZlkzKfxkVaOBO/MSsJWWmMQkcNtvrZLTM=; b=rJ5ipS1l2RhjSMaQesv1LqneRdY+BiJhmgYhevLSjfevWJlzDbDV+S1PNRKg0lskTr y4Ukboe46/Qq/6E384D1RD/f4skKHvHZxcsB8oEhuZeOnxf8F5uE1pt2LB9CDqvp8biK SkxISXn+5hbATw5KpiwKPpLPzRezOIeGFWP+yL0ho4WACuAFgBi3QKwLgM+uqf8q9DWj dVm9cBdImuJ+MA9/1DN6TvFGzT+Nj2/+nvrWhYbWi20V27il0FHOWKbiw3EMXpVGN12m 4h8mVFfk2vxkP8WpOyDc15+h+aG1SDIUlgRN5u9XFoLP+Cnj+CCv+HV+kW5k28Flc13O qK4w== X-Gm-Message-State: AOJu0YzL6GFQ8Q2H4FCUmUYSfRojOHKYcBYdcQ+q6WWiUrbw7UF7Dds0 UucbweWY0xIjXzRdFtVyNNvkegM3TEM= X-Google-Smtp-Source: AGHT+IFO3abV2EKQZrN2ckdnjoVnBcR3PzCNfDjTrhhaLi32+0w0l960zPJ8eSGzuKxXMcSFfRqHtw== X-Received: by 2002:a17:902:820b:b0:1d0:7407:355d with SMTP id x11-20020a170902820b00b001d07407355dmr956482pln.50.1701883215300; Wed, 06 Dec 2023 09:20:15 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.59.161.253]) by smtp.gmail.com with ESMTPSA id iz4-20020a170902ef8400b001cfd049528esm81810plb.110.2023.12.06.09.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 09:20:14 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 7F61F74062E; Wed, 6 Dec 2023 09:20:10 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: rick.p.edgecombe@intel.com Subject: [PATCH 05/17] x86/cet: Check CPU_FEATURE_ACTIVE when CET is disabled Date: Wed, 6 Dec 2023 09:19:58 -0800 Message-ID: <20231206172010.1023415-6-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231206172010.1023415-1-hjl.tools@gmail.com> References: <20231206172010.1023415-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+patchwork=sourceware.org@sourceware.org Verify that CPU_FEATURE_ACTIVE (SHSTK) works properly when CET is disabled. --- sysdeps/x86/Makefile | 8 ++++++-- sysdeps/x86/tst-cet-legacy-10a-static.c | 2 ++ sysdeps/x86/tst-cet-legacy-10a.c | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) 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 dea14e343c..580c3ecdc5 100644 --- a/sysdeps/x86/Makefile +++ b/sysdeps/x86/Makefile @@ -126,8 +126,10 @@ tests += tst-cet-legacy-1 tst-cet-legacy-1a tst-cet-legacy-2 \ tst-cet-legacy-2a tst-cet-legacy-3 tst-cet-legacy-4 \ tst-cet-legacy-5a tst-cet-legacy-6a tst-cet-legacy-7 \ tst-cet-legacy-8 tst-cet-legacy-9 tst-cet-legacy-9-static \ - tst-cet-legacy-10 tst-cet-legacy-10-static -tests-static += tst-cet-legacy-9-static tst-cet-legacy-10-static + tst-cet-legacy-10 tst-cet-legacy-10-static \ + tst-cet-legacy-10a tst-cet-legacy-10a-static +tests-static += tst-cet-legacy-9-static tst-cet-legacy-10-static \ + tst-cet-legacy-10a-static tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd) tests += \ @@ -182,6 +184,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"