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 7FBCECF0429 for ; Tue, 8 Oct 2024 22:38:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6CE016B00A5; Tue, 8 Oct 2024 18:38:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 67D096B00A6; Tue, 8 Oct 2024 18:38:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3BDEC6B00A7; Tue, 8 Oct 2024 18:38:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 1C8966B00A5 for ; Tue, 8 Oct 2024 18:38:19 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 792B2160C53 for ; Tue, 8 Oct 2024 22:38:17 +0000 (UTC) X-FDA: 82651899876.12.57A8B41 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by imf28.hostedemail.com (Postfix) with ESMTP id DD462C0009 for ; Tue, 8 Oct 2024 22:38:16 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=gCJV7N9n; spf=pass (imf28.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728427053; 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=HqH/AhXY0hzM1+WX3zWeccxGSysMowKCTsAPVGtoEZU=; b=nxmStENeVowI3AvwYfkalGaFKql8ZeW+lR4SHgiesFGB/AklyhnpH4CsB/hP9Ek+V5Ew0S w/1D2mqa8qHS+uy6OE85zsRWa/WTshkRfnjp5lC/5M8I3M1IoF9v6xGglqZwNIO7B2JDjD FVGfDR8UbSTmyntwSQP2jJaI8VYvM40= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=gCJV7N9n; spf=pass (imf28.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728427053; a=rsa-sha256; cv=none; b=AiKpjZFE8YpRoJYxDIcsNZTrnd0D7xV/oJmxL56KHeBEfoXhwtKL7DazY7xuOs9dHULcBk bMQTZ41ofF2Q7EMfG5OyQTU2sDxA0opjq2bIt1RtMd9SA92SOxSN7C8+ZIG6WfaaXJ3roe /DnPiyGrF+ptU/wxjQFBIZ+wp+jWMWM= Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-7e9ff6fb4c6so4606760a12.3 for ; Tue, 08 Oct 2024 15:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1728427095; x=1729031895; 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=HqH/AhXY0hzM1+WX3zWeccxGSysMowKCTsAPVGtoEZU=; b=gCJV7N9ngTZqqIng+KYwUUgyuWhtOhNehnJtZ+LkTk5i/qWjq4hpD9V0ghJVH7P07G fvy/PhH/vJhrbG4RC5pA3aCBolkWGRoqLQsd2Xj0ve35iwkYVIy9gjTUSNonuQ/ZK8gf HQtV0PGgryYhY7mKWo7KDbfyvdK7vjIJOmEL0t55Et9givcnNetrIFb+U2lCTMkO3+IE F0+G0+M3phbfzvU5LzJMEWpyQZ0bqsrW/d22np0su/hxJjP7h22NUsi7hyU7P4Fmg2m0 cLQzrEuSfQUFVKBETbkdja2LQRk9+Etb1FgCZaEHk57jMq9ZYXU+RwlbCj7kLi4LqHls 0DiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728427095; x=1729031895; 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=HqH/AhXY0hzM1+WX3zWeccxGSysMowKCTsAPVGtoEZU=; b=gbokeeZNlph4cAYuUQ/D+Ab9ysIpn4aicPLWIkJIl7PEm7gSTwBdh+xikiURyk1sL/ hqWEM6frG8PvrNZMb+6Uf5OFzpFD/QDpbAqo7LuYEC6gN0Ff/fFkUGjBVtqfNDkQy7T4 G5PPgDLhVlZnCX0SvA2IV+Cg5QpmubWVom2A51FzjdJiDJiwyqy/w41W7HWgde70sTa2 zaep8TdwJUE00+UfWnDUprAULvL4C1d2CIc6luXwgleq4IWqfd6WbMDHyNg8CevTxUqH Erv8TgZK7S7aMpyJfQL1aJjTzoLzP+Tvik9XE0gg4ourcazxgXQBijbQ6kCSLM/xkbTo 5S0A== X-Forwarded-Encrypted: i=1; AJvYcCUe8ccmfBeiNJQO0jljTbtxigjU2WNS6L5B2WWBnWg1Nju7Y9JukFf7WB65qDe8eki27zAxRgKJ5Q==@kvack.org X-Gm-Message-State: AOJu0YwYlBtPj3dtE5+JGQunYwVo2W6RVcuU9NONjkezIK2dc7yhf58f UD5FSPm5kb8Rtk9xLnS3HfMRVP2XYgVkRk5b0XRdJMsAv9iGTovToNTUsvbU0o8= X-Google-Smtp-Source: AGHT+IGmH0pAT3k+B512WMEtl+jnoszZMXZJopQwCiYj/5o19BiNvFPol3OfLSxKWlmI805IJexCZA== X-Received: by 2002:a05:6a21:78d:b0:1d7:7ea:2f2d with SMTP id adf61e73a8af0-1d8a3be37d1mr856278637.6.1728427095593; Tue, 08 Oct 2024 15:38:15 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0ccc4b2sm6591270b3a.45.2024.10.08.15.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 15:38:15 -0700 (PDT) From: Deepak Gupta Date: Tue, 08 Oct 2024 15:36:52 -0700 Subject: [PATCH v6 10/33] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20241008-v5_user_cfi_series-v6-10-60d9fe073f37@rivosinc.com> References: <20241008-v5_user_cfi_series-v6-0-60d9fe073f37@rivosinc.com> In-Reply-To: <20241008-v5_user_cfi_series-v6-0-60d9fe073f37@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-Stat-Signature: 564z9d7c8cc6337nadci38oguk8nkkuh X-Rspamd-Queue-Id: DD462C0009 X-Rspamd-Server: rspam11 X-HE-Tag: 1728427096-710553 X-HE-Meta: U2FsdGVkX1+oqSegDHycOjyNGtDz6YvNPIiEhlRw3uM+jyQ1bA2xVRvOCdvDzP4r9JDFterWIr8SKYzXVmqKNYWBmmTvXUMM+tyNSAriZ4htO4XF3qRqWt1V6XEJu2souOkZ3h3AfGuyFI6tJdd378HKXHy/UYGNie/Mxpk9f1X7bC4fm2ZJ9nVXu2WupJ3MDvqlE7umJdj9SyLcavMqPKMVAS6Tp0O06dyT9Nt9tgX//qrGmkDC4VDW2idUr8PsBCIH/djkkw3ux39D2xGChnIocxUtuPLbxcOI6nLOjc2r9VxsCpRtmfN/KjREtX7AD4g/NJnlBQWArYQcl96EGDD7nxVb+FCzasly/WZWWQUqopDeIPWJDWx+10BWTv1qsIBVU2Bb9HyeWDZP8FwKyluxCWzs3xGGBjFBLzkvpS9BT6hQVhPWB195eW2YOz6Q5R46jioOW5AS//lF/5IZvhqUYrQG4cblELcQi3QzM9ONzhis6vHhS4imoEzQwdkXK3QwEQw/G2AHaS0DDXPZqV3szfcFYzj+/gFM+izTfXJonFBxVa/o++1g1kltSzQnQNRNG6/R3HxR3FqBtvehorA2kAkpkT/5KKfV/tFL5i+QfLe3RHcVmBHp2V/z46jIcX3gSa2IAr/De++84+c8vvB2b4QjjCZJE9KtyZCkf2BZkEGb1KxkkuqY4gB9uvK/E+rGpwzAdBuJEslgCl78jCgH2ShAeA6ws35R5+ABHQVOOHciTnThz6fhdBeZYfMtvhwdMC5xoRe/Kk//jbnIp+2S+GqotHL6sJmTNbB939i2slE737slAa9ie7xUGqaLf1bw2gSqM5zaQh9n9Cql9LxcSjOHn/+ciMducKUP/+ZiJkE/l8BGcnz81UEGdqhRj1xdAGW6Pdf82IToalEaTblhADCuN9cCq9I7f4eyDStDL98zQb4J24m53DS6DGProPu//kVl/m04gl0cTS9 Sby2D0mg pZLVuhcISKNVbmc5eB0pwsKEmEQozIHr1WSUzWVdiykCOFfRW2EAUC8BggWSmS1cPWjbl2H0FXvyG2ANjP1eUe45toQriDPl8k3qbCZlyfernE+Hx9W6OkJmbsBG30YL8nccj54oxTZTUCZYVfP+mO7plNTu4Y84FT/Aaui6FUcmmBgekizjdTFAoEGY4upfsmm4nVDLfgzCi8w+dRKpTXtdU1Pqcb37I5GTMm6xbJZuMUGHbnRZWjTqDXY7ow5jJtFH9i/LS8YzXGuoI8YJEgU3oNlrvsvJSDrjzp2fw8KCOpE9+7QQfr4VYxXJuAROjR0rwgUbMfueCGRwMaxifHtXT4OqOi9vGiS7MVCYty49DGdsQ1U0+H7DjN71ukPCsZlN5mTa9xQnhh2vFvxbZTK4uWjzJ8o3UorLOAsc3AMtSNA5NQ8ma4uPfSpcGVhd4lxgbasXX+UjVjo7RxBt51f0DDl65slO2Go9m21MN4Xp6c3n6CclLqj1VThH92LyJCAIdodldjhjq0WF9s4bX7jV36n/bLbcZWU0r/5kqH4DEsx4= 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 aec3466a389c..5a8031384021 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 ebe52f96da34..12263cef7518 100644 --- a/arch/riscv/include/asm/thread_info.h +++ b/arch/riscv/include/asm/thread_info.h @@ -57,6 +57,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..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 -- 2.45.0