From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC9C51B0F1E for ; Fri, 16 May 2025 15:16:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747408577; cv=none; b=isfWz4mBrp6dRfOkJKr0C3Y/weieGiy3KoyJ2dkea1va9we1d5bEU+DfeVB158SOVsonvT8b8KqM673Eszb4PDvwdKu2EZTHJRWb1hfTj5TWN4vEdRe6a5Xc0G6HnmfsJ5w22hbAFT9pfc9ZP6s5U9SmHJKZuGX2wtYpGgQmsCY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747408577; c=relaxed/simple; bh=t+2Gst9xAi5hlIwYx/cxza1UHimWoYdHPusTdQrrccY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=hInffBfy02RBSdsIusjCwGbretEJZ7SnKc6kdKa58fFZ12AkZlEiAJLtOsnyuzdhs5Q6aOf36a8PG68ljyNtx2JmeQzTyeIiAjVP6SpO9sbI8NfyOvJVqw9uWOoMf6RhazTwAd5Sl/ip0euTtosrFPMVZMbMQ1YjeSf05sXKiA4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=GQfsSeGy; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="GQfsSeGy" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2301ac32320so25842845ad.1 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=vger.kernel.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=GQfsSeGyAB7JAoCVcMbV98hs3mI84XNwIJHFtrgZ90GXZKudh64JoDvi+O3SUidgzX wiBkIPz47Q97T6sfusCfCzh0Dk5lLz3omyUJigHsvb/MvSSSToZxSPeDs55kTmN+Dje6 Ki0sQL/oLrJp6rWPCpfIOTDzB9OS/ZWkGpE4op+b3+LdLJw9FuUA61krpV1YlMV3tJPq sjiDQ/w1EIWBYEb6Q1/yCANfG3KI4kwTvTy0TolvE/EhUPFv+EAYz+RSaAjDs5FwXb24 QgtLTuDiBW3kzQCZJyeDIGKyfXtcikj3A4LntFRTfkmy/zOIk4iF1Nso18z8PWPcJ3sj 3wIg== 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=eiAP+TNHMQo1MvtF3Ghff+Fkih85VcxF00azN6uBTGlHOpbRxJSBzkxQYtgpwpkf9K dkZHGHQxNfyoKTXXV/rqXY8mvUOByupHcRgiJVp0PTRDSmLWOBlSTZ2ODEMpfoAdVRpF 0EfDERtkh3HR15VGgJsivdIb8Atk/z4kWvmOC1CRz8sBY8wBm2R6B97AI83b/MvCU6H/ Vi8BlA2pBoePLhzsz7DYkHOr4IWhNu95FLoZFPKBWzVNS+IHdEi4DaSxm62/5M5G0BTt LHggA7Yv3E4+EYp3Tn9OVWoXUF5rCe1GxgY7MToGctL89kqbFuwAbwsV9JKVlqpKr0be 7xsQ== X-Forwarded-Encrypted: i=1; AJvYcCVUqexbEdpqkisnPCXmYJ8sL7LaZChxsEXP9JnxhZjlV9sPpQ8vdfZu/JFup195uV9NC60L9V6KfXNRPN2GYg==@vger.kernel.org X-Gm-Message-State: AOJu0YwYEHSxKgiA8/i/2bHGdMUPaCGqC+GQx/ay0u7Khflu1uP/UC3g 52YkAuV3RMpn0gwiy5D7DoC3xaPqszQN7WiwtaOIb0HDtJkOh9vRIJpsXZAWUDD9fQs= X-Gm-Gg: ASbGnctO+EjbovCb/SgLyI3YHmy0TirC9pU/wEA1qeHlS49la0ZpaPCrlfwxcMUtJuW vUJGOOa4oY2Wm8/6ITgUeUdo/g+uvIYSJubDyJA+YU29At4hbSyj998PMj+Rcrdrp0xRqmKhf3h btO7kxYjMFEsKb8kNsOKHffr1hiMLzb9NE2rEhqZu2dDaRgOSeVBNDNMeo4GgQfmNF2XY2YvKbE xhVWV9it42/3UdKgmaTusYotHgonwty5gzjuHzphga3OSY3dp28SWhYHC1immTsEuJAP32qETlW oHjoWhxVmTzkLBeFDSVRAdKCPm5EXnISE+T26KB3o/yKADK7qgxUA1s5GJBEtQ== 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> Precedence: bulk X-Mailing-List: rust-for-linux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: 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 >>