From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF06AC3DA6D for ; Fri, 23 May 2025 08:34:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 85E786B00AB; Fri, 23 May 2025 04:34:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 836886B00CF; Fri, 23 May 2025 04:34:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7254C6B00D0; Fri, 23 May 2025 04:34:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 4F1766B00AB for ; Fri, 23 May 2025 04:34:56 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B9931E4F39 for ; Fri, 23 May 2025 08:34:55 +0000 (UTC) X-FDA: 83473512150.27.BA8FF7E Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by imf03.hostedemail.com (Postfix) with ESMTP id A8F3A20007 for ; Fri, 23 May 2025 08:34:53 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=h4GwyVJl; spf=pass (imf03.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.216.53 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747989293; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=QFH4rCHezP5WjYwMNylmiPm71hfdGl5rPcdDjEwQneE=; b=ObO8T1bSdmBU8kNABmaFQj4m0bXH5BmpIEKTTUvE24MmLZ5lH92WxJoNjOjRVHTjViP5C8 2Y1XpuN/VtoPI1oT+Pru2pDl7BMEsBV7kcOcL3ySuH98h/68qMmMUWZ184h9WgvMfJ0oIV maVflynxDUwcyfy3Z6ukHWtEjky2g5Y= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=h4GwyVJl; spf=pass (imf03.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.216.53 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747989293; a=rsa-sha256; cv=none; b=LDWE4iVJNaGaxuTZYr3EpFypQz1z/LPrkaIZH9gI4IDOwjrJrNk80susJEeLJSi+Xvc0ug rjlBUlpgA8hDBDKruPIKOYkN3n/hUP/Lit3ZhwAWWh5WIbujjT4433CDLh7hE3cJTxCCyQ Ah9BmKBsiqLthrz5hd/9mktw9tdGbpE= Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-310e1f4627aso1137352a91.2 for ; Fri, 23 May 2025 01:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1747989292; x=1748594092; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=QFH4rCHezP5WjYwMNylmiPm71hfdGl5rPcdDjEwQneE=; b=h4GwyVJl0KCgzqbeiFEbTcG1af+PGRAX8x5Y/zXB68mI7Z2inEsHWhPBk1zciYYDIu eCUZZO8VbRSGQ7WfKoAH3NYDhjAU6prfykx/WIe9o1VDjsGFg1+XDMpySm/rEk0WKzH5 WT+3paA7US8CN9lfHBbVt3Jtzrgy3rOLv6CKg1YUsNLfONcymrj44FGnX6MMSyj9++V2 HAmc2ZE3+6eVICsPk+kPVXNbWY3ZPH/UUpSktJUU2pe0oBg3Ey4qb3/vpHZD1qvFwgOl R47JpdEM+8Kc0p8wL1ou2B4XkgK1ccSZnQEEykn2IZ3PU05Y+jadNAyNzJm4cD+mK5MU mGDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747989292; x=1748594092; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=QFH4rCHezP5WjYwMNylmiPm71hfdGl5rPcdDjEwQneE=; b=DgS8bfhLdGNxun/PzAJk0DjT2e0mKKi7D4IFJeXNYXa4MSNbrzEy7bGq94UB93zJ5f k54xUGjMYISdC6KzOT5OZOsNVAz6qeXzl4Net/opiV90gaUugEZeyc5lGAKNYVQ9CfU3 UqjsBU6poKO65KmgLPIVpuzO6BjIXcGoeU+OMxuAg8CVMebMoCm57l1vMzCrnviPNVpj ouPD6xiS5SF8Pb9l131ohvM5PJsK0vv+MqwxwkZJfdAbvgJwwM6Qp/JVZacNUWHzE7Wc oz0j9uUeu0rTUK3QLaVz9qj/ahBP6EecjBtyxkQrsQv6vlxPu4ulcJC6Nb+1imSA1yt6 o4eQ== X-Forwarded-Encrypted: i=1; AJvYcCUkt30ATgKJYwXb2FsK1iO92HMOCYJznFCMUj2H2R/6un+KiRWTqRJs7wajCxhfNYLOtEzEwXvOzg==@kvack.org X-Gm-Message-State: AOJu0YxkbKC9a4tgTHSaU/BRppk3QTwl9mixIVj6wYpsaBbFUXRgD3DV 0dJH6rZPhAow3G78q8Z3hFLCSPg9ViQe4Y9gW3QTSJqI6rJWomrXOyc/rNAMjDmI2w4= X-Gm-Gg: ASbGnctfCkVirG51+IkE1oSC5MQa01QezmQ2rw1vuw5kPQ0mHHxEMbu8RZMhmyrM43m PDla8+v3M9Q+bVET50fwqfSUHgyvZIdrB1HNSskz60F7AZjJSc2H0cmhM+sluhLkaaA+mGVwuji XqjRBJINjzhrfzTd2cJgVdVdWthCx22TwkddRPlZIp+HNzys11K1ne/g7pEZKM+sAYqfJWnqbEb wA4oHDfiR2XcEgyQY7QgNzxQGU03ImY9la6s135cMpQcPZhuKw9vpJOSw+U0qGLMoQ5GcRFT9Jv zRdAHp3DTipKdeI7QH3RU1r7mHG+O2wu0ls/Tpk5E0t74CM= X-Google-Smtp-Source: AGHT+IE8u+OPyjcWjqvEDj8SAFbqWd/XiBXDBL5jYF6HDxzl2cQBuKfiwmEqfdjMVQet8oJWUPeOwg== X-Received: by 2002:a17:90a:e2d0:b0:310:cea4:e3b9 with SMTP id 98e67ed59e1d1-310cea4e3ecmr4522544a91.34.1747989292241; Fri, 23 May 2025 01:34:52 -0700 (PDT) Received: from ghost ([2601:647:6700:64d0:56f1:bd85:b85f:460d]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-310cec3f320sm2311855a91.9.2025.05.23.01.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 May 2025 01:34:51 -0700 (PDT) Date: Fri, 23 May 2025 01:34:47 -0700 From: Charlie Jenkins To: Deepak Gupta Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?iso-8859-1?Q?Bj=F6rn?= Roy Baron , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, rust-for-linux@vger.kernel.org Subject: Re: [PATCH v16 27/27] kselftest/riscv: kselftest for user mode cfi Message-ID: References: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@rivosinc.com> <20250522-v5_user_cfi_series-v16-27-64f61a35eee7@rivosinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: A8F3A20007 X-Stat-Signature: dmt3w7qpyaxqf44tbthhwk69rw83yey4 X-Rspam-User: X-Rspamd-Server: rspam07 X-HE-Tag: 1747989293-584558 X-HE-Meta: U2FsdGVkX1+bjLaitWzk64iUlueBNEFnMP2stof+K1M/RQM6CDXwdhON+6o5tfP68Ktgx5q0nCHCK/P4bUyHfJx/FuyXnpFn2ePSLVjjcyf7pnFfXQco241BrtPd4q4wJHhvamVH1qPjZFg61n/u09nFCJ6vOrXUuUworq6Vp9xJ0DusXGSzs7P82rZ2nVCLX46/kcfUHugJSSO7TbqRyrpZVcfpF73wjOUUT/3mhinh8naWTyx/+eghZ5wJ73pntHLzv06YMf0sRjuOWdNssD5Ql79DnyKbiV1ByJWe9AJ/uCniqoekRS05HaNStNbatStotdiQWtWT3Nrrq+Euo2SVETitT8/P8eJsZApPIgIXMFekelK+KdhpggD2au51tKaM9qG4NonCSfvlWKtuxt67gy1CrW2pG7ypNcYrno2d3QB7Dt8LxlATuRBAy0DklpxJqLTHP/SMez6IbaP9TqGdUXNLOVjuBzbLzFhQFgnABEeR7EF+tLXFG+STTrt+Wbg56rBW3EKFPeNaTYERSfdh3sp1thqx6BRIvmuaBPnUyEdQmmj7BB4L/bltJnIdGmV5bj2FoJlWA6Tvy8DzO5+qKtXJ2coCB+GHp8ABcF92Piaau4r7c7fgIqDxYFP6Y4Jaf2sry7KISs2VR99hRtGGA3QG5a5l6PPVfcieinYJOJGMIeS88hTJ4YKAc9x5MlHW5p+Sc647+MM2xfrMiSIBRcEvnvxucbm5cupy5VTxCA8yYJ7C6PwdPXl/f8RO2tRCJ5363Sbd0WIBvXh/uaC3YZh1eaG4qzwDZpMz/pcWX3SO2g4cq8tipHSz78qqRV0oAYtavcqXoixGTsm1sp+SO7WmOfNDB/m1hxS20G+jMZV/rZmcc25DvBaBE7kBT2NwMY4AUQl5uh8lGtUE4mJzPYkIGtU+qRFsiSCEDe+EJ+NRiHatTkSymCOMkpgoapfzsEzl4uymadX2mLm UeUqUB2p 1nNWAyxSmkGgWOHGVGddWU+q9c7cVXRuGOdIPM7fF/p1Ao4p5Qcv8bv77npkVbXMpI5Rz7PvyRJ5STGKfA3/LWJmc8crsINz7y/6c3byG979HxQrgib9CBTC3IDwNSGyS4CTf4x60g0kCXV3jm5II4t0jwnF4cjfBZ0xtV9AmspmAzZF56g0eostI5y/Unf/pwfyi2uPuaJnM3M8igab79G83E1UMa5lEbLc5Bw9GnCkkryRbp5T+asU4odlVRynjnyqsbaD7m/vnR0MDD9ZELokNOkq1sHO6ffmKcWJU7Q0Ebzt8fuXEg7sGjhEJ0dYuFd0qf2Rd734XvPCE3NwqWlaTJE7eRZdrR8GHiwWN0QEfAAmZ62Vq4FbdEcI2hcqsL8zc87idx1HVMPpPwnpwtujKZlXd9S8xNgAtSoKVgsYznkQmDvXyt1pNPr1Iv/u5z6CgYbvd2GipoeijRVrbls1QNDkPak7DVTJ0Z3c6dBuqdZSA8AYm/J9GKA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Fri, May 23, 2025 at 01:22:01AM -0700, Charlie Jenkins wrote: > On Thu, May 22, 2025 at 10:31:30PM -0700, Deepak Gupta wrote: > > Adds kselftest for RISC-V control flow integrity implementation for user > > mode. There is not a lot going on in kernel for enabling landing pad for > > user mode. cfi selftest are intended to be compiled with zicfilp and > > zicfiss enabled compiler. Thus kselftest simply checks if landing pad / > > shadow stack for the process are enabled or not and executes ptrace > > selftests on cfi. selftest then register a signal handler for SIGSEGV. > > Any control flow violation are reported as SIGSEGV with si_code = > > SEGV_CPERR. Test will fail on receiving any SEGV_CPERR. Shadow stack part > > has more changes in kernel and thus there are separate tests for that > > > > - Exercise `map_shadow_stack` syscall > > - `fork` test to make sure COW works for shadow stack pages > > - gup tests > > Kernel uses FOLL_FORCE when access happens to memory via > > /proc//mem. Not breaking that for shadow stack. > > - signal test. Make sure signal delivery results in token creation on > > shadow stack and consumes (and verifies) token on sigreturn > > - shadow stack protection test. attempts to write using regular store > > instruction on shadow stack memory must result in access faults > > - ptrace test: adds landing pad violation, clears ELP and continues > > > > In case toolchain doesn't support cfi extension, cfi kselftest wont > > get built. > > > > Test outut > > ========== > > > > """ > > TAP version 13 > > 1..5 > > This is to ensure shadow stack is indeed enabled and working > > This is to ensure shadow stack is indeed enabled and working > > ok 1 shstk fork test > > ok 2 map shadow stack syscall > > ok 3 shadow stack gup tests > > ok 4 shadow stack signal tests > > ok 5 memory protections of shadow stack memory > > """ > > > > Signed-off-by: Deepak Gupta > > Suggested-by: Charlie Jenkins > > --- > > tools/testing/selftests/riscv/Makefile | 2 +- > > tools/testing/selftests/riscv/cfi/.gitignore | 3 + > > tools/testing/selftests/riscv/cfi/Makefile | 16 + > > tools/testing/selftests/riscv/cfi/cfi_rv_test.h | 82 +++++ > > tools/testing/selftests/riscv/cfi/riscv_cfi_test.c | 173 +++++++++ > > tools/testing/selftests/riscv/cfi/shadowstack.c | 385 +++++++++++++++++++++ > > tools/testing/selftests/riscv/cfi/shadowstack.h | 27 ++ > > 7 files changed, 687 insertions(+), 1 deletion(-) > > > > diff --git a/tools/testing/selftests/riscv/Makefile b/tools/testing/selftests/riscv/Makefile > > index 099b8c1f46f8..5671b4405a12 100644 > > --- a/tools/testing/selftests/riscv/Makefile > > +++ b/tools/testing/selftests/riscv/Makefile > > @@ -5,7 +5,7 @@ > > ARCH ?= $(shell uname -m 2>/dev/null || echo not) > > > > ifneq (,$(filter $(ARCH),riscv)) > > -RISCV_SUBTARGETS ?= abi hwprobe mm sigreturn vector > > +RISCV_SUBTARGETS ?= abi hwprobe mm sigreturn vector cfi > > else > > RISCV_SUBTARGETS := > > endif > > diff --git a/tools/testing/selftests/riscv/cfi/.gitignore b/tools/testing/selftests/riscv/cfi/.gitignore > > new file mode 100644 > > index 000000000000..82545863bac6 > > --- /dev/null > > +++ b/tools/testing/selftests/riscv/cfi/.gitignore > > @@ -0,0 +1,3 @@ > > +cfitests > > +riscv_cfi_test > > +shadowstack > > diff --git a/tools/testing/selftests/riscv/cfi/Makefile b/tools/testing/selftests/riscv/cfi/Makefile > > new file mode 100644 > > index 000000000000..55165a93845f > > --- /dev/null > > +++ b/tools/testing/selftests/riscv/cfi/Makefile > > @@ -0,0 +1,16 @@ > > +CFLAGS += -I$(top_srcdir)/tools/include > > + > > +CFLAGS += -march=rv64gc_zicfilp_zicfiss -fcf-protection=full > > + > > +ifeq ($(shell $(CC) $(CFLAGS) -nostdlib -xc /dev/null -o /dev/null > /dev/null 2>&1; echo $$?),0) > > +TEST_GEN_PROGS := cfitests > > + > > +include ../../lib.mk > > I'm sorry, I just realized I messed up this patch :/. This line is > supposed to be above the ifeq line to get the proper definition of > $(CC). Okay that doesn't work either, this does though. >From 8aacab45ca9a2402bd6b65e7f5d9529e0bcc184b Mon Sep 17 00:00:00 2001 From: Charlie Jenkins Date: Fri, 23 May 2025 01:32:52 -0700 Subject: [PATCH] kselftest/riscv: Fix cfi selftests again Signed-off-by: Charlie Jenkins --- tools/testing/selftests/riscv/cfi/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/selftests/riscv/cfi/Makefile b/tools/testing/selftests/riscv/cfi/Makefile index 55165a93845f..41dbb4a263e3 100644 --- a/tools/testing/selftests/riscv/cfi/Makefile +++ b/tools/testing/selftests/riscv/cfi/Makefile @@ -2,6 +2,14 @@ CFLAGS += -I$(top_srcdir)/tools/include CFLAGS += -march=rv64gc_zicfilp_zicfiss -fcf-protection=full +ifeq ($(LLVM),) +ifeq ($(CC),cc) +CC := $(CROSS_COMPILE)gcc +endif +else +CC := $(LLVM_PREFIX)clang$(LLVM_SUFFIX) --target=riscv64-linux-gnu +endif + ifeq ($(shell $(CC) $(CFLAGS) -nostdlib -xc /dev/null -o /dev/null > /dev/null 2>&1; echo $$?),0) TEST_GEN_PROGS := cfitests -- 2.43.0 > > > + > > +$(OUTPUT)/cfitests: riscv_cfi_test.c shadowstack.c > > + $(CC) -o$@ $(CFLAGS) $(LDFLAGS) $^ > > +else > > +include ../../lib.mk > > This include can be removed as well. > > - Charlie > > > + > > +$(shell echo "Toolchain doesn't support CFI, skipping CFI kselftest." >&2) > > +endif > > diff --git a/tools/testing/selftests/riscv/cfi/cfi_rv_test.h b/tools/testing/selftests/riscv/cfi/cfi_rv_test.h > > new file mode 100644 > > index 000000000000..1c8043f2b778 > > --- /dev/null > > +++ b/tools/testing/selftests/riscv/cfi/cfi_rv_test.h > > @@ -0,0 +1,82 @@ > > +/* SPDX-License-Identifier: GPL-2.0-only */ > > + > > +#ifndef SELFTEST_RISCV_CFI_H > > +#define SELFTEST_RISCV_CFI_H > > +#include > > +#include > > +#include "shadowstack.h" > > + > > +#define CHILD_EXIT_CODE_SSWRITE 10 > > +#define CHILD_EXIT_CODE_SIG_TEST 11 > > + > > +#define my_syscall5(num, arg1, arg2, arg3, arg4, arg5) \ > > +({ \ > > + register long _num __asm__ ("a7") = (num); \ > > + register long _arg1 __asm__ ("a0") = (long)(arg1); \ > > + register long _arg2 __asm__ ("a1") = (long)(arg2); \ > > + register long _arg3 __asm__ ("a2") = (long)(arg3); \ > > + register long _arg4 __asm__ ("a3") = (long)(arg4); \ > > + register long _arg5 __asm__ ("a4") = (long)(arg5); \ > > + \ > > + __asm__ volatile( \ > > + "ecall\n" \ > > + : "+r" \ > > + (_arg1) \ > > + : "r"(_arg2), "r"(_arg3), "r"(_arg4), "r"(_arg5), \ > > + "r"(_num) \ > > + : "memory", "cc" \ > > + ); \ > > + _arg1; \ > > +}) > > + > > +#define my_syscall3(num, arg1, arg2, arg3) \ > > +({ \ > > + register long _num __asm__ ("a7") = (num); \ > > + register long _arg1 __asm__ ("a0") = (long)(arg1); \ > > + register long _arg2 __asm__ ("a1") = (long)(arg2); \ > > + register long _arg3 __asm__ ("a2") = (long)(arg3); \ > > + \ > > + __asm__ volatile( \ > > + "ecall\n" \ > > + : "+r" (_arg1) \ > > + : "r"(_arg2), "r"(_arg3), \ > > + "r"(_num) \ > > + : "memory", "cc" \ > > + ); \ > > + _arg1; \ > > +}) > > + > > +#ifndef __NR_prctl > > +#define __NR_prctl 167 > > +#endif > > + > > +#ifndef __NR_map_shadow_stack > > +#define __NR_map_shadow_stack 453 > > +#endif > > + > > +#define CSR_SSP 0x011 > > + > > +#ifdef __ASSEMBLY__ > > +#define __ASM_STR(x) x > > +#else > > +#define __ASM_STR(x) #x > > +#endif > > + > > +#define csr_read(csr) \ > > +({ \ > > + register unsigned long __v; \ > > + __asm__ __volatile__ ("csrr %0, " __ASM_STR(csr) \ > > + : "=r" (__v) : \ > > + : "memory"); \ > > + __v; \ > > +}) > > + > > +#define csr_write(csr, val) \ > > +({ \ > > + unsigned long __v = (unsigned long)(val); \ > > + __asm__ __volatile__ ("csrw " __ASM_STR(csr) ", %0" \ > > + : : "rK" (__v) \ > > + : "memory"); \ > > +}) > > + > > +#endif > > diff --git a/tools/testing/selftests/riscv/cfi/riscv_cfi_test.c b/tools/testing/selftests/riscv/cfi/riscv_cfi_test.c > > new file mode 100644 > > index 000000000000..486a2e779053 > > --- /dev/null > > +++ b/tools/testing/selftests/riscv/cfi/riscv_cfi_test.c > > @@ -0,0 +1,173 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > + > > +#include "../../kselftest.h" > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#include "cfi_rv_test.h" > > + > > +/* do not optimize cfi related test functions */ > > +#pragma GCC push_options > > +#pragma GCC optimize("O0") > > + > > +void sigsegv_handler(int signum, siginfo_t *si, void *uc) > > +{ > > + struct ucontext *ctx = (struct ucontext *)uc; > > + > > + if (si->si_code == SEGV_CPERR) { > > + ksft_print_msg("Control flow violation happened somewhere\n"); > > + ksft_print_msg("PC where violation happened %lx\n", ctx->uc_mcontext.gregs[0]); > > + exit(-1); > > + } > > + > > + /* all other cases are expected to be of shadow stack write case */ > > + exit(CHILD_EXIT_CODE_SSWRITE); > > +} > > + > > +bool register_signal_handler(void) > > +{ > > + struct sigaction sa = {}; > > + > > + sa.sa_sigaction = sigsegv_handler; > > + sa.sa_flags = SA_SIGINFO; > > + if (sigaction(SIGSEGV, &sa, NULL)) { > > + ksft_print_msg("Registering signal handler for landing pad violation failed\n"); > > + return false; > > + } > > + > > + return true; > > +} > > + > > +long ptrace(int request, pid_t pid, void *addr, void *data); > > + > > +bool cfi_ptrace_test(void) > > +{ > > + pid_t pid; > > + int status, ret = 0; > > + unsigned long ptrace_test_num = 0, total_ptrace_tests = 2; > > + > > + struct user_cfi_state cfi_reg; > > + struct iovec iov; > > + > > + pid = fork(); > > + > > + if (pid == -1) { > > + ksft_exit_fail_msg("%s: fork failed\n", __func__); > > + exit(1); > > + } > > + > > + if (pid == 0) { > > + /* allow to be traced */ > > + ptrace(PTRACE_TRACEME, 0, NULL, NULL); > > + raise(SIGSTOP); > > + asm volatile ( > > + "la a5, 1f\n" > > + "jalr a5 \n" > > + "nop \n" > > + "nop \n" > > + "1: nop\n" > > + : : : "a5"); > > + exit(11); > > + /* child shouldn't go beyond here */ > > + } > > + > > + /* parent's code goes here */ > > + iov.iov_base = &cfi_reg; > > + iov.iov_len = sizeof(cfi_reg); > > + > > + while (ptrace_test_num < total_ptrace_tests) { > > + memset(&cfi_reg, 0, sizeof(cfi_reg)); > > + waitpid(pid, &status, 0); > > + if (WIFSTOPPED(status)) { > > + errno = 0; > > + ret = ptrace(PTRACE_GETREGSET, pid, (void *)NT_RISCV_USER_CFI, &iov); > > + if (ret == -1 && errno) > > + ksft_exit_fail_msg("%s: PTRACE_GETREGSET failed\n", __func__); > > + } else > > + ksft_exit_fail_msg("%s: child didn't stop, failed\n", __func__); > > + > > + switch (ptrace_test_num) { > > +#define CFI_ENABLE_MASK (PTRACE_CFI_LP_EN_STATE | \ > > + PTRACE_CFI_SS_EN_STATE | \ > > + PTRACE_CFI_SS_PTR_STATE) > > + case 0: > > + if ((cfi_reg.cfi_status.cfi_state & CFI_ENABLE_MASK) != CFI_ENABLE_MASK) > > + ksft_exit_fail_msg("%s: ptrace_getregset failed, %llu\n", __func__, > > + cfi_reg.cfi_status.cfi_state); > > + if (!cfi_reg.shstk_ptr) > > + ksft_exit_fail_msg("%s: NULL shadow stack pointer, test failed\n", > > + __func__); > > + break; > > + case 1: > > + if (!(cfi_reg.cfi_status.cfi_state & PTRACE_CFI_ELP_STATE)) > > + ksft_exit_fail_msg("%s: elp must have been set\n", __func__); > > + /* clear elp state. not interested in anything else */ > > + cfi_reg.cfi_status.cfi_state = 0; > > + > > + ret = ptrace(PTRACE_SETREGSET, pid, (void *)NT_RISCV_USER_CFI, &iov); > > + if (ret == -1 && errno) > > + ksft_exit_fail_msg("%s: PTRACE_GETREGSET failed\n", __func__); > > + break; > > + default: > > + ksft_exit_fail_msg("%s: unreachable switch case\n", __func__); > > + break; > > + } > > + ptrace(PTRACE_CONT, pid, NULL, NULL); > > + ptrace_test_num++; > > + } > > + > > + waitpid(pid, &status, 0); > > + if (WEXITSTATUS(status) != 11) > > + ksft_print_msg("%s, bad return code from child\n", __func__); > > + > > + ksft_print_msg("%s, ptrace test succeeded\n", __func__); > > + return true; > > +} > > + > > +int main(int argc, char *argv[]) > > +{ > > + int ret = 0; > > + unsigned long lpad_status = 0, ss_status = 0; > > + > > + ksft_print_header(); > > + > > + ksft_print_msg("Starting risc-v tests\n"); > > + > > + /* > > + * Landing pad test. Not a lot of kernel changes to support landing > > + * pad for user mode except lighting up a bit in senvcfg via a prctl > > + * Enable landing pad through out the execution of test binary > > + */ > > + ret = my_syscall5(__NR_prctl, PR_GET_INDIR_BR_LP_STATUS, &lpad_status, 0, 0, 0); > > + if (ret) > > + ksft_exit_fail_msg("Get landing pad status failed with %d\n", ret); > > + > > + if (!(lpad_status & PR_INDIR_BR_LP_ENABLE)) > > + ksft_exit_fail_msg("Landing pad is not enabled, should be enabled via glibc\n"); > > + > > + ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &ss_status, 0, 0, 0); > > + if (ret) > > + ksft_exit_fail_msg("Get shadow stack failed with %d\n", ret); > > + > > + if (!(ss_status & PR_SHADOW_STACK_ENABLE)) > > + ksft_exit_fail_msg("Shadow stack is not enabled, should be enabled via glibc\n"); > > + > > + if (!register_signal_handler()) > > + ksft_exit_fail_msg("Registering signal handler for SIGSEGV failed\n"); > > + > > + ksft_print_msg("Landing pad and shadow stack are enabled for binary\n"); > > + cfi_ptrace_test(); > > + > > + execute_shadow_stack_tests(); > > + > > + return 0; > > +} > > + > > +#pragma GCC pop_options > > diff --git a/tools/testing/selftests/riscv/cfi/shadowstack.c b/tools/testing/selftests/riscv/cfi/shadowstack.c > > new file mode 100644 > > index 000000000000..53387dbd9cf5 > > --- /dev/null > > +++ b/tools/testing/selftests/riscv/cfi/shadowstack.c > > @@ -0,0 +1,385 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > + > > +#include "../../kselftest.h" > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include "shadowstack.h" > > +#include "cfi_rv_test.h" > > + > > +static struct shadow_stack_tests shstk_tests[] = { > > + { "shstk fork test\n", shadow_stack_fork_test }, > > + { "map shadow stack syscall\n", shadow_stack_map_test }, > > + { "shadow stack gup tests\n", shadow_stack_gup_tests }, > > + { "shadow stack signal tests\n", shadow_stack_signal_test}, > > + { "memory protections of shadow stack memory\n", shadow_stack_protection_test } > > +}; > > + > > +#define RISCV_SHADOW_STACK_TESTS ARRAY_SIZE(shstk_tests) > > + > > +/* do not optimize shadow stack related test functions */ > > +#pragma GCC push_options > > +#pragma GCC optimize("O0") > > + > > +void zar(void) > > +{ > > + unsigned long ssp = 0; > > + > > + ssp = csr_read(CSR_SSP); > > + ksft_print_msg("Spewing out shadow stack ptr: %lx\n" > > + " This is to ensure shadow stack is indeed enabled and working\n", > > + ssp); > > +} > > + > > +void bar(void) > > +{ > > + zar(); > > +} > > + > > +void foo(void) > > +{ > > + bar(); > > +} > > + > > +void zar_child(void) > > +{ > > + unsigned long ssp = 0; > > + > > + ssp = csr_read(CSR_SSP); > > + ksft_print_msg("Spewing out shadow stack ptr: %lx\n" > > + " This is to ensure shadow stack is indeed enabled and working\n", > > + ssp); > > +} > > + > > +void bar_child(void) > > +{ > > + zar_child(); > > +} > > + > > +void foo_child(void) > > +{ > > + bar_child(); > > +} > > + > > +typedef void (call_func_ptr)(void); > > +/* > > + * call couple of functions to test push pop. > > + */ > > +int shadow_stack_call_tests(call_func_ptr fn_ptr, bool parent) > > +{ > > + ksft_print_msg("dummy calls for sspush and sspopchk in context of %s\n", > > + parent ? "parent" : "child"); > > + > > + (fn_ptr)(); > > + > > + return 0; > > +} > > + > > +/* forks a thread, and ensure shadow stacks fork out */ > > +bool shadow_stack_fork_test(unsigned long test_num, void *ctx) > > +{ > > + int pid = 0, child_status = 0, parent_pid = 0, ret = 0; > > + unsigned long ss_status = 0; > > + > > + ksft_print_msg("Exercising shadow stack fork test\n"); > > + > > + ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &ss_status, 0, 0, 0); > > + if (ret) { > > + ksft_exit_skip("Shadow stack get status prctl failed with errorcode %d\n", ret); > > + return false; > > + } > > + > > + if (!(ss_status & PR_SHADOW_STACK_ENABLE)) > > + ksft_exit_skip("Shadow stack is not enabled, should be enabled via glibc\n"); > > + > > + parent_pid = getpid(); > > + pid = fork(); > > + > > + if (pid) { > > + ksft_print_msg("Parent pid %d and child pid %d\n", parent_pid, pid); > > + shadow_stack_call_tests(&foo, true); > > + } else { > > + shadow_stack_call_tests(&foo_child, false); > > + } > > + > > + if (pid) { > > + ksft_print_msg("Waiting on child to finish\n"); > > + wait(&child_status); > > + } else { > > + /* exit child gracefully */ > > + exit(0); > > + } > > + > > + if (pid && WIFSIGNALED(child_status)) { > > + ksft_print_msg("Child faulted, fork test failed\n"); > > + return false; > > + } > > + > > + return true; > > +} > > + > > +/* exercise `map_shadow_stack`, pivot to it and call some functions to ensure it works */ > > +#define SHADOW_STACK_ALLOC_SIZE 4096 > > +bool shadow_stack_map_test(unsigned long test_num, void *ctx) > > +{ > > + unsigned long shdw_addr; > > + int ret = 0; > > + > > + ksft_print_msg("Exercising shadow stack map test\n"); > > + > > + shdw_addr = my_syscall3(__NR_map_shadow_stack, NULL, SHADOW_STACK_ALLOC_SIZE, 0); > > + > > + if (((long)shdw_addr) <= 0) { > > + ksft_print_msg("map_shadow_stack failed with error code %d\n", > > + (int)shdw_addr); > > + return false; > > + } > > + > > + ret = munmap((void *)shdw_addr, SHADOW_STACK_ALLOC_SIZE); > > + > > + if (ret) { > > + ksft_print_msg("munmap failed with error code %d\n", ret); > > + return false; > > + } > > + > > + return true; > > +} > > + > > +/* > > + * shadow stack protection tests. map a shadow stack and > > + * validate all memory protections work on it > > + */ > > +bool shadow_stack_protection_test(unsigned long test_num, void *ctx) > > +{ > > + unsigned long shdw_addr; > > + unsigned long *write_addr = NULL; > > + int ret = 0, pid = 0, child_status = 0; > > + > > + ksft_print_msg("Exercising shadow stack protection test (WPT)\n"); > > + > > + shdw_addr = my_syscall3(__NR_map_shadow_stack, NULL, SHADOW_STACK_ALLOC_SIZE, 0); > > + > > + if (((long)shdw_addr) <= 0) { > > + ksft_print_msg("map_shadow_stack failed with error code %d\n", > > + (int)shdw_addr); > > + return false; > > + } > > + > > + write_addr = (unsigned long *)shdw_addr; > > + pid = fork(); > > + > > + /* no child was created, return false */ > > + if (pid == -1) > > + return false; > > + > > + /* > > + * try to perform a store from child on shadow stack memory > > + * it should result in SIGSEGV > > + */ > > + if (!pid) { > > + /* below write must lead to SIGSEGV */ > > + *write_addr = 0xdeadbeef; > > + } else { > > + wait(&child_status); > > + } > > + > > + /* test fail, if 0xdeadbeef present on shadow stack address */ > > + if (*write_addr == 0xdeadbeef) { > > + ksft_print_msg("Shadow stack WPT failed\n"); > > + return false; > > + } > > + > > + /* if child reached here, then fail */ > > + if (!pid) { > > + ksft_print_msg("Shadow stack WPT failed: child reached unreachable state\n"); > > + return false; > > + } > > + > > + /* if child exited via signal handler but not for write on ss */ > > + if (WIFEXITED(child_status) && > > + WEXITSTATUS(child_status) != CHILD_EXIT_CODE_SSWRITE) { > > + ksft_print_msg("Shadow stack WPT failed: child wasn't signaled for write\n"); > > + return false; > > + } > > + > > + ret = munmap(write_addr, SHADOW_STACK_ALLOC_SIZE); > > + if (ret) { > > + ksft_print_msg("Shadow stack WPT failed: munmap failed, error code %d\n", > > + ret); > > + return false; > > + } > > + > > + return true; > > +} > > + > > +#define SS_MAGIC_WRITE_VAL 0xbeefdead > > + > > +int gup_tests(int mem_fd, unsigned long *shdw_addr) > > +{ > > + unsigned long val = 0; > > + > > + lseek(mem_fd, (unsigned long)shdw_addr, SEEK_SET); > > + if (read(mem_fd, &val, sizeof(val)) < 0) { > > + ksft_print_msg("Reading shadow stack mem via gup failed\n"); > > + return 1; > > + } > > + > > + val = SS_MAGIC_WRITE_VAL; > > + lseek(mem_fd, (unsigned long)shdw_addr, SEEK_SET); > > + if (write(mem_fd, &val, sizeof(val)) < 0) { > > + ksft_print_msg("Writing shadow stack mem via gup failed\n"); > > + return 1; > > + } > > + > > + if (*shdw_addr != SS_MAGIC_WRITE_VAL) { > > + ksft_print_msg("GUP write to shadow stack memory failed\n"); > > + return 1; > > + } > > + > > + return 0; > > +} > > + > > +bool shadow_stack_gup_tests(unsigned long test_num, void *ctx) > > +{ > > + unsigned long shdw_addr = 0; > > + unsigned long *write_addr = NULL; > > + int fd = 0; > > + bool ret = false; > > + > > + ksft_print_msg("Exercising shadow stack gup tests\n"); > > + shdw_addr = my_syscall3(__NR_map_shadow_stack, NULL, SHADOW_STACK_ALLOC_SIZE, 0); > > + > > + if (((long)shdw_addr) <= 0) { > > + ksft_print_msg("map_shadow_stack failed with error code %d\n", (int)shdw_addr); > > + return false; > > + } > > + > > + write_addr = (unsigned long *)shdw_addr; > > + > > + fd = open("/proc/self/mem", O_RDWR); > > + if (fd == -1) > > + return false; > > + > > + if (gup_tests(fd, write_addr)) { > > + ksft_print_msg("gup tests failed\n"); > > + goto out; > > + } > > + > > + ret = true; > > +out: > > + if (shdw_addr && munmap(write_addr, SHADOW_STACK_ALLOC_SIZE)) { > > + ksft_print_msg("munmap failed with error code %d\n", ret); > > + ret = false; > > + } > > + > > + return ret; > > +} > > + > > +volatile bool break_loop; > > + > > +void sigusr1_handler(int signo) > > +{ > > + break_loop = true; > > +} > > + > > +bool sigusr1_signal_test(void) > > +{ > > + struct sigaction sa = {}; > > + > > + sa.sa_handler = sigusr1_handler; > > + sa.sa_flags = 0; > > + sigemptyset(&sa.sa_mask); > > + if (sigaction(SIGUSR1, &sa, NULL)) { > > + ksft_print_msg("Registering signal handler for SIGUSR1 failed\n"); > > + return false; > > + } > > + > > + return true; > > +} > > + > > +/* > > + * shadow stack signal test. shadow stack must be enabled. > > + * register a signal, fork another thread which is waiting > > + * on signal. Send a signal from parent to child, verify > > + * that signal was received by child. If not test fails > > + */ > > +bool shadow_stack_signal_test(unsigned long test_num, void *ctx) > > +{ > > + int pid = 0, child_status = 0, ret = 0; > > + unsigned long ss_status = 0; > > + > > + ksft_print_msg("Exercising shadow stack signal test\n"); > > + > > + ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &ss_status, 0, 0, 0); > > + if (ret) { > > + ksft_print_msg("Shadow stack get status prctl failed with errorcode %d\n", ret); > > + return false; > > + } > > + > > + if (!(ss_status & PR_SHADOW_STACK_ENABLE)) > > + ksft_print_msg("Shadow stack is not enabled, should be enabled via glibc\n"); > > + > > + /* this should be caught by signal handler and do an exit */ > > + if (!sigusr1_signal_test()) { > > + ksft_print_msg("Registering sigusr1 handler failed\n"); > > + exit(-1); > > + } > > + > > + pid = fork(); > > + > > + if (pid == -1) { > > + ksft_print_msg("Signal test: fork failed\n"); > > + goto out; > > + } > > + > > + if (pid == 0) { > > + while (!break_loop) > > + sleep(1); > > + > > + exit(11); > > + /* child shouldn't go beyond here */ > > + } > > + > > + /* send SIGUSR1 to child */ > > + kill(pid, SIGUSR1); > > + wait(&child_status); > > + > > +out: > > + > > + return (WIFEXITED(child_status) && > > + WEXITSTATUS(child_status) == 11); > > +} > > + > > +int execute_shadow_stack_tests(void) > > +{ > > + int ret = 0; > > + unsigned long test_count = 0; > > + unsigned long shstk_status = 0; > > + bool test_pass = false; > > + > > + ksft_print_msg("Executing RISC-V shadow stack self tests\n"); > > + ksft_set_plan(RISCV_SHADOW_STACK_TESTS); > > + > > + ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &shstk_status, 0, 0, 0); > > + > > + if (ret != 0) > > + ksft_exit_fail_msg("Get shadow stack status failed with %d\n", ret); > > + > > + /* > > + * If we are here that means get shadow stack status succeeded and > > + * thus shadow stack support is baked in the kernel. > > + */ > > + while (test_count < RISCV_SHADOW_STACK_TESTS) { > > + test_pass = (*shstk_tests[test_count].t_func)(test_count, NULL); > > + ksft_test_result(test_pass, shstk_tests[test_count].name); > > + test_count++; > > + } > > + > > + ksft_finished(); > > + > > + return 0; > > +} > > + > > +#pragma GCC pop_options > > diff --git a/tools/testing/selftests/riscv/cfi/shadowstack.h b/tools/testing/selftests/riscv/cfi/shadowstack.h > > new file mode 100644 > > index 000000000000..0be510167de3 > > --- /dev/null > > +++ b/tools/testing/selftests/riscv/cfi/shadowstack.h > > @@ -0,0 +1,27 @@ > > +/* SPDX-License-Identifier: GPL-2.0-only */ > > + > > +#ifndef SELFTEST_SHADOWSTACK_TEST_H > > +#define SELFTEST_SHADOWSTACK_TEST_H > > +#include > > +#include > > + > > +/* > > + * a cfi test returns true for success or false for fail > > + * takes a number for test number to index into array and void pointer. > > + */ > > +typedef bool (*shstk_test_func)(unsigned long test_num, void *); > > + > > +struct shadow_stack_tests { > > + char *name; > > + shstk_test_func t_func; > > +}; > > + > > +bool shadow_stack_fork_test(unsigned long test_num, void *ctx); > > +bool shadow_stack_map_test(unsigned long test_num, void *ctx); > > +bool shadow_stack_protection_test(unsigned long test_num, void *ctx); > > +bool shadow_stack_gup_tests(unsigned long test_num, void *ctx); > > +bool shadow_stack_signal_test(unsigned long test_num, void *ctx); > > + > > +int execute_shadow_stack_tests(void); > > + > > +#endif > > > > -- > > 2.43.0 > >