From patchwork Mon Mar 10 14:52:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010195 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 11CB4C282DE for ; Mon, 10 Mar 2025 14:52:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF5BF28000B; Mon, 10 Mar 2025 10:52:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A0B94280001; Mon, 10 Mar 2025 10:52:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7994228000B; Mon, 10 Mar 2025 10:52:49 -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 55148280001 for ; Mon, 10 Mar 2025 10:52:49 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6AF201A116F for ; Mon, 10 Mar 2025 14:52:49 +0000 (UTC) X-FDA: 83205933258.19.0EC784B Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf06.hostedemail.com (Postfix) with ESMTP id 6650A180004 for ; Mon, 10 Mar 2025 14:52:47 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=V5tMltWI; spf=pass (imf06.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 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=1741618367; 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=XFoiG9nO9GzRbM78aaWwJK+Q/U0QRSToN08KNluZphY=; b=AU8/8yEQskbCLDoVdN+xS3O+NF0xYbhEtc7lkkUIpbESHCZoWChw74Eg3b+34OlZ8JdEvO kIeKS3uGfIE9GFWr6hLlcH4mP49T4baJewc2dbnIE6Dj82tVCEirMYxNyx6HQ7KRnxuObt bIsfaQYwWnbr9rj8xhimOqPj6HaQo7w= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=V5tMltWI; spf=pass (imf06.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618367; a=rsa-sha256; cv=none; b=3af2XtHZQFl5B19Wfk6WfLq7Lr9dxMUnyOsnJPQmILXu069aJOzmhK6r3/xNdFbVKW2ubc aSOVx1wK5D8MNMrWpECPv9WgYmsDsAR4BtT7YsuKRMgbTI/wUeDWACJWfx6nzDwn5wqAUq cXsOsdGBip3qb43s8I6Uj8YFYOizBNM= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22548a28d0cso11712875ad.3 for ; Mon, 10 Mar 2025 07:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618366; x=1742223166; 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=XFoiG9nO9GzRbM78aaWwJK+Q/U0QRSToN08KNluZphY=; b=V5tMltWIWisQU+VafgUaHMwamTP04NxLk6vBeX4A51FesEZqYCJv9YnhwPyopPGIck 6mkMDZnntgv4I6+yZCz+oOXVDH1sJwMlc3UbZtxrN+Ib/QikbmosJ+biU7PwJJrfeXB9 3qTCgbIGfqCkJTcVFxpVs6equKLrHhn1oLVby47RNjtM00M8YVIJHOSFbOUXSo7XMKbg 0gnuRNtY1r4HvDuLjxuCo4JhXiBf/qwwxkGNkjDlGxh+PqocF3QdeP9a5driSslQqNTt VKSt8pRLsqpuNKb3laTeuFySnDpVkQF0YAwnuzvnuypPcbU/XUE97RPppL2/RBPTYWdA 9MNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618366; x=1742223166; 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=XFoiG9nO9GzRbM78aaWwJK+Q/U0QRSToN08KNluZphY=; b=nuIvGSsGco8VsNvwOVhtt/IORekfsCkXy8Zt8kwX4/GsYfEqTI2AmCmENA2MSsJU5F f2LmciuvTIbc9RKl1bBSJ+lZgYYKbB6I66dNiL3u6+ciqVV+IcVpSNFq7M34A5peq43Z uFQ35ZC7Hf+FejwUL9bBNDXA1VEqX/AmU/L7cP+0YJ/eGrQaW9kd/0/GNMSS3t+hrUCc PHICHI0E90Tnyqs3hqtqeAiOc+RoFRNF3a3/f/HJdNp4jHVJdK9MzriOVQW6+or6zl5+ TJ61TGTj0kzZJgLKGBgbK/fv10mLlFNUyq2Nh7N2fyTXPAOoRJg2tO7ZUSyBSwbDxKm/ 9GlQ== X-Forwarded-Encrypted: i=1; AJvYcCUh5TzlxScWKOxOKjs9kj2up5Em7X35cbTeC23CNt5X1q8l5VOvQDGFaJU8kETlmYyvhrck1ulD2w==@kvack.org X-Gm-Message-State: AOJu0Yz9y+DLQaroRMxab68unxRnvO6MV3W76OjQqA3yPnJvmAU8JbCu emF13dkc2X6rfkJoEzs9PAtLum7Hla6aafEhuaArMcqNjBknoaJ5RvLBu+tVu9M= X-Gm-Gg: ASbGncvZlOTcFK81dXPM89zYypO28SHFsnRxOpd2g6g1x0h9F4PCiZnRPwQO3hNKrxl Xp006hdHFwwYYSMNkk2kAbXQBu0v9ocT0PJWAQeFKmuXYNgvuRNY68Qa+JixBFtOwML8H1o5IUd a2Eu3h8wYB66OCoBRoQ1K5JfvvhwzmxeqsQjKt9I+ZwnUaH5SZ3NAe6GiW2ghKYVBgMUnBpGwl+ 8a51t+P14Of+EXgr6sR4e4OcX+wnpJ5TtD8Cn3EBTRosfC1rKpMlHHg4tWbr0hJi/11BYVeACi+ NKasCIcR6U0NvpTFnvbMLrK4V6XHf95ee7w4+PkKAYVLOvDWTLGIBVk= X-Google-Smtp-Source: AGHT+IFBz3aXVDVmIlmZqzUHJQr+CufocIiZAA2+T986OpEaME/vCYGeegLtAo9744J8E/xHkN/qMg== X-Received: by 2002:a05:6a00:928b:b0:731:737c:3224 with SMTP id d2e1a72fcca58-736aaa1e02emr19336418b3a.10.1741618364845; Mon, 10 Mar 2025 07:52:44 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:44 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:27 -0700 Subject: [PATCH v11 05/27] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-5-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: 6650A180004 X-Rspamd-Server: rspam03 X-Stat-Signature: wnyr3c8qe5xdkp786i3eqwg51f141764 X-HE-Tag: 1741618367-741088 X-HE-Meta: U2FsdGVkX195bRh3c4Lb7YJghUhastiPOtcpwHk3vielE7WxwKD3dWZhG4mWLmPEp1E1pOBLd0sbP+efu+8USL58ifUFgIg0xkC5djtJeeY8Gg67v4tmJyE4ci81DikGcdRDPzJ+03ZupaS4zDOjbbJts8Xoi+1zZfaN+PNsoHJffFuz5eiMbHRl//EhwDD7o0o3ALB2l3nPrSZyQTesT1/SqiHVWfT7T3Y8InT4idQBJ1jkSHjTMPX2Zv9xejl8qsrDCeuVZcAV89qSRJcNOxZcxRCDasRlaUFPyFV0yupRruBOQUhshochQ9DG8pUiAExxKhDOWhXOKy+JyZmml8NIkzfirog3/x1dj+Nq5Z4koymN7NPkVWZ7I2ZdBXJ000ZC8K+C2bIZZI4dx9LbmpQ4CoArji5zKnZbcG/Q02IG5S5v9QXn+odlQIroNH5FR4NWEzzn0FHXJwSGfIoMIF4PkIpB8KAP4UL6FVS0knXwikFyde26HPY02sTM2G2uHU7G5x6Eoy90Oj4SGP92XWq7J07lDbRpFd4kqBd7DIlnacvFfhM+PfgiFhYpUqyxhgZNdzl3pY+7JkjbrWVi5oxwfFCB/b61BcY4a36PQb/GqAIfLpv+oPKlZ2iM8j98R9Xf7onSymuO27uUPAgYTFk86OhT0mlSgOa6Q04nkymqCIhlgfic+Van6j36RzGHyPGz/H3ZvHAdlWAXA331fDFIG/HD6TEbZaO22INa0xj5lf/ODvZZqhPWoY8oddGHwThFM5mtW64tUPpfQ5lIytOHu/ifNg8nYJiv/u5zOrlWdxMb8dRwDfxhqCTgkMv2dzw3d3erjd8dbkmXecIYDmT5lXrZAm2NUoPHtPL50wXCmKMcbpcYdrMsmtD1g5fS76qdunyZilZoQLjdvoJ1xxvMIg/b1uEpq+tmKj60ABjbtIK/BRm88V5IVw9CvWs64RjGYoJJUrFWC4JlYIx oAV2WEC3 BeLG9sqWhLtdMpRYHlq7QaKcbvf6TEMBc/O2QhbM8YK9Gl/fe3vasqdZO7NIKRU/SsVwPFNSeV11Vpe25sTWnSzoDapM9DpG2M0QsuRvFxIU9lcmMQjbNEbxDy/p1ylJRTMcTJ/7t39EqpDwmH1K2tb9WzUznNqSYl597A+IXVAMxJPAfHIHy6BR/zTsb3BxVXcP80KRMpZmx+pxH0vpo66EIhqVh02Bv9xWHaN040Sjt8rfHjff7EUM6rpiCEb6dEBEI/QfOrB3By3qGHQrO/7wBzRTYpKUPy5ThKjGMr1QNur3ncJturYuf22EI89dGdyPt2eEEsX+Y6ujY9XGfXvWe9cmmkFgHZE6R9/fXmAGkYJ0i2sQuZQb3RZJaCa1kVldCf9fMFitFbaVv3xnOPPYpTJT7Hq1ZrZArQXmPEvB8YSHgvD5bSYErIG/uuay1ZwLdO2FNDSGlMlmieIeXn+dOEOlVtYNgy83jNSE54hNZHI7qxhfHnNYO3qPFSh9M2W9Kb769h29VI8CDoqRwq/ZQOxnkqXNdFfD8 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`. Signed-off-by: Deepak Gupta Reviewed-by: Charlie Jenkins --- 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