From patchwork Tue Oct 1 16:06:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13818413 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 C8B94CEACE2 for ; Tue, 1 Oct 2024 16:07:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE2D02800A5; Tue, 1 Oct 2024 12:07:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B9217280068; Tue, 1 Oct 2024 12:07:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A0D9E2800A5; Tue, 1 Oct 2024 12:07:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 7B9F9280068 for ; Tue, 1 Oct 2024 12:07:29 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 359D7415DB for ; Tue, 1 Oct 2024 16:07:29 +0000 (UTC) X-FDA: 82625513418.14.565F957 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf11.hostedemail.com (Postfix) with ESMTP id 466AA4000C for ; Tue, 1 Oct 2024 16:07:27 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=wDPB13aH; dmarc=none; spf=pass (imf11.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1727798808; a=rsa-sha256; cv=none; b=yZXu8XC9EJzvEbU+1MZ2dUZms9surqGE+G5FtGikYgc6E6lM7BzHb6K8339K9unFqsku8C 17iI7Vf0MzLj4RYKhvbaWWMGr34jJk8vNR6Ey2qm5JxfrSo7SI6Cz5zubZqA5yKN9llg6J WEiozlmFrlgMLURD5wPRLPnm9VSPfsQ= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=wDPB13aH; dmarc=none; spf=pass (imf11.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.44 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=1727798808; 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=vp6gF9RB7PujTLsWgMJUvhBPp2Lp7GCbQKh7IscdynM=; b=BuYFANqhFTHazC24MzIjHxLOZ02x01hx+jMW9gU0k83nqDJmB7xHaRkYwSYzgx7h0DnkmO RFdAqo0R5HDWjbBEMtA0BQJ4gXXLKgVLKrw6bTCrTvT7WPaCdmrrPLpoWC0x+Ug2oqZ4nd SNclSQn2Dh1k1k9kc5ixrXrJPhYb6J4= Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2e0a060f6e8so3908795a91.1 for ; Tue, 01 Oct 2024 09:07:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1727798846; x=1728403646; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vp6gF9RB7PujTLsWgMJUvhBPp2Lp7GCbQKh7IscdynM=; b=wDPB13aH2axwlz37YMZs+N49KD2juBJW6njabSYm5evjvvEicpFZJ0gujbhwCweUeP 8iY/hegbIPPFX7drI2y0H1JO9siq68wERBzUQaH9VDnvI/OwYrSCcbI1bCcx3vneCg8v 36zI46NFVyqGJCmzgp3GAp470F88y3RP5IICx4FrTkDy5vMIfHbzEiw83JLAvCUdZgQ7 dJtAqiXKgxwADOM++s8TGehmxY3TDcZiaQKGEpOF14sNABrwZscBKTJ+QAPklijYLV/1 LepemQlKy7hOSOBS51JOTxDZQugd/pFH2uBjJseX8sJYckehOqH6gdgsblg2ODlG4DFE GsOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727798846; x=1728403646; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vp6gF9RB7PujTLsWgMJUvhBPp2Lp7GCbQKh7IscdynM=; b=S67NwYy4ldswxlnSc2yxBCUykr0aROS9dnU1/1S5eq5pVz5b9UmyyVB7FWFSe6rOxn XOIcXu6J3pPtloniDqzfCFpPAjZKJjBFs7doJcPIXLDkaKBVCuZ3RxLa0feiiQUshJEn ghXAdpvdW4l+MHtMHmxdY/Rw+9478NCtRamRn+4QmFVSf9qjuO/wISgbNv3BbeqOS8p/ Eb5mW+3fRjCrFhLww/0mkuMCXB2BRtO3vrIqwXE+/1ZfpoJuBqlXjEaRNWes/lBvazep 2XW2DfgEL81TaxXIAzM9mSZf3XlToGjZmGS5sdeMGJf5qrEW4DrVGycyeCc9yf/CwaT6 q+9Q== X-Forwarded-Encrypted: i=1; AJvYcCXYukfo6TkPYuC0tRSkQTsAaCFiiQyBGvUl3CO6mFaxLpw+Bht2uHeLyRbL42atyp9JniPgCuIEcg==@kvack.org X-Gm-Message-State: AOJu0YwaDnXuwmCyFt3PE3pLaSWv48bHc/3e6buGBspHabrw3emwuaRg lP/qxTy4M+2mIS1frsNd+evGQv24w5vIHFstkjLjRxrlgb8ojSSmlfURqM6Tn1A= X-Google-Smtp-Source: AGHT+IEmg893m7cJrhVZzbTskW+hEDS5KhBOOmodDZAU10FTUO0uF+C1k8JeSAdGJ2XwaC8MJ5TMpw== X-Received: by 2002:a17:90b:378e:b0:2d3:da6d:8330 with SMTP id 98e67ed59e1d1-2e184529ed1mr235894a91.4.1727798845993; Tue, 01 Oct 2024 09:07:25 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e06e1d7d47sm13843973a91.28.2024.10.01.09.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 09:07:25 -0700 (PDT) From: Deepak Gupta Date: Tue, 01 Oct 2024 09:06:15 -0700 Subject: [PATCH 10/33] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit MIME-Version: 1.0 Message-Id: <20241001-v5_user_cfi_series-v1-10-3ba65b6e550f@rivosinc.com> References: <20241001-v5_user_cfi_series-v1-0-3ba65b6e550f@rivosinc.com> In-Reply-To: <20241001-v5_user_cfi_series-v1-0-3ba65b6e550f@rivosinc.com> 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 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, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: 466AA4000C X-Rspamd-Server: rspam01 X-Stat-Signature: nhbbn859hqmt3oanfkomx4e987wyo55e X-HE-Tag: 1727798847-3572 X-HE-Meta: U2FsdGVkX18mppLxprb2RtMKb69lYwFKSeq30f9qUIpUJ0b1a55Eu+dRDBLN3N0rLhpYUcFewG/nz1xAaxqBdRuYC8yQliv/yHQHVsFt3Lgp1cDSiipDxztiJt/lPfN8syR80Xo3IvN2isYuwRQac3BJzRtOglWDfBuyOeoDoC4v9D4MpjPgBQy8L7nX+/l0z44i/2JoU8aLr5rf+5yXyuxg3E16P/zSDnbrtfJy5mQ0WkT9oVhj4tVpC1ZApGu6zzxTwHkwJQLUd5TcS1Ttdf8oItVfNeuGqaInII9f5U3jXAAX6vc4oh08AjN/CoYLWp75Rc8wEllgj0mdwoqSJLBrirxVfp3nmeUm6txTtyEn6rwjuPUNYuZiiXCl4k6md7+4gS1F3Tv/5uQ9Dy4k/Py7YLlKGoo8feZx0P+CXcto1S/wOt7VQdSgyOrANXWJ8nAfRpZp/BW/p/JiYAbTy4mfTfKN1h2GoPdlvkJNZJsmFG/k9OOFqBx4lLHadEODlbBfq/kEAxoyQo7ghjEMTCWhe2qT95QJ2lqmlRLjKf8y65WhHNtasdMseJdQ799fcUMzfCwrZk5fzZbzanAyDX11FLs2GCeUkoqliUq+EPs+dsYNGmgy8v1gscobgxm7x9UjsWVuf18sgS1XuySzmmbE5hm7kW6oSoYCdzCT44p7iIewQTRwWy/aDrZjQGwPan52PTu8xSns3VvMSE/oBRRFsEKEgBKQlSrizmyq1noAPcJ+I0R2u0LVVy+ZIPQAE4zIxI/kPJHj1sQ+tpogWe/ueWtnOBZ+TFjlJpr/T/01dqN/1W6l60x+MwnlvDxTgIAvGAxXEBg6QL9u7qnQNvQeggEMvMTvQbRvFTGA4469DBU6jVXrmE96K7UeXva27l3zfuo9+bOJbN9QSs3XnvZtStJsLgMR7lEi0ahxKjzMcxFkW36XJILF7gsTzYulrytK9SfkkVtiDMMnGEj nz92yw1T tTuPpqvyx7GhUQbxw7G3pCiiT01wm6bonuCCm+Xtz+69rD99B0dmwjbsJtx8i4I+zFyTjjEo3+Fsy/p+ZBjNqXhhZ/1Sb34w8em+/hWw4znd+OfFz3iKtQD9+VMCJOYb5m8nE8pfDDz1d84k2tE/2x472upx+xQhMUsVuJhz7cLhoUe+HJ6Mexj98+4tGy36sUkTkisg+WVDhrzgtHOwfl1h1Ci+Dl22cbvXCXer0kWpaXyjHry0oRp0racBgkH4LPzLdivsSJaomEbfVL62FpuV8cpUDZGNix+zrSBX78CRVK0l9mS4GusG6iwZuJYtQ1F3+rDXLjX7tLoYdteZOjWNQ7AD4jAxQVJlPJsMm+FfZaC/P5GA7v+THSUb40s7EKZZp1jrNi6D29Q4r53dbXirdtOFfub6tRtWfKsLySsZnMAKtE2W/OWOr6R19DgbSK2KgNl1n4H6pVTJQwFdNZMC5kbppWrw25vr1AcK32WSW2QVdKXOQ7rsIUNd8futdy/wKfRB3VCFvFKfnk1ZbdnNyqrWDP5CmUgEDBYj9aPLytOg= 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 `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 Reviewed-by: Charlie Jenkins --- 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(+) diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index 9ea0021a1a75..0e05c9682b3c 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 e494871071da..ed9e6cbacaa5 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..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 e94180ba432f..766bd33f10cb 100644 --- a/arch/riscv/kernel/asm-offsets.c +++ b/arch/riscv/kernel/asm-offsets.c @@ -52,6 +52,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 c200d329d4bd..8f7f477517e3 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("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 @@ -236,6 +250,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