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 B9243C5B555 for ; Wed, 4 Jun 2025 17:16:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 38D658D0033; Wed, 4 Jun 2025 13:16:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 27A288D0007; Wed, 4 Jun 2025 13:16:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0CD598D0033; Wed, 4 Jun 2025 13:16:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D61758D0007 for ; Wed, 4 Jun 2025 13:16:31 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 98513C02BD for ; Wed, 4 Jun 2025 17:16:31 +0000 (UTC) X-FDA: 83518372182.07.9E165AE Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf12.hostedemail.com (Postfix) with ESMTP id B47D040003 for ; Wed, 4 Jun 2025 17:16:29 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=oxxcOjRw; spf=pass (imf12.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749057389; 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=eyCgE0sNHOlyx9zGD2XlqTc9W1j01DyA5vw9LyX8zMs=; b=1x0LYXQ383o8wXdarptOmsfRjnuPZ5j078MlG1h8z2NR7z146Rjnxk33GBLKexwAELp34v TEnbXsfuF71neJEtLhy91HU2Fx1Od3YP3Bt3cRj5eXEuZSWXXAXXUVIy6MgcfgCdmXGxa6 noaxP9NlVJRUHmpCjZ99Jlnydb+oRUI= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=oxxcOjRw; spf=pass (imf12.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749057389; a=rsa-sha256; cv=none; b=bQFyVR9UkQXc+8HWTLl9t0FdYgx3GZ3NuwEK/xAXKlL6Aofv87g1DvQWWJ2hEJKTQRLAE/ Oo6+TEDGQ15sRBFfk0BfWTn/fuSs2zCDTG4qODjanCKRxELS+M4xwK6XIeWM4kBSFooVB2 adWyn+1qN+yG6XUMLQBL9syoQgrervk= Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-311d5fdf1f0so84214a91.1 for ; Wed, 04 Jun 2025 10:16:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1749057388; x=1749662188; 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=eyCgE0sNHOlyx9zGD2XlqTc9W1j01DyA5vw9LyX8zMs=; b=oxxcOjRwbSMDuUv7lZ8OGAhIMYvKLhvIwig4C+HW47UZXMYpcSX8fTA+89qx302uaS owcKqxh47O55gUadcXMJmJ0cIU4qL+OJ5nsSBeXpYMWgR7f+etVyE4BHRw1wn0XXllRC Rshc52KozuSpidImrUIAg9VV42OOBUBSsNSMNMr0w42WgkWjyGQ61ktidET9yF1nhfGD 7v2xY/I41sCjgoICGwrU2b/5ztWWQdJRiJt3xlDgRoWxiqUobqTV7bCrj8DL/R1wa14V ZEICalWfAqzZpd9UaFVUoaySNai0th2zupNPWqopKAnlSMhHcEj/3d/SFUHjeWwEX0e1 /yrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749057388; x=1749662188; 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=eyCgE0sNHOlyx9zGD2XlqTc9W1j01DyA5vw9LyX8zMs=; b=PiJgeFrYG1PJBDd1ABdwxZSpjMKTZFTE+KnJ6efOJbZeah8XWyeqW1cTRm63nxPNoV Ihr0WTABgta5A5gfkck5ecyFe21VmyVMZO3ua5UVYNK46UNcaYNFAqu2qoXf59Hfa4JG BV5skO28yvnNg7yV9op41QXpTn9JDlvSTFZM9umMh665uNZUA31mBlGVFZS9VdtPZFRn Y6YkbkjG00tD0meHJo6Krjv6zm0egTxknIEXhAI0v3BXcEHb8XVKNn5ZWdE92ocpwcU+ vZNJq2AS/RjCQd3550QgjTYGG561fml7u+HkfICg84vXITic/mmzSyfmYxNjrTp5R5tt eNPg== X-Forwarded-Encrypted: i=1; AJvYcCU81CB9vAkjCXfsNBEgbUTUuNNdpb69zDR+8RUbQpBTJf+zbw3HHQi1dTQEAlaXHBwU74o2DxB32Q==@kvack.org X-Gm-Message-State: AOJu0Yz7hrfpLldvjD384LQmXSP81youJkzhizvL9CQC3g13Kkqd+KqM pWoupAnVZIGQ1sh1BALWZWxdTKCyfdMma4ixKyjfoWEyFfT2CNB9FYg/qbf9UihwNV8= X-Gm-Gg: ASbGnctTnipP6NTz6jVyJHX/rrDnvBDGVypwOsnHUrDWPM07AEBaoh62oL2dk9dHmew Ce2COWH0FZ7UipzqVZCoMfk21/qiq5nDE1is6h6ZSSW+4OtFl6Znx2V3yqgZhtytcdwUcudMwdp QDeiYJLHZUCgS3Bj9TUlhaoswe5dnJT39r/J9XYIGYn07ThHOPa4fq5BPhHGXH4DOZNgYKVvyNU CAM3V9tU9jPjfL52NQ9fzbsaMRLpemZ99MDklYF5qXsX2DCt5M/fNRt45ccxoN2OTGWSxv4SDBD Txr/7TKxayXCyHvTGFjiZNGN4H4dFLoUOWFnZAZJtZVfprsVC44qDa2olqUejEhMqxtwFnLL X-Google-Smtp-Source: AGHT+IHMOq/u2tFRTZvHKVb54drs49US8l1H7uubvUaLV8NV+WZds+TZeiMTNEPUQiklHTteNj9xxw== X-Received: by 2002:a17:90b:1d51:b0:313:2464:ad20 with SMTP id 98e67ed59e1d1-3132464ad44mr2126953a91.13.1749057388336; Wed, 04 Jun 2025 10:16:28 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3124e2e9c9fsm9178972a91.30.2025.06.04.10.16.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jun 2025 10:16:27 -0700 (PDT) From: Deepak Gupta Date: Wed, 04 Jun 2025 10:15:29 -0700 Subject: [PATCH v17 05/27] 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: <20250604-v5_user_cfi_series-v17-5-4565c2cf869f@rivosinc.com> References: <20250604-v5_user_cfi_series-v17-0-4565c2cf869f@rivosinc.com> In-Reply-To: <20250604-v5_user_cfi_series-v17-0-4565c2cf869f@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: rspam01 X-Rspamd-Queue-Id: B47D040003 X-Stat-Signature: mbiaissmsn9y9xnb53txwm4b171nbmkw X-Rspam-User: X-HE-Tag: 1749057389-741143 X-HE-Meta: U2FsdGVkX19TUQZ2VShMEUgYGyM9R7CErP+WQmhXQBX3jctlX7Fj0xSFsE1BAUg7GeTBeVP1xk0Kp39zUAz/Ngun5Om0IeJykef3QXwxG9pYNLHkUsYGbdmynD7FkWD8lkAXOb/YmRjrVa1HGeE/CaLMBxdtZwW+CSmRKCvnghgL+HNctn5Ioz5sBmKKWR0KCIBkG1fEN5YZoqxeJ8sf/6ftQvOf7evOOCJ1m+cMFonwN7PK1vqj9kiKJJSCtVouU3z52f2RCKXFlKik+ongaFzIqgt6Wq5+JzF12B+DU5JToRw3SAkXIX89oKsp23HEMl0gBMt+sq8kvKdtMfOZJmsvE1CbwRPACQOjASiJJ1eX67OoMuNXKg6P+2AD7+vQd/QC99z+yBSR9PDrvlvL1hVV7StNnoI8/6HyXMfa6l2JA+kZm491l0yfm2PY3FpElZ3j626BYJgoD8cQerqmQGQymxA4z1Zowc+CS+SaAzoWs6AB0DupKZ5Eck4z6mccLHn90AZf/N647O5cJCcFN0gXUyL+lEPhtkLSPB7TWsrssH7CdAFSKJXgJZ+CalFdJ3VcCEZWFuo4nCbT+nINti7ZanqmfmhRbMDpN+QTDWE4UwMN46GvIhlxtHmmZBK3fvZ+7PXur7eXY+igjWWu6hFkJEjgV5atYtEV7ZcdVXu6Mzej2gWLCDZBHEXsdgawXZBZqWZXx13VUdsq+HPR3SIqBwLe9Mq1pzP4rGaJoxkhm7qD0O4/CScrAFboJGZCTs06aGP2XJ4dGn3cuEbQModw1pj5D1Bb9xUrsHbtax9/junZ6FWYSJxcHfjL9W8zZ494F2uvoTlCqCyDjoyEl7nAnm74Y8J7baSw6qeJdnAaZ6aDjoxOzaZggWnph+99Csn22LfL8FGS492sZvL3ooBj+/FiQJRND0ghh338k/LTQbUroPYntkDw+TLmLG2FPUzP3kuqtEzf6TSb3qR 9wYbz1wJ e1bvookSJjk/VOyc+3VfTQwGI/AgjzePS/D+Cl8X8+d/NK+NXGLwqRuht57Cejn6tALuzvO+Jhv0dTgFCYpl5TsckxA4ZBBcJggjPRwYrehxgo6jTeR2Z8Aw/bHSM6Jz+WGhtbl5OyAocnc6KfhgR7MAl7RdBVgIER4cIqT2QPRhu92mzp/4Yu9ezNv/fjVLohDMCDlYXHRmxJljXuCG7u+Js9XT4li1G8pbmXJXYg015mrhnE0gaBMO31FEf81OXgAPnokOGGu50yVALqyiolunjf39af7YCLLM5xzFUlkw4WfPfyzW9IgTQRkk7t/Hnq9A44ikGZjBte21XAlIxXrHskrzNcn9qXlmMoDMLjgLxqX0huredzj8pHLoo/vxwBz7uxsz8WgGNSvoSSmU3DuOQ2Cx5daVShWViLle58j6CaoZTOo1yWcaB7aaW1/07MJcVJXlmz81FhiUGtZ+ZsmgmIhHaPAzZnwrTuw3dF4t2g65kEQ4lcflA8yrRTj+LIsuXn9DLRGT1Y+3fqq2co4nMDMk5lppvVoshqU7P58CPzB6jJeAI9XkdbNuns0FlOLXd 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 | 23 +++++++++++++++++++++++ arch/riscv/kernel/asm-offsets.c | 4 ++++ arch/riscv/kernel/entry.S | 28 ++++++++++++++++++++++++++++ 5 files changed, 59 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..e066f41176ca 100644 --- a/arch/riscv/include/asm/thread_info.h +++ b/arch/riscv/include/asm/thread_info.h @@ -73,6 +73,9 @@ struct thread_info { */ unsigned long a0, a1, a2; #endif +#ifdef CONFIG_RISCV_USER_CFI + struct cfi_state user_cfi_state; +#endif }; #ifdef CONFIG_SHADOW_CALL_STACK diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h new file mode 100644 index 000000000000..94b214c295c0 --- /dev/null +++ b/arch/riscv/include/asm/usercfi.h @@ -0,0 +1,23 @@ +/* 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_state { + unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ + 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 16490755304e..f33945432f8f 100644 --- a/arch/riscv/kernel/asm-offsets.c +++ b/arch/riscv/kernel/asm-offsets.c @@ -49,6 +49,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_STATE, 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..c4bfe2085c41 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -91,6 +91,32 @@ REG_L a0, TASK_TI_A0(tp) .endm +/* + * If previous mode was U, capture shadow stack pointer and save it away + * Zero CSR_SSP at the same time for sanitization. + */ +.macro save_userssp tmp, status + ALTERNATIVE("nops(4)", + __stringify( \ + andi \tmp, \status, SR_SPP; \ + bnez \tmp, skip_ssp_save; \ + csrrw \tmp, CSR_SSP, x0; \ + REG_S \tmp, TASK_TI_USER_SSP(tp); \ + skip_ssp_save:), + 0, + RISCV_ISA_EXT_ZICFISS, + CONFIG_RISCV_USER_CFI) +.endm + +.macro restore_userssp tmp + ALTERNATIVE("nops(2)", + __stringify( \ + REG_L \tmp, TASK_TI_USER_SSP(tp); \ + csrw CSR_SSP, \tmp), + 0, + RISCV_ISA_EXT_ZICFISS, + CONFIG_RISCV_USER_CFI) +.endm SYM_CODE_START(handle_exception) /* @@ -147,6 +173,7 @@ SYM_CODE_START(handle_exception) REG_L s0, TASK_TI_USER_SP(tp) csrrc s1, CSR_STATUS, t0 + save_userssp s2, s1 csrr s2, CSR_EPC csrr s3, CSR_TVAL csrr s4, CSR_CAUSE @@ -236,6 +263,7 @@ SYM_CODE_START_NOALIGN(ret_from_exception) * structures again. */ csrw CSR_SCRATCH, tp + restore_userssp s3 1: #ifdef CONFIG_RISCV_ISA_V_PREEMPTIVE move a0, sp -- 2.43.0