From nobody Mon Sep 8 12:36:49 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1756575553; cv=none; d=zohomail.com; s=zohoarc; b=Z5IxKt0iOISPa63bqn4uf8NjxQJ7XtE3QfPVMYmHwZlYyzXjfK6mqmfTSAac1MYErhgNUenuFpEimv+/wQiZL9feV8YZo46NJHOX4zIHH7GE8H+Stu/JDmEbTb+cupRcLw8gn9Ytpt+z1MNOgnFf39srn4PltJodqzkxZP+2b5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756575553; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7QFj8gESh/eq5jJW2e2RUPuhA+cwRUSiqjJJ5xCzpQk=; b=Y8aBdQXzMffBxvrIkJ2dN0hrqVkuTiOm9643kSBAk9J7wftQRVUF3bc8VYTlMa+Qae5Q2IdvAMkVmN60lsSSZq/iUsh2qoHF6B5LHFjKBXYmMTC88IHxe1xZ2s86z3D10cxugam/Ub1nQKKJ4hUv0gimPlQGwpT5HKoR9KqRymA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1756575553491136.42850499655674; Sat, 30 Aug 2025 10:39:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usO0E-0001nV-N3; Sat, 30 Aug 2025 12:00:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1usEUu-0008V4-GK for qemu-devel@nongnu.org; Sat, 30 Aug 2025 01:51:36 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1usEUs-0005ji-MS for qemu-devel@nongnu.org; Sat, 30 Aug 2025 01:51:32 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-7722d6cc437so1233412b3a.0 for ; Fri, 29 Aug 2025 22:51:30 -0700 (PDT) Received: from stoup.. (122-150-204-64.dyn.ip.vocus.au. [122.150.204.64]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7722a2b7d10sm4198475b3a.33.2025.08.29.22.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Aug 2025 22:51:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756533089; x=1757137889; darn=nongnu.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=7QFj8gESh/eq5jJW2e2RUPuhA+cwRUSiqjJJ5xCzpQk=; b=ZUCoTuqIeljiAcUU1ToYcW6EWJ90MmbbRjzyLGeXZNBIv5U3jbeyvuuLyCZyaORU2J m21ZSKsj4tCvX/FGWNaq4iEqkOGUkQYQUnkk4L+iGsGPfuMhTL9hOfuAT7JQ7SGzrUoV dDku4eSfejDnK88n07z7krxrucfwywPaYNye72sg7qmRsdbRAztkw+PxSwWjRFqmVMwv +cmKkoV51lPpcI9zETqOLxqa7G3qTNwLQm7xN/tZCkG+J77561+ZykBWhSO5FKXJV8jN OsTEmZTOpAlYAQ7pn/Lrp7MgB6gTyVXya+3uuKoqI7lQGoXdA1eBITfS6sCnUOwFrv1f tJ9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756533089; x=1757137889; 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=7QFj8gESh/eq5jJW2e2RUPuhA+cwRUSiqjJJ5xCzpQk=; b=V9qxUt2Mt1zcrFYdSZ6OZH9tNjWRQMWwoz4Danoy1eUqNfo1Qz7HKHrzXTzZPVHeu1 0wrkaL3PA+Y+LD036EeX9McD4C6TLKXRHyqcD+GGpBLFaOz/ck7YoYDmyJOGjgKAOdXd 7KkQdway00wd7WVr6G+Ag3NRteKpYayidY7VPi6IK2ENp1Tnl7re2dewVmLqjMQYE5go lBWZFNiyLxKpniGjgGx1uGpw3PQPRBfpb6Uj0tdN9MTs7iw4nnSqGw5MTZRG8+25FdpV zKkbHMiPTFoovrH4gDNCs+MjG1NgWqUF/uNO8KL0bzUwpkBzTLmuUogeHmscMZ9HJe0m NWTw== X-Gm-Message-State: AOJu0YyJyxh/a1RqA0yoMpC/ia+fXIX0DjFWNjb2DGJggb1d0+Epdwbo zTIviT4Xj8g/0O1lQXLSGxGPHmnKDw32269hLOhJP1qJD7KBU7v9/gVOqyzl3i47khKyQc8Kpg4 ofJiudJQ= X-Gm-Gg: ASbGncsMKotvhC9RaVG4WeQIWhY1s9iE6U/AQ0dDrbcZ9sWJD+B2/Lj8h5Ant76buBY 8UuK8GAyUDfv2bI7WSCOnrTEKz/ZpCjlK0bTcIkZD+mQuhDBhJVRTBDcazU5CizXbfPotj6wb2H yOouqIC8LybTVJQmT89s3iVufUiwhBcAhsTRHd5zTh47I/mAl38S1vV3H4ZiUx7mn3AFtg25dIL nk6F7TDnkDPzEEPXhgmPTLqXZ/Cco5HDvt3wHJCTpQgBls14Q6mjaJhqjbQg4BhgryL326eeY5h exXio6jLbzISxmgoYtyVDm6DEhn+rUdEpUnMumAo5vaKcB6reS8bFpTB8nQVQBwlg7KJcyGNnP4 beTEnCLyLt/qaXxMagO2hxUE7sZIXBJiSEoNFGvKcbY9rBrV67wbqsKeJJBvr X-Google-Smtp-Source: AGHT+IECXJlHJZg2A2IQP7+e5aKOrlV6gdG0TTZ+YCQ7Q2XE98OVa3qMr6+f3No/8HhMOofCGrVfbQ== X-Received: by 2002:a05:6a00:4191:b0:771:1b70:2d1d with SMTP id d2e1a72fcca58-7723c43862amr2282864b3a.6.1756533089318; Fri, 29 Aug 2025 22:51:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v4 82/84] tests/tcg/aarch64: Add gcsstr Date: Sat, 30 Aug 2025 15:41:26 +1000 Message-ID: <20250830054128.448363-83-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250830054128.448363-1-richard.henderson@linaro.org> References: <20250830054128.448363-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1756575555308124100 Content-Type: text/plain; charset="utf-8" Add some infrastructure for testing gcs in userspace. Validate successful and trapped executions of GCSSTR. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- tests/tcg/aarch64/gcs.h | 71 +++++++++++++++++++++++++++++++ tests/tcg/aarch64/gcsstr.c | 48 +++++++++++++++++++++ tests/tcg/aarch64/Makefile.target | 5 +++ 3 files changed, 124 insertions(+) create mode 100644 tests/tcg/aarch64/gcs.h create mode 100644 tests/tcg/aarch64/gcsstr.c diff --git a/tests/tcg/aarch64/gcs.h b/tests/tcg/aarch64/gcs.h new file mode 100644 index 0000000000..99cb4d4e38 --- /dev/null +++ b/tests/tcg/aarch64/gcs.h @@ -0,0 +1,71 @@ +/* + * Linux kernel fallback API definitions for GCS and test helpers. + * + * Copyright (c) 2025 Linaro Ltd + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef PR_GET_SHADOW_STACK_STATUS +#define PR_GET_SHADOW_STACK_STATUS 74 +#endif +#ifndef PR_SET_SHADOW_STACK_STATUS +#define PR_SET_SHADOW_STACK_STATUS 75 +#endif +#ifndef PR_LOCK_SHADOW_STACK_STATUS +#define PR_LOCK_SHADOW_STACK_STATUS 76 +#endif +#ifndef PR_SHADOW_STACK_ENABLE +# define PR_SHADOW_STACK_ENABLE (1 << 0) +# define PR_SHADOW_STACK_WRITE (1 << 1) +# define PR_SHADOW_STACK_PUSH (1 << 2) +#endif +#ifndef SHADOW_STACK_SET_TOKEN +#define SHADOW_STACK_SET_TOKEN (1 << 0) +#endif +#ifndef SHADOW_STACK_SET_MARKER +#define SHADOW_STACK_SET_MARKER (1 << 1) +#endif +#ifndef SEGV_CPERR +#define SEGV_CPERR 10 +#endif +#ifndef __NR_map_shadow_stack +#define __NR_map_shadow_stack 453 +#endif + +/* + * Macros, and implement the syscall inline, lest we fail + * the checked return from any function call. + */ +#define enable_gcs(flags) \ + do { = \ + register long num __asm__ ("x8") =3D __NR_prctl; = \ + register long arg1 __asm__ ("x0") =3D PR_SET_SHADOW_STACK_STATUS; = \ + register long arg2 __asm__ ("x1") =3D PR_SHADOW_STACK_ENABLE | fla= gs; \ + register long arg3 __asm__ ("x2") =3D 0; = \ + register long arg4 __asm__ ("x3") =3D 0; = \ + register long arg5 __asm__ ("x4") =3D 0; = \ + asm volatile("svc #0" = \ + : "+r"(arg1) = \ + : "r"(arg2), "r"(arg3), "r"(arg4), "r"(arg5), "r"(num= ) \ + : "memory", "cc"); = \ + if (arg1) { = \ + errno =3D -arg1; = \ + perror("PR_SET_SHADOW_STACK_STATUS"); = \ + exit(2); = \ + } = \ + } while (0) + +#define gcspr() \ + ({ uint64_t *r; asm volatile("mrs %0, s3_3_c2_c5_1" : "=3Dr"(r)); r; }) diff --git a/tests/tcg/aarch64/gcsstr.c b/tests/tcg/aarch64/gcsstr.c new file mode 100644 index 0000000000..b045aee925 --- /dev/null +++ b/tests/tcg/aarch64/gcsstr.c @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "gcs.h" + +/* + * A single garbage store to the gcs stack. + * The asm inside must be unique, so disallow inlining. + */ +void __attribute__((noinline)) +test_gcsstr(void) +{ + register uint64_t *ptr __asm__("x0") =3D gcspr(); + /* GCSSTR x1, x0 */ + __asm__("inst_gcsstr: .inst 0xd91f1c01" : : "r"(--ptr)); +} + +static void test_sigsegv(int sig, siginfo_t *info, void *vuc) +{ + ucontext_t *uc =3D vuc; + uint64_t inst_gcsstr; + + __asm__("adr %0, inst_gcsstr" : "=3Dr"(inst_gcsstr)); + assert(uc->uc_mcontext.pc =3D=3D inst_gcsstr); + assert(info->si_code =3D=3D SEGV_CPERR); + /* TODO: Dig for ESR and verify syndrome. */ + exit(0); +} + +int main() +{ + struct sigaction sa =3D { + .sa_sigaction =3D test_sigsegv, + .sa_flags =3D SA_SIGINFO, + }; + + /* Enable GCSSTR and test the store succeeds. */ + enable_gcs(PR_SHADOW_STACK_WRITE); + test_gcsstr(); + + /* Disable GCSSTR and test the resulting sigsegv. */ + enable_gcs(0); + if (sigaction(SIGSEGV, &sa, NULL) < 0) { + perror("sigaction"); + exit(1); + } + test_gcsstr(); + abort(); +} diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile= .target index 16ddcf4f88..0347a36e8d 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -75,6 +75,11 @@ AARCH64_TESTS +=3D $(SME_TESTS) $(SME_TESTS): CFLAGS +=3D $(CROSS_AS_HAS_ARMV9_SME) endif =20 +# GCS Tests +GCS_TESTS +=3D gcsstr +AARCH64_TESTS +=3D $(GCS_TESTS) +$(GCS_TESTS): gcs.h + # System Registers Tests AARCH64_TESTS +=3D sysregs =20 --=20 2.43.0