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 E3FB7C369D1 for ; Thu, 24 Apr 2025 07:20:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 843AE6B0012; Thu, 24 Apr 2025 03:20:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7CB246B0022; Thu, 24 Apr 2025 03:20:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D2826B0023; Thu, 24 Apr 2025 03:20:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 351C56B0012 for ; Thu, 24 Apr 2025 03:20:39 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id DADADBEA00 for ; Thu, 24 Apr 2025 07:20:40 +0000 (UTC) X-FDA: 83368089840.20.E14D3EC Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf05.hostedemail.com (Postfix) with ESMTP id ED7C4100003 for ; Thu, 24 Apr 2025 07:20:38 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=RHWGgM0R; dmarc=none; spf=pass (imf05.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745479239; a=rsa-sha256; cv=none; b=6cdx7kWC3AeutlTqdag65cojpY8ZIKfYOXPgoYigS61ngc8+IXcybRIyplT1E0WV13R8PU 296D0i1FthbpqJeEvFEvhQt+E2BjGD8k6WQwywF1cIVX9mM3XI1VXEVNPWnvOds1j8igR1 yZutBeQCWROjo/3OwhNeZyoc+NraeiE= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=RHWGgM0R; dmarc=none; spf=pass (imf05.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745479239; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=E2iQwykcrMqX35SdzbQmxoYXyPhByf18rj1xks04xkI=; b=T6v4zf7tgkGoY7Z6yMu+RLPW5PFfDcXPHUFnPYvBaui4hkdlSb3s40yoSNMovzlL/fFLcG 7ic02BeEvmARBvp3H8YRW0SZQsAdmsUv15lohh0aUGvbcczdS+oUcSp5GLCiBITLA7OBof /NjkfyrZTSYYVJfvsLKE7Ov2LmIpJo0= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-22435603572so7542335ad.1 for ; Thu, 24 Apr 2025 00:20:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745479238; x=1746084038; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=E2iQwykcrMqX35SdzbQmxoYXyPhByf18rj1xks04xkI=; b=RHWGgM0RIqFpzUef58YqH/+2pwXIVkdvwn+EU9ZZUcLQCBuusIMvhOgVHgE26ta5sj BESXrrM2t+A5Jd1b85FfPYMts/Xl44gOf6MsmlxqD/DIMA6D4prc6B+11jSIv6zK2VKB ce7nZW1gEb5a8I4tPhUwfwvCqHLONoK4BGaHX1osEVlUKShZQJenBk5GIRVMUcTTCRQY CnJbJiPpEWMpPbEIrvR1E3B++BgpCRc6R9AR7RZJK0dN8ms885Sd0io7N9msWSidO7+5 zJ2AdVMdmwV29WCK8fdYeHyAnBOZP9Fb5h/2eekVX4JXSaBt6HK0sqdTejY3UxPAq4yk CA7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745479238; x=1746084038; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E2iQwykcrMqX35SdzbQmxoYXyPhByf18rj1xks04xkI=; b=Y5r2Z3pgAgzbKSvaRfL+4ikvdAL2xQ6FTFiRbQZi1U1IYfO7A5MgmbP8ZFAEa41vOa S14hyWzCM2pWypVj//9fDxV+LOFinLI80grkdov2LWiqKDV17k4GPMkXZxoptL8AD5SD 30UoAoGB5u6k0uogdDjDqW7J+G2sb4yo/EkWGzxl73IKr7cEQzBpgxK4UdbJ2ymSSrLL hlhHXLguSunoJ6rlplXWQ4ZWQrnkBQ21Ue3U53EXfCkLxuWj6494xwOKc87fJSKyP7S8 2wcrPEYOj3I/Cqg9HU8x7P3b/kcYhKPogsQXCpGf6S8UnorEu/GSy1oR6YEVcmGKJbdH Db7g== X-Forwarded-Encrypted: i=1; AJvYcCVEujHlVdRcenrkwjr85rQlS9KRyBruYFFqCd5xIYCjluKXDFle7LI1NFDKVYJq9XMsyIlQO8ahmQ==@kvack.org X-Gm-Message-State: AOJu0YwMrX8kO+b9BqaQfPb5o2CuyF5QXq1l2PpQaSQXSj3LZRdNS3S+ 6+nbUxBEiNJY1ewyiKAqqkOybR/cHYty1ZygwGl5w4wEMWejpACS2Bb/tRwTxQA= X-Gm-Gg: ASbGncvXRNHMDBTE1xeF+DKizTJRE5P0kRfzRSyCHWX+snJhOioM4baZwHt4R5vnZVS V3Bkx/jel/qSLDQwS3fH76cE9ji32TTZKqT3IYqR3lGQUaTB4mYhzO68lNTLqZ+LU1Y78vedmec Yc2iwleXJbOF+KP4wGU2LKt+v7PJJK6wZ8TzsunqBhwSYuX4xP90273OgY3H0YXMUK8BXc5TtDo v/StiVCh6PTlxnVAgQP/CgoVcfntrPFxwTA4LpYQETThnTbLyPiAE5M/WsKYyOMmVy165yla4oD nwuNSCQ/UsTf12D0vnoowtJHN0IscMBEndpwRmr47Z4I+NUlfic= X-Google-Smtp-Source: AGHT+IGTUNfhbadbAV/QV8/Z1nPIpw+IRD35ku3cOXRKsWZQ9FGvK/U4dKyN0R2NYVwk5yjzpaZp3g== X-Received: by 2002:a17:903:41c5:b0:226:5dbf:373f with SMTP id d9443c01a7336-22db3bbbf6amr24730505ad.10.1745479237787; Thu, 24 Apr 2025 00:20:37 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db52163d6sm6240765ad.214.2025.04.24.00.20.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 00:20:37 -0700 (PDT) From: Deepak Gupta Date: Thu, 24 Apr 2025 00:20:20 -0700 Subject: [PATCH v13 05/28] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250424-v5_user_cfi_series-v13-5-971437de586a@rivosinc.com> References: <20250424-v5_user_cfi_series-v13-0-971437de586a@rivosinc.com> In-Reply-To: <20250424-v5_user_cfi_series-v13-0-971437de586a@rivosinc.com> To: 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 , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross Cc: 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, charlie@rivosinc.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, Zong Li , Deepak Gupta X-Mailer: b4 0.13.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: ED7C4100003 X-Stat-Signature: robzroniitrk6z89jedsouhi44xhorbj X-Rspam-User: X-HE-Tag: 1745479238-388614 X-HE-Meta: U2FsdGVkX18O60WJ83Ltc58VFQl7qkasiHr3J0Kn3A6eBYciFnmj1JdaI52Xxgo80hdyiOJWtXgY0fpTiVvRyt0WCihXNyFp6cBS7cDFenwGgHzV6NA6Y5Xe1qyanF/v410mwTL/MOOSJQn3TMyJhnyXrFF1Ioj5iLavbsX/b9F1gTLGZPnNpOUn/DvxmcLqJ4glEpsGS6LJrzmpG8Z2V1DYzKz0+7atnL6sejGx9TCv8yBc8GsOOMGWAmCGVxQnJf7+HP/ChgeA2DOglixYbQCzbANi0szah018lIvDIDl3rTG3HkNN4APsdfzoY2hgKgeRAwHAJ6Z1Nls7nlhdPf33lVHSYmvFj5GpoXgJ0/0YOn/fShta5b763qpezQ6Lrwuh9dvUAqF70jFmb1VEiQeePKcRimND113HX5rZutLEyEsx7br4ciEkdxhiT+kEr2rufXFExeC76+23x3uGTDU1Wfto3HUIcuokKfYWTz93INcoKMyjAEKovMSoGReKUJiJuduVKCSEId401DYsxOL7b4UoMpu2RxJ5tnmJz2xIz5qd3wy0otv9IltkNeUpl1GcXvq9CFC9RHQ+RxXMJjg2lNpEUR8rN6XELi8DShwqrTPT3HMHzJMSGVtorzj1fkMTijaQm/vTOUOiSXR1G8OhpdMJlwvOrna2BFPvvuBWg7NxZkOJiF19vxuJ/myBYFBYFRNKtCHuv7AracVtif5gkJib+WLiIaKX0fKiHyojGaaARVnHC+xIAi0/nY1wBdBBiE5BkR52OEuwztt+f2edNAHt7objNrlx4DP41zpm4Dlb8CVGFu/UitRjS3q/FP+ek9DqNwPTrIEk/W+Dc7EyutAUnWB5VgD53l1b4ZrdgOgQphpZsBKFY9mik4DGHMAaCoW0sTbhG3M8HZiqVyJoiRN5WbXJfDL83Z0SYeGKUXP653ONnuvFICeWmYkGuFMjGdC9uCmv1axVWqO //e/jtIw Fmy+83g5YP61FVXttziSPIXqo6f4VOuXKL8kjqgGytZzrmDXuPemx7ovAJgQ258LEDqdAgtTI2x2pMgh0XDbqsYdjCEWHMrpE+RUSsvY3sB5P3Cg/3bEh0EeqKBLqMIhkVu1UjAIvH7M16lwXMUb+8LqefPL+JsqlZmcb+890wYzdeI8UhdIBoWrWRzecH+r4mnXkhY9YWHPZ1ZU9CSngCnzlXAUWo1dw2LUhP0Tfu6AG2ipTr9cUBfAdZsCQXk+mb1+BMX0xqk12yYvs3WqtEM6X9tysXpMB76MWj5erADQ8biLP8SAVS4rbo9wyYbZojVHpC5gLYdT2en90s8aF2Ejjumq2TCdaPzLF+Qa0E3sPLTtBMoL6660s9Iug1CqL+ZFmDjctyCFgVMyYhpQwRQy9Ly6iGLvyJ2EAf3EwTXIGLn1iw5gHWZQqz1WJulTv1K8JtwSj/WbONdcbZR+74zYxbJmWUye4y+mKGFW/TSRJICFH4DgI8kOzNdD0Q4blmxEMpBjl7Wq/RY1+IoP8xU5/aiecYRfCbF4D0D/6+sCQe+9+KApwGypXPw== 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: Carves out space in arch specific thread struct for cfi status and shadow stack in usermode on riscv. This patch does following - defines a new structure cfi_status with status bit for cfi feature - defines shadow stack pointer, base and size in cfi_status structure - defines offsets to new member fields in thread in asm-offsets.c - Saves and restore shadow stack pointer on trap entry (U --> S) and exit (S --> U) Shadow stack save/restore is gated on feature availiblity and implemented using alternative. CSR can be context switched in `switch_to` as well but soon as kernel shadow stack support gets rolled in, shadow stack pointer will need to be switched at trap entry/exit point (much like `sp`). It can be argued that kernel using shadow stack deployment scenario may not be as prevalant as user mode using this feature. But even if there is some minimal deployment of kernel shadow stack, that means that it needs to be supported. And thus save/restore of shadow stack pointer in entry.S instead of in `switch_to.h`. Reviewed-by: Charlie Jenkins Reviewed-by: Zong Li Reviewed-by: Alexandre Ghiti Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/processor.h | 1 + arch/riscv/include/asm/thread_info.h | 3 +++ arch/riscv/include/asm/usercfi.h | 24 ++++++++++++++++++++++++ arch/riscv/kernel/asm-offsets.c | 4 ++++ arch/riscv/kernel/entry.S | 23 +++++++++++++++++++++++ 5 files changed, 55 insertions(+) diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index e3aba3336e63..d851bb5c6da0 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -14,6 +14,7 @@ #include #include +#include #define arch_get_mmap_end(addr, len, flags) \ ({ \ diff --git a/arch/riscv/include/asm/thread_info.h b/arch/riscv/include/asm/thread_info.h index f5916a70879a..a0cfe00c2ca6 100644 --- a/arch/riscv/include/asm/thread_info.h +++ b/arch/riscv/include/asm/thread_info.h @@ -62,6 +62,9 @@ struct thread_info { long user_sp; /* User stack pointer */ int cpu; unsigned long syscall_work; /* SYSCALL_WORK_ flags */ +#ifdef CONFIG_RISCV_USER_CFI + struct cfi_status user_cfi_state; +#endif #ifdef CONFIG_SHADOW_CALL_STACK void *scs_base; void *scs_sp; diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h new file mode 100644 index 000000000000..5f2027c51917 --- /dev/null +++ b/arch/riscv/include/asm/usercfi.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 + * Copyright (C) 2024 Rivos, Inc. + * Deepak Gupta + */ +#ifndef _ASM_RISCV_USERCFI_H +#define _ASM_RISCV_USERCFI_H + +#ifndef __ASSEMBLY__ +#include + +#ifdef CONFIG_RISCV_USER_CFI +struct cfi_status { + unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ + unsigned long rsvd : ((sizeof(unsigned long) * 8) - 1); + unsigned long user_shdw_stk; /* Current user shadow stack pointer */ + unsigned long shdw_stk_base; /* Base address of shadow stack */ + unsigned long shdw_stk_size; /* size of shadow stack */ +}; + +#endif /* CONFIG_RISCV_USER_CFI */ + +#endif /* __ASSEMBLY__ */ + +#endif /* _ASM_RISCV_USERCFI_H */ diff --git a/arch/riscv/kernel/asm-offsets.c b/arch/riscv/kernel/asm-offsets.c index e89455a6a0e5..0c188aaf3925 100644 --- a/arch/riscv/kernel/asm-offsets.c +++ b/arch/riscv/kernel/asm-offsets.c @@ -50,6 +50,10 @@ void asm_offsets(void) #endif OFFSET(TASK_TI_CPU_NUM, task_struct, thread_info.cpu); +#ifdef CONFIG_RISCV_USER_CFI + OFFSET(TASK_TI_CFI_STATUS, task_struct, thread_info.user_cfi_state); + OFFSET(TASK_TI_USER_SSP, task_struct, thread_info.user_cfi_state.user_shdw_stk); +#endif OFFSET(TASK_THREAD_F0, task_struct, thread.fstate.f[0]); OFFSET(TASK_THREAD_F1, task_struct, thread.fstate.f[1]); OFFSET(TASK_THREAD_F2, task_struct, thread.fstate.f[2]); diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 33a5a9f2a0d4..f5531d82f7e7 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -147,6 +147,20 @@ SYM_CODE_START(handle_exception) REG_L s0, TASK_TI_USER_SP(tp) csrrc s1, CSR_STATUS, t0 + /* + * If previous mode was U, capture shadow stack pointer and save it away + * Zero CSR_SSP at the same time for sanitization. + */ + ALTERNATIVE("nops(4)", + __stringify( \ + andi s2, s1, SR_SPP; \ + bnez s2, skip_ssp_save; \ + csrrw s2, CSR_SSP, x0; \ + REG_S s2, TASK_TI_USER_SSP(tp); \ + skip_ssp_save:), + 0, + RISCV_ISA_EXT_ZICFISS, + CONFIG_RISCV_USER_CFI) csrr s2, CSR_EPC csrr s3, CSR_TVAL csrr s4, CSR_CAUSE @@ -236,6 +250,15 @@ SYM_CODE_START_NOALIGN(ret_from_exception) * structures again. */ csrw CSR_SCRATCH, tp + + ALTERNATIVE("nops(2)", + __stringify( \ + REG_L s3, TASK_TI_USER_SSP(tp); \ + csrw CSR_SSP, s3), + 0, + RISCV_ISA_EXT_ZICFISS, + CONFIG_RISCV_USER_CFI) + 1: #ifdef CONFIG_RISCV_ISA_V_PREEMPTIVE move a0, sp -- 2.43.0