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 3F89EC3ABAD for ; Fri, 2 May 2025 23:31:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9DAEE6B00A1; Fri, 2 May 2025 19:30:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 93A5F6B00A2; Fri, 2 May 2025 19:30:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 766346B00A4; Fri, 2 May 2025 19:30:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4BFCF6B00A1 for ; Fri, 2 May 2025 19:30:58 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 1698580CE2 for ; Fri, 2 May 2025 23:30:59 +0000 (UTC) X-FDA: 83399565438.05.7BCE915 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by imf05.hostedemail.com (Postfix) with ESMTP id 1878610000D for ; Fri, 2 May 2025 23:30:56 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=PPEHZLKI; dmarc=none; spf=pass (imf05.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.53 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746228657; a=rsa-sha256; cv=none; b=S5umvIZhhNAMCh+CkchYv9Yy/FYEIX/eHUxoHjojUyEQVPqoo8jvGGKDsb0ggNomYFj85o XWaPRCdYurNBx5DTJQM16WBSIWFZeNmGWUPPMYtv5DBU5qlwqHTYM0sF4UDWaYCOPuE9rh 72rluYgo3f8JGysjJYBriOawzpRoPHQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=PPEHZLKI; dmarc=none; spf=pass (imf05.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.53 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=1746228657; 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=eyCgE0sNHOlyx9zGD2XlqTc9W1j01DyA5vw9LyX8zMs=; b=21MvJwFVGa71ER2Sk0Fn6uZcavYngMYcZuqD8gPPiqp6xaetbvem43CJVo2KaSbXMJsChz 6Q/MV1Q6EcA6csZ4U17Zo9O/p4AlmkiOm7bcAyxE/cC4qSdH3KQkAoZ8vOp0oyT6vtmxhA NPlgmyTaivnYf1N2k6OsxB0ZLei6L4w= Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-3018e2d042bso1827111a91.2 for ; Fri, 02 May 2025 16:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1746228656; x=1746833456; 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=eyCgE0sNHOlyx9zGD2XlqTc9W1j01DyA5vw9LyX8zMs=; b=PPEHZLKIdY72TDZMfStuOaTSV7eyVzou1mg/BUYKj2WjjcmkEU9lyjdRPWIPR0aLon GU/bhlKiTrZr+OzJV/uPmWZLuFEjg43DAoxulQYIffATU19423CgvLP41mD1HqQKJ8ik YA5QwCz3/a4/5d0bCR/cDIBwydLSGkVRjsKvQBieH/5Bc8XSaIZcMtBcnBpr4MH0r+OT E9G8NBH/fOlI8PZEpQNRxoyh6UALMjiW2sN/0nTsDWCvgaIMc0PvPY6Hl0rgYmMVucJr J0Ag5Dovv2khkm9vP3FZXoh35tIubOFVv/uAYYPhORt0WjK1C8oyRq5g17PFmkfejnQC ZSqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746228656; x=1746833456; 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=eyCgE0sNHOlyx9zGD2XlqTc9W1j01DyA5vw9LyX8zMs=; b=FDPJBLZzCyvd/Q1Aw4aRwwiZYhBCmXUEhtZBGpGBv5iLRpl9i60HEVY2AHxggN5dAM 3ZUGbt7tHMgE9m4qUteMF7vcEbdYveRFwmwzdYb34XRR1Thn0A33rne5TsFiDN4J1o8k Qt4A9auUHh5oUL6Cd+sFG+OKxei+drx+2BYVU7Qxhhy5C0mc1GdVZUy8n7wnf1ulNfSI 3sD22lM/XoSV0Kk5dyTejf4a4fN8AYk2G/6yf9DoDHqeFnTe8Uul8qD2czlsp3ORqZJF j3+YFavoV4vkjItIEPd79dAKv2pp6hAJ3O4BIalnc79fOfG5QAbpu9jRRxN61uhQyQ3+ j50w== X-Forwarded-Encrypted: i=1; AJvYcCVpXiMvHKrtYFByHEwn6S2dYcBcdmswnt5fggyLvQo9uYbm8lZDkHkRf8HzSmEhtOYCYYGijV789Q==@kvack.org X-Gm-Message-State: AOJu0YwfYfuvwSijDsDTYW+g3Q16+MPS967Fv6x4GhDqw0wiU30Zhfpf sGkEc5GmmX44Xp5ZZZB9e1T1+HlxRf+SN55bMiVmn6N9FAsEB0SDtWcpp5eSk4k= X-Gm-Gg: ASbGncv2yJPqEWZpbE9NxqYK9zGr9xEkadV1HuvdpqvLvksbGarFpA3/oeRtJIL4c+N rZoPha9NaH2Mo3ayxKaO33ZT+GxiUKDxV7Cnb+HGyXp62Id6nAXfAM3SIyUOwOTfRuM7O2/jgjH Ou0kNmF4QjOCRb1E5KxSjuxke0NfzEvMtpkMSua1E69DU0oINmHSdYMDkagXiwRmwAOAIgn/aFY CCh7ffg4sa+WClPmAncLOobdNtW03oB25zsFgstBUJSC26XZNdTA16AXLq2w7ZOvtTsnMYQz9yi 69d4b/yaWDz7AyBojWh/tWT7V4yxJP+Yb+x3xdE5YvS3zTlXj+ItVSBOPsIMZA== X-Google-Smtp-Source: AGHT+IFc9DXgv2QdNwPn3PuhCWiUMD3Xa2Lw3LJw3Yfwsp2Ilu8nuNc3bnHagRry8Xng0dgjTK/XvQ== X-Received: by 2002:a17:90b:58c3:b0:2fe:68a5:d84b with SMTP id 98e67ed59e1d1-30a4e5627admr6284705a91.1.1746228655948; Fri, 02 May 2025 16:30:55 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15228ff2sm13367055ad.180.2025.05.02.16.30.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 16:30:55 -0700 (PDT) From: Deepak Gupta Date: Fri, 02 May 2025 16:30:36 -0700 Subject: [PATCH v15 05/27] 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: <20250502-v5_user_cfi_series-v15-5-914966471885@rivosinc.com> References: <20250502-v5_user_cfi_series-v15-0-914966471885@rivosinc.com> In-Reply-To: <20250502-v5_user_cfi_series-v15-0-914966471885@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 , Jann Horn , Conor Dooley , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross 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, rust-for-linux@vger.kernel.org, Zong Li , Deepak Gupta X-Mailer: b4 0.13.0 X-Rspamd-Queue-Id: 1878610000D X-Stat-Signature: 9q1smkmnbdpodgk6xqhd77z4gbqf4cu5 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1746228656-85113 X-HE-Meta: U2FsdGVkX18UkMiayXIqVplee1ORGb56ToQeOEhjGE9AGUJ3JGnGkZQ4hvv7+zS+xetWTaToVi6ySEOlvSsu0Rgv/WIrqN5dsJZfEdWkRupr+I4HdAz7J+jFIas7FPYVOOvO9YWCEPoh/RLECcUmjbOYXuF4Sz//Qq5+K/0mo95YTVksN5avFo/yKm/g2CX0ZGOjsJdsQHdm3yuAyEPzgZ99l5MFPKhnZI+//UtTok6WaAwmgDl74lSg6JiUBS4guZ/JlM7xV2e8rk1nJlcnvKYEo2XVMSWkQRWiMg2kT3CVdCI1u3j9VETUdMHj2yDqihPUCzMmmZfpnKoXzaK+vQlpyb+/SNiMmfl2GGvdYwblIfSQuMuzuoRsKZoUnUysS5KXfFAdvqp5gWJtmNpih5sNjTbT++TSO/b9Nu3mIhGfifIFs2ypZ5kzDtD7IqnShh45FDBmbC0osoUqsF3+OAlZajdwa4mAEix40rblFwQg/0C/WMexTr3pSST5VZxctwHKSgUzTV/pLuQNhSWfzBgMzTT10m5p75YUyzoyPOP9nWEtVrGCr5u+hoSiQwtzX3J/zSkB46vC5HtbEBrXI6bhmGe8jA1aqeN7m9nHj7M7OaHVhZ5xOowN/dnFZP/G6Ma3EZRW+KZE/t3Mmgvf7Ga86+ZYJXj27thH2utcPKztmJrX4LuC/KDSmB+C4Aw7f+yvT00yvy0t+SDlNhz0znNr+MJ3lwyOqpZp0Uc0ZjzFe6aZuiCFZ+mYz3P8g3a0F57MYutTSFkso7/6Q4Ou20CGEoRZs7Nn4b19KFm0gHzKe96ghgHljoMVFrbCsoNVvjMEL4qRsMNcOqqz9Jj5WF2WLdE11FNg+6/RkEviZADqzp3Vllq9B6T3aOIzy/XEY5AV5fzmNx5TKKWl1KSHDbRSfdgCS+CSZngetnwMpyGUtNoKdWXwWxgvslAIE5V6WjkKwwdiTMTqxZMR/AI umHtTZ8m TYbZYIvN8xaWE0foUWeMrWbI9cfjY3lYAhC3bvJHAESz8dy1bWaKxUlzmIVhGMa2QHJIxxrYbubzV9RnvadUHDu8R5811Y/gf3yjdhKBs+oiB2tlvRHc3Jk00IgENO7AMTJ9F1CdGfrkDHeevsVFZRSYHd5w7x4x6CDuqNdNp0bTPkgPYgs7FLjX+liFzmzJ302MkotDiSB1Yb0qrgtBn6sCg0sv1qmF7WLm+9EPmzIUTTNCJmGnLTI5SlfJzypmtE+Dq9iM7B+THFDE7UmkkIK5Ij7TVAEgv2iHEPKQHg9NOzTd2jqU87VUaJEZrTNvd7Y0i6NdnZ+qLrHTHl48ytT+5Hzz/dlVBTPPKtUcC+ceOp86fuXnFR0ojNRSaf/ERYYnKwr5QB8absE1HgIx5vgvXJj6bA7FCgT9eZZR6HF+SjCxjJucuYivJZj3QYF9yrf/RPCbDGYrdgXiwGqlzTUiUsoll5eUf2MKhc8i1J7Wc6vMPZ0q4dzu7yf2+9ApvcQ10ZoPx6HmJZdvtM7zFIvzZp4qh/4pV/li/kwkDFLjbxFRogHcmBnP4cr5Ztergnm32 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`. Reviewed-by: Charlie Jenkins Reviewed-by: Zong Li Reviewed-by: Alexandre Ghiti 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 | 23 +++++++++++++++++++++++ arch/riscv/kernel/asm-offsets.c | 4 ++++ arch/riscv/kernel/entry.S | 28 ++++++++++++++++++++++++++++ 5 files changed, 59 insertions(+) diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index e3aba3336e63..d851bb5c6da0 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 f5916a70879a..e066f41176ca 100644 --- a/arch/riscv/include/asm/thread_info.h +++ b/arch/riscv/include/asm/thread_info.h @@ -73,6 +73,9 @@ struct thread_info { */ unsigned long a0, a1, a2; #endif +#ifdef CONFIG_RISCV_USER_CFI + struct cfi_state user_cfi_state; +#endif }; #ifdef CONFIG_SHADOW_CALL_STACK diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h new file mode 100644 index 000000000000..94b214c295c0 --- /dev/null +++ b/arch/riscv/include/asm/usercfi.h @@ -0,0 +1,23 @@ +/* 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_state { + unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ + 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 16490755304e..f33945432f8f 100644 --- a/arch/riscv/kernel/asm-offsets.c +++ b/arch/riscv/kernel/asm-offsets.c @@ -49,6 +49,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_STATE, 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 33a5a9f2a0d4..c4bfe2085c41 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -91,6 +91,32 @@ REG_L a0, TASK_TI_A0(tp) .endm +/* + * If previous mode was U, capture shadow stack pointer and save it away + * Zero CSR_SSP at the same time for sanitization. + */ +.macro save_userssp tmp, status + ALTERNATIVE("nops(4)", + __stringify( \ + andi \tmp, \status, SR_SPP; \ + bnez \tmp, skip_ssp_save; \ + csrrw \tmp, CSR_SSP, x0; \ + REG_S \tmp, TASK_TI_USER_SSP(tp); \ + skip_ssp_save:), + 0, + RISCV_ISA_EXT_ZICFISS, + CONFIG_RISCV_USER_CFI) +.endm + +.macro restore_userssp tmp + ALTERNATIVE("nops(2)", + __stringify( \ + REG_L \tmp, TASK_TI_USER_SSP(tp); \ + csrw CSR_SSP, \tmp), + 0, + RISCV_ISA_EXT_ZICFISS, + CONFIG_RISCV_USER_CFI) +.endm SYM_CODE_START(handle_exception) /* @@ -147,6 +173,7 @@ SYM_CODE_START(handle_exception) REG_L s0, TASK_TI_USER_SP(tp) csrrc s1, CSR_STATUS, t0 + save_userssp s2, s1 csrr s2, CSR_EPC csrr s3, CSR_TVAL csrr s4, CSR_CAUSE @@ -236,6 +263,7 @@ SYM_CODE_START_NOALIGN(ret_from_exception) * structures again. */ csrw CSR_SCRATCH, tp + restore_userssp s3 1: #ifdef CONFIG_RISCV_ISA_V_PREEMPTIVE move a0, sp -- 2.43.0