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 7C184C3ABD8 for ; Fri, 16 May 2025 15:16:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0AF526B019D; Fri, 16 May 2025 11:16:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 05F086B019E; Fri, 16 May 2025 11:16:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF7426B019F; Fri, 16 May 2025 11:16:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BC4296B019D for ; Fri, 16 May 2025 11:16:15 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 347291CFB82 for ; Fri, 16 May 2025 15:16:17 +0000 (UTC) X-FDA: 83449121994.30.B7441A6 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf24.hostedemail.com (Postfix) with ESMTP id 4CF93180002 for ; Fri, 16 May 2025 15:16:15 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=aubTF51B; spf=pass (imf24.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=1747408575; 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=0GNirFBXfZksDmcLkIx7giCST3II4UpjpZdHFvaex5s=; b=VdopOb5E4jElFxL6H39PIXP9GEgH6DrOyKZK2VAYvCVB+idJFboUDOEKBc7a8oNvKxx9Zf tpmLLDIKS3qXoBJCXMm13PsAQehz+jn3FV7RyJUj6A/R4uJuXjbKhunqiwqj5P+hqJaPqw VFeL9rU+sgt+u9Q2+0MZ9O7B8un30Vc= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=aubTF51B; spf=pass (imf24.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=1747408575; a=rsa-sha256; cv=none; b=ejmMzclR9mL5XsC3iYGD58/uC/xro0hzdUbe2C+zzhtq/GJR3GonqOncI/P9jHf1ZzbDYR QEs08OrUSZwK0lHYU3JAm25ZquO5WT/6zUujU8IcYfCD72Gc7tBNNdq/GyyBflggp01J0Q cS0ZCTZ2TF4jessMf/7RLRFikecI+IY= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22fbbf9c01bso19667385ad.3 for ; Fri, 16 May 2025 08:16:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1747408574; x=1748013374; darn=kvack.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=0GNirFBXfZksDmcLkIx7giCST3II4UpjpZdHFvaex5s=; b=aubTF51Bp0WhH2Gtv8CzzGdjceOuxHEJkYZO96pdJkuC7Vjkx8n6eZ05O9HheoQYG2 jGdM+v2i4rzsgOzgjiDjI7U123AQds73/TS/4W3+PHwpmrpghItSsWeiQyokaOj3uvW9 4o8DymKhd8dwiRMvjOjQ9hi8S5rC7wyaWJKIE9Sdvx91PEspQlTxkMBQtWzWWhE9fEij EBGWdXI0N88kHTzcwgGedYejzqW5x+LsI8JimNkCSas5tCblGbFU/fyfCs71jU5nqzuJ lTuEMxTiuCJVxtso9OGcfQcDSNuQXqHhVBFWs9x1jUR1wr3EHM332Y6DyEODWGfDyGXV 1gSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747408574; x=1748013374; h=in-reply-to:content-transfer-encoding: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=0GNirFBXfZksDmcLkIx7giCST3II4UpjpZdHFvaex5s=; b=N6k+nd9pLkywWtS+i8j7Vg898ekodJzbWVN+lVKqgryxE6dCJ01Ep2rkoKMaIup59h FTPTDehQc4RHzaK8fzsA6MglD2hv/7loGNJkVXtxnQ5fXLAnyELo3nDMz6QwIB1Y26Md 7akxl1iGXcF8OUGyw1ptaxyirW0TZKa1zB/lHy8bFqqfO4OkpNssWVgqp37YCjcEjCY4 sxwwrIHQezFH/NZayZ7Zb+5MGDUvfsADRH2VM34Uy4qBwjhXtwjIRMxt4U8SBqmO6PVs 7IxNw/auThu5bILBtW73TSqDl1kNKptC0dGSqYSU/niDPtZAMazvxsrWm/eXlcRZEsqH AJqA== X-Forwarded-Encrypted: i=1; AJvYcCWHmDr3SyvyOBsBvacEHtYJQO5bbE3P0lxQEQ0v/CSaP/U95L/od0sWHfS51gWrxOJQcdEY1UOfqw==@kvack.org X-Gm-Message-State: AOJu0YwGtqgVViF2CMWeV1JleAcn+gcqlgn6iMfCwfjlkcPb86SqUXls 22dqt9NCuarwnhu9LQNAmX3zzYYwv37yuoTRr/t2B+mc1/yMqK6JCR5H3DDcBMg0zC0= X-Gm-Gg: ASbGncupCLUOaMvPrstk3pztHYB7NKQWncRTLtO8YRJ0coc+jUtolPW9IKkKRY+7O8I KWkP3EJgb+EYzOGR3U3dVan9xtQ4VRl1/UsCAwxIHFiT6pOGO9cve/v6d6YaWXp8JSzeUUq8eDl Dsc04sxclUxgnWYp1RwBISCWqv8pgQGFDGAfxSn3TbkevZjO4rLgm4hVkAQvZr0l4qtXYh4QXXT QI+SlblMaP2tlAVRN/HW7UTQfLZE5wU6/ka9D2emgkP803Fjl2FASMT8cFim/0MwaimJ1VvRvJ9 633HvkwkrtGM+R3LSqcpOsDvW4sDxZT0dRQ/VXJBqLDmpV8xU9rbk7e9/d+gRQ== X-Google-Smtp-Source: AGHT+IHSSRQv6UaVUp1uY7YxcQ7Fp0Nkh/iVwU/C9R2BEes+S1JYlxj3SIRdl94BDLGOoJJBYixrLQ== X-Received: by 2002:a17:903:faf:b0:224:c46:d167 with SMTP id d9443c01a7336-231d44e7049mr42573705ad.16.1747408573939; Fri, 16 May 2025 08:16:13 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebb0d4sm15446025ad.195.2025.05.16.08.16.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 May 2025 08:16:13 -0700 (PDT) Date: Fri, 16 May 2025 08:16:09 -0700 From: Deepak Gupta To: Alexandre Ghiti 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, 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 Subject: Re: [PATCH v15 22/27] riscv: enable kernel access to shadow stack memory via FWFT sbi call Message-ID: References: <20250502-v5_user_cfi_series-v15-0-914966471885@rivosinc.com> <20250502-v5_user_cfi_series-v15-22-914966471885@rivosinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Stat-Signature: wcne1q3ffcded4cj38yiobf3sho5zxm3 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 4CF93180002 X-HE-Tag: 1747408575-535140 X-HE-Meta: U2FsdGVkX1+EFIsVuEJbe4hr4I90B1sHrU/Vo9K06sFOlTt2fVSfJODCRJyonkmCoONBOUGNJQck7sstGkxYRmouQM7u2Ky4jukj1/dFSs7Y1DKIT1Hylw5JWFrnEwH+k+ncFttDmSB5QCz5MkPudsylhbZVxzQ78ch3T3r5yUuCLzRt9iIERCZeyK4fndkYEC3Sk35jk3ft02wkP76OP7FuRIjbPA99bkPTEdtNS5niJM8dpNJ2YDJCMe6VhBUEp4ykOQtaYFFQKN1oMI57hjCK7RoHeBB1mA/8uOpQ+cwPfK7iPkrLV+XXRheqg5yTejkYt0zDUx8EWFCcm5ukTnBfJielkwktZbQh104WV4J4tk4gd8URX903mc8h6noi7FjAouoK4P6QXNx5fBOA8xHfErCMghgSW4Wfja8JNsTQhSE2nSNTUHX54S+sSDleLWfmvhskkLdoZ7HdeHdQVr77dDb3Q4VGezu3Ih0no7zTQtxkHoIo1CJ11o774n5bSog1Hz6cY1w9Gr+fpDBtvPGemqhFkxausm1TQrq6KMOADBfQDmGGk/EE4wRWWSiIC/fbXso7CXTBIDfr1LaNvMtOWT72G9ieKIoNyk2p6rO0TjEJ38NMpVdSaJ3e+eD4GKIMZvG9npEyZXXnJ7eM5UKK8aP6qmLiFoRWl8rkXsDCZj7wcm/5tWuXw+E3Zk9keaNRoRjkuItjSEU57/q8kFB0KiMxy3iURdti4pSau+MofymLF+GUaNxLwBYEQVbpqLjJCWhKnEZOg63YLT7CtCCbcu4VT1JT36/Lglq1XgFB2TDMSudU/VYGahsC+3GIGdWCN8mPpam+zjdf2pR03ubemNNSMb6ZiF2EDkUOrjS5ufVbhDRVhfzRlx74vPG8bKkbxRZ3EnurgEQPQMjknywEjDrvN/yS9xRw8bENGH7JNNed+IyR4q4z/3I1S+/XNh2f6npSoDoiqxb1a/h 5tgROR5y 6Bkfsudj+ehnynV1Hme3wnVmWFjk7sOME1x4SXEs8Y7pnJal2C+wJwXqqpZpJsJ/L1Cle/3MjNx4vs/U8PcqzHkmmxY7PxY1WKfnkgsErAYx3qqywL2qmrE+VFw/+hCMecOzbwWhYpTu/MI0= 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 Thu, May 15, 2025 at 09:10:08AM +0200, Alexandre Ghiti wrote: >Hi Deepak, > >On 03/05/2025 01:30, Deepak Gupta wrote: >>Kernel will have to perform shadow stack operations on user shadow stack. >>Like during signal delivery and sigreturn, shadow stack token must be >>created and validated respectively. Thus shadow stack access for kernel >>must be enabled. >> >>In future when kernel shadow stacks are enabled for linux kernel, it must >>be enabled as early as possible for better coverage and prevent imbalance >>between regular stack and shadow stack. After `relocate_enable_mmu` has >>been done, this is as early as possible it can enabled. >> >>Reviewed-by: Zong Li >>Signed-off-by: Deepak Gupta >>--- >> arch/riscv/kernel/asm-offsets.c | 4 ++++ >> arch/riscv/kernel/head.S | 27 +++++++++++++++++++++++++++ >> 2 files changed, 31 insertions(+) >> >>diff --git a/arch/riscv/kernel/asm-offsets.c b/arch/riscv/kernel/asm-offsets.c >>index f33945432f8f..7ab41f01aa17 100644 >>--- a/arch/riscv/kernel/asm-offsets.c >>+++ b/arch/riscv/kernel/asm-offsets.c >>@@ -514,4 +514,8 @@ void asm_offsets(void) >> DEFINE(FREGS_A6, offsetof(struct __arch_ftrace_regs, a6)); >> DEFINE(FREGS_A7, offsetof(struct __arch_ftrace_regs, a7)); >> #endif >>+ DEFINE(SBI_EXT_FWFT, SBI_EXT_FWFT); >>+ DEFINE(SBI_EXT_FWFT_SET, SBI_EXT_FWFT_SET); >>+ DEFINE(SBI_FWFT_SHADOW_STACK, SBI_FWFT_SHADOW_STACK); >>+ DEFINE(SBI_FWFT_SET_FLAG_LOCK, SBI_FWFT_SET_FLAG_LOCK); > > >kernel test robot reported errors when !RV64 and !SBI, the following >diff fixes it: > >diff --git a/arch/riscv/kernel/asm-offsets.c >b/arch/riscv/kernel/asm-offsets.c >index 7fc085d27ca79..3aa5f56a84e9a 100644 >--- a/arch/riscv/kernel/asm-offsets.c >+++ b/arch/riscv/kernel/asm-offsets.c >@@ -532,8 +532,10 @@ void asm_offsets(void) >        DEFINE(FREGS_A6,            offsetof(struct >__arch_ftrace_regs, a6)); >        DEFINE(FREGS_A7,            offsetof(struct >__arch_ftrace_regs, a7)); > #endif >+#ifdef CONFIG_RISCV_SBI >        DEFINE(SBI_EXT_FWFT, SBI_EXT_FWFT); >        DEFINE(SBI_EXT_FWFT_SET, SBI_EXT_FWFT_SET); >        DEFINE(SBI_FWFT_SHADOW_STACK, SBI_FWFT_SHADOW_STACK); >        DEFINE(SBI_FWFT_SET_FLAG_LOCK, SBI_FWFT_SET_FLAG_LOCK); >+#endif > } > >No need to resend the whole series, I'll squash it. Thanks. > >Thanks, > >Alex > > >> } >>diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S >>index 356d5397b2a2..7eae9a172351 100644 >>--- a/arch/riscv/kernel/head.S >>+++ b/arch/riscv/kernel/head.S >>@@ -15,6 +15,7 @@ >> #include >> #include >> #include >>+#include >> #include "efi-header.S" >> __HEAD >>@@ -164,6 +165,19 @@ secondary_start_sbi: >> call relocate_enable_mmu >> #endif >> call .Lsetup_trap_vector >>+#if defined(CONFIG_RISCV_SBI) && defined(CONFIG_RISCV_USER_CFI) >>+ li a7, SBI_EXT_FWFT >>+ li a6, SBI_EXT_FWFT_SET >>+ li a0, SBI_FWFT_SHADOW_STACK >>+ li a1, 1 /* enable supervisor to access shadow stack access */ >>+ li a2, SBI_FWFT_SET_FLAG_LOCK >>+ ecall >>+ beqz a0, 1f >>+ la a1, riscv_nousercfi >>+ li a0, CMDLINE_DISABLE_RISCV_USERCFI_BCFI >>+ REG_S a0, (a1) >>+1: >>+#endif >> scs_load_current >> call smp_callin >> #endif /* CONFIG_SMP */ >>@@ -320,6 +334,19 @@ SYM_CODE_START(_start_kernel) >> la tp, init_task >> la sp, init_thread_union + THREAD_SIZE >> addi sp, sp, -PT_SIZE_ON_STACK >>+#if defined(CONFIG_RISCV_SBI) && defined(CONFIG_RISCV_USER_CFI) >>+ li a7, SBI_EXT_FWFT >>+ li a6, SBI_EXT_FWFT_SET >>+ li a0, SBI_FWFT_SHADOW_STACK >>+ li a1, 1 /* enable supervisor to access shadow stack access */ >>+ li a2, SBI_FWFT_SET_FLAG_LOCK >>+ ecall >>+ beqz a0, 1f >>+ la a1, riscv_nousercfi >>+ li a0, CMDLINE_DISABLE_RISCV_USERCFI_BCFI >>+ REG_S a0, (a1) >>+1: >>+#endif >> scs_load_current >> #ifdef CONFIG_KASAN >>