From patchwork Fri Mar 29 04:44:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13610050 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 2BA4FCD1288 for ; Fri, 29 Mar 2024 04:46:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B29736B009C; Fri, 29 Mar 2024 00:46:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A87706B009D; Fri, 29 Mar 2024 00:46:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B3676B009E; Fri, 29 Mar 2024 00:46:10 -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 6859A6B009C for ; Fri, 29 Mar 2024 00:46:10 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2F789A10BB for ; Fri, 29 Mar 2024 04:46:10 +0000 (UTC) X-FDA: 81948839700.21.6F7ECAF Received: from mail-oo1-f41.google.com (mail-oo1-f41.google.com [209.85.161.41]) by imf11.hostedemail.com (Postfix) with ESMTP id 5642740004 for ; Fri, 29 Mar 2024 04:46:08 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=GGvtlEpq; dmarc=none; spf=pass (imf11.hostedemail.com: domain of debug@rivosinc.com designates 209.85.161.41 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711687568; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=iaRh0bZD1J49LQcAlor7p4SEY3y50QUlPea61yaZwvU=; b=WJHsrUqBWBWt1jmAJIZU9lV0YrpamGVlI9y7zpGVUiyrMwif4Kjo2zBlkMCO+Z9d9nBoCk StJn2aqNJ2ESzUaxR5aKV0XNaXwOlXXlN0jfmIlHruut5r8VaBpDKGtWZgMjTigtKbJAZD wLx/Dc4t3NzutKsLBjkCCiBC0OK5vcE= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=GGvtlEpq; dmarc=none; spf=pass (imf11.hostedemail.com: domain of debug@rivosinc.com designates 209.85.161.41 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711687568; a=rsa-sha256; cv=none; b=7I3hCDwLwu3Slo3jRsbJPil/dUtxU/IQorEdRuslEWDROESJOAMVy49L2LMc6zPUfwd6Kf TPHJ7pKG5ltHRvX9emJN3F2ZhcxpPjoB+n6WmnneNeJ2Z6ozs5cupsfUOVuCH2yt0SKQJX fySOGdncsgbevWOosGWtUjsYzSrRWGo= Received: by mail-oo1-f41.google.com with SMTP id 006d021491bc7-5a5362ceb7bso896130eaf.1 for ; Thu, 28 Mar 2024 21:46:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1711687567; x=1712292367; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iaRh0bZD1J49LQcAlor7p4SEY3y50QUlPea61yaZwvU=; b=GGvtlEpqe3w5Obv6NHSX3cBiTVvcBNLq/6AlY4wQF1azEBaeEjB3Nv3vVBe+e+jgsy I1kGT8mDXldYgPmVMSwIUQnix+d6QHoKVoyWsQdNuaau7/Y4qx58dWi9ZZd5XXNHr2Si Ng8/pyAtb/xYQQNUUkR+dWbC1JVX9KipXLu+SWqqrDlCJgVuQHQXgB4jENoFJxIYx2JE 3V212VZ7VLIuSochPfExawtCLYRB/PK3XZCg4dGrHBgSO8LGlb4O2zMx6e95B0f0chAW co0dF+c4YWO7tDq8OxH1jriz17GS2NkFYl2RXQLjcFlmEedG/OokGVhfCvcWef1V8/es 6YWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711687567; x=1712292367; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iaRh0bZD1J49LQcAlor7p4SEY3y50QUlPea61yaZwvU=; b=D4GCusQ5ejpgWB9k/JHWAFAFDGGq7ImkfmZ7PziHd4rO+Aot+VCXd8ilxomBDjHwwI tqhrAWM4kbsL4vFuhZyjMeMmPVQrMVswf5uD/eyNt/VXNeblM5s71WQT80RWLu7M2ynt oIGjIfJ4tttTWqzJB3PFZ8tkWKwm2yyYHayU3wV7c1SZ5WWQMPmSHkv1aBj3n+ZtGfgj yPMaW3cDw9kzIo6hrb9BYQV4I150yOeQ3SBoiV4jBpwloyBIgmayG1YonDrzyD0GzJ2L 94RAM7Md4/kPPe9wsogLoyOnckHMxqb/veVCs7Zq3SIy25rKHpM2X4qh0ozS2ma14hTE yXoA== X-Forwarded-Encrypted: i=1; AJvYcCWIDHeegPlG6eX3bzQQFBBWBwOwf/ktvWqoz/ove784I2dc+F/1ebFtii6JB4qVcUAUyEffIUKlxSaAJGH4Gf+fA/0= X-Gm-Message-State: AOJu0YwKLLZHFeBJ5m4rTUNaSSax/aTLiYHHOzBlgOZe4NpQYtWFQYl1 AfwQGOZDggpmtVI9A0UmasxcRi55R6xHu2VfLUN8tYRyvcm7omQdN+4oWFD+9Ms= X-Google-Smtp-Source: AGHT+IE9kWmyXBbaE5AFJPfIKBuGwtogZOPz1PpuRSBvlhnYIYRCVsT5HXaIBxM8bJ6Pf6POxqvejw== X-Received: by 2002:a05:6870:96a4:b0:22a:5f92:96fd with SMTP id o36-20020a05687096a400b0022a5f9296fdmr1377784oaq.25.1711687567318; Thu, 28 Mar 2024 21:46:07 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id i18-20020aa78b52000000b006ea7e972947sm2217120pfd.130.2024.03.28.21.46.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 21:46:07 -0700 (PDT) From: Deepak Gupta To: paul.walmsley@sifive.com, rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, kito.cheng@sifive.com, keescook@chromium.org, ajones@ventanamicro.com, conor.dooley@microchip.com, cleger@rivosinc.com, atishp@atishpatra.org, alex@ghiti.fr, bjorn@rivosinc.com, alexghiti@rivosinc.com, samuel.holland@sifive.com, palmer@sifive.com, conor@kernel.org, linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: corbet@lwn.net, tech-j-ext@lists.risc-v.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, ebiederm@xmission.com, Liam.Howlett@oracle.com, vbabka@suse.cz, lstoakes@gmail.com, shuah@kernel.org, brauner@kernel.org, debug@rivosinc.com, andy.chiu@sifive.com, jerry.shih@sifive.com, hankuan.chen@sifive.com, greentime.hu@sifive.com, evan@rivosinc.com, xiao.w.wang@intel.com, charlie@rivosinc.com, apatel@ventanamicro.com, mchitale@ventanamicro.com, dbarboza@ventanamicro.com, sameo@rivosinc.com, shikemeng@huaweicloud.com, willy@infradead.org, vincent.chen@sifive.com, guoren@kernel.org, samitolvanen@google.com, songshuaishuai@tinylab.org, gerg@kernel.org, heiko@sntech.de, bhe@redhat.com, jeeheng.sia@starfivetech.com, cyy@cyyself.name, maskray@google.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, cuiyunhui@bytedance.com, bgray@linux.ibm.com, mpe@ellerman.id.au, baruch@tkos.co.il, alx@kernel.org, david@redhat.com, catalin.marinas@arm.com, revest@chromium.org, josh@joshtriplett.org, shr@devkernel.io, deller@gmx.de, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com Subject: [PATCH v2 06/27] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit Date: Thu, 28 Mar 2024 21:44:38 -0700 Message-Id: <20240329044459.3990638-7-debug@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329044459.3990638-1-debug@rivosinc.com> References: <20240329044459.3990638-1-debug@rivosinc.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 5642740004 X-Stat-Signature: w7uhemtrdb9sfg977uo6hmigrdg58ix9 X-Rspam-User: X-HE-Tag: 1711687568-703752 X-HE-Meta: U2FsdGVkX1/5CBd8bXvUJ7swihFfZE35pmMIxcSyZk3v8/sFA1lw/efJpQEf1u6h4QHgIrDSIYbTvLB2BKeKFJZEg5pyBWYEsC8RUD/10lPs23V8flauK3sFet4x/6UkvowWRj36cRm8FubRHQvpffOpVxyODc1mzJGEjJnJS0xC1nJyHQze9p+xTy21lU8BS/bg76rHLo4iQVOUvmPR1zC5rFe0L9/2eXdRaFKwCiF4+yoGhNY7QEqEbFH1Vp+EVp4VbJLm03VzqDFiofVhDKuIOrbi1EdIKrLGRu/vgAI3SB8hqpp8Luu4ufpl3CspYb8AGmOOpkSs00eWxXcY9msGIoRmNt3tudNzah+zc+gfnma/ff3bwBX4j8qj3m7aeF4sttQJcr61muJbL4j65dnXPLgEN/cnREIUnD3C3l0PCfTuXD0LfzOonwRyMFujciDGB5Hs0SvD0+GuVJAfuwMLdJzJilrn20FUfzA24vEaaELkhAjDrK/yqx9vz/w9NoOcMjA2d0/bOnvCWFd7RnaCuTtyZqGlBX0OudOBY13kUTUP7Gdb3h9f0rdLGd0mgdtFtszrNChT7e6Czzge5c1rMBtpJFkfVjaDeUv6B7s5nnUIWwsDe7+xG/x8Ja53XUrOl8+f+z9EEX5+Rm1042OQsN5i8wXajHgX7Kp45EwFPQCHAec92zOGTHfgtUbH2MTkBiFVBJ4LXepwrtAvYpQGBoWfzA1KRaGyCs5GQPseNNLliI/KqO0zbTaDDqDUAnlkjR7fS6IXfjdcNtolHwNz51pa06rw23lIS0AGENOgkfvtEulx/fctWOr7rEqmNEvfDvVbtkrMmz0Lm+8YFAkEKydYqgATniUuI8jsS9GtQsiKCOOcSFiooalLbxEnUlzH1grWLCS/Yy7crE2F+omtgP2d3peVOJXfUpk5eCxTqjyNJTe2cMWyxO3JzYKTFMXql15qrW1P0xtbeq9 zjvSDE88 +krLwSYHVfiDrx8pLrkAQvBpaPLw8YokCErJZx196Eb5vMHdFU4y9JZniQQEmfTUREwq5IXGOQW7UGCpS1YI5GDBaSMLnmtnNWS23D1AzHACA8tCRDV+KwKJvzafgNq2q18Ey3ojADYA5n3ZJQwqsWkjWDACYLvhg4cyyWaH0EBcrYye3DNuuMmm/y+yFuGunQUm6zmP6zKzOv+H9XWqkzxLJFddQg2R/Ja10sL88wbQlYCZ+tBRu/RMKecHYmFzGhIxPrcR9g9WDhQ2KQXnnrSQC2bouRrQHQ4XZCVvrNxIOt2S9m5szJp1fSA1o1iiToTjL5qgMmae6Xh6e5sKRAzAScXBgSarPR0U82wh99PxK5H7GsIqFA7yb6gpiaB89CR626YLs+mXQmWK+W+KQEXlQ/wXCegIUanPZ3hxHNPK2m1UXlZFgnDzs8W4dwoh7JxyJpiqqb1H6ZqvwHQgdsOLl8PJJXMLCylmsFUtZ/HTa0m2IOOVcpK7QtXRhJIh15KScoGmTklE+alddlbJQinPsIqjHQaCkfImL9EB04SmMoujyI19qEPXr/yDxaDR3k16q 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 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 --- 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(+) 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 6c5b3d928b12..f8decf357804 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 a503bdc2f6dd..f1dee307806e 100644 --- a/arch/riscv/include/asm/thread_info.h +++ b/arch/riscv/include/asm/thread_info.h @@ -57,6 +57,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..4fa201b4fc4e --- /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 a03129f40c46..5c5ea015c776 100644 --- a/arch/riscv/kernel/asm-offsets.c +++ b/arch/riscv/kernel/asm-offsets.c @@ -44,6 +44,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 9d1a305d5508..7245a0ea25c1 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -60,6 +60,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 @@ -141,6 +155,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