From patchwork Wed Feb 5 01:21:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960366 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 87DFFC02193 for ; Wed, 5 Feb 2025 01:22:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3363528000F; Tue, 4 Feb 2025 20:22:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 27135280001; Tue, 4 Feb 2025 20:22:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A0BB28000F; Tue, 4 Feb 2025 20:22:07 -0500 (EST) 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 DA279280001 for ; Tue, 4 Feb 2025 20:22:06 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9A11D80461 for ; Wed, 5 Feb 2025 01:22:06 +0000 (UTC) X-FDA: 83084139852.20.8C38A72 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf18.hostedemail.com (Postfix) with ESMTP id B08F81C0009 for ; Wed, 5 Feb 2025 01:22:04 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xgbiPf0O; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 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=1738718524; 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=XFoiG9nO9GzRbM78aaWwJK+Q/U0QRSToN08KNluZphY=; b=OsAk+70P3VQHc6mNu9pexz2vsvX+dQbi07Rdgg9lnCPo92c6T2190+XGPMTbRhWd7YDv4b r5sKEd9Kd9wsyVifrwkYLJhKZYtT7a89ItTWESGDKZts0WX4QhIs2ntGcNycR+WAe3TkTJ NXYW8I91EtAMTMwx9EYzJ1FRc37X8UM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718524; a=rsa-sha256; cv=none; b=G16NGw5BtFzmSMsDhDX6ESV9enkJEPvlcNOINDH2cJM5rkZlRJRVnLBEZfbE2qg23+xQkq hI1vpR05Y2BWBZOyXy+1E1ayfC5Wd3igwmDsGBgsX7OuvB9gM1RgBY/lkXjySc19osf1/F LjF8s1CerAhLF5ObQmFhfWpUl0SPZig= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xgbiPf0O; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-21f16af1f71so4828585ad.3 for ; Tue, 04 Feb 2025 17:22:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718523; x=1739323323; 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=XFoiG9nO9GzRbM78aaWwJK+Q/U0QRSToN08KNluZphY=; b=xgbiPf0Oe3ag7kyfUyHzasDJW9iQ+bOp5Wo/WT/nHphuW63FgOMEQqv6uMB6vmXOyX VMUeF2d5L0Mqh5WnCVH7ofj3r14A5UQ09L3xvdlukaa6bowI98u71t8/WdjTxshIE0WQ lyLg97Ic6ppW5WW6CwaRtqPg1//hRzw2tHmj5Y10GFXDvXeLa6PGeNC1KMLKmpj46tho M0z8fsZ6WfugZT6rkwG4AtnSYTSyWxp5i4KyffHyj8E/ON22JxWM+3IJk+ghnSwEtIHu dPr9g0xQsGMh+0h23TCgbglZe26BjyrrUF2OZX8ju9y0BvcOkc33+oZe92NfvBF7KcBK amDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718523; x=1739323323; 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=XFoiG9nO9GzRbM78aaWwJK+Q/U0QRSToN08KNluZphY=; b=VwDlynnen4/v3Pz5GygMh8bkfRmYM3WlEqJLBtp7C//96tAh165cP46MNqFCotXmu+ FH/qP3OhUxZiurtprP43keqQKztu/ZAxaMNR7g4Nmi07tDmwSj+4SLnnMBW37PSeQS8S mHAIusqil6ZjI6RTKOVfV7boJumlYqthQsprv+RcJ5g/6mt15vzZz9+zGUCnOMG9DndA wSqTAzJsNpAsOrcDF8ajkWGtEOIPjgVxoL1162r++scnlIFm7HLAbbFQ5zvZG/KmyhZa 9O1kScQxbCAErBEeLd+w6AxOExxg3hXmhIAYj6Ytobjxyur1KGB6Mp9k2ExehPO+1JBG g7Bw== X-Forwarded-Encrypted: i=1; AJvYcCWzNKOuCB+dKZpId0kjm1RzdJxvlexvm79mFf7CdXHdCtfYNT9Nt0l+z1+IGgpXLz49DKT9hGGPRQ==@kvack.org X-Gm-Message-State: AOJu0YyvzAsy/8N8Nzkp4hyjT17Cs/vemUqBMOwml0Ei7oyj64iCGFET TwxUNawQzlt2mejxSJeYSkH06eVoI5a35CNBGBnRNk26Kr9LN+Ipi9+bwsIe2Zk= X-Gm-Gg: ASbGnctUDdkCXHRD8JCHqRBDCRS4hWSZZIQMHy6Jrdge6VB5cazYUKM9uHzsB69T0ps ReBqxPz74mT3plgvxSMewCsjkx90b4cbsf9V2q1YwnWdy2Q4hlbUYf9GmWAdbC4CFVpMjcnhAoR lqrD0hDHZytqcaGZ6b+MiFoJrkk6MjVncbTZC1lI5YJ2bcXA5SR7TfE3OEM/X9truzb59VHNv5V c3Qr6Krqr/86JEQb/N6x2N9K5OtLm+As4C5ABcngFo5AKNIZCSFrSe/0T/Xq7QXx6Xh+ury/raf Ao/DGUzT9jprom/0wRQfOB4rgg== X-Google-Smtp-Source: AGHT+IEJH+wrDsmQPEIkR5pVBGlKeUP6WNEh0OjFhPnTJqvMzIBJHV63zzIl7KoIxuXF1C9q00ecWw== X-Received: by 2002:a05:6a20:d498:b0:1e1:ca27:89f0 with SMTP id adf61e73a8af0-1ede88d5aa2mr1761718637.37.1738718523627; Tue, 04 Feb 2025 17:22:03 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69cec0fsm11457202b3a.137.2025.02.04.17.22.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:03 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:52 -0800 Subject: [PATCH v9 05/26] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-5-b37a49c5205c@rivosinc.com> References: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@rivosinc.com> In-Reply-To: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@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 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-Rspamd-Queue-Id: B08F81C0009 X-Stat-Signature: 3wcri6s6u85m4b1tdxx7593rpsrdd11o X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1738718524-2654 X-HE-Meta: U2FsdGVkX18YV8aHHH0goxGeNzrt6lWBanp1NMSD5vOoiGzXU5/PgtA2jPenBhQXNQ4pkPrS4Wy86Se/E7NuJ3zE0G+j/8SvyQeXB3BQW5IO/JhBQZPoRDQoz+QFaj+zrvupcF/UXDTBEGhZCEWyKAti40SS/KBnpqwbsPC/eJUoBDyx2upMtpzsbSeEZG04zX4BEaOcBXNQKX1P775H3MEHMsRSb0KBqp869T5uHsH4TcXk/WZosN7+u7BMe34Nsj0bFt4tWyvQ5JFhE2GYgkr8wB6nNnhDYO+jbcogBTUNsaz/QlPHBbRut7Ya/GFK/Z0LZ+hUlDzJ0/RxgCoM2Rq2R5zThlgRbvMT6neNm3zVYOcADnwGhucMx2I84c32BzgeAkPYFwH5m6u9u7UN42mxRHHrqSOxrQEzLgNS16ZfHY3vMXXUexFIz3OpJVcbV4fV470Lpng2vAA+jRQUQjPwkZwk6TtYGRWOc4DFHTj+C6eDNiMJ3Q4gKJvBpbb2riudel4z1LyBR3ejrXXxUJBLZifBXuChGL6Y8XLGrt9cS/OQpiTz5YxspHG9aJrufFjPPT3JVjTUSoOfqxIK7MR+tx5LOpvSW/oJmlDCcZqA0nWEqImXh59pmXygB/q5+mQQKBge6evh6oZhIG7pyjEt7+OTmTgNFXwHx+CQ4l9K9YkR3/SUtqPhtn4BlZHTvuycVJGz9ic5mu1SVPDJUPRJwJirjAYTCXSOfXEUAfgUPY07NoDi1jm30FPZnBenoQ/38ouhPt8dndCA6mIGvwE2CHsszsfo8qGa0J9MUrSxQZfOIuaVWOvZEJ+c/QZntcJlTDW5Qq64KxODu7s6bQRN7wtlZoBdhpmhWqGgtmYLIOvtULMv85gF9GucsqOx5zJGBxrxsZ0v40lQ0oZ6z7goYI4+JYPPAi9pcCk/n+umixUgXZP2P0sSPcC7LTbey6qH3sMuNtFkkcNMCRq oXJFyw7S xRGowuTGLL7oRNomvdsdy+aDhzDANMc34rH69iRWVHm7dTNvk42lZ0fBSZGUAp36/f/Jrrk3hSeVOqt9sgI71c1CNn/68eM2ejXOIvXkwNeeaRFGtnLNsYAkVaBFg9i9jMDnWslqhzV4vzmuu7dCoHsje76S9dUa7whvtAlGIq3kjtdZBYTJQYB5oai8f0BSsez2vks0U4mcW871YjYZpuTtLkjF+oTKZXmu7uXbBlMXLaUA+0xnvYcXGSNJR7Jymls9gtF8htSLIN6FZgj0BU/SMaYmUISP5/vSA991UB/kIvqWa7CgBT53RMMk1vKskukEFsLxxBewHCPgj7qeZFwracYsz+8dhRq6mz2rZqeLCSRSxro6INk0dI+Sc0+49eJ8JuQeDVEF2VDAuApRWsK1G/5RgFtlSKYi0ZdbLN45LCqiZQ8xs7i7fUECGqe9YlbRy74RDsyspgHDjkDTyLPv5EBn5rZvPncSb0wikOf67L9txtm6um6s/L2ZyUm9cUuuHnZy4W7jxBBiQKeDk0fW4AftoJo5nqGlFlETGBnIVoUU= 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 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..a0cfe00c2ca6 100644 --- a/arch/riscv/include/asm/thread_info.h +++ b/arch/riscv/include/asm/thread_info.h @@ -62,6 +62,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..5f2027c51917 --- /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 e89455a6a0e5..0c188aaf3925 100644 --- a/arch/riscv/kernel/asm-offsets.c +++ b/arch/riscv/kernel/asm-offsets.c @@ -50,6 +50,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 33a5a9f2a0d4..68c99124ea55 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