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 B76C6C369D1 for ; Thu, 24 Apr 2025 07:25:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B1EA6B0027; Thu, 24 Apr 2025 03:25:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 842456B00A3; Thu, 24 Apr 2025 03:25:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68D946B00AF; Thu, 24 Apr 2025 03:25:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 486276B0027 for ; Thu, 24 Apr 2025 03:25:41 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B170A8063E for ; Thu, 24 Apr 2025 07:25:41 +0000 (UTC) X-FDA: 83368102482.25.4EC1AD0 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf04.hostedemail.com (Postfix) with ESMTP id C555740003 for ; Thu, 24 Apr 2025 07:25:39 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=f4UUoImD; dmarc=none; spf=pass (imf04.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745479539; a=rsa-sha256; cv=none; b=xzRRfJ0pKYvOeuyXSNl/pemG48LtWhAi2uV8KvNcoGp7TwMmAxiWpBhesTr4yFt6l9qaRl ly3OJm0Mj4d9Z9H5IXB6U1uAqn71i4wMNlNiye6/Xhb38/c2dLhmxCRnPAtUkPhlGI5Guo 2/b0uWghZ5BEERzOVMXlzTKNYaOdfiA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745479539; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZraI9Ovv6gpYhi0G8W3Cw0oZRXxTTj3IaFkdasgPTa8=; b=uZMPKxG8IdA9qApPBM55VF34OpK7c17IZYeyHEnYCySreeO6pewZaUeeE8hZWrs86zD8BT zUHxl8+rI6L3exhcoGUusSOYW4tv7d5FYkAB7yz6RWLX08bXQayvIv503fsxXBMPx3A2K6 Ef13vmdvCbofN2BZYjG664eAAEV1B0E= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=f4UUoImD; dmarc=none; spf=pass (imf04.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-224341bbc1dso7739325ad.3 for ; Thu, 24 Apr 2025 00:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745479539; x=1746084339; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ZraI9Ovv6gpYhi0G8W3Cw0oZRXxTTj3IaFkdasgPTa8=; b=f4UUoImDVwKsYPSI/uaCgASDAvR/QZvt4f1yAKP3OZQozFSWvZBubyW+4K5FTR09bD PGxHv+3OR+rhUHyPjk53Cn6y1+Ti7tY7FuuWV9wOxmJiH6X4493m459PuUlC9IxlPtRb 7VM/xQIChJyEx/RP83o/ZdocTFiGvmoRSbirFUhWP5BmohkZr90oHLSLPMCtCMqxSI77 sbc0S2xYdJBYEnFqombzafu6v04L4HOXylPF+5QBJmFp8RH9eu9xp5Lj07DqtWmJ5JYd I0s49uIModyWrSMy0N6qijksiaheDz519Qt8QTXe3BZyZX8bCH0oaqFCM7LTMs/0izr3 qpzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745479539; x=1746084339; h=in-reply-to: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=ZraI9Ovv6gpYhi0G8W3Cw0oZRXxTTj3IaFkdasgPTa8=; b=Zybqo69TWqedMfuWwxaItegzmsZ36iw53B4uxTcZCyrNgAIaFKWqEz21w0JPfiw76d cHjNhq5CYJc9Z4yghvyAK0I4xdFOHbTMvy3PBWEWBydSqa9gJe4hZ4Ky7RF62H+1lsdd WUL5MfMzr5BJuhHo/uGsQgsRd3mF7FCOU2B95mB3Qq7MBzBqlkN6vA6tjFFX11+v4xmD HxUIhn3rUYjzWVJt4qBbXuZ4A45lwqNwS3g2cZgSxBb8Bd84V3KbstmCp4HdSRtsZYXn TUCgVRh5Sa8pq/7FnyXiH5bMuXV9uXbnPyRyyudOGdSZ5tp/Fu7QtwpZsxoRFP0QW4Id 8SQA== X-Forwarded-Encrypted: i=1; AJvYcCUzpKxR5Twl5/+0ZTH3pFUxj8uf7tEDTZ/25kyahOe97swt+18am4qvH+YHzJNIBcmLG9Gn3uQoOg==@kvack.org X-Gm-Message-State: AOJu0YzVtZyqdaItvuOfS8iM/qXl+DTmR/HhNEpg7HEJcqUslPC4MLEh 0IANmJC2nC9KZDlFiid4noMJ0jsapFwwjQCXbQDN38oILkp+R9iVfti4evH4e/U= X-Gm-Gg: ASbGnctqiP0N+7Oc8FPU+hAyhFotOhGspJQgT3GPa3sYAZ3llArmPppaBZGRNEWvOXo IAzRKYXtBdrbH1P7q9L8qhfZ6znZFgh6ze7lQ45bASBDiqs+bFvD0eC2dnbIup6uwiBYrk0XN7b evafnODB/0H+hjiaWgyoZ+28IOMJbygpsS1H0nmUb8hYyRnENMnqOXV4aN8A4UfWsvfo/WyKoUR b1W/lQvgaklpMh572DRnQLZGjBbOd98gYNGe7ganaqFQ82Yo5wCHiMhOtzxFMGYLp5MfUbWbRuf lZKe2g2p14+jBCMYIDkDUueaPmQ3U18/ZAu66oFnsR3Iig7Hvex7yAKHYKZmqg== X-Google-Smtp-Source: AGHT+IH7Pn7YrwNkVIPl7Y7iC7lJ60MGgO6KIgekfFqy8hhbQAHwjVQ+88ZLIatTihzxRFG2BgkJcw== X-Received: by 2002:a17:902:e5c8:b0:220:c813:dfd1 with SMTP id d9443c01a7336-22db3d777c4mr23449115ad.36.1745479538561; Thu, 24 Apr 2025 00:25:38 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db50ea91fsm6333385ad.126.2025.04.24.00.25.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 00:25:38 -0700 (PDT) Date: Thu, 24 Apr 2025 00:25:34 -0700 From: Deepak Gupta 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 , =?iso-8859-1?Q?Bj=F6rn?= 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 Subject: Re: [PATCH v13 05/28] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit Message-ID: References: <20250424-v5_user_cfi_series-v13-0-971437de586a@rivosinc.com> <20250424-v5_user_cfi_series-v13-5-971437de586a@rivosinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20250424-v5_user_cfi_series-v13-5-971437de586a@rivosinc.com> X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: C555740003 X-Stat-Signature: myf9nd4rjc4f3345h7tgm9jxd34i3ncd X-Rspam-User: X-HE-Tag: 1745479539-933660 X-HE-Meta: U2FsdGVkX1+EqHVT2EIMt5KE1HP810A4nxL8xSoH+3L3VscpcnrV/6dBTKxi2vcy39Q50r5nAm36oWd2dv+ML40crAinw9Jpj/b9wNqW01WpKskNByjAkr9vmXCyKi2s/l7aAiiP51Lsd2gFxPNRo0JB4CasWntUO8R5mvrAu5YKP1rMFlCXZVbwJ5ysoElqcZlUqTFF1eS/Y26O6NuAaywd5vvRmBx8InGFtSAvnA9gPYeGFiiVEBWsZneglpY81c93BfNX2ll+E6ZNFMl19DcCvbllmbGHP4QGv+NbSTzlNfZeJjPYoVg5wM7XVqTu5gfvUiwBWvsvyai3Lyt+/i6boFPQHehmtyLwOuEW+K1USoLtSXYIT2HcCqCiugh0JUGyL5hIO6Esqd9CDVsjmL6BTfaRv3Y1QFm8pHfYsZ/4YbSKgGdcRolL/BAbnLIDrstLQoapdvkXv+QCe/rtKMKfsoEx7FaSduuZIEHx9O6RVFBSP+JDFwHVwj1uhFsTSWQNgIbx6SdnpiGvGI8Kfwn2PUYsgtwY0df9P7eQ3pgBGYuqW6wCZYAj1j1RSaAXScAepgJqxJUoe881S14TPyZE2ZJuYAnZeQ/LS5efW54PcM0xKAPGVQ8QXbim6PyHkQLe+/g2S5r2eg+twRhqcIz6Hhp5H8B/mC+o4FT3koRpBjj6Kr5SFmpjXtfYRa2excOnINIeaDBZ71lEwc/Judb90XUPlpkSNRHPwfxzTrXcwkTuQhjzNDy8tvEfBsKAgkTLeH6lc1+fGI6nULsf7B1PjOzm8o8PqPb/DnZkvBfPGmyHbwdi/Y/sok0BQuO1ucobBjY6z13eN7zxr+DKPdU83gY6E2vONhPj7zkYlXxROap+51nch3gHb+A/pjTYwcOlSMOkNQbklBQhW/XTtalzA36P3o9zGBttTtzt1VGNJJvGLBGhlBydH5ADs7UYhvE8quAJi/3oMzv1w2K fyqwWo1D zmDJvoAlcxBKTbrNQSUGcQ2s7kWxPBe+GBDJLRZOkl9RJDz/s3nJoeSdpXq0LMrIFk6H6HB0ruEGlRsmEKf7pJlYUd6ChE6UDpnGwD4a6VExwX8/6wAMBZ8q2Sa+aqfPLvHSsM8a8OWSTu38PQ1JbMi5f8EM0AkgqPgtU7zu22El/iYmelMLejA7X6nVmUxRI4gt3iKADeotwWuSDQaEC9UnfYF8R0akGgs1DpCjjWSso9Xgt9BG0XVZIe2P7uoH0egoaiwdyKRpjnc76trO2QcPBUsNCgZ9o/XNdys5nySm+f4LMTo3t/iTKCjZ037JsRtibHTC5ymiQHbHZer0DjZzN4PZqRiNR2KWSOo8DUxW+VhTHezJWaW5o/lpOmT+qAGwpy85Bds+k01yqQqMU9L32PmVXX1okNyt9/7FJGSWfEGqNwmNIq04b8r9QI4lLu4IbWQ8EK3NyDsMxGhBUKWnv9mppd+leV0tjHnFeqYGJlb31FEQdIeNEwWI9fRme4AZeP67xD+TA+av2AS4r9drNvqMQWOlabx5b1UR3lhemsZqVBeYZshpS0nWW+Ay5rFZvYCuhR2TARQI0hJgq2oRg5K+uw4akCXkY 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, Apr 24, 2025 at 12:20:20AM -0700, Deepak Gupta wrote: >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 */ >+}; I didn't change this part yet. There are two comments from Radim here 1) Separate state of enabling/lock status from shadow stack pointer. Same goes for landing pad in later patches. I am arguing that since thread_info is already occupies two cachelines and there isn't any effort to manage it within single cacheline, I am not sure if it's worth the effort. Most likely comment is stale or doesn't have backed up data behind it. Furthermore whenever state of enabling is accessed, most likely shadow stack pointer, base pointer or size of shaodw stack will likely to be accessed as well. Thus having all that in colocated cacheline would actually be useful. 2) Convert enabling/lock status from bitfield to bool or accessed via bitmasks. I am agreeing to feedback here and will do that once we converge on point 1. >+ >+#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 >