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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2D458C48260 for ; Thu, 25 Jan 2024 17:30:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hc3CuXU/0H77FeGO8s49LSg02PSzRjOAXbh6u6Xo9DM=; b=TIHA95aSeiQ3vv7yo+yIALcGVU xL0xj6Eqvdcgr0XsWQ7o6Nbi6OJ4OUu+XOKiS3GnDSa7KkzIKRXEv3upYPC1bgi6bYXdoAt5Vvrfu RlVR0/6BhIdhp6r6Ewj8+S3E2vJ/Geo0+tgMaQ/OBWGwuvsttjGfFG5jFvfUu+8Cx3S7thA1OZRRR WywLcD7YDnhpGx6DVFPBG8xlCJj/UKY+Dwhmu8Mh4FZZbas/tgQhRUnhZ0Ds9nbLVZNecr9mdl0NE 9V5U97bQIY70cFsBiNPgEuT/ag/K9SnHhg61u0W1nJTDaTXlUpzcVYCp4sfY75DWk26ZEFSqTOMHD SUYX7sVw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT3YL-000000019gJ-2Psl; Thu, 25 Jan 2024 17:30:13 +0000 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT3YI-000000019fd-2dmq for linux-riscv@lists.infradead.org; Thu, 25 Jan 2024 17:30:12 +0000 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6da202aa138so5285173b3a.2 for ; Thu, 25 Jan 2024 09:30:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1706203810; x=1706808610; darn=lists.infradead.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=FiMcoXLtake3SsYp4VgIXSl2ZPSDDwizQGFnhQxFN8w=; b=Mx230EFo9TxjiTeFc18yzuUsILNKhmtYOmn9NhcaxJpKxWlCX36GoV+rGRz2YgR68G qjXGMa7H0npWwhKVGScxRH+IF3hcsdJwMYBDev16t4iQ/o5aUd855a4CHBZUCzpJaZ3S Imx40k+kag0+gm2RRCAcdXdCrPjM99MFcwkZO3LnoIU/yiTGbF9kNggB7Srvy4trrnM+ 6yLQ5HJmkSo/sE92KrSEzG/TPxJl/z4CXoristEuwO2StRvbpAnEWJ5ilZZU+85x2YCx nQC3G2XKi1jAmnXX4k4fMhwqSpXW45fU6jqiONS88wcLOTzi1U3+i9l5fsIGTdKxyIBW RcLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706203810; x=1706808610; 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=FiMcoXLtake3SsYp4VgIXSl2ZPSDDwizQGFnhQxFN8w=; b=QqOuzEuh9gAjma30sQJ7c9civxnR3pMvd6UYPXw81a6lYdggal5Bl0cWeYnwezYga5 YTX6Zfr4bHXgy9g4ebS1NngaYbkijPGvvmgracRIBZTvqwcOg2c5xbUSHO2CCGKmP+jk JyB+6JFaqDmKXrK5uzad6nRRzwJ7yR61yMBslgwu30FnrRp3vcU++teOYb9kWYuJf9Ai lQ9uZuxxl14tcrrpjPFKCJCxUhEhHElJ/WaQrcG/Inxbq5JDn7u4ZwozSugY+Q6jz+on oDPZJINhGY0xR3ZcAj0GEYwCkpQd8Mr+H8tPnWBEISYpXD0aVAvj8n4gfEcYe3TeNIl7 VXJg== X-Gm-Message-State: AOJu0Yw1mbg2+mK8j6b6DlX8LK0OI6nFqWqFgLwXbJHyWQP7ycyK/JnZ +hIReRB9Veh+rsjXfKJRY6TCilRtwcHG5rItqmNckZFZ1zKqn92DU4pb/Dn3nHc= X-Google-Smtp-Source: AGHT+IFiBmJ9bUWly4Y63SGZXbMGx4CdDV3C4ohhFPjAa5O+ssE0qkHaRA6CwOtYsFJogn6onLaUzQ== X-Received: by 2002:aa7:8755:0:b0:6d9:be3e:19a0 with SMTP id g21-20020aa78755000000b006d9be3e19a0mr32266pfo.48.1706203809641; Thu, 25 Jan 2024 09:30:09 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id v6-20020aa78086000000b006dbda1b19f7sm9099781pff.159.2024.01.25.09.30.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 09:30:09 -0800 (PST) Date: Thu, 25 Jan 2024 09:30:04 -0800 From: Deepak Gupta To: Stefan O'Rear Cc: rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, "kito.cheng@sifive.com" , Kees Cook , Andrew Jones , paul.walmsley@sifive.com, Palmer Dabbelt , Conor Dooley , cleger@rivosinc.com, Atish Patra , Alexandre Ghiti , =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= , Alexandre Ghiti , Jonathan Corbet , Albert Ou , oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, "Eric W. Biederman" , shuah@kernel.org, Christian Brauner , guoren , samitolvanen@google.com, Evan Green , xiao.w.wang@intel.com, Anup Patel , mchitale@ventanamicro.com, waylingii@gmail.com, greentime.hu@sifive.com, Heiko Stuebner , Jisheng Zhang , shikemeng@huaweicloud.com, david@redhat.com, Charlie Jenkins , panqinglin2020@iscas.ac.cn, willy@infradead.org, Vincent Chen , Andy Chiu , Greg Ungerer , jeeheng.sia@starfivetech.com, mason.huo@starfivetech.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, cuiyunhui@bytedance.com, bhe@redhat.com, chenjiahao16@huawei.com, ruscur@russell.cc, bgray@linux.ibm.com, alx@kernel.org, baruch@tkos.co.il, zhangqing@loongson.cn, Catalin Marinas , revest@chromium.org, josh@joshtriplett.org, joey.gouly@arm.com, shr@devkernel.io, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com, linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: Re: [RFC PATCH v1 07/28] riscv: kernel handling on trap entry/exit for user cfi Message-ID: References: <20240125062739.1339782-1-debug@rivosinc.com> <20240125062739.1339782-8-debug@rivosinc.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_093010_717889_D7BE2F8E X-CRM114-Status: GOOD ( 28.25 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Thu, Jan 25, 2024 at 02:29:01AM -0500, Stefan O'Rear wrote: >On Thu, Jan 25, 2024, at 1:21 AM, debug@rivosinc.com wrote: >> From: Deepak Gupta >> >> 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) >> >> 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 | 5 ++++- >> arch/riscv/kernel/entry.S | 25 +++++++++++++++++++++++++ >> 5 files changed, 57 insertions(+), 1 deletion(-) >> create mode 100644 arch/riscv/include/asm/usercfi.h >> >> diff --git a/arch/riscv/include/asm/processor.h >> b/arch/riscv/include/asm/processor.h >> index ee2f51787ff8..d4dc298880fc 100644 >> --- a/arch/riscv/include/asm/processor.h >> +++ b/arch/riscv/include/asm/processor.h >> @@ -14,6 +14,7 @@ >> >> #include >> #include >> +#include >> >> #ifdef CONFIG_64BIT >> #define DEFAULT_MAP_WINDOW (UL(1) << (MMAP_VA_BITS - 1)) >> diff --git a/arch/riscv/include/asm/thread_info.h >> b/arch/riscv/include/asm/thread_info.h >> index 320bc899a63b..6a2acecec546 100644 >> --- a/arch/riscv/include/asm/thread_info.h >> +++ b/arch/riscv/include/asm/thread_info.h >> @@ -58,6 +58,9 @@ struct thread_info { >> int cpu; >> unsigned long syscall_work; /* SYSCALL_WORK_ flags */ >> unsigned long envcfg; >> +#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..080d7077d12c >> --- /dev/null >> +++ b/arch/riscv/include/asm/usercfi.h >> @@ -0,0 +1,24 @@ >> +/* SPDX-License-Identifier: GPL-2.0 >> + * Copyright (C) 2023 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 cdd8f095c30c..5e1f412e96ba 100644 >> --- a/arch/riscv/kernel/asm-offsets.c >> +++ b/arch/riscv/kernel/asm-offsets.c >> @@ -43,8 +43,11 @@ void asm_offsets(void) >> #ifdef CONFIG_SHADOW_CALL_STACK >> OFFSET(TASK_TI_SCS_SP, task_struct, thread_info.scs_sp); >> #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 63c3855ba80d..410659e2eadb 100644 >> --- a/arch/riscv/kernel/entry.S >> +++ b/arch/riscv/kernel/entry.S >> @@ -49,6 +49,21 @@ SYM_CODE_START(handle_exception) >> REG_S x5, PT_T0(sp) >> save_from_x6_to_x31 >> >> +#ifdef CONFIG_RISCV_USER_CFI >> + /* >> + * we need to save cfi status only when previous mode was U >> + */ >> + csrr s2, CSR_STATUS >> + andi s2, s2, SR_SPP >> + bnez s2, skip_bcfi_save >> + /* load cfi status word */ >> + lw s3, TASK_TI_CFI_STATUS(tp) >> + andi s3, s3, 1 >> + beqz s3, skip_bcfi_save >> + csrr s3, CSR_SSP >> + REG_S s3, TASK_TI_USER_SSP(tp) /* save user ssp in thread_info */ >> +skip_bcfi_save: >> +#endif >> /* >> * Disable user-mode memory access as it should only be set in the >> * actual user copy routines. >> @@ -141,6 +156,16 @@ SYM_CODE_START_NOALIGN(ret_from_exception) >> * structures again. >> */ >> csrw CSR_SCRATCH, tp >> + >> +#ifdef CONFIG_RISCV_USER_CFI >> + lw s3, TASK_TI_CFI_STATUS(tp) >> + andi s3, s3, 1 >> + beqz s3, skip_bcfi_resume >> + REG_L s3, TASK_TI_USER_SSP(tp) /* restore user ssp from thread struct */ >> + csrw CSR_SSP, s3 >> +skip_bcfi_resume: >> +#endif >> + > >We shouldn't need any of this in the entry/exit code, at least as long as >the kernel itself is not using Zicfiss. ssp can keep its value in the >kernel and swap it on task switches. Our entry/exit code is rather short >and I'd like to keep it that way. I kept it here because sooner or later we will need to establish kernel shadow stack. Kernel shadow stack on riscv (compared to other arches) kernel actually will be easier to support and adopt because there is already support for shadow call stack (SCS, [1]). Difference between existing shadow call stack (SCS) and `zicfiss` based kernel shadow stack would be - In prolog instead of using `sd`, we will be inserting `sspush` to save ret addr - In epilog instead of using `ld` and compare, we will be inserting `sspopchk` So a lot underlying work and functional testing for shadow kernel stack is already carried out with SCS patches. It would be easier and faster to re-use SCS patches to support `zicfiss` based shadow stack. I don't have favorites here, if overwhelving opinion of community here is to take this logic into task switching and re-work this logic back into entry.S whenever shadow stack for kernel patches are posted, I can do that as well. [1] - https://lore.kernel.org/all/20230828195833.756747-8-samitolvanen@google.com/ > >-s > >> 1: >> REG_L a0, PT_STATUS(sp) >> /* >> -- >> 2.43.0 >> >> >> _______________________________________________ >> linux-riscv mailing list >> linux-riscv@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-riscv _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv