From patchwork Fri Mar 14 21:39:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017492 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 E1661C28B2F for ; Fri, 14 Mar 2025 21:39:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 92613280014; Fri, 14 Mar 2025 17:39:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 85B20280004; Fri, 14 Mar 2025 17:39:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5ED75280014; Fri, 14 Mar 2025 17:39:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3D994280004 for ; Fri, 14 Mar 2025 17:39:42 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 663F214105E for ; Fri, 14 Mar 2025 21:39:43 +0000 (UTC) X-FDA: 83221473846.07.41B4D44 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf01.hostedemail.com (Postfix) with ESMTP id 735C940007 for ; Fri, 14 Mar 2025 21:39:41 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=NoDOsddV; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 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=1741988381; 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=EvIiEqJjsqgbsYMUY6NKV1JWZOMquSSP9DBah5grL80=; b=h4ZYEmSzOqr3HeWuJYxg+Ta04OBp34V98MFe01byeWQmKOmlvje5x06OpB2xI9/Pu7rnlM R/E4KixuXpYNACOJ2V5VqHt7MKAAAN0kxPsJN4XmN+W9omJCqcfe+sJJYrkQR7Fp5xlYJK wcnUQzhLmS0zglYypv0i96/r49MzR1k= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=NoDOsddV; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988381; a=rsa-sha256; cv=none; b=AWVsYSj+akDjlsw/LI6hiC+4W5pdDhrO38zIkBdCrhYNsRt7aunSwl0wW0ZmdnK63ljz8u NlcsNU+KzpKZS+ohh0yGu1l2kDjY3AbvKj32MZ7oVAiNq5nsGomeDta17lMEFqBnUpUZes kaPF0vMS27iF4gPqutNm55AwUPIUIQg= Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2fec13a4067so263119a91.2 for ; Fri, 14 Mar 2025 14:39:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988380; x=1742593180; 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=EvIiEqJjsqgbsYMUY6NKV1JWZOMquSSP9DBah5grL80=; b=NoDOsddVITIPYi5JS28MnwI8iFdGBRfTCg+n+5j4lMAoT80IEcqLBrT11y9g7UEVF2 pst65CA9B8dbgvvbclQhvyOet6lPG8T6Xrzone3uxj3OQIUC7CY9PLxK9iFSGmvaxmrC VBfQrdpjbPYun46MiIbBM+siAi5fhNyEwavIbrvFZaC7BxdD/Qn4g4OlnNAc3Rp+idDY Q+34iBEM9cfAhcemr606CJL4JxpIF4Zc/IO+1f1PvLvUzkd8M+ZUxUmzA0u88GrG3eMf BhL6bGDhVAgMftJhuCb3l/ZkIUYUOrQ874uepR16JmlEEuY+j545NnqTFiz5GGOjqvG4 8TVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988380; x=1742593180; 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=EvIiEqJjsqgbsYMUY6NKV1JWZOMquSSP9DBah5grL80=; b=qE2PvBRdHt/2nTbnX7HsJyBUQh1BNKUk6AyPXR/XgWMkvxwJKpkzAemZ9tTLQsRjns Qdooc95kjAo77xPE89rMHb/eseZkgKzhvw2SmbJY3d/AF1FNGdFsZ36QT+19bQnvG+5b RD9igMKL+LFqZ7ceGo5QRSYygYUx1vOy1vvP5OdksMk+QZO1fY7Ib0MdfLUuVHwrNh9D Abv7p38dRUhOxqlVJkZj0RUdxUUckN8bECLf3cy5L9An+9l+EEWTuVS3h+sq18SVD3cX Xxy6+dHOM4gLKqUVQ1YnsWd1avesVG6ov6pjBSPpFFwq96z4xNnf8w2xwIGqYSJaNsHT AjAA== X-Forwarded-Encrypted: i=1; AJvYcCVoOgv4pbaSK2EAEu472ZexNydjAY0UV95v5Q2f3Zw/n4qXHst2MyB5cyt2N7ygsGrktCdeLvPVdg==@kvack.org X-Gm-Message-State: AOJu0YwRD81fAF3lXKdqAx4wNkoQSPLczeIlGcYBG62focYl23QuRk8o aV+H4iR6X6trI+Sur8BXEndfI/Lmh1TukZO+Y//tQA+7Qp6KW7a2u/XrQIcnWG4= X-Gm-Gg: ASbGncvDpvcP6vrDzrjq3PxYZI78ALK04uwp8p8VYfVp8S/O66Ii1leDUffA665TnGM 8jlvTjLWaDipH785P5rSXPgGRkNljpyzwm5jPHUMFt27VSi8fEUD8KCC/hUQTpGtB0UVAJu91sL Cw0wFI/ThuQ4frYa36vTS1E6pvy4U+00m+RpWsmNIxGGiSWhR/DCEzxkAA2k8jVI5NKn3n1wAne SJKGigTYzIKR6zHq33XX6M6IHAU69rsXPNFM/pWvPW9w40QtQRdZe44JFk836dncCzc1u4qxJdz iP/dxggaTIxg3+sZ3zJ9OBYox8pEuPcPhedJ5Id3RJW0zZIXwARQ0uM= X-Google-Smtp-Source: AGHT+IF8ug4c9Y+jOxof384y9deWCg2zD3mmcGlgW83PZeg3Mt1WDeZf/8sTLDXIp12wuvsfq/2KLQ== X-Received: by 2002:a17:90b:51c7:b0:2f4:49d8:e6f6 with SMTP id 98e67ed59e1d1-30151cab271mr4923714a91.3.1741988380285; Fri, 14 Mar 2025 14:39:40 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:39 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:24 -0700 Subject: [PATCH v12 05/28] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-5-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@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 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, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Stat-Signature: 4zpcmg7gttr9wuqfxmz5ibwkzjcdih6x X-Rspamd-Queue-Id: 735C940007 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1741988381-463041 X-HE-Meta: U2FsdGVkX190or1vRIQafzq6ZVzjTvX3puTcC3JhiJxziRmiCZLIZuH4SwPU20p/CQR369QYDW+lkO/0e40YCRPFL1By/7BvSiw/J/RFjlIiq8RMKj76sLV9xj73cZB468bcrtVAD6F7p1NUye16qf1AwARmfZDzQ2mBUvYohpJw8xgUqhEZ2/stDz2NAxNDCSzfSthGY8batrgQqBzidDB1cf4GXNT+NolNPWM6n7F1EJoP6mdYB+rEgM0nsbxSaaMWdNFjUKZGmUSO8m412GVOvBMo710GWG9/sEKllTj9vKxxkKlkE+I9/Pm6Tw2xokPhR+B5r/IiI2UYnKxvrGLppQRb1tjkPRezU/BgZ8kQxNfBezbaYL22uC2UowUTSuTKWAnQBJLgicKQvx5xh0xiX0JoByb7oTcBN7Q2Ligd2QAIYri6Q3l94NgVjE72Yo9CxwhLFc/NmgaDb7ZEuCm3dkvMWi86Xz8YI/fUeeZOZN8Ame0QXGnOhv+yjpw8w79Ijl1qEfrKAfwuDoh+lQyz0mGuxYvd4PMz1M5qqZfL+I1NIlz2IYRJwyNhp81VaBS23mSJXFtH2NHN7VIjOjCwSpZQt0DJjU7b98Y9mqpam355CVfQdtGs1pMGs77dUAILSIJrEH78xs20ckt8+zMpb7gUWL1kp6CTJxGHwfrrIVSrAdhuDeUOBzMrJDRIW4dU/HKrNyUwYfapq6FGiWUXQYUDwl7Vf78B7lUJBztm0GOM4hlyWNopiYA/4BXXKZpv/1DoAc2YoHC9GrSvhfhNsCo6giNxSN0Jx9nUyhy1qMpkQSVdsH28njNEyO9J9HgwuhA/c+g7D2svxKdS4WCxPXdSuS33YVJqiNF29OLZHiDHX01/fSscB1oab3ruPEMUu2OJP/ahStLWiQK5XlSW4sD/6ImFMhqtChq1ACcKRCJd/sC/agTJwLPZUr1Ai9dTKHnz2EfMr8t9eiF SwgKy2Ml 5vfvwpc0WjDtYpzfVRAd2E9UDstqjfEAlGNpOpwihNN2Q5Fh1VvX2J1WQGFcYLhbjtVjRFPGxgfC66lNlp6otTI/7+h4WrMA+qWMl71myNzGJXPhdy40dyJc9yuYmjA/eQOS0jHMb0/G6X1dGqqJKfbc7qpVgChAv6MW6vdDN352/xb/RUiGMhAGbsSBLA9a7KwEJ3MV+HMzYUOb5fTfInB+d2s21OqI7yqZidloQ7RLGzgetbDuPMmYSnDImXzCOp7rEZzcbb9bUHCPApDycgq9Zi+L9015fKl76rylN1CLqQV2pZrU3s6wCecm0t0HsDK08cZIjBfyft9GIzzAgojhfGotfgVvjIIn55EUdJZXtju+2VoDKz0RbHgQmpbI/k+4dtOg3/BUbQD49vlRGGlf1DG0QL1z6IpC9pSm+iY6z1cp65/gLjDrQOGJy1eYONDlpQH0zYsZy6pwbPHStta39xOWOfu70YbVVIwcu5hPF0SmXxmBrGCn5KhQsqoov6Rvx8WelziA7lCscXkuG9p0DY3+vbRYld7evffNHQOhtMogDUuzVzK/7f81Mceph/6Ie 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 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 | 26 ++++++++++++++++++++++++++ 5 files changed, 58 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..68c99124ea55 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("nop; nop; nop; nop", + __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,18 @@ SYM_CODE_START_NOALIGN(ret_from_exception) * structures again. */ csrw CSR_SCRATCH, tp + + /* + * Going back to U mode, restore shadow stack pointer + */ + ALTERNATIVE("nop; nop", + __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