From patchwork Mon Mar 10 14:52:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010191 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 4A24DC28B2E for ; Mon, 10 Mar 2025 14:52:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 339CA280007; Mon, 10 Mar 2025 10:52:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2720C280001; Mon, 10 Mar 2025 10:52:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11242280007; Mon, 10 Mar 2025 10:52:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id EB3DF280001 for ; Mon, 10 Mar 2025 10:52:37 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 45EFAB7C52 for ; Mon, 10 Mar 2025 14:52:38 +0000 (UTC) X-FDA: 83205932796.24.8565C96 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf06.hostedemail.com (Postfix) with ESMTP id 5D6E6180004 for ; Mon, 10 Mar 2025 14:52:36 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xWXOxRrM; spf=pass (imf06.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 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=1741618356; 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=9ADFXc53D/cc0VutYfr8tgUjvI5cmEZUhOUtSZhfaHM=; b=0ksmJ8tCr+WDvX0haJ2P4Wb9yEtRHpwO4unCFYAvQZiRCpOWmBjgFV+oqnm4XQBh+L/JAj +xRRKMnAIVbp2hocqO7GAGRRuseUN/TwEOg1PkUZF3Ty8yzTvDMLg3djpOPryqU9MAQr6n bW2tpmBah0L6NqoyqlPDgPCw8fIHOZc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618356; a=rsa-sha256; cv=none; b=tu8VgAA3w3IUa52UX1WVBw7gYg26ezD7BqsGgYlihrE4StIwBX1bVHsf7+b7e0BXIw0Ryk x/ghvIqD+e9xr3hG19caeYk6vXynJWNu6km79YtJos3DkzItlzTh8QlUzQ+0usHC6Oknsf wyzdvp2MO7kYNVNbwVjTXhI9KH/K2C0= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xWXOxRrM; spf=pass (imf06.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2239aa5da08so68467535ad.3 for ; Mon, 10 Mar 2025 07:52:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618355; x=1742223155; 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=9ADFXc53D/cc0VutYfr8tgUjvI5cmEZUhOUtSZhfaHM=; b=xWXOxRrM6X0zruMce9uWGu3rUfU5VZJPteVsr6dbkmXRHGKaI9KnaxFsx4E8QT2KQA 4+W1odw93/iO3nQTsQd6jC2ZGt4PTvi/1A12ZILKsaT7PLgWNI7ez9bUMdWsZ2uxGXPy omQJcF13qqbmFOWwxANwyV49R1W4Yh5+1uyICL1ggnrNW6/jqtFN6Yji3oXr/+BRcnvz Y8UwyxsF0hZ6dBNsqYRR0DoUPxzVFOyN5XphzPn7MMHIM2xKj4K6xRevC/jPxdKLHIj9 Ng20+RAGthjaPBMiCE2hG2AcWqNc6/sIpAvZVdkzgSokAtB+xKtrztQxKz8Syq0Hiet1 QUJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618355; x=1742223155; 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=9ADFXc53D/cc0VutYfr8tgUjvI5cmEZUhOUtSZhfaHM=; b=Xs8rLrqvF6+AGcwXCay9Ox4Qh1/wrX1w70y3SP5satA4sQ6CgririLiVMsZH5rPke0 liXKDIMWNiOe+eoTWNRMmcOhdTw04g/LgBfuxeNtOJX5H+M2Nk12+cEaUhxVfeuX+dSR ntmocM2Gg77RAnBYhNpZ0g8Xos/PfTDzfstVzIGBqB2WvqMdQj4KBhe5AuyS1nAoi3fP lGjMrid/bIUDnLH7o0J4OqqRYSdM1eUw4MGs+ssAS5MOoi5ViUNTslXAgKvVZtCnNwn5 6x7TBvZCezmOLSdSjivDTaeTLba5nmqccmH5hi/amLRRztl7Iw2Pj7YlWSU372AWyzd5 UXcA== X-Forwarded-Encrypted: i=1; AJvYcCUURdnCeK17ycZ+qYvSotd6QfCpmhyVSWpI9ZVKimHj1QGwKcmP1noWlIJUGS3kwGLuOsvHwYXCCw==@kvack.org X-Gm-Message-State: AOJu0Yw1F3p8b2uf94Rpwaio5+T/mblYYrLcvlKwP2WZ1zPodRtTOsmY u2MRhfEiC1jlPZZ6fOTRgYdKTwWqrApzYz2vf1R7tkVb3Fv/TgzcTpwNMx9hivk= X-Gm-Gg: ASbGncs4qyVb7Wg4z72+L/1U93trGVVOQBFyz4I6UcnBui9/iQajb53fFGvbWuwI/wD taxPhDYke9BE1lYbEPLDmwGLUWA9C+DwHNYpz7Y2tHd+whtEUMYviLU8HjoMz6E7JmxZZQa7Zz1 Igla69d8GvYxN1RCOK2zmU74SiarvhCOXVT7+fzS3mlZAYDHkXPsIqaIVCi3oelA+vpuwSUJASr +PMZa0GqtDVVd/LSHHJ/4utXDV2b/A2NFfLYYhbcLFYMazlzwavTXfHIvvJIB6HcnwwjOmC6fOx Q8aZt0VCSL0UImZlm+r+KyJ8cEarnVTkM2W2NGHN/BgEUGYMjjppkcY= X-Google-Smtp-Source: AGHT+IGmALl7tE1vDAuhwzUIZXgg+Q9w22Wqj1GO54eJLmN8OylP52nRYF70/T1mCfLbdEp2H00RTw== X-Received: by 2002:a05:6a21:4606:b0:1f5:7df9:f147 with SMTP id adf61e73a8af0-1f57df9f49dmr7380018637.40.1741618355060; Mon, 10 Mar 2025 07:52:35 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:34 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:23 -0700 Subject: [PATCH v11 01/27] mm: VM_SHADOW_STACK definition for riscv MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-1-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Rspam-User: X-Rspamd-Queue-Id: 5D6E6180004 X-Stat-Signature: 9nbx5fq7sytpmosnajgp4o18x8uahetm X-Rspamd-Server: rspam10 X-HE-Tag: 1741618356-320687 X-HE-Meta: U2FsdGVkX18zux1etcyFrA8mtGxjm/pftC5YcKtB/op6JMBZUoIhwHjUGmw/IrDQDVuSsfGP+uFemgX1NepIzhvOYGjK9bqdkeuwkFU7L7NoO4wWKbNRnympofM9VUtGtJOy0AP7w5DiN1Fd0cIoaO2xCX63/TB77pm0+C2bCD4OQffMwujd6AfzJK+y/nqxY1rU3OYp89oXVaHQevP3KYcZo5ag7z390cZWCMdGNQq8bP1TcUcPNCU/JZKJUAZrftMvQ51TW0q6tr26ZlU9DeJ/OwuekHb+tuVo1jpuoNQgoKSFl6NorAewac/odr1Tg3PhMBA1sWjkxDfRTmOnqKOhYi4Kgzjxk22vO1PlBI5b30VIeNfn6oiaBdnz7G/+cUJe2mcIxQgv/L6DstYcO808MbAwCahm0flae05nfJslXbl+AQXd61myNJy0wLYzP3zRoHJYBfIZ/AyWgsDW41M07Z+2lcds12EO54Q9i9z8v1NMW8YZlwOhXdnckuF+VYflAu8WYA6aXUV3Eqn6onAMmwGpW129L8bx5ttQ0oD4lRJ7iiQsC7PS8JqXgLycs3/4Be3mABhhgiEbNOEZLiO25lgUgKTfu4t6/keNRjOR+599pvit3KsErvBy1kDHeAa0Ewsdh1m0iF7JZ8N/eI10fOVG//sOmJ2eibPXf0QvkYlwMT/ITa/TDwXFzwsUI28SaXYuvqkmh82urUbGxbwiFNj3h/Z0zX1e2tcAxjayqzLwAZi5yp9QIwHpxcHcEKCFkYsxm8XJzWd42pMUXoXSjyU/v1YcZXmo9HNho3z8vQf2dpqmBUkc3Cl/dlxWhGNyKA+0jOFMH4wEPa03P3BbQ2hqbI3x+GNQjG5/wA+UVFikP/SSGwDz+kSVGkb0oaWK78Z0wfeWj9Z1MFxRQBXbZ8x7W4MN9HvOoQ4ZnfUEIdEwGHPAqk5MD+pXfNfiBY0iMufCwmMgRZUh8ig G8u2q3oj Icw+U5P0j9/F/y+Yktu3HkniGO4QPVFXsalwEKSxIdB+2aFn1dsSJkkXgU0LwlxOx4FEgaMCCN4TPAxM/5Z4ILm7dol8h0dpN/KjZ0tKBkhp/y8Ea5SmeMNyXbp7wodfA8dYaXqyV/jeS85NkxBabdyQBTU3CX9i8OW5XX8JG0LYM4dOsEVJZk7J1b4UjB5cYV+rEK9ZdciJ/88WJSMc0gbHtRCTb1V+dPPz9aST6zMxnlCChfq3mzUoN5YNBXhArypj5lIWH0rP9dCv4CkAQReIBCmVlUMnXjLSbm2QEi5rwY+Ts92e+BIiQSnRQkv2PwgRiwXz5jv4KDSxwE7EXNQ7Iif+G4FwbJkkwLWJXuNrNjlWTjvYxwIzwHS/KEqgJrKO1317pvauUbFzVbOusQmWeJifeZITmBcEX02dux/nt7ay0t2HsMJw4eUWfpSllAmKXYwQ+8X2rinJ6Xf/rdUAe68kzgb9Jxgrk3cmk6mawpUrui8pvvYLgreMfaDlqjAq0 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: VM_HIGH_ARCH_5 is used for riscv Signed-off-by: Deepak Gupta --- include/linux/mm.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index 7b1068ddcbb7..1ef231cbc8fe 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -378,6 +378,13 @@ extern unsigned int kobjsize(const void *objp); # define VM_SHADOW_STACK VM_HIGH_ARCH_6 #endif +#if defined(CONFIG_RISCV_USER_CFI) +/* + * Following x86 and picking up the same bitpos. + */ +# define VM_SHADOW_STACK VM_HIGH_ARCH_5 +#endif + #ifndef VM_SHADOW_STACK # define VM_SHADOW_STACK VM_NONE #endif From patchwork Mon Mar 10 14:52:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010192 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 272FAC282EC for ; Mon, 10 Mar 2025 14:52:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1277A280008; Mon, 10 Mar 2025 10:52:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 06285280001; Mon, 10 Mar 2025 10:52:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF5C3280008; Mon, 10 Mar 2025 10:52:40 -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 AD8DA280001 for ; Mon, 10 Mar 2025 10:52:40 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0740E81189 for ; Mon, 10 Mar 2025 14:52:41 +0000 (UTC) X-FDA: 83205932922.03.989F92F Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf21.hostedemail.com (Postfix) with ESMTP id 1C0771C0019 for ; Mon, 10 Mar 2025 14:52:38 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Bj0xuenj; dmarc=none; spf=pass (imf21.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618359; a=rsa-sha256; cv=none; b=dMQDny0CcqVaCSQt5U6jLZLaJ8XH9UMAAz0ScbNcvbQA840v8JKlT9BfV/iOAQslaakXjd H+PaDdWtrrqapiASvxF0AZX2UksEQS2oRk1VqPxTnMRIilLhET9EY0KDDvfPuAV9rdSHiV 8BYyjjfVQ8fpis7z6nVZ0DuFZSxZ3vs= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Bj0xuenj; dmarc=none; spf=pass (imf21.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 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=1741618359; 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=kHEXIimjUTXAyC0fOzh8XAkym19Q72QcmDI6hc+cq4k=; b=VeNmfNdEki70wZiKJ6mxFcvhqLBN3N8NXZUXtuy2KG9ONqf44m9Joe2qJE/G4tp8FmW+/q 4OH6MQ4iAAZd2KYkMxhLcCrTgswTxgTJ3i1x4K9LBJep1x2j51jtlmCk8aG5u55jLtTEgz oX7bCcEBBkkPoq4lm9YxfKtk5ShjjDM= Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2fa8ada6662so9115307a91.1 for ; Mon, 10 Mar 2025 07:52:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618358; x=1742223158; 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=kHEXIimjUTXAyC0fOzh8XAkym19Q72QcmDI6hc+cq4k=; b=Bj0xuenjklNJAuf0kHqAqrPgRJ41jWOCQfuAlH2p5CmcEXJsolIRduLVAQvPSRdvls c2LS9q/VQ0MXVYNsKaQBwUVeX5AISQQZ/Rae9wamGDO8hbSDa5xPHlEId60zgOZ1rf5y BIHgEWEsU8ke1aJ8vLB/Pu+qkSz+1ihStd6M/UbWDANIIUf5TFDP+cQ7BsmhHdk61iix +9INPOt3JE7N/vYtJAbAd5+45r6MbWFZseqjGz1i3abPCG2ryKw3qW7C/ePRZOEvuTbz jlfcDw+veCXPPnhrAOSg+9jG4TILNkCUbsnB8roKv8WL+3NjqRD1Ni9Uhh74qLcnpI0h XEPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618358; x=1742223158; 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=kHEXIimjUTXAyC0fOzh8XAkym19Q72QcmDI6hc+cq4k=; b=OSRaE1vnUO6VwXuq1lisW1yQSNQGX0OlnFXVLFpF59oqrYAvYYNKf33lNqi4wpqWT5 3RhRl6qASHgvjzpLkWO6x72PT1OzUd4pQarzqn9LbBEi6w8CkpIjK0HS+oO0fCwazglL uQGQQpW9eHPchGqQzpDzSl9dypxCnad8PwNZLF5rrvAwztqesMNjabH85yjd8t+WJ1hH n6kL0qCSYgyLKTGkF6ufaud6Whw5B2AOLP8VSqevHXN15zLc2fJ9xOTq0lINWY8uTQG/ RDqLwZ+bwwwEPO2Y0Cv0I4h3oWAKPAcjQoj8SYkWfrtz3dkG3fTC7uqnWbQ0G/IUnEeH FV3Q== X-Forwarded-Encrypted: i=1; AJvYcCUzUJWdWJE7YFWlR1rWq0TLp2+Hm4TmpWUEGuOSFFxz3V1xhmEkCzanp5RtvGikNWa7yp4i6E3fGQ==@kvack.org X-Gm-Message-State: AOJu0YwvYy7PMebWO3F402Sc/a0Mi4XO/uBQYKVi2uK6FrBhl3OEi8YI QS0F4ggCoQgwmbOTkmBLYDG+XVpq42gOb0Ns8R9SRpDDMyGmBWBSvSz5zEZxtbs= X-Gm-Gg: ASbGncs+ekDbtjEegVMh0vchnrd+QU7Hg518sBm7Y/J6et0cPMlkOX0VnOhbFQAjTpQ uJ2mL1PP51NSEJmaUxzN00o1HHomSo3CT36O6rMKIA5BKcSMVzB7423dmTdY9qAov/RqYjFR1nJ +tUTNaZoEdiGVJj4ZyzYlo+Bj0CHhC8MoOlfAH5NZ2droMxeFYLezEK9MSWf5aF4c6CbOFqp7cm T2JLkqkJhZEGLfcmVkzqWt1G6mmXIWjRCo4ZhNT6PWLIzV0lY7rdOAagtSyVL5j2L+FUOJ0CjZO +i+YB+EUnVVLgBBPwwuN9yA8Im42x/l+yjV+LXWv5iTGrltuleRfPz0= X-Google-Smtp-Source: AGHT+IHtkwbPi3YsMJ6A8ZQyEy1VJS3fRxtZo4fUkREMtAJmz9IifioPXZ2s22L3uz4hyDnWUTIX/g== X-Received: by 2002:a05:6a21:2d08:b0:1ee:d687:c39b with SMTP id adf61e73a8af0-1f544c37a63mr24132640637.7.1741618357489; Mon, 10 Mar 2025 07:52:37 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:37 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:24 -0700 Subject: [PATCH v11 02/27] dt-bindings: riscv: zicfilp and zicfiss in dt-bindings (extensions.yaml) MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-2-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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: 1C0771C0019 X-Rspamd-Server: rspam11 X-Stat-Signature: yepzytx8mhpon5jejb1dfmx494c7iofn X-Rspam-User: X-HE-Tag: 1741618358-330658 X-HE-Meta: U2FsdGVkX19wGZ356FMUCIsWY1iCXdGR+cJCBfnG5rkxa8xYRPuxWk9tlZu30CeWZsYDUqhjB95uv0camFC3G/YGwSdN6s26z82+XAIjYf+K13eqm0GHHjLiJHSjDaViW2SRgQCkKUmGbqmBbGnzo8iPGoU+KkCIQF8xPiRlhm+T2H2dsBjpDxgIFb/jvG3sUIe3Y2Ml+uzEtm7HQSKscTiVEdvvskCL23Tb1ma0ksmmzy/92xQtsB3GjUSQ3EZmhda9sZ3nCEQ6gaDo7QBe70+3ZKCvOpVk+vmh+zlx7TpmsmyfVhTbhuIhlYuSVKVis5OegEHhDrGOlcntELQ2IWMCaXB4/l9jhIJs6rvKYNhOctAjDSPUg89gKR8BBGicMqlBpHTna1/fMfgvZbIPBHFPvRYgXE8bW5IbcVrAC7MU4xvDfPT0xhGfXKfiJBnxH7kYVjR+8TEdxi6oBGGmqzeiB9H8gzvZpo6nFeitda0P7r7flWLuEbZmgmmknw7aIg1AUgq0x/WZ/b5kvVIrEOhPud1NDLcQTERU15Q1MZOFKDTMYb93LLB4/Enc8ZKG+ncW+LFsbIzq+Qg9hqGE7zUZ7Uqxw45yVd0idhiBICi4+O7pV9IsVUDb8Aouba3xqEfOpr1WFdsA+xehZHC12Urj/LaqArjyIG3DaLE64dsYdECLzIoqg9UtMOxOV8hyJ9QX6Wkvvh/eCOlsZXm0XtK3R5aQom6k1V1f6iTbs8rsY57Ie6HbqPBdNntRdjMc+aTRPyCu9294rYGHr9JnthGtFDsL7Q75WO1S/MtHSmGJM2bZgO1H8dQ371PRwc7QTA3axolMkTGz72DrnvMQTS72RNY27DH7savmH7NOPOcfIW9RwQjRCoVeiqYaQEWoYmAFxrr8uri3eUVy5p0M9I97a5X20wupoOW/b+ijdxOrWqLxIIua8vr4hnul8F6aQdLq/hq5lAzfT4fgVr2 3sSwmj5Q vmXZ9xxqrcfhvJIEbO+yJJpGSo9u+COZ4/p6mN+Y0Xjhb1xhBzWUKdJHqFlWw0qK0lodpuccgDVfq3v56YpkJ++hqEdic3Anj+i/EdxuBXSP415+RfhiYokzfJZxXLfv7URFCLljQn6cOuiQ7/NITmr//edjc1vcJi/p3fBuulJvAiPMOye1Y0gzs/lB2hjvSKJ9kPu6tcrA+uQ6Z3wF/+qOn2u/g18dYQNJ41MsU7XrblLxvwSK/9BSBzx42tA2tnTP/ndr8z7jrkXx5NHlWzTI93Iw7V/X8g1IcAioGmhDjcD9uoWjSCZFLdaI9HZO7kDa8hC+TVZsoE02SoQguOHya4qUTFLmGpwM834sP740xeJF+qRNdUwF6QjHUewF+r+KJK3rds26UtKTkSH881BbJsMD3ooDfc2AkofKjFy7pAyeovRMl5LQbb276hPkIvXesQ4ZM7jP/ryua6qHkhstAuKlZh3e7GGFYl1m6CX5FxyQ= 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: Make an entry for cfi extensions in extensions.yaml. Signed-off-by: Deepak Gupta Acked-by: Rob Herring (Arm) --- Documentation/devicetree/bindings/riscv/extensions.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Documentation/devicetree/bindings/riscv/extensions.yaml b/Documentation/devicetree/bindings/riscv/extensions.yaml index a63b994e0763..9b9024dbc8d2 100644 --- a/Documentation/devicetree/bindings/riscv/extensions.yaml +++ b/Documentation/devicetree/bindings/riscv/extensions.yaml @@ -426,6 +426,20 @@ properties: The standard Zicboz extension for cache-block zeroing as ratified in commit 3dd606f ("Create cmobase-v1.0.pdf") of riscv-CMOs. + - const: zicfilp + description: | + The standard Zicfilp extension for enforcing forward edge + control-flow integrity as ratified in commit 3f8e450 ("merge + pull request #227 from ved-rivos/0709") of riscv-cfi + github repo. + + - const: zicfiss + description: | + The standard Zicfiss extension for enforcing backward edge + control-flow integrity as ratified in commit 3f8e450 ("merge + pull request #227 from ved-rivos/0709") of riscv-cfi + github repo. + - const: zicntr description: The standard Zicntr extension for base counters and timers, as From patchwork Mon Mar 10 14:52:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010193 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 F0A46C282EC for ; Mon, 10 Mar 2025 14:52:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7CB0C280009; Mon, 10 Mar 2025 10:52:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76603280001; Mon, 10 Mar 2025 10:52:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 50B29280009; Mon, 10 Mar 2025 10:52:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 29EA7280001 for ; Mon, 10 Mar 2025 10:52:43 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 7C0B51610C4 for ; Mon, 10 Mar 2025 14:52:43 +0000 (UTC) X-FDA: 83205933006.02.2D574A5 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf12.hostedemail.com (Postfix) with ESMTP id 22F0940011 for ; Mon, 10 Mar 2025 14:52:40 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="W/A7AVaH"; dmarc=none; spf=pass (imf12.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 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=1741618361; 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=dbqILCM4sqAsqnZWR3n0haWRm4rdBukz3/+QEOiXjzw=; b=1uhCS1LoKx+KdLQOKxDRcFlaoV7KNA4wH717olXIocRaiejF/AdQKykpeao6yJ43OvrXO7 wccYsUJihsj8mngDGZQ4DiTIGInL4P8YbknTmkU1/FeGD5zs84hil9Ey52+FgWgLFftFmN cIVSn89DgT4dlJXYQr9uFwjuHV+7jxc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618361; a=rsa-sha256; cv=none; b=nqa8+2ogTESaQwMSWwm1PAqeNJcuLx1Vnyj2sFdMbh9Z+0tNTfizwWTKXOwegEsrsrwg/X R4mqRAOy4539qg4vQI9zvOMUYcrD98EmRjX0P2Oge/D90uimsGO0Xok4csmJjNP0kSTVCk f+7k7ELjLei3AbTd2oE6q2FEYvrmY4Y= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="W/A7AVaH"; dmarc=none; spf=pass (imf12.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2241053582dso69026125ad.1 for ; Mon, 10 Mar 2025 07:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618360; x=1742223160; 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=dbqILCM4sqAsqnZWR3n0haWRm4rdBukz3/+QEOiXjzw=; b=W/A7AVaHcdByMHTsbDmTca43bJE2my0ZAlaRW2PKDRt//4AC/vM8iE1vaeg50aFQyp wbtbUMw6yAeQCBwDo1l6xjp/uZv+GFfXjObOaWZrmKaRLgsDqGjt9YsK7yZc3P3DUtJi SmdZPWL61027f9od/etF3mox8mDld2vx3LWXI4QiFnZ1JTIFV1C822FmMhl6AwCTmMl0 9kGYwUvQ3yjInT7jg8+hqn3bbrKIDhEJxQNgoq/52r2MlvMy/JvHREPIPbgJ8IqyeuVc affVHVzQnBIFIR/K4QaR8Ew1euq7G7U9b4Ug+FlfhONDrDF0dk7uufAsCog+hHp9VTdr YkcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618360; x=1742223160; 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=dbqILCM4sqAsqnZWR3n0haWRm4rdBukz3/+QEOiXjzw=; b=pwqX9YhUnN8ADEZ9EV1cnursk1i70Uqwnzi/W5DtCGm7E3MNsl2qEJPG4fhWsJ8GEk /hz4fBKNIqL60ccLgdgh2Rc/mWsLTcf9WQbig1/Jv8Y3QvIZ3JdNHzubOCGkgdRqhMWf pJYBqtj2/kRxgSg/bO3/XkvGdeOFFyxcJQU5AuGKC4PNRscMxnWYS8WtL9wDY1E4s7XV qmyDpz5atx2Ubmm3uzKIqHs8gpgnLU6ixR5yI3PSF8pROBvVUClpDDbfSNpfx6ou+yf9 H8wccUoqzzRkQrAKr7kIi2OH/9WhvlPtq/mt2Ri14tp+nCe1TJSSg2ATKah69l6jaPD1 bpZA== X-Forwarded-Encrypted: i=1; AJvYcCUa8KY9gNdtEwJ3BNOLEgGXy06sQw0TKeQ5XZTYODEED+7p9Jsg3EyRWgGfIiJsBN1+XRGeKgwLuQ==@kvack.org X-Gm-Message-State: AOJu0YySopQjgLeT5wTumxR08omJENqVefz5xayj40VsJ1jH+fTsjBo4 kGcKaCgOK+Ccaxl+FzBEACRnAl177PoriHq+2atez2DOpE5+07Duv+K0EBZ9ivw= X-Gm-Gg: ASbGncuSHelMMY8857My3HUF7G7+cSFvKHzB3q6yycCIF0pnX1ydBzyp8Z4tfx33NG6 FutiSStTxRXA0zzzAGQSjUvwQEPSrX5IG1XFQ4Rdy4PuV5k0nzmKchwbwyLFsiWN0s7JjrplDUP TE/WgZ9VMuUn48vbM4t2sPlO578mLw8jKXxJ/dFgif8Y8cmxKJ9Wi+hJ0dpKQzW4eK61fLKD2d+ OEhGjmm/AeVEXRNlL1z61LoQTvWBw4RWI0n7oQjb60kzdTnNkkhzkEgieh6w4AZuA5eTj6V4/ft IKvQhoeh7u+Mwc0La7vgjCHHwW7gwUHOOPbuPkUU0gY/H2o7k92EiLA= X-Google-Smtp-Source: AGHT+IGingfz3mCoLXCx4AWjWHsD50K0dzh2NK7v+KMvVV2K5wL6QO4M0vSkH0GvDvftQkvXnd4PuQ== X-Received: by 2002:a05:6a00:b4d:b0:730:8a0a:9f09 with SMTP id d2e1a72fcca58-736aaaaca0fmr22178030b3a.18.1741618359953; Mon, 10 Mar 2025 07:52:39 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:39 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:25 -0700 Subject: [PATCH v11 03/27] riscv: zicfiss / zicfilp enumeration MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-3-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Stat-Signature: 3qu3diax8gwuixp68cyez7m3t8boprqx X-Rspam-User: X-Rspamd-Queue-Id: 22F0940011 X-Rspamd-Server: rspam04 X-HE-Tag: 1741618360-280695 X-HE-Meta: U2FsdGVkX19MHRq2srrDVU+TtiDl9oJ1GPNh7FGUrzvxKKMDe2jZUCxGa7uHk8mLNziVBAT2T/ZqWtZIn3CmUQearlMEs6uJm+cd+tPyZvEUgkf5jCN2LUJYKJfAu0YwMwVOBlPCJd6rPtHge2SNe7w8RoztQIsCVGAfTICv/QUNC+fBwAgLY+wyuDkGlZ2BWOECrpV+Y6McfpdPcHb6bk+3OoGpgZ5q8zKN1EB0xY+PBYmynZLGrJKOuP0hf1uddGx7gOuzNkkPaLKtqKQT4SsiKZITRBDZ0YJeoFXy72vf24sKYLuLpFWIO2GF5KCgIxvonPN4F3abPdMw0Sj38jeLuo5G15Z4gZE1qrJ1nvWEnRWw4f+f0Wy+bi7yy+rFlrZYMa9h9g41CnSS3tQVunnjjaFkSLiZs3eY9I4gbP5KC2lgXHRLlx5bsyjJZ/T7oOVfPu6P9rbsDyvPPn8yua7Z0a5YVn1c/IkgJu7sEOnswKw0pvDelVWH1ZV4FZqAKd9CIXmULt9JHHNnZRV6yejdgpAB747JRrz34WY1HFm/aPTInCh4iRP8ucHftfWD1bMwY0dJO+LUPlwTgHFGw7agQp28hWFlB8FWC8kw8N+AaKjEkpn1bJFeHhWMtVKOEARoBQp/rIYBF3kAy8PPhZCkI8rWYe/RB4rnTtcCa/1l31972OViViVT2L859meug79J6N2IdLVWzpha5bN/1th7Id/aoP9u/EC/Ogg1DO+C6cGjEa4IXsZGjIVQDFOIvMQ3SWSQxCVTPVqpki399WzLdIJJKUqT//rc8dy3bST94p1ljdM5OmDXqPg/JFMlIdOGM3B5CXbfzIF7/FspJTjIPIW2TkDOYfuNrYqQgTtIQSvrEATIveXPRzQk+nRR3MQjGm+XqjaIRIzHNCdYeVTQl7SRqK/dI1mrOQ3mcHENKRiI6MZKQdjto+rUdwQLTPCnH4sB9ADnOSJ4AYb eoGO00Er 9yN8vqA4+cd8Tn4NG6QPayPxKioM62b4q3zRLPJA2cc+0K/Utj/KaUBBe/VAdEKz0nC6k0QOR8aUfXgQeQ9sD6/y2vmaSFhvAdh1x/C0adI5HhyklXX8n3I2v70JfB6+Im55nZK5867JbAQLM2aWVxZMSMPo/nrnru/iN+KORC1dOn6txV7mijMHMzUJvsTeE8MxHKrybyZ3PZow1P63ZF5t21CSaf3cMhozD7JokPRdQNzdDLHYgfQ2aZV010//ClM9rwZP0N4cNR3b6ckz12PZu+eP1reXsMloER3JFMwiww9SyJ0HqDvjaXt48VaLIsMWJ0qOEVXFsfEB5d4/8NZK9Yox64GfWICB1f/MPoE/1sCNhlmCHSiSIBW/FR1kquh9UIq9Ptoh6Wh4Sa8ECKoflalyhdW7eWrhBFqNDIhgu8mOHAPSZ82y8I9vsEah9lWezBFgG1TPBiSmjvxtBq/7y0wa0WagSZ6C+l+y42KdH2R5hLq7hdU++Lg== 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: This patch adds support for detecting zicfiss and zicfilp. zicfiss and zicfilp stands for unprivleged integer spec extension for shadow stack and branch tracking on indirect branches, respectively. This patch looks for zicfiss and zicfilp in device tree and accordinlgy lights up bit in cpu feature bitmap. Furthermore this patch adds detection utility functions to return whether shadow stack or landing pads are supported by cpu. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/cpufeature.h | 13 +++++++++++++ arch/riscv/include/asm/hwcap.h | 2 ++ arch/riscv/include/asm/processor.h | 1 + arch/riscv/kernel/cpufeature.c | 13 +++++++++++++ 4 files changed, 29 insertions(+) diff --git a/arch/riscv/include/asm/cpufeature.h b/arch/riscv/include/asm/cpufeature.h index 569140d6e639..69007b8100ca 100644 --- a/arch/riscv/include/asm/cpufeature.h +++ b/arch/riscv/include/asm/cpufeature.h @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -137,4 +138,16 @@ static __always_inline bool riscv_cpu_has_extension_unlikely(int cpu, const unsi return __riscv_isa_extension_available(hart_isa[cpu].isa, ext); } +static inline bool cpu_supports_shadow_stack(void) +{ + return (IS_ENABLED(CONFIG_RISCV_USER_CFI) && + riscv_cpu_has_extension_unlikely(smp_processor_id(), RISCV_ISA_EXT_ZICFISS)); +} + +static inline bool cpu_supports_indirect_br_lp_instr(void) +{ + return (IS_ENABLED(CONFIG_RISCV_USER_CFI) && + riscv_cpu_has_extension_unlikely(smp_processor_id(), RISCV_ISA_EXT_ZICFILP)); +} + #endif diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index 869da082252a..2dc4232bdb3e 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -100,6 +100,8 @@ #define RISCV_ISA_EXT_ZICCRSE 91 #define RISCV_ISA_EXT_SVADE 92 #define RISCV_ISA_EXT_SVADU 93 +#define RISCV_ISA_EXT_ZICFILP 94 +#define RISCV_ISA_EXT_ZICFISS 95 #define RISCV_ISA_EXT_XLINUXENVCFG 127 diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index 5f56eb9d114a..e3aba3336e63 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -13,6 +13,7 @@ #include #include +#include #define arch_get_mmap_end(addr, len, flags) \ ({ \ diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index c6ba750536c3..82065cc55822 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -150,6 +150,15 @@ static int riscv_ext_svadu_validate(const struct riscv_isa_ext_data *data, return 0; } +static int riscv_cfi_validate(const struct riscv_isa_ext_data *data, + const unsigned long *isa_bitmap) +{ + if (!IS_ENABLED(CONFIG_RISCV_USER_CFI)) + return -EINVAL; + + return 0; +} + static const unsigned int riscv_zk_bundled_exts[] = { RISCV_ISA_EXT_ZBKB, RISCV_ISA_EXT_ZBKC, @@ -333,6 +342,10 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = { __RISCV_ISA_EXT_SUPERSET_VALIDATE(zicboz, RISCV_ISA_EXT_ZICBOZ, riscv_xlinuxenvcfg_exts, riscv_ext_zicboz_validate), __RISCV_ISA_EXT_DATA(ziccrse, RISCV_ISA_EXT_ZICCRSE), + __RISCV_ISA_EXT_SUPERSET_VALIDATE(zicfilp, RISCV_ISA_EXT_ZICFILP, riscv_xlinuxenvcfg_exts, + riscv_cfi_validate), + __RISCV_ISA_EXT_SUPERSET_VALIDATE(zicfiss, RISCV_ISA_EXT_ZICFISS, riscv_xlinuxenvcfg_exts, + riscv_cfi_validate), __RISCV_ISA_EXT_DATA(zicntr, RISCV_ISA_EXT_ZICNTR), __RISCV_ISA_EXT_DATA(zicond, RISCV_ISA_EXT_ZICOND), __RISCV_ISA_EXT_DATA(zicsr, RISCV_ISA_EXT_ZICSR), From patchwork Mon Mar 10 14:52:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010194 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 27055C282DE for ; Mon, 10 Mar 2025 14:52:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9DC0528000A; Mon, 10 Mar 2025 10:52:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 916A2280001; Mon, 10 Mar 2025 10:52:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 76AAA28000A; Mon, 10 Mar 2025 10:52:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 54A8F280001 for ; Mon, 10 Mar 2025 10:52:45 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8562012110E for ; Mon, 10 Mar 2025 14:52:45 +0000 (UTC) X-FDA: 83205933090.29.113DB19 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf25.hostedemail.com (Postfix) with ESMTP id 812B8A0017 for ; Mon, 10 Mar 2025 14:52:43 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ErNiPPZ3; dmarc=none; spf=pass (imf25.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 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=1741618363; 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=n3DM8zy+WllPP0TujEXFZ0Ycc0zGrpNRrMRWPkPmGZc=; b=54MdMyIkOyj7F84bQV/bbqbyfEB5l+brpn/0LHBBFTNxusHpqD1TSPwX0QJNCV0mw2kStz 3ofHNZsVQvAYAyOdPdchpgSsRMFk8KkAmrsy7Rit3P/fMvnK4z+W2wLsndbK+ezwbSU0R4 okPnCPth66+J+mus8KlPgILY3dYQMz8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618363; a=rsa-sha256; cv=none; b=jAMhseueY21tCUcHWmMhyqAtOpf63eKABSjrLq3CNbuXNexmUIkgXj8QIBEOP0obi3BPWa ACGrwViCVcBkBl3uhNuFlbmVySBDbZ/ekgmNO4rnUhfvW280xDfRd5U1dQFoNqa50ymE52 GaFvuLR0ndM2HQmEfOY1eJkHYOAV1gc= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ErNiPPZ3; dmarc=none; spf=pass (imf25.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-22423adf751so60781615ad.2 for ; Mon, 10 Mar 2025 07:52:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618362; x=1742223162; 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=n3DM8zy+WllPP0TujEXFZ0Ycc0zGrpNRrMRWPkPmGZc=; b=ErNiPPZ3mFoE5zmXXCEmFnjz9ffaqyfZJUpwzUcI++xDJI4Ol/IVEf0Ybx1rHPfcI2 H8tQwOwCVtPqtNrOiYrqcABIAio6v5AhusJGzcbVcY16+zW7X4tLe1KnGNkHkOgybP8U GKdjB0Djh+KjoeuMp52eGB18TQsdmPSyH/Rr6zPu2swn4vvlCUspwD+BTSA+qdEy7GHj Trvya48b5Kks3VLGbt6xJtsZx3fOiUkVbSWp9frWRs7bVuB3y5gX1c6/3nynHTukb+RO O4ERTGB06JteC7KsWY3E7kcr6bmZWdzIjgm7J3U/aUUBSNxqGY+1+m6M27JoHyYruusP wMeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618362; x=1742223162; 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=n3DM8zy+WllPP0TujEXFZ0Ycc0zGrpNRrMRWPkPmGZc=; b=qpa4zbvGxuU1H3Tg3cehUUtgmFyhRLRAeYwhIpSPsHV3oYYZ33xEqOKoUG0L4rtexs 1DFUeB762UlF319eWDHT6OMB8zZHp3iMa94lKdPMF273x4OWv0qY5CE0QBw0VHFYyT1J QUccBf0SvtjKNmASf5u1SsneNyw2Z2ns5u55AQwDRmv/iLb0I5w21vsoRxdNWt8clk2U 5EgILuAyC0QxJDI8afWNzO62Kw/k4qDiDqhxFmSsnREoVpb1XLsYbeCdq3/hWCLpeqt9 fKpXghnC6aSKKbNdRBzOrmysStUFlrn4tiIuFGSNV/IKxH209q4TX1zvPbNqOuac0BIC kUUA== X-Forwarded-Encrypted: i=1; AJvYcCVHMrHMVMfzOOxmRtHS1hHsBGerHXcskuTJGPDYs/Kjsjo1WpnwV0xudnrvdRnCTnyUF0vvQVjcCw==@kvack.org X-Gm-Message-State: AOJu0YwY28w5cojOFYSY5J1pcAKqDFiqWTT1zMZeRLwvQTIJ/KhXUAf4 gK0YIB6jgNs66oS7vBpShhwVfF4kjNnHZaC0Vt1jScc4iFuZ8bXKUeffUfFn1fc= X-Gm-Gg: ASbGncvpuiq0Imt0PG42IZ6yNvfPcGnIoYN5oMTOsXJmAzfHo0oBOEjbcYwwxqbdpbQ KeGDKnMwlL+P+KvwrNwhGj9i25CkOq/oTs6uBr9TYGKhTgDdQJD8LoKbqHFEnJTTySN4HCbcQjO NFcEYsSzA7HKJD2ogWYhH5T/25ck+Q9MbxnivMlJvoUBTIkAhEWKkLx+3TlhcjpGAjTozmcpATH GyS41zRm6qw/IAGSENJzBmUAUY3740O+eCvnXWXAGcN65YWp0zd9RTERR4ByTbGq/0++SKGIcD9 oFSyRNQj7N+HP+rWuQpfilCSHYWysbcolQe53K204gaEgKNFI22mANA= X-Google-Smtp-Source: AGHT+IHEgbV38+kdB/KuKTC/ngiL6naw+4KBErVaQq0wSwONUo1ce4xmBDTiHE9RxDA/IFBRpdqZjA== X-Received: by 2002:a05:6a21:1fc5:b0:1f5:6878:1a43 with SMTP id adf61e73a8af0-1f58cb239e0mr144294637.14.1741618362407; Mon, 10 Mar 2025 07:52:42 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:42 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:26 -0700 Subject: [PATCH v11 04/27] riscv: zicfiss / zicfilp extension csr and bit definitions MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-4-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Rspam-User: X-Rspamd-Queue-Id: 812B8A0017 X-Rspamd-Server: rspam08 X-Stat-Signature: p56w8h8o3pro3cauj75pb7gizbhkt46m X-HE-Tag: 1741618363-659693 X-HE-Meta: U2FsdGVkX1/IPpNG5AAMsUfCRoL25F591mCw3+W+EQqcF0DazHpoGZ/zbOa9fw9a8PK9NvkGXhQ7eO+csBXrz2ABT0s7BGNSnB+5I7risLNI6HmQN7VbtoODGtWCcZFnXJzPffE8FVk0AmvHC96zchfeaFTqoDkb47/VjC7/GcpLnrmcVA8QwEtoZhf84wL/XhaheEVMiH0Hrpxs5SwAEE++litin6mqdcwgZsrOlyrsbJ+mzowQOIX83Xzk34fE1v8gfdQVS0CFyLOwIGDKvfwI5DyDkdvOJWG9peZNNceb0ZCKfuhosiqPR9+xQDmOjmEEbz83mOOH7TIDpZvj1J879mXQAJlA/43sg+aHSiVYIpzbnBnQTf7T6jPsxH0595M7jiydP+TFhd/o+ecUf/bjQfbdUX8eUsi2VJDqPGCSJ1+p/z5bSyd/syGYWko4wSNL6yEDnk5Sm0COeggEWi5VvhwXtsvXbUiQiG2XWgd/rGzbCgrv9q+FcqMUwTD/1M7BUEwYPab3r7k/s9D0P4J0dJOMlPCKIWUOjO1fhHz/QSfsTEwrMp+hjx2FJggtQRcF4vKSTwTOq4b7MPt0MQHqJG6eVUPjRcDqKQIkiPoSS8pj0VKsdEyBs0rg8apMM7OTwAWfArygbe7y0t0DR6gCr48ODfDEYaHBGKQJDbHv5Lr0lelsAGlxnCzHQH4xsTKKW/R/edh9U6jMaAZmFqJ2mG0Lw/9myGDoq3wWuKy3FAX/DQQkgNG7KWiEE3J8YYSbosWEwlM+BvugFOkOG1bJdVztDVjYhJ9YTYF3Y1D3EyQlD+tF3zmQmMg9Tk42IXCyVJiTeooy6326hRjEt3MGQez7QNgkzQudlBHPzGVpiUJvx9XK3n0FpgAlZAHI3exeUoQPE+N2rhTPGNNhde/FK0lMflwXX1VZYAqY5mWIevfFH4g9YRVNvHWLIA+D+OLHq7mD+HiA2U+llql wuSPmWd4 +U6iBYXNQYkFmK8un2EQacpY2sOnjsQqyBAnSDnG1LWHeAr5CNP1zVe2Afeih0DbwWzIIEcxwA6Ev49hz4BSdglApAQjfWvlC0lq8ifmubqzj9iibF+EdQ8QKSG6r1F26JsFPmpMtZIcSPGYOKKfTcEY71aDOK7u4mEyn5CKHHN6zhGIna+qyKLqzbzKvkhxIBz29FELdMt4HKCAcZjIJRD7sMsTxzhuvavPOAbLTNxXuPo7aWNCtLC3RCoqUTCt08rRr5Y7vSVV1SD7C/Vn1xDG3Gx9biFLMOskwq+NP3zh8hWp/oxlNY/WdXojjtYdSHhfDJbhWxbX3pl6czEWTszfF3QAw9k64DYsUvXwUR8GGSGnHKPlQkmeD0GTxf1gt2LAX5VgRW0PXC4Ell4yVWQBLvT4vdISCax6Czo59aHgHjw7OJPlACo6bk6T6al7Ve7s7jEeztjJ1iyw= 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: zicfiss and zicfilp extension gets enabled via b3 and b2 in *envcfg CSR. menvcfg controls enabling for S/HS mode. henvcfg control enabling for VS while senvcfg controls enabling for U/VU mode. zicfilp extension extends *status CSR to hold `expected landing pad` bit. A trap or interrupt can occur between an indirect jmp/call and target instr. `expected landing pad` bit from CPU is recorded into xstatus CSR so that when supervisor performs xret, `expected landing pad` state of CPU can be restored. zicfiss adds one new CSR - CSR_SSP: CSR_SSP contains current shadow stack pointer. Signed-off-by: Deepak Gupta Reviewed-by: Charlie Jenkins --- arch/riscv/include/asm/csr.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h index 6fed42e37705..2f49b9663640 100644 --- a/arch/riscv/include/asm/csr.h +++ b/arch/riscv/include/asm/csr.h @@ -18,6 +18,15 @@ #define SR_MPP _AC(0x00001800, UL) /* Previously Machine */ #define SR_SUM _AC(0x00040000, UL) /* Supervisor User Memory Access */ +/* zicfilp landing pad status bit */ +#define SR_SPELP _AC(0x00800000, UL) +#define SR_MPELP _AC(0x020000000000, UL) +#ifdef CONFIG_RISCV_M_MODE +#define SR_ELP SR_MPELP +#else +#define SR_ELP SR_SPELP +#endif + #define SR_FS _AC(0x00006000, UL) /* Floating-point Status */ #define SR_FS_OFF _AC(0x00000000, UL) #define SR_FS_INITIAL _AC(0x00002000, UL) @@ -212,6 +221,8 @@ #define ENVCFG_PMM_PMLEN_16 (_AC(0x3, ULL) << 32) #define ENVCFG_CBZE (_AC(1, UL) << 7) #define ENVCFG_CBCFE (_AC(1, UL) << 6) +#define ENVCFG_LPE (_AC(1, UL) << 2) +#define ENVCFG_SSE (_AC(1, UL) << 3) #define ENVCFG_CBIE_SHIFT 4 #define ENVCFG_CBIE (_AC(0x3, UL) << ENVCFG_CBIE_SHIFT) #define ENVCFG_CBIE_ILL _AC(0x0, UL) @@ -230,6 +241,11 @@ #define SMSTATEEN0_HSENVCFG (_ULL(1) << SMSTATEEN0_HSENVCFG_SHIFT) #define SMSTATEEN0_SSTATEEN0_SHIFT 63 #define SMSTATEEN0_SSTATEEN0 (_ULL(1) << SMSTATEEN0_SSTATEEN0_SHIFT) +/* + * zicfiss user mode csr + * CSR_SSP holds current shadow stack pointer. + */ +#define CSR_SSP 0x011 /* mseccfg bits */ #define MSECCFG_PMM ENVCFG_PMM From patchwork Mon Mar 10 14:52:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010195 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 11CB4C282DE for ; Mon, 10 Mar 2025 14:52:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF5BF28000B; Mon, 10 Mar 2025 10:52:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A0B94280001; Mon, 10 Mar 2025 10:52:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7994228000B; Mon, 10 Mar 2025 10:52:49 -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 55148280001 for ; Mon, 10 Mar 2025 10:52:49 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6AF201A116F for ; Mon, 10 Mar 2025 14:52:49 +0000 (UTC) X-FDA: 83205933258.19.0EC784B Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf06.hostedemail.com (Postfix) with ESMTP id 6650A180004 for ; Mon, 10 Mar 2025 14:52:47 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=V5tMltWI; spf=pass (imf06.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=1741618367; 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=AU8/8yEQskbCLDoVdN+xS3O+NF0xYbhEtc7lkkUIpbESHCZoWChw74Eg3b+34OlZ8JdEvO kIeKS3uGfIE9GFWr6hLlcH4mP49T4baJewc2dbnIE6Dj82tVCEirMYxNyx6HQ7KRnxuObt bIsfaQYwWnbr9rj8xhimOqPj6HaQo7w= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=V5tMltWI; spf=pass (imf06.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618367; a=rsa-sha256; cv=none; b=3af2XtHZQFl5B19Wfk6WfLq7Lr9dxMUnyOsnJPQmILXu069aJOzmhK6r3/xNdFbVKW2ubc aSOVx1wK5D8MNMrWpECPv9WgYmsDsAR4BtT7YsuKRMgbTI/wUeDWACJWfx6nzDwn5wqAUq cXsOsdGBip3qb43s8I6Uj8YFYOizBNM= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22548a28d0cso11712875ad.3 for ; Mon, 10 Mar 2025 07:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618366; x=1742223166; 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=V5tMltWIWisQU+VafgUaHMwamTP04NxLk6vBeX4A51FesEZqYCJv9YnhwPyopPGIck 6mkMDZnntgv4I6+yZCz+oOXVDH1sJwMlc3UbZtxrN+Ib/QikbmosJ+biU7PwJJrfeXB9 3qTCgbIGfqCkJTcVFxpVs6equKLrHhn1oLVby47RNjtM00M8YVIJHOSFbOUXSo7XMKbg 0gnuRNtY1r4HvDuLjxuCo4JhXiBf/qwwxkGNkjDlGxh+PqocF3QdeP9a5driSslQqNTt VKSt8pRLsqpuNKb3laTeuFySnDpVkQF0YAwnuzvnuypPcbU/XUE97RPppL2/RBPTYWdA 9MNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618366; x=1742223166; 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=nuIvGSsGco8VsNvwOVhtt/IORekfsCkXy8Zt8kwX4/GsYfEqTI2AmCmENA2MSsJU5F f2LmciuvTIbc9RKl1bBSJ+lZgYYKbB6I66dNiL3u6+ciqVV+IcVpSNFq7M34A5peq43Z uFQ35ZC7Hf+FejwUL9bBNDXA1VEqX/AmU/L7cP+0YJ/eGrQaW9kd/0/GNMSS3t+hrUCc PHICHI0E90Tnyqs3hqtqeAiOc+RoFRNF3a3/f/HJdNp4jHVJdK9MzriOVQW6+or6zl5+ TJ61TGTj0kzZJgLKGBgbK/fv10mLlFNUyq2Nh7N2fyTXPAOoRJg2tO7ZUSyBSwbDxKm/ 9GlQ== X-Forwarded-Encrypted: i=1; AJvYcCUh5TzlxScWKOxOKjs9kj2up5Em7X35cbTeC23CNt5X1q8l5VOvQDGFaJU8kETlmYyvhrck1ulD2w==@kvack.org X-Gm-Message-State: AOJu0Yz9y+DLQaroRMxab68unxRnvO6MV3W76OjQqA3yPnJvmAU8JbCu emF13dkc2X6rfkJoEzs9PAtLum7Hla6aafEhuaArMcqNjBknoaJ5RvLBu+tVu9M= X-Gm-Gg: ASbGncvZlOTcFK81dXPM89zYypO28SHFsnRxOpd2g6g1x0h9F4PCiZnRPwQO3hNKrxl Xp006hdHFwwYYSMNkk2kAbXQBu0v9ocT0PJWAQeFKmuXYNgvuRNY68Qa+JixBFtOwML8H1o5IUd a2Eu3h8wYB66OCoBRoQ1K5JfvvhwzmxeqsQjKt9I+ZwnUaH5SZ3NAe6GiW2ghKYVBgMUnBpGwl+ 8a51t+P14Of+EXgr6sR4e4OcX+wnpJ5TtD8Cn3EBTRosfC1rKpMlHHg4tWbr0hJi/11BYVeACi+ NKasCIcR6U0NvpTFnvbMLrK4V6XHf95ee7w4+PkKAYVLOvDWTLGIBVk= X-Google-Smtp-Source: AGHT+IFBz3aXVDVmIlmZqzUHJQr+CufocIiZAA2+T986OpEaME/vCYGeegLtAo9744J8E/xHkN/qMg== X-Received: by 2002:a05:6a00:928b:b0:731:737c:3224 with SMTP id d2e1a72fcca58-736aaa1e02emr19336418b3a.10.1741618364845; Mon, 10 Mar 2025 07:52:44 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:44 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:27 -0700 Subject: [PATCH v11 05/27] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-5-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Rspam-User: X-Rspamd-Queue-Id: 6650A180004 X-Rspamd-Server: rspam03 X-Stat-Signature: wnyr3c8qe5xdkp786i3eqwg51f141764 X-HE-Tag: 1741618367-741088 X-HE-Meta: U2FsdGVkX195bRh3c4Lb7YJghUhastiPOtcpwHk3vielE7WxwKD3dWZhG4mWLmPEp1E1pOBLd0sbP+efu+8USL58ifUFgIg0xkC5djtJeeY8Gg67v4tmJyE4ci81DikGcdRDPzJ+03ZupaS4zDOjbbJts8Xoi+1zZfaN+PNsoHJffFuz5eiMbHRl//EhwDD7o0o3ALB2l3nPrSZyQTesT1/SqiHVWfT7T3Y8InT4idQBJ1jkSHjTMPX2Zv9xejl8qsrDCeuVZcAV89qSRJcNOxZcxRCDasRlaUFPyFV0yupRruBOQUhshochQ9DG8pUiAExxKhDOWhXOKy+JyZmml8NIkzfirog3/x1dj+Nq5Z4koymN7NPkVWZ7I2ZdBXJ000ZC8K+C2bIZZI4dx9LbmpQ4CoArji5zKnZbcG/Q02IG5S5v9QXn+odlQIroNH5FR4NWEzzn0FHXJwSGfIoMIF4PkIpB8KAP4UL6FVS0knXwikFyde26HPY02sTM2G2uHU7G5x6Eoy90Oj4SGP92XWq7J07lDbRpFd4kqBd7DIlnacvFfhM+PfgiFhYpUqyxhgZNdzl3pY+7JkjbrWVi5oxwfFCB/b61BcY4a36PQb/GqAIfLpv+oPKlZ2iM8j98R9Xf7onSymuO27uUPAgYTFk86OhT0mlSgOa6Q04nkymqCIhlgfic+Van6j36RzGHyPGz/H3ZvHAdlWAXA331fDFIG/HD6TEbZaO22INa0xj5lf/ODvZZqhPWoY8oddGHwThFM5mtW64tUPpfQ5lIytOHu/ifNg8nYJiv/u5zOrlWdxMb8dRwDfxhqCTgkMv2dzw3d3erjd8dbkmXecIYDmT5lXrZAm2NUoPHtPL50wXCmKMcbpcYdrMsmtD1g5fS76qdunyZilZoQLjdvoJ1xxvMIg/b1uEpq+tmKj60ABjbtIK/BRm88V5IVw9CvWs64RjGYoJJUrFWC4JlYIx oAV2WEC3 BeLG9sqWhLtdMpRYHlq7QaKcbvf6TEMBc/O2QhbM8YK9Gl/fe3vasqdZO7NIKRU/SsVwPFNSeV11Vpe25sTWnSzoDapM9DpG2M0QsuRvFxIU9lcmMQjbNEbxDy/p1ylJRTMcTJ/7t39EqpDwmH1K2tb9WzUznNqSYl597A+IXVAMxJPAfHIHy6BR/zTsb3BxVXcP80KRMpZmx+pxH0vpo66EIhqVh02Bv9xWHaN040Sjt8rfHjff7EUM6rpiCEb6dEBEI/QfOrB3By3qGHQrO/7wBzRTYpKUPy5ThKjGMr1QNur3ncJturYuf22EI89dGdyPt2eEEsX+Y6ujY9XGfXvWe9cmmkFgHZE6R9/fXmAGkYJ0i2sQuZQb3RZJaCa1kVldCf9fMFitFbaVv3xnOPPYpTJT7Hq1ZrZArQXmPEvB8YSHgvD5bSYErIG/uuay1ZwLdO2FNDSGlMlmieIeXn+dOEOlVtYNgy83jNSE54hNZHI7qxhfHnNYO3qPFSh9M2W9Kb769h29VI8CDoqRwq/ZQOxnkqXNdFfD8 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 From patchwork Mon Mar 10 14:52:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010196 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 3A954C282DE for ; Mon, 10 Mar 2025 14:52:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6AA1928000C; Mon, 10 Mar 2025 10:52:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 636DD280001; Mon, 10 Mar 2025 10:52:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4372028000C; Mon, 10 Mar 2025 10:52:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 1AEF0280001 for ; Mon, 10 Mar 2025 10:52:50 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 5CB5E161101 for ; Mon, 10 Mar 2025 14:52:50 +0000 (UTC) X-FDA: 83205933300.17.2B54452 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf12.hostedemail.com (Postfix) with ESMTP id 59D7B4000E for ; Mon, 10 Mar 2025 14:52:48 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ev5id0sK; spf=pass (imf12.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=1741618368; 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=1e5RgGuqZS+AKw5oTSgp47pWFJ0GDjWFc7jT6Xd5TJc=; b=ECr57nSBvQ9H32BOlGG06RPAOw/lfdetcDGXuE6+IbIzq965WFFXQ+2NfGfWxbFDqzqrgT pLNhEJsA2GhcGjMSiuiWyM6QnAo7awk01e+EPg7BuMBq45RPitogNUOZ2XfhkbnIdiAQFl L1mLSY2aUuHKQjzSojeqxqCroHVyjkw= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ev5id0sK; spf=pass (imf12.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618368; a=rsa-sha256; cv=none; b=0+W0mJKpRxMVwpOyKTUAjWAJtuHTlhPCanhwB0eYqB7ZLTyq/Lu+zT9nJHGXhGP8rKz09Z pteyNQn1rHmjZpcw2DCdQF7HN+sC2mTlPH5ctskI++SvlzTiuCm65DXVDf06IGncCG6Zwk xb/Z8JsclEjBA89hpPLpDCKpRjf88lE= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22185cddbffso95162285ad.1 for ; Mon, 10 Mar 2025 07:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618367; x=1742223167; 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=1e5RgGuqZS+AKw5oTSgp47pWFJ0GDjWFc7jT6Xd5TJc=; b=ev5id0sKrVTmgcyLoDpoonm6ltNj2IWJpU+DEJA8imtVuJc8gqxt6qu9HckHR/no5N tTkpYxtMJV51Hxpk6laHPdFWQUdcDbN8crKFwhGxd9XM7/Ywr2jr28UDU9YBELlwfONO D994PIxvi1eNRqZIKeXgrSAgYYMv5ihTErSW8NonOChLcswKzpgcj6urCnYj0erCDwB0 Eyvg//eHEbUcck8LzBkkvGx8uPE/0fWwnmW+GiarBu07thM28wj6rCv3Wmla/Zq84rGW V6fvdHbFie1nZQw4s0A2UkjAMAlNAQMxos5azEojkpY57H9J0dE4YYTtN2Bv+Dp9SF2Y u+lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618367; x=1742223167; 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=1e5RgGuqZS+AKw5oTSgp47pWFJ0GDjWFc7jT6Xd5TJc=; b=bceFhl1A94XtbBbss/mqLiKc8itos5FtIwhG8FPm0dOb/cnzqEXCByyb1i0rnNyn2B 1xTCvgBPXPmwQyZxr2g3nLaKKW4zFN/lvzGZ/I9Guhd1+5DgpqcWZoYutiIX2amBO7pY DaBS/dQJKjaMZG8IG99DqBHT4OD8kVe1pd49tylrbBhE7J4NxpsJYGRsmzlEwaVBDAPl lHDZbW6LmygdOHn0ArmnXA1niSyV/DY4wnCcs3OMnyLjpJ3kL0jeM06Q2+hVvZFz9SSj obe9YmVT2dTdK4qRxnrIQp9o0K8edMKmDixim3ezMQh3ALGER89ySxZysHigz7OFV32s HH0Q== X-Forwarded-Encrypted: i=1; AJvYcCWyZHxThh8ADkT6in+L4VEfJgf8x3OoabbDzowekaL0beEl6pb3Hn8Rd8p53sM/z9gWWLc7c8aPKw==@kvack.org X-Gm-Message-State: AOJu0Yyw7eiwd4pglktG2PmOSUpzilYIVZ/xg3otowTObDay80KKAcl7 L/SCZIEwQ84Bqx42R/axaOxH1DNXW1ecRX52N1TThDlaKBxNabXEFazlXha8OXs= X-Gm-Gg: ASbGnctG8zw1wH8vCPd8Oor3WQgDeS9/q2Ia0YNv4nq87/fvrsUNLSPO3wqNlu3a+0I okxYsAYeK7OgiqccZmjqkY62OxRIibwvzu4mqLcBGg8YYbiwU3q9BK0J6ygx3CxL1EFjKvbIRi2 /KXf0sj/U8DbdPo9RH3VZjo7GyNV40ixKAwSAMtARcXwqSTZhThKZI+rAhFE9MhB56uua+7Rqh9 TYNAxFHbAJuyhxZP7GB2ZDtX+e3VTY4ExMSv3IDJaZSDZCHj9T9uM97tfyWbMwB4b36QBSzVOIH UQg/FGmSt4whKarTlkrResMWziaNJLaGM0UoTXa68V+ktTXZineyqO8= X-Google-Smtp-Source: AGHT+IGncZQFemH+Tqb/7Cg0gaGakZGYufPeZUJHTPz51xcsHifa9ayQ0v/V99iUl8be0Qgt8Ur5MQ== X-Received: by 2002:a05:6a00:8506:b0:727:39a4:30cc with SMTP id d2e1a72fcca58-736bbf433d9mr12618993b3a.1.1741618367246; Mon, 10 Mar 2025 07:52:47 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:46 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:28 -0700 Subject: [PATCH v11 06/27] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-6-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Rspam-User: X-Rspamd-Queue-Id: 59D7B4000E X-Stat-Signature: p4chyss5sucbyrtauzzxm5xyib6jbm5o X-Rspamd-Server: rspam09 X-HE-Tag: 1741618368-22356 X-HE-Meta: U2FsdGVkX18IT/gc3ebLXu+B41Eyi9pnTwyjvoF73J2QHGcCPz5Da0O99aTUnQ7lXWXvmsVZ4pMRIinG22XBP7UhLPBzs+ktrJuZhMF33e+DO2y3XdMIB+v7f8KqUueHxrR52ddMoDmsCRqaZDbwAxxoQ+c24IoBdStLw/VqPeGIaYoIuiiLIDC3gZpwBsCEEJAlabqPTDwB9i4EyfLhuhkAg+S4Isz7NhOEUPuZrzitLxnDyTBZpdprlAjrMnSaeynlgSrmKiRLoNvmOfad81jK28b1945vZ91ZG20ql+B4Rccrk+WNggCyyyczMfjXzNUVSTxCNKw8e9tHr3oytBz0KFEte3ekhvQ+lWyjlGlqDzv/WW0tryITokuICgo1Rpie5LorrxoXZeUrgKiEOxMs/fCYTGnMM+/N7U6uU3DgQ/ZnLz41sUbBAXFb9fR4y8NZFVzet4uVe6KbKwvmyje6dQPo9dscOJqZ8QbDECg/ItSchU+17qCrRXGtcptpRkPLT6oYGCf8e9p1KB50HTeuMBCOBX60tqgI1rEdzpVQhOPocuUDXZVAqf8gutDGdmOJsbziZaIsewwAIx33vbsHjRIbBY87aiu0lblRdUCD535wF02yPOHaPy3oiQLkluvg8kUsMWFNjrkCQO4KlHR79HbCmxT4NGSXM4MpbgRa7Mokc2kwdVjiK7j5Dn0zezUyI7buqkyzJMBq1ZLmBH+ToOOdb1uKzVfBaQwzMqgXSi4hzdW3ECFTNyxN6JjISQQc2uJbTynskWwrnlMCNwdpKYC2RnPHKk/bAUehuHO/YZ3Qqd0CegM3T5wz3UYHmC6uIDSW63s6FgST23KxTpGORhH1+napmhRIFxarmAiHl9Wbni+msM4XRy9IsTUkWV35T2+EGvxu4KnkYua2nKyKCAuIH91ly597wIYHus3ST6aTiNwzL61ijDp2KhcZYUVs7ENrKlNocYv3Azh aWqN+Ovi vfbMercJYr4Qvsjg91p6J9141uRwNn6MplnMkyd9Js2Gd6zue9+Dp9iFF2AYu9J+NecNz9Pg39IyHqejI1seFokk5eqs2Xe6uVJxBtaoTod0zFD8k7MKLHJ2ujS/y/ZpjKRE+YJ8KduNrOzUiHU9xcqg2usstEGfhIkJdudcEhwXzEmEGsxDMj0j6mlngqkGNY51B1Fseyp2swYFk33lSffWWHnA2BqWo4ruxvGi/scPjUevFI7x0KDmuOSpdWQMemzP+dLvG6MqFCpIYFANwpSu7SIIArdEglQrGEUkHr2i8okbScwp2dTuH0mSS35Y0DXS7SVfSSlp/uSJj/Vnl/yFwKfzKvAVn1728KX/NoZWoVf9MY5noncN+R2YYi5kJPVnt+4Ei1iSt0HXWdXg+E+edmdJ6/VDUu+I7PJR+ChVHXV8QpQ+BQeEch2xZp+w/jXVcCcKHPPKXRXb8BMd8e6G+WbRc0dSw+cyisap2fWtQSQQ9aPmTZCP2RuPeEuIEUARE+nciN5yWrpEkF2+XFHMztm4kiOPE09SD/SxjcbO/W5k= 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: `arch_calc_vm_prot_bits` is implemented on risc-v to return VM_READ | VM_WRITE if PROT_WRITE is specified. Similarly `riscv_sys_mmap` is updated to convert all incoming PROT_WRITE to (PROT_WRITE | PROT_READ). This is to make sure that any existing apps using PROT_WRITE still work. Earlier `protection_map[VM_WRITE]` used to pick read-write PTE encodings. Now `protection_map[VM_WRITE]` will always pick PAGE_SHADOWSTACK PTE encodings for shadow stack. Above changes ensure that existing apps continue to work because underneath kernel will be picking `protection_map[VM_WRITE|VM_READ]` PTE encodings. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/mman.h | 25 +++++++++++++++++++++++++ arch/riscv/include/asm/pgtable.h | 1 + arch/riscv/kernel/sys_riscv.c | 10 ++++++++++ arch/riscv/mm/init.c | 2 +- 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/mman.h b/arch/riscv/include/asm/mman.h new file mode 100644 index 000000000000..392c9c2d2e78 --- /dev/null +++ b/arch/riscv/include/asm/mman.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_MMAN_H__ +#define __ASM_MMAN_H__ + +#include +#include +#include + +static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, + unsigned long pkey __always_unused) +{ + unsigned long ret = 0; + + /* + * If PROT_WRITE was specified, force it to VM_READ | VM_WRITE. + * Only VM_WRITE means shadow stack. + */ + if (prot & PROT_WRITE) + ret = (VM_READ | VM_WRITE); + return ret; +} + +#define arch_calc_vm_prot_bits(prot, pkey) arch_calc_vm_prot_bits(prot, pkey) + +#endif /* ! __ASM_MMAN_H__ */ diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 050fdc49b5ad..8c528cd7347a 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -178,6 +178,7 @@ extern struct pt_alloc_ops pt_ops __meminitdata; #define PAGE_READ_EXEC __pgprot(_PAGE_BASE | _PAGE_READ | _PAGE_EXEC) #define PAGE_WRITE_EXEC __pgprot(_PAGE_BASE | _PAGE_READ | \ _PAGE_EXEC | _PAGE_WRITE) +#define PAGE_SHADOWSTACK __pgprot(_PAGE_BASE | _PAGE_WRITE) #define PAGE_COPY PAGE_READ #define PAGE_COPY_EXEC PAGE_READ_EXEC diff --git a/arch/riscv/kernel/sys_riscv.c b/arch/riscv/kernel/sys_riscv.c index d77afe05578f..43a448bf254b 100644 --- a/arch/riscv/kernel/sys_riscv.c +++ b/arch/riscv/kernel/sys_riscv.c @@ -7,6 +7,7 @@ #include #include +#include static long riscv_sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, @@ -16,6 +17,15 @@ static long riscv_sys_mmap(unsigned long addr, unsigned long len, if (unlikely(offset & (~PAGE_MASK >> page_shift_offset))) return -EINVAL; + /* + * If PROT_WRITE is specified then extend that to PROT_READ + * protection_map[VM_WRITE] is now going to select shadow stack encodings. + * So specifying PROT_WRITE actually should select protection_map [VM_WRITE | VM_READ] + * If user wants to create shadow stack then they should use `map_shadow_stack` syscall. + */ + if (unlikely((prot & PROT_WRITE) && !(prot & PROT_READ))) + prot |= PROT_READ; + return ksys_mmap_pgoff(addr, len, prot, flags, fd, offset >> (PAGE_SHIFT - page_shift_offset)); } diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 15b2eda4c364..9d6661638d0b 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -342,7 +342,7 @@ pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); static const pgprot_t protection_map[16] = { [VM_NONE] = PAGE_NONE, [VM_READ] = PAGE_READ, - [VM_WRITE] = PAGE_COPY, + [VM_WRITE] = PAGE_SHADOWSTACK, [VM_WRITE | VM_READ] = PAGE_COPY, [VM_EXEC] = PAGE_EXEC, [VM_EXEC | VM_READ] = PAGE_READ_EXEC, From patchwork Mon Mar 10 14:52:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010202 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 4FF95C282DE for ; Mon, 10 Mar 2025 14:53:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4E57280012; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BFF76280011; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2A7A280012; Mon, 10 Mar 2025 10:53:05 -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 81360280011 for ; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id BBBF114114A for ; Mon, 10 Mar 2025 14:53:05 +0000 (UTC) X-FDA: 83205933930.10.B7620E9 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf15.hostedemail.com (Postfix) with ESMTP id CAAF5A001A for ; Mon, 10 Mar 2025 14:52:50 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Dc+CXAyY; dmarc=none; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618370; a=rsa-sha256; cv=none; b=GsU735VXpvqFcQ2yMUuU5/d5EQSzXK18tCkSXtBpft9kiOSl8gS/yIi4f50eqoib03cwgE +J1x8DPu91vu/ITuv/hCCXNkWQjINGEUa9XD1YDdlaMYK10/0UtJi6B2svMErQYnZ+vdlZ cvZbf9mh5bYfnzPHmKC5qt4WZdbzStM= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Dc+CXAyY; dmarc=none; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 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=1741618370; 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=Bi056oDr44X6mEA5ptOBWamFE29btTVHHp5F60vYQ4s=; b=XJIfxBbdjHF2QBU/43IezKw29RoWfdDuinC9I0GbX5ZkYw9B76iEMpBoUFq4hK8IbzybRq uLDZEpABh7vGBBwqAzkE0NXrexo6z+imcP7N+4P9EPE4ni1BryxS2rMFL7wCPYlopnp85A KsA+78aZRrDFvHdlps81Fj1K2hzr/cE= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-22548a28d0cso11715495ad.3 for ; Mon, 10 Mar 2025 07:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618370; x=1742223170; 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=Bi056oDr44X6mEA5ptOBWamFE29btTVHHp5F60vYQ4s=; b=Dc+CXAyYBnfsai/DRJNh25aYy7e6j/A+Z9VgXVboro20tg4fIvM5JFZxlgY2LQmKze XvC63MIuSpn8uHnz3u3gBpikEmmmrw3XN7WLmY+6Fat8i8Tp8H0yNDXYa3ZVm/Zrsm39 urUBfVp8EYO7O18qSIMRO8n7UCyG8tShgRiIrZ1WKX4eaMLwPB08XpBLjwNnB7pgVUmh BAToSWYEYeIMdHnhRYTp99aZvOfQ+JrTZxwkFJu1PF7y3C+7np2Lhf7tU40GIsiyumlx cUYM21LsHQFt2ztfHAX13HVytaTquAVsErrVcgUp4M4H2COhporJ0fReVXySwyeQZUUN t1Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618370; x=1742223170; 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=Bi056oDr44X6mEA5ptOBWamFE29btTVHHp5F60vYQ4s=; b=NzEo5kDTqwXezGB2Da4LV/iDDkyDtzAGjc+sETDlY6CbQohRwXm8ZdPhOol9NkIqat F8xFfG0zq6qEh993vduZOV1XyPfxQECxnFcR50bAGH0k32lWu9TgiSpp0Xr0P3apKYDb +4R8BVrenhodquDgOpYRnCZPVd+W6miX2Ka9iUmAkXrKdIlefZsO1uI5+ZT7TQ7EuuZE Y0ghQk4Pw2ngkLBU9GsbuwZg7LV2gACs7Ng52N7MrMrtkCf2BgRhgGyRtaIbPHWXP2Hj 2/wkBPCRRxgQaAOVYZTFcNyLeesojMO/8hwNDg2MkeRn0lZkSgHVMVnaXgRClmiCgCm/ ErmQ== X-Forwarded-Encrypted: i=1; AJvYcCU/oG+PvdW4wL2km1OA4u8ULzlBEr6q5W70TNAWIW9beeLPjmPxTVEP20i+3mvcsqjSNLlVN5ktEw==@kvack.org X-Gm-Message-State: AOJu0YxxFYtgEluMaLlmp7lxXQ6ewxwcOCvkp2BYdOiebCcA/T+rVPsR VSg3nNtHdeAjgNwr+qLV77fsS+33j0R7BqrLIpih6HlvnT3eM5CkaV+vmhl25Zo= X-Gm-Gg: ASbGncuuAykObW2xhDJwqYjicRj5vCYuucxCFUcWv39VQ44cuz0pzvsRJVDRhfiQP0m i3QKXj0YPUJUh8DVKV6WyXd88BKh+2F8J3oWcGeIb6ECCEGp7uwokzfqF403YvBbpXgy1mzAPDa rJ2+9uql7n/HZUIiIU8haWXl70icn8WoaKGpvK1FKqW/yEbkjuhWzn0ec23u29GNdqdRE8IAcLT KvPeKHgblSUFRG+L5z3Nw38KGihm4B2bGOMZBcgqgH7D7Cu58r1SP30BrUKim9QvOC3R2uHOM+S RTn9ogEI3cUP9wIguBcQvYShrovqxb/A7KyfyioGGxw1yesFe2g48ug= X-Google-Smtp-Source: AGHT+IHIjPCK5/0EhbZcTRnURyZw0NTj2K+W71g/3+djiMGOR5iYaRFLtirQywnmf6SGr6Tob6ydqg== X-Received: by 2002:a05:6a00:218c:b0:736:562b:9a9c with SMTP id d2e1a72fcca58-736aaadf10emr17282132b3a.18.1741618369717; Mon, 10 Mar 2025 07:52:49 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:49 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:29 -0700 Subject: [PATCH v11 07/27] riscv mm: manufacture shadow stack pte MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-7-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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: CAAF5A001A X-Rspamd-Server: rspam11 X-Stat-Signature: dcmfuzqhm66ofdam1ahcqo1gg1d9xtmd X-Rspam-User: X-HE-Tag: 1741618370-989931 X-HE-Meta: U2FsdGVkX1/nXcoK6jcz5NBbX8csqoFt1Up7eRA63wVSKyIK0nZh/5+PAoM//w1Z6gKkOTSRZXHR+adykqOIiLkk9yfyVfRd508EVextZwIUZjYgDmElJ1Onl8S+SvvwRxgw01UcUhB9DGwNDLCZewlRcsfj/E1SVPW5Xs8grI1GyfwvgIbKqPK5dJINrIgIa521pMEfFmZejhFFDRw+qsM0AP0wY4dyi4ZAQVeYI014LegXN3YbyyzEqqqmJOkfCYiGtH5n7fbJj9kUWbOEmG31Vnbi0m2hjIl1BOD2fblhdmbRYZS6wFd17EWtIAQQ/+fE9++yIqWI1vfvQeWeUSrXaVVIuPYEPsg2AqI5pJGYiJRKcfR3IoQeAl/BrawSEjT3ZPda18IW9KNzVi4swRmSCRiBDCK4S/Emmhz78vUNl00K60BbzgmfzjZAlWfspSKjxbdsarfwsFtnlWhbkVHz1jcmeLYQHszLhlAVzZgUWdXedbYP+lzXJS3AeaCCzbyu8iVA27iHxgq3mmDLxNtS2nkEJanEjM5ShL5zCszpMKEHwFiR1SBOMwdkMaGJ+xNXCEhvMjCgpPnPF0YCMMenHGAHOElMB5zKs1OmYsZ/Jf91Mbn/9CWIk68ZCWnL1uh0eezmHgD0/ebO/UfK0EhWc873p7LuDXqB5obwBqTrCBe9bfTXPnoNGU3bffxIPq3OqvCbfI1pZMkXuVVAwlXEJX3864Ve+UdnfkRWDr4eX3OxwVWrQf1GyUz2PynWCnsHKRnJcHBT5ttq9dHiX7wjXEpveNVde9mk8n4QKwA+mQl9g+Qh9DzY0UrAQC2fE2iEemRYlWKhzjdLEoHSW+gEilOzsNNXQ6+AFpoAglNf8piTmjJgSi9NoHhtAQrI73jSOgyxC5bTQr+gdJGi9Xlcx6nf+UTIsSkU3ZAn9ewPdfRAcbnd8u7fzyBlVUljtNe8Ye4UZOC69frm5YI BpYEmxc7 Tq1q+Nbq6z3w2hL0eQFXMQkjlbphjuEo/bQL0JNZjz0umjjoqQao76dRo/kI+xh4K049ohdsSuhOx8cFZsELq39w4WnKAAsPUk39yiDwsJftLipvQizV+WAIMut4ICFM0uUpA1cQfdYk9ghJCfq09CRqY+rMDHAbOJOUGSQh+L7wjyJ75W9Iw/44fXPUmZpW621f6w7qR93XrJvNOHXUOjEZVX+Ki2hb/eEi0nvMmt4ree33PCgK7VANFxorc77S7Qaix81nOy+OrylIKO+PiA2jlMq4WbmSCYwk+gvzJNgoizBFBXYeticzXkgjP1zngXgiK7s1iJCkWVZiGsPhViEtzMlaBCMRqQAzmyVtVwyfdh8AKn3/BM9wBz2DCDaAcdKKGw0A7gKHaVK+K+EiVs3EPhED03DGUBn7llAyTQ+8WdMmKoB3bDdx7PkGP0gL7ZttxPuvJN0I7anQ= 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: This patch implements creating shadow stack pte (on riscv). Creating shadow stack PTE on riscv means that clearing RWX and then setting W=1. Signed-off-by: Deepak Gupta Reviewed-by: Alexandre Ghiti --- arch/riscv/include/asm/pgtable.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 8c528cd7347a..ede43185ffdf 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -421,6 +421,11 @@ static inline pte_t pte_mkwrite_novma(pte_t pte) return __pte(pte_val(pte) | _PAGE_WRITE); } +static inline pte_t pte_mkwrite_shstk(pte_t pte) +{ + return __pte((pte_val(pte) & ~(_PAGE_LEAF)) | _PAGE_WRITE); +} + /* static inline pte_t pte_mkexec(pte_t pte) */ static inline pte_t pte_mkdirty(pte_t pte) @@ -749,6 +754,11 @@ static inline pmd_t pmd_mkwrite_novma(pmd_t pmd) return pte_pmd(pte_mkwrite_novma(pmd_pte(pmd))); } +static inline pmd_t pmd_mkwrite_shstk(pmd_t pte) +{ + return __pmd((pmd_val(pte) & ~(_PAGE_LEAF)) | _PAGE_WRITE); +} + static inline pmd_t pmd_wrprotect(pmd_t pmd) { return pte_pmd(pte_wrprotect(pmd_pte(pmd))); From patchwork Mon Mar 10 14:52:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010200 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 82EDAC282DE for ; Mon, 10 Mar 2025 14:53:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE8AC280010; Mon, 10 Mar 2025 10:53:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CCCCD280001; Mon, 10 Mar 2025 10:53:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B1C7A280010; Mon, 10 Mar 2025 10:53:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 92F99280001 for ; Mon, 10 Mar 2025 10:53:04 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C895314114A for ; Mon, 10 Mar 2025 14:53:04 +0000 (UTC) X-FDA: 83205933888.10.2599DF0 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf29.hostedemail.com (Postfix) with ESMTP id 54265120007 for ; Mon, 10 Mar 2025 14:52:53 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=i3It1f7l; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 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=1741618373; 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=WPde6NcIQ47rHbegQG8dPMP+orPth983zEAPX8ktkAY=; b=COxEOWhMKqd/9YoejdlsiAm3BLnCeSsbHeO/mmXP6HiNQkSC+TEryU5yxTt0J1Wd0g97jI KgrChEeEibzar1zKzYA3t3Zqcq6raXzPLoEwSQ0igopWlSCawHIPS3lsTplwQqSYJT7Xer Dtu1ecsInSRAV8KdeWoznzcTUFm8+0w= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618373; a=rsa-sha256; cv=none; b=8DhJU1+B5wBiAjFV3Cjdq82Npnm5Xwqu2YYVgzQYVucriqZUa1IC7jEq0KHVXv4WwBJBeG z5ISCDlww3s0T8jXZbFpzRoTbBqivuR+kBDlfwS6fLXl5V3PMv024R0qUuR/k0Y9VthOpl R5sNkUdFi/mHb60n4aT6zBziz3XMx1Y= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=i3It1f7l; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-22435603572so41595095ad.1 for ; Mon, 10 Mar 2025 07:52:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618372; x=1742223172; 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=WPde6NcIQ47rHbegQG8dPMP+orPth983zEAPX8ktkAY=; b=i3It1f7lIL7q/Uk3aRwqcGBKVjM+BKrYEWMYuN24A54QLxE+TGczBVjZjfpfbMLWMF md+cZKcBLawvvm6bWMYq/5xH1RTG77OnBx1oEHNMedUfrJXJD9Y7t8ozgLwu5wkPRyJB hdGjKx6/LiDqYZhP0NILYJVBLXsljkEMGYopbXwSXt62aoVDoYeCRfW4aF6kjrCRIZT6 8Va0OAlS8ZoIYnpo4z7Qo8jmh3JxBIJnFCgbOuF4rY0RiC7gS9Pn7ZazKNPVEisdj0Nv EsvjpsBtfl4jYu6go7L+63dYZdPkGW5YCOZsoVPbp156PoXMo01TEJ7GwZbQswW/dtBc J5qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618372; x=1742223172; 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=WPde6NcIQ47rHbegQG8dPMP+orPth983zEAPX8ktkAY=; b=sHw5cZew59Pb5a/CPCQ4pYuQYEIy7kCN+hBV39pYHiS1IeDSMt2wXrm6ouu5Bby2zy mbgu0c+UdfV/TsB6edEU1exL2MVC4BOSkCgOQ1P14PxYRH7ruaRbLk4yk9oIgb7r4xSV HfPLqUMjtVlBwQ4YbSUB8LN9w2ADVKjCmMPAUfa4PeH0hY9AemOqlgYR7DMOYuiTd5MP /FVCJBQ7ybxarAd1Hz3KYC+ZM1bNxBokisfTOAE85w+Y/C3quOp8Hz/88INHdeRGAMvI hNYLInphhH3eCmp5eyReKCYYzwJsCH2FRCm+HfgoNQDZRst3cqmvsCRksp0mNoLr2aN4 9gqQ== X-Forwarded-Encrypted: i=1; AJvYcCU7zH41XFSVpCGRs0aTTNgtcVJGDfJFmjAtP06Emi7OLcrTUJ/hCCEqbD14qry3jPW6EPkHjXF02Q==@kvack.org X-Gm-Message-State: AOJu0YyodwxYVn39NLD8daO7vHAHjk6EcwbCqcPfomQ+KlYou3kXadjy QnRg/OoyZCnVm2XJnfAOAe00aYmV/dTpSJQz5NO14Uyv8v3iDUj6qCTRvEUHF2I= X-Gm-Gg: ASbGnctoiKAnraEGlixmgWJNU6h1w1RU7L/YHd01ji0ILiWQRzkfucN5DTcTthsSiBK qQ07HZSrAAm31NDxthKy2XDE6L7DjwWVnCQbutjo75kWO1xsnY/3luuTFqopGNlKPjqrLeovZ5u t0Zlv1pgIbZlQDLSCXxi/9HT5U6Btrured66ijD10aSZ9VaUfBLnX76Pq+eWwwndPhyAbV+qiC4 yX0btJJb8hkPVv/kl2O/vNt5tjDMu1icDJhUdDiig//9rV/TEFqCdlOhetftasahikSwIZJdkwB 5fBdmxvyWBIA4Vv1w2gxWVNU8TcrSjizTLeE/pI4TyHzj0JAN75QtTU= X-Google-Smtp-Source: AGHT+IFqTxU+p9IhkI8RGdvHdyJEHoK+vlH5JWBOUOv0UhGLOT20CpZOV0dtGMVo/7iEBeBe/MTApw== X-Received: by 2002:a05:6a00:928b:b0:736:4d44:8b77 with SMTP id d2e1a72fcca58-736aaa1cf9fmr27006391b3a.8.1741618372105; Mon, 10 Mar 2025 07:52:52 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:51 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:30 -0700 Subject: [PATCH v11 08/27] riscv mmu: teach pte_mkwrite to manufacture shadow stack PTEs MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-8-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Server: rspam12 X-Rspam-User: X-Rspamd-Queue-Id: 54265120007 X-Stat-Signature: 1h6ywyqyam1o97asx91rw36r5nz6ekeu X-HE-Tag: 1741618373-356310 X-HE-Meta: U2FsdGVkX1+h6ZdVJUD5ZptdB4amuaStN8oAkpz/ampbCtJuHebkwDkJUZ3Wo24sbRfvCG7cmvEtWi/Iv3h6d1Dpg8Xpj/UogYx0Flta9GzC0DqPLB/Xt6RK/aNv6AtCmszZvhIqO8lndMvwFCZUrNlFg2oG9TsuDhGgtZh+EWop4RxPUwR/HO2IpWp7St7Qtqax5qcPC0MJ8eDwfU5XV6sgxlUdxK3hyWgTjcbBv3a6NdhsCgwhj26OWa90eYJ+x8wkyyVGqSEX+6SS+t4zb8A5e2yNensY/j7/TJ5rrRBOG+dQAI3qlAkeYTRFOSsohvVFugJGMskEEUX541LzKQRQiFfbuiI8vM9iDDVzX3b6U6h+yigrgQUZasVFR4Fr0qb6NnTfeIuZdOjdEbBSSDlWrgs0L/7yS0K11Kjakt07UJ2CQZH8sGzCCSP5hXL4n1iFutKAhh6vAIF12pj1pCaegBPmOEEEAWTTvskUMu7zSJttT/1Z9xGZYn+qDTcwxeoHlUjNco4UJzZ+enHcA5WqOQndudSSYEgQIEdtVsVG0QxXy3x37FdRAQAVH/5yrJrLc9YrtH7+jydhdheNUUfHYRS3MC/IYa084yIxZy6hLbUfQTEUC/AH3XCzsOntcw87PFsqyob2Bco/+NyESR5reU6RvDpwshtsa5TC2l4CZX/mjm5mX3S3wtz9InFOzy/RtBF2PRFhMXqblvJK5zwv9j/7xLsS52eU8WEWPJ8xTGSIRcYTPBdVPmGcF2s/b0bBJYuwnbRiKPyHOh3wR/3V9T9Yas209jweXGOWPm//IXX/Mb74QG86nlGtmf0ThqR2hl+ynKdS7RksvOQn1dOk95vzf/rqnuoUB68Np2RhsTlIn4aHqcIZnybUeEgOpaEdoF55T3SPHpmD6A2kG47cNGgwYy6wZfDDUJjLXd/W5f55Kw6J6svpbfXQOsBH9S9ppuGlocL1MBp8wKB KdsP7LUg kl4D1MMZrOJfGKXNI5hsNrJmMCHRj/uvKitZxT3/pQxlW74Ck8A9SeTdmqHJkV26cSglyzUBylMzVzlpXugOMuD8xy0++Nw0tFwdVOHvv3rhazkR4wR1RoADOmm8F+F5wOVXGxeapOr2MO9sdqdgxmW4HIgWr9qKt2c8GHcwAEJP7NCEH7rhpOgdcmTrqcXePuCqt5tv5kdL/nX7FEC1y9I/1RiWSZUzaYshmzlASN0LUMV2ubgIQM/y/TLZxv7CouMnLbrEgBLIODDaNibFk9dZAjasY9zvW/Jv7VuBiPR/YKcIrSEgT6LeqDtuwFnD7+tjxkcQqO7pfTTTgK5J5QRSAgb3eyxnAgU3eCRodgfGUjaP7wUd2Gu/OIcgbXMLrqAYWcK/KBmAXc7INYiyN5s5eXdcYrS2caT77HtLl3dB+tmQi3qDN9pNFAqzEPdpfEoxm6PsOo5CRIh9PvQg6O2Vc94b709ivWuP/tVbfzRmmiGfiI2dcyDmqcqzHuR194Wb2 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: pte_mkwrite creates PTEs with WRITE encodings for underlying arch. Underlying arch can have two types of writeable mappings. One that can be written using regular store instructions. Another one that can only be written using specialized store instructions (like shadow stack stores). pte_mkwrite can select write PTE encoding based on VMA range (i.e. VM_SHADOW_STACK) Signed-off-by: Deepak Gupta Reviewed-by: Alexandre Ghiti --- arch/riscv/include/asm/pgtable.h | 7 +++++++ arch/riscv/mm/pgtable.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index ede43185ffdf..ccd2fa34afb8 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -416,6 +416,10 @@ static inline pte_t pte_wrprotect(pte_t pte) /* static inline pte_t pte_mkread(pte_t pte) */ +struct vm_area_struct; +pte_t pte_mkwrite(pte_t pte, struct vm_area_struct *vma); +#define pte_mkwrite pte_mkwrite + static inline pte_t pte_mkwrite_novma(pte_t pte) { return __pte(pte_val(pte) | _PAGE_WRITE); @@ -749,6 +753,9 @@ static inline pmd_t pmd_mkyoung(pmd_t pmd) return pte_pmd(pte_mkyoung(pmd_pte(pmd))); } +pmd_t pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma); +#define pmd_mkwrite pmd_mkwrite + static inline pmd_t pmd_mkwrite_novma(pmd_t pmd) { return pte_pmd(pte_mkwrite_novma(pmd_pte(pmd))); diff --git a/arch/riscv/mm/pgtable.c b/arch/riscv/mm/pgtable.c index 4ae67324f992..be5d38546bb3 100644 --- a/arch/riscv/mm/pgtable.c +++ b/arch/riscv/mm/pgtable.c @@ -155,3 +155,20 @@ pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, return pmd; } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ + +pte_t pte_mkwrite(pte_t pte, struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_SHADOW_STACK) + return pte_mkwrite_shstk(pte); + + return pte_mkwrite_novma(pte); +} + +pmd_t pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_SHADOW_STACK) + return pmd_mkwrite_shstk(pmd); + + return pmd_mkwrite_novma(pmd); +} + From patchwork Mon Mar 10 14:52:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010197 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 C143AC282DE for ; Mon, 10 Mar 2025 14:52:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F77D28000D; Mon, 10 Mar 2025 10:52:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A574280001; Mon, 10 Mar 2025 10:52:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8459228000D; Mon, 10 Mar 2025 10:52:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 67F5F280001 for ; Mon, 10 Mar 2025 10:52:57 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A57931610C3 for ; Mon, 10 Mar 2025 14:52:57 +0000 (UTC) X-FDA: 83205933594.13.401B494 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf03.hostedemail.com (Postfix) with ESMTP id B541720016 for ; Mon, 10 Mar 2025 14:52:55 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=IxskUNjt; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.181 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=1741618375; 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=kL+yIoSlkTX0SokBaTv1DsPGjl4jKUPC0i4GBiCWGFY=; b=tcQzIbKibwtSgXyshuTqZIhzsSRMDrhDgJ4QA6Qs8Urdnaz/LkUTJVNW5hPCss8vORsrmY wd00Xi1hOBVU/H0ZaXanrKfUZU+SNaX/qiIUW54OEU4VO2ODM+ZEN9AfWi5H5NL08TkDWU A9A0B2MkthS3e6Ur3Ma3XEFPMVvs0PY= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=IxskUNjt; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618375; a=rsa-sha256; cv=none; b=8Y6zb0hNSf+EG2U+dB+1h8o3zYY0jCqa5FZQSZD15pJATmSLN514mL4FPC08+bg6jMacU3 1kzx0RYNi5d8ZM23BLFvYi+RX4jLlqn1/uAL2FjHe+sfihnpK4+ub4ji8ZR2CLJu9ns2DY 7YzwQWXpYg9qv8Hn9ga2DCPV8hvwYGI= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2234e4b079cso76866735ad.1 for ; Mon, 10 Mar 2025 07:52:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618374; x=1742223174; 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=kL+yIoSlkTX0SokBaTv1DsPGjl4jKUPC0i4GBiCWGFY=; b=IxskUNjtDMNfLCkUB006SJY9zrcNWTZwu5Za/UPshCvtkKLlu2gqpCi7zLDWoSQELD xlFIdkucQ815cwbyHbLaVC6GuCTHJTr7mh8JGvtJxFhzhzbF7B1KXTAzC1Y90ZUW3wqH XqYTmwmtZ/9iOdr9ZVzbVF+drxq0Kk20TmZ+5DW0DEHFbzGKSJ1wq//BxolSczzvk7AN +IM8iN/MdITi//IC+Bw5CKDmqpiKC2EdwzDXJ4COq7L5MdwHjWTc2c6IkV7/hs/+77/2 VN8M1g05yqjLe+1UTzwkXdhYY3pRKvilIHKUMV6VV1bL/sGgW8gUvtxnD9ath8esw/oy Xnng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618374; x=1742223174; 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=kL+yIoSlkTX0SokBaTv1DsPGjl4jKUPC0i4GBiCWGFY=; b=s48RO1CmRoZUFgKBFXkJJfIZU/0G0f/ReoWTpUvWx6kBajGa7ZIe016FsZIlVbcFYO 1hKyCDJxfeF87p8ssO6ebDRAVOJYp807vv/H9PzcZcZgW5HjRW9VJpJNkWuZY8xLVaeP mWLY1x2ldW0HbvGnkACzwsw9Ai3pKOHcJYIHEpR8XaZDCf/5LNpPlN5s4fw3gXDFLY7V PvO/cJi5DHE9YUEAkVv1hyKmJnb7xDInlYpqIE1w31y7Sr8hauQnhPKz/O2zWhOvGCld p73OYqKQ9fTdH1rk+kadOlpwncM72UBWTBPpcrePRWscYhNybwtxmHUThCzXwbbqoWk5 FB/w== X-Forwarded-Encrypted: i=1; AJvYcCXMxSnlcbyBjc7EabOs0I6T5s9d5wmsinmXH0QjtO9VHgwXN/PWmNUDNqk4OuHbWcy281nsM7suCg==@kvack.org X-Gm-Message-State: AOJu0YxZoswxfbzq0L0+7qYObAgVfBXbBxQ4N47rGfnLMe11+lAT3UgU GJPIG+FLkc6Y2w4MZHG7gewe4jubWwOE1b/gTWS2X7HiIrBipIxgGXBkh0ylNRs= X-Gm-Gg: ASbGncu0HMma87k7QrqT3MpDfurmjq0a+tJCUhgk1L1fHFbHydz9vG7WVerpuwSET6u Wuf+SBcOyeFwFFOx/9gHctC39N1t7t5SeCo+BmOezm4ishmInoCm4w9PmNQfBl3O4ypku3jtQtp V/oI8wzhnQpomDsc/dlAQhBzx/et7q9nRBTuIumoXfHSCuvxBF1EomRRh4mrF+Fpd2hnC+Xi0/z 0GPFopzlo0WI+D7cwSSGcro7tnfPJa9V5lLKD/S5atxzRDyzNVoqHf7/guFKNSLIvwTkq8E+2GS 9uA7T/EBR1OOI4VAe/FjGLWvvvpvVZMpBRg68girFY0GKZkZzkWYMd0= X-Google-Smtp-Source: AGHT+IFKPuh8cOHYjBgEoM7t8cHgv4gW4YpL9WqheJYopfOZX5sbWBiog25DM4bQ+IO4xPTW/pcKfQ== X-Received: by 2002:a05:6a00:14d1:b0:736:755b:8311 with SMTP id d2e1a72fcca58-736aaad1daamr15723454b3a.16.1741618374533; Mon, 10 Mar 2025 07:52:54 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:54 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:31 -0700 Subject: [PATCH v11 09/27] riscv mmu: write protect and shadow stack MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-9-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Rspam-User: X-Rspamd-Queue-Id: B541720016 X-Rspamd-Server: rspam03 X-Stat-Signature: c6f95u5w9kq7gqfoiszmn7131kkdikxn X-HE-Tag: 1741618375-566157 X-HE-Meta: U2FsdGVkX1+BeFigTTfWveDQ2bewWXVRCqNmnFXh7TksDKgi83+iUyKZyxNN5QetHgsu7Rpxluwd1VTPiSW8cYRoMVeCwljWZzdyiy2EvIviD7AFRid+vsKJS1AGTZefeEieaVyYYOkj1ZdY9UHW0vOursQ41hmzUEXSmsVd8pCWD0dEMoUrNv0V+eV+IgDuGLwKAKLI86qUwzBTxQgCmaq1txE/4oGQ9nq6JPIxg6EOT2m95VHNXs7qqIN5GNyAvb64XO+vIHUB603o1iAlJRfvjgZuZf7rGiGjMM1JN00/qBI25CufR61w3rbiQSt0PviHUCPKORdMZfogfXxYUAyCoTtXmTYPaBu5ytCdv5y3LOq1aWEhdRQ5F+1loYj70GO0qlBJyqm0t8AaWe+/NqYARY905qup8tF71EMcUv8XPzX92GWdfpr1tIL3k3xzz/uGmaVkJX6WtF6Dq01u/cjQVMu0BPUOWE1VOPC98NYJhmya1auibFnOJ64I6hs1ZxE4HCaar++RhP3BphR1PrCnZe0kfhpH2o7IlFcx58M+QZaPNctuGTb5k0WENgApM1nXBqhoFjtgrySfcf4jQvWt8o0Z+KbpcNE7G5oQYdd73Z7m+q5KQd1iB8USghVuZD8byRTK4fcSl7VOi0Mjea9tpASpInsG8iBt/gbR8S3v7ql+RkwZpyHkoJCPLF69FiXqL6hZHZEb8gz7eeB978aG2AdPR59qGjWXXstYU2GFIMS0tJ7BqT9hE+vxZlCZQ3Ol5TAg9a8qapNViroBblFcZAqB5oEfpvDNQ9azOfSx6b9owEFbURALfXNFtTgjkRvXJbyrXfXh4FySAhE2zexwQaYfoapPQcadb1y+x3QJXvZF0ePKG+wltLxH5qrK4yQxgbsyL+6QZkMAy+RfggfhtBHWhbkHbBsc/Ji1GXuJgGgUinLGYRJkVMFZRxSiSckYXEkQXfiIe7GG928 48l22F8K UUc382ErenaUZqYvOETcmTCnJRM4mgWb8BHL/Q7WcUeEXV5+MlG/8QLH011tpCiRKpITJNgB7ZLK2kmzp7g/Xdlx8NqnFiGf9xtwrJa1CKlwdd6cgpkY436JFQt3Lh5YebazGiTwER3+dfcx7B3g76Duh71fMvFBQv7m3XJi5BcCu2xquU+tY3VeX/hF1utE22xUx0UASDPDobyl2eCZANGhv3ds4brVHAR/IlIDjxlO31miYDyNEyAn8NaJN8fdIHoErqLdOwsgGcarsycz1QSPigV8/DomvF1p9XeKLtOerXudC5iVUn24JGzx4vhY1uhVBOn4vt1x8Q3CLLrksYuYZLvyogJE2c9qGRiBR9ZzTtzs121Y46cd5XdflVEFf0TYtG/hU0IwCfRrljQCRxW4FETW+dX/WezM12XDGeIdtWQPdZd6dXFQcIoeIept/HwfZ/bfp+zM3A+c= 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: `fork` implements copy on write (COW) by making pages readonly in child and parent both. ptep_set_wrprotect and pte_wrprotect clears _PAGE_WRITE in PTE. Assumption is that page is readable and on fault copy on write happens. To implement COW on shadow stack pages, clearing up W bit makes them XWR = 000. This will result in wrong PTE setting which says no perms but V=1 and PFN field pointing to final page. Instead desired behavior is to turn it into a readable page, take an access (load/store) fault on sspush/sspop (shadow stack) and then perform COW on such pages. This way regular reads would still be allowed and not lead to COW maintaining current behavior of COW on non-shadow stack but writeable memory. On the other hand it doesn't interfere with existing COW for read-write memory. Assumption is always that _PAGE_READ must have been set and thus setting _PAGE_READ is harmless. Signed-off-by: Deepak Gupta Reviewed-by: Alexandre Ghiti --- arch/riscv/include/asm/pgtable.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index ccd2fa34afb8..54707686f042 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -411,7 +411,7 @@ static inline int pte_devmap(pte_t pte) static inline pte_t pte_wrprotect(pte_t pte) { - return __pte(pte_val(pte) & ~(_PAGE_WRITE)); + return __pte((pte_val(pte) & ~(_PAGE_WRITE)) | (_PAGE_READ)); } /* static inline pte_t pte_mkread(pte_t pte) */ @@ -612,7 +612,15 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long address, pte_t *ptep) { - atomic_long_and(~(unsigned long)_PAGE_WRITE, (atomic_long_t *)ptep); + pte_t read_pte = READ_ONCE(*ptep); + /* + * ptep_set_wrprotect can be called for shadow stack ranges too. + * shadow stack memory is XWR = 010 and thus clearing _PAGE_WRITE will lead to + * encoding 000b which is wrong encoding with V = 1. This should lead to page fault + * but we dont want this wrong configuration to be set in page tables. + */ + atomic_long_set((atomic_long_t *)ptep, + ((pte_val(read_pte) & ~(unsigned long)_PAGE_WRITE) | _PAGE_READ)); } #define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH From patchwork Mon Mar 10 14:52:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010198 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 2B504C282EC for ; Mon, 10 Mar 2025 14:53:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1563328000E; Mon, 10 Mar 2025 10:53:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E278280001; Mon, 10 Mar 2025 10:53:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E032A28000E; Mon, 10 Mar 2025 10:52:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id BE980280001 for ; Mon, 10 Mar 2025 10:52:59 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1CA91C1135 for ; Mon, 10 Mar 2025 14:53:00 +0000 (UTC) X-FDA: 83205933720.08.2F9AE8A Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf10.hostedemail.com (Postfix) with ESMTP id 12E11C000B for ; Mon, 10 Mar 2025 14:52:57 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=jAWbkeAT; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 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=1741618378; 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=hK7DlmuIRYzIsuvvXHgsbKnv3WN7JKJpEt1D7vAnJaQ=; b=oEPkUyUsUbNHMlcOBCdKlULdpO3Y/8svYRqSZ2cDW5tueQe6+3aFDY9eOvdIerwDghPPC2 nMSMewI+pnJOKw0GptT9fSc1Vx8Il1Qiar74QnxHMMXa9tZiHPf9uqSx56w3mpi/iZsruN 0WNr16cBKzA/usOuZ/jNGT7elGddvTo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618378; a=rsa-sha256; cv=none; b=ZDwvFNS4+39lcFyCWTSiIkXa3bWr/Dp1Yma2/ZyqwYf9E3K93q2FHge0ipWbn7pdkqiDq6 LOZ7vYWdMz2DNcqGA8ku/YyFYH+mMP8/zZlgA8QHFJ/Km6nqMGj2lgn3uQ6yJCT60h10zS TI8rhtgDe3UUUs+eXEx/G/ov+F4QFHs= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=jAWbkeAT; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-224100e9a5cso80029405ad.2 for ; Mon, 10 Mar 2025 07:52:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618377; x=1742223177; 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=hK7DlmuIRYzIsuvvXHgsbKnv3WN7JKJpEt1D7vAnJaQ=; b=jAWbkeATJl9mUXXWANH5Jx9usQU/dWBzpuWaSdiC4LoPQ7UOYQQnA57bx07dIFumJ3 +jHCENSTF0JhgYKYUU5nsfd1Dq/GZyfTuqMJ6OuIbIGKpvPlDaIxVYGo0Z2/h8JFMy2H TDv18GlZPojwBBaAGE8VyGJId2XJTfQPqhYSuXUesVHfGVdwweCiGKM88NE8CE3Q6zej aZvkBFcRI9zy8fjgOmalKW/VwyLqf7pBP/iAf6o4W/a9vT5DDgkE0qVBs1OgmHJYNM3h iqYrlGUPhmtzCrhbC3O6NeyAoJIaOqqBBCHE+4FX5rNSlSYdUTroQQZycPcmV6OxUviy eufA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618377; x=1742223177; 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=hK7DlmuIRYzIsuvvXHgsbKnv3WN7JKJpEt1D7vAnJaQ=; b=VtcUGU52PmYDKLG8W1a5mRyw4cDf4Yh6Pmux/Cbn5aqarO/UXzLfsejfvKCyxuNxrn DCQMkSpBlIOO7jmklGZuWJFIn1RDf0qLzt0IdEZsArncPZwgwYrvy5EtVVEYaYyBNIp8 h4o0KIYxwckrSz+NaMChuWy8xx0Ne952UawyuPi3rMQXo1qBipfPP2MPlaiRlxAA6oz6 3VGF9Ujfrl/67ooYtvZbtEMe3KeEvrBV249TGmiu1tBn5Lv6slUPYixC1faQ0fIe39Ut mZ8TGDuQRg30iCRSTAjGfwmiOZBnBAzwaKg44EOfmIfXwIOhMrE60xz9shT2O5eHA9Z0 DWUQ== X-Forwarded-Encrypted: i=1; AJvYcCW8VzfJhcVQspzheo4AA54jG113tkB3UHb54mvdP+di25HfLKA6ErTIIhQnd9S6PmK30K0LY4hXqA==@kvack.org X-Gm-Message-State: AOJu0Yy/iLjdLdgA7hMWo6l9/b+3Qu3RhhYRu2boIvbDaJgw6wo/pgAX PEfRwVkqDO6rAmaKG8DRPGg/HYwtuTnKvtjzyzWRFzfdmZXaT6l09w/FcpB3d/Y= X-Gm-Gg: ASbGncvaXtrCPMlFKqczzlvRIM42JneOKombUbyZxRl4mHgXAv1PGU3gDWoZo2s+jWi VDFL/pCfdYH7oCOfCsfKfeeZ+pbJDMub872rXZdDSzFMOeNZZcUG4e/WoP/4LaUk92xbp6QzHnv jr02EICtucJiV0pXKcqmV82AVM5hWc4TFUQgkJCpPGWbtW7pm7PzZEOAlsX30tDKb/+3fzXzTB5 obmEVf1a6cTlGWKOAI4nEbP0+/Grn7qkYcyHNDMDUv22NtXk7xCnGcKuBuPNkFiQiGebnGF1V2K aUQaEt8qgMLB4t67hR0v+3NETyZQIzri12HZAgvY8pLWbPp4s/+2nLs= X-Google-Smtp-Source: AGHT+IGqKWX94qO9AqEOI9XVMPr9YtNG73DineLHU1SUa0qmkdl6iHIBj3KU2DOsCD0Dz98oJGoQVg== X-Received: by 2002:a05:6a00:b86:b0:736:50c4:3e0f with SMTP id d2e1a72fcca58-736aaa373b8mr17095202b3a.10.1741618376979; Mon, 10 Mar 2025 07:52:56 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:56 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:32 -0700 Subject: [PATCH v11 10/27] riscv/mm: Implement map_shadow_stack() syscall MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-10-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Server: rspam12 X-Rspam-User: X-Rspamd-Queue-Id: 12E11C000B X-Stat-Signature: 65g5ocxzpuri65uez5jtaa4pnkay7ro3 X-HE-Tag: 1741618377-877476 X-HE-Meta: U2FsdGVkX18Na8Mh1AB9pMqXr1onJgbJ1HGZSt6HEV8RsO6juvPcFGdVxW3pXoASFVUehztStGkzdiBcpAY11y92J29ekUMW21wmqzym1bfsFfnHB8j/nkwW6TNarmazAFeKOOzwOzeg4tDcxR9QVPtfUNrTaQZSqQMSmg5XIVzKkR38TCEec0sIkBD+kbLGE/5qO5gqJW5fFXJAZinVpBFCj2+JzDjUwsBkyrgR+9Sx+KxLpkfJR66314INsWS1FlVOQTH+5YPB5YqS0zdejhQ90re66MIkflhhWaYVjI0g1I1gZ8DM/U/gwOHCZruoFt9yW82SYjJeLV4CX77+3jMDcj16nqQzetWMccPTrprFpwbps54nj3o12xHJROzEguueShFI7K1a2g14AqMKrhf7pJEcLbldbFtjCaNkjTmjr/4rhR/hBYFswx2tFwtki+tfxENXWUDdPmU4KT8CjFDMPVWVGldxK+0NywaxHXVEAIDiL5xt5VXKy5Vi1R9um9d4yxsN4o9XD7PermkUO+LDCLegDdrY17bD4SU3VrkxW1xbIjHM0vHRENWXAw/dRQ4rs7HVCqafzMvFQkrGJCfx0RGym/Srzz+TXTJO96XBxHX2/oEqi0dxad8mFw0t09v2GshFQf0ghSjPwe1va2jdP5J0X2UF8pa97vd8jNIduV0lDRhu8zopuc1oh+TdEcCQYON5tZFJpzgmr8KpkPDL9o3InGf1m17vS8BQdMU5v17B9f4xKvoMFrB6874vyiynH7Axk1JBKpOthjIFA5dQXg1nDpL73tvbC2fM+YVQKRYL8H/akCH+P0eg2eSSV8rutxPxptHYk04pp9Svwy50eksUc4BSHoNejjCR4Rg5bGItNf7NmdRF1E87Feyps7Fz0t90V4CWf1IAS0ojKYre8ssNimpCfYCBi+A2CHENmSBIw2kP9nmkfC0f0Rq7rICFPdcqgeWZ7MXgTZq B8zeRIZ2 gJCRChO+LzZabZ97ULi8gKrShujgcugTorn0z8NH9GkH0yTZpH0PzksbVAjqBy4oav1lB0XTKYsfqZsmbHj8qLRWFjtY+SRKEBnfTbj9UdkfuA//GYeRzaavwLkD2hdeqnzjpvV9B4K80AdQm+M+W3mP+S7v/gXVLF/stuXCPoyX+AwWooIR9JMkSN56E2dcc58vopcOLx2bVUT2hooIzjkyLmslm3N7f4UPqnZ4U5SRPYbbOy3P3U7siAn1Jw9FR/NO+WuXtFsAVpZeQga+47lF0YiBnnDcKKKO03iLjqbOl3s92jqpgrG3k4esWNSF2StrmewoguYCEecUhpWK6Sc/J3P+D5cJ36sIbDiw4WzptW5JrwMPvItHQ7RbgK08FdwLzRVvFXrxDPzUBmKXyjP/3sJj3SH304f3m+Jdc3m5bChpskg+EiJVyM33D8IkWYLWLB+UL6ZqdCSSIapF10Li4K/s/AAW052gQZfJikE7Z2+TbVCvEJ+Z9nEl/8UILdyUY 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: As discussed extensively in the changelog for the addition of this syscall on x86 ("x86/shstk: Introduce map_shadow_stack syscall") the existing mmap() and madvise() syscalls do not map entirely well onto the security requirements for shadow stack memory since they lead to windows where memory is allocated but not yet protected or stacks which are not properly and safely initialised. Instead a new syscall map_shadow_stack() has been defined which allocates and initialises a shadow stack page. This patch implements this syscall for riscv. riscv doesn't require token to be setup by kernel because user mode can do that by itself. However to provide compatibility and portability with other architectues, user mode can specify token set flag. Signed-off-by: Deepak Gupta --- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/usercfi.c | 144 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 8d186bfced45..3a861d320654 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -125,3 +125,4 @@ obj-$(CONFIG_ACPI) += acpi.o obj-$(CONFIG_ACPI_NUMA) += acpi_numa.o obj-$(CONFIG_GENERIC_CPU_VULNERABILITIES) += bugs.o +obj-$(CONFIG_RISCV_USER_CFI) += usercfi.o diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c new file mode 100644 index 000000000000..24022809a7b5 --- /dev/null +++ b/arch/riscv/kernel/usercfi.c @@ -0,0 +1,144 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2024 Rivos, Inc. + * Deepak Gupta + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define SHSTK_ENTRY_SIZE sizeof(void *) + +/* + * Writes on shadow stack can either be `sspush` or `ssamoswap`. `sspush` can happen + * implicitly on current shadow stack pointed to by CSR_SSP. `ssamoswap` takes pointer to + * shadow stack. To keep it simple, we plan to use `ssamoswap` to perform writes on shadow + * stack. + */ +static noinline unsigned long amo_user_shstk(unsigned long *addr, unsigned long val) +{ + /* + * Never expect -1 on shadow stack. Expect return addresses and zero + */ + unsigned long swap = -1; + + __enable_user_access(); + asm goto( + ".option push\n" + ".option arch, +zicfiss\n" + "1: ssamoswap.d %[swap], %[val], %[addr]\n" + _ASM_EXTABLE(1b, %l[fault]) + RISCV_ACQUIRE_BARRIER + ".option pop\n" + : [swap] "=r" (swap), [addr] "+A" (*addr) + : [val] "r" (val) + : "memory" + : fault + ); + __disable_user_access(); + return swap; +fault: + __disable_user_access(); + return -1; +} + +/* + * Create a restore token on the shadow stack. A token is always XLEN wide + * and aligned to XLEN. + */ +static int create_rstor_token(unsigned long ssp, unsigned long *token_addr) +{ + unsigned long addr; + + /* Token must be aligned */ + if (!IS_ALIGNED(ssp, SHSTK_ENTRY_SIZE)) + return -EINVAL; + + /* On RISC-V we're constructing token to be function of address itself */ + addr = ssp - SHSTK_ENTRY_SIZE; + + if (amo_user_shstk((unsigned long __user *)addr, (unsigned long)ssp) == -1) + return -EFAULT; + + if (token_addr) + *token_addr = addr; + + return 0; +} + +static unsigned long allocate_shadow_stack(unsigned long addr, unsigned long size, + unsigned long token_offset, bool set_tok) +{ + int flags = MAP_ANONYMOUS | MAP_PRIVATE; + struct mm_struct *mm = current->mm; + unsigned long populate, tok_loc = 0; + + if (addr) + flags |= MAP_FIXED_NOREPLACE; + + mmap_write_lock(mm); + addr = do_mmap(NULL, addr, size, PROT_READ, flags, + VM_SHADOW_STACK | VM_WRITE, 0, &populate, NULL); + mmap_write_unlock(mm); + + if (!set_tok || IS_ERR_VALUE(addr)) + goto out; + + if (create_rstor_token(addr + token_offset, &tok_loc)) { + vm_munmap(addr, size); + return -EINVAL; + } + + addr = tok_loc; + +out: + return addr; +} + +SYSCALL_DEFINE3(map_shadow_stack, unsigned long, addr, unsigned long, size, unsigned int, flags) +{ + bool set_tok = flags & SHADOW_STACK_SET_TOKEN; + unsigned long aligned_size = 0; + + if (!cpu_supports_shadow_stack()) + return -EOPNOTSUPP; + + /* Anything other than set token should result in invalid param */ + if (flags & ~SHADOW_STACK_SET_TOKEN) + return -EINVAL; + + /* + * Unlike other architectures, on RISC-V, SSP pointer is held in CSR_SSP and is available + * CSR in all modes. CSR accesses are performed using 12bit index programmed in instruction + * itself. This provides static property on register programming and writes to CSR can't + * be unintentional from programmer's perspective. As long as programmer has guarded areas + * which perform writes to CSR_SSP properly, shadow stack pivoting is not possible. Since + * CSR_SSP is writeable by user mode, it itself can setup a shadow stack token subsequent + * to allocation. Although in order to provide portablity with other architecture (because + * `map_shadow_stack` is arch agnostic syscall), RISC-V will follow expectation of a token + * flag in flags and if provided in flags, setup a token at the base. + */ + + /* If there isn't space for a token */ + if (set_tok && size < SHSTK_ENTRY_SIZE) + return -ENOSPC; + + if (addr && (addr & (PAGE_SIZE - 1))) + return -EINVAL; + + aligned_size = PAGE_ALIGN(size); + if (aligned_size < size) + return -EOVERFLOW; + + return allocate_shadow_stack(addr, aligned_size, size, set_tok); +} From patchwork Mon Mar 10 14:52:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010199 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 74A24C282EC for ; Mon, 10 Mar 2025 14:53:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8970628000F; Mon, 10 Mar 2025 10:53:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 81F90280001; Mon, 10 Mar 2025 10:53:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6730C28000F; Mon, 10 Mar 2025 10:53:02 -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 41E9D280001 for ; Mon, 10 Mar 2025 10:53:02 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 931B71C8A04 for ; Mon, 10 Mar 2025 14:53:02 +0000 (UTC) X-FDA: 83205933804.02.0451938 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf22.hostedemail.com (Postfix) with ESMTP id 96065C0004 for ; Mon, 10 Mar 2025 14:53:00 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=rVwPAz6W; dmarc=none; spf=pass (imf22.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.181 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=1741618380; 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=42Qh4XiAuZulv75xzl4kByDL6UOmUjop2oq2YsBLVIA=; b=mCpc14a4B6esl+uqBayUEWMepb0ivfhxgc45mT4YfasX+AycEr7Eh9YqxiJAOUD+ktDQ+g 9Z4sTouMhtFfVTop7aiycWIcY0+YseGUmSKsHwzLXnmxipwlN+1oDIcRbqRhWm709gBxVa 404BdftQBncFdBqaKyHKWS9bnrBC51E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618380; a=rsa-sha256; cv=none; b=CDh8I2wbvdMdejc+Lijr0mE0FZCD8FXsK0gZe9UpzHGDPJc8mShHgT7y1t7ZXHOaWlMeSr Dyli6tex5Z5HaPoyvds6+OpMgz49O+yyLSU7cF8QbgHgwGtnNnyxELGB3brIVMUvWd37DX 1SQ9jKqrvTRGuExIl04IrFbvbgmmosQ= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=rVwPAz6W; dmarc=none; spf=pass (imf22.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2235189adaeso72294135ad.0 for ; Mon, 10 Mar 2025 07:53:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618379; x=1742223179; 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=42Qh4XiAuZulv75xzl4kByDL6UOmUjop2oq2YsBLVIA=; b=rVwPAz6Wo7Do1CAl2Sy8cuBjsOgN4tZKjaeh+GHBMvG8xnJA8rhYrmK25sJi30NZg3 iCqUJvsip47dUKoHMUPC3/3RQn65g68KBNbCZr2E52Vsu20Tw2xR4D1WAWkyFq0y8+WR OAELkq9Rte8CU/bW2rB5JTJx2MzfRlCCBJU+prBaOuWMhNZbWxk/PqATlCpgXP5UuSHj 1agySfPXlKYMzqaHXdb6QIktuAZyZUbLDPYvSTfjisUxHI/udS0B2BUKEpTQKIrsiqyV RPTy4/NkJYJsPEUsOLigt+Dqf1QdpCUsXBf45OWcftIrB8P6kFH3yBDfYjn071RrCT3O NqJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618379; x=1742223179; 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=42Qh4XiAuZulv75xzl4kByDL6UOmUjop2oq2YsBLVIA=; b=qzitx2HclioRyTEc6S/15Wu0+vs9m0qX5Ag/hwZEpHH3fCowmDjwXiJSAvL7sNgfa6 NaWaMAGxaB+1pmgSnnhVVhe617Y7L9KEQudqPCxQDoNNE/drqfA3S5DHwjL/eJRQoVE0 WVpe9//xBzWx2NFwVF/xwFHALrjkGic2c2R1TpdLF+e33OhE1+5YkEH+yfbVgVSVTk6T 33/s7HzPDQfFHsNEEN97ucWhaF9F1WeN2sUHAkMbZEa7InAQ6uqXzF7bq7xh4x2fMwC7 v+KaUEHfCTB2FMmblVo68mVD3vvErhYls2LMluIpv1rzdF40dj8/SFj3yD+R3lD29y+R kUKQ== X-Forwarded-Encrypted: i=1; AJvYcCVToIiel87oeJo0f02Sof2eGAEp2adFHp4K6DwKojom5K4poiiOFFAbUTPmstxXnzCePJf5/PBiHA==@kvack.org X-Gm-Message-State: AOJu0Yx7nNaIO7x4Bg89kHjQEd7/5QH8W+Y7tzrxCbUOxhMgykWU8gBd 0uv2JVQ3jadaA0Du+bgnEN0uA77hgpXsEAB9TvZcDEzI++y957m6QaNT/c6BRt0= X-Gm-Gg: ASbGncuPRC0cifu3U+LYx4VpGD+ujjVw1KFsLb0IPVLlV3BrALvZtd7rCecp5LZG02e H60uEo7gMSbwNO6wJE31uYT96YN7zNFve5R/pjwlr/oaDs6dBlxtkXpJcNh8glK1Lss5kHmlWkv dV58mmHFkr2cH9hi4VJk5R1ajQlrr0YIrNdBu3CuS1jWHvDuuCPG+duaZ4prm7e049mQhL1Bdqm f4ghM6yeqv9himd7PicRyeiIF/dLD5bteKVUaMnUo16tHmZVL98OqbWRWTgKeFvWvfcNhPWdgKJ /3M6MHuviIEkP2j7rFb544uZ3G6w7k+l4ot04XbvUZiNMq8YOOiVtnw= X-Google-Smtp-Source: AGHT+IHEXGQJboz6H1D26OUIQwYNlDx0HzkIlJbeLtq0a2EzFTAzmNT4PJCmia/gb9gcmwxF4dQMsA== X-Received: by 2002:a17:902:e74d:b0:223:517a:d5a9 with SMTP id d9443c01a7336-22464503452mr163981475ad.15.1741618379437; Mon, 10 Mar 2025 07:52:59 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:59 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:33 -0700 Subject: [PATCH v11 11/27] riscv/shstk: If needed allocate a new shadow stack on clone MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-11-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Stat-Signature: bp8puuankkx1c3c1uwhu7rn86w57wpjb X-Rspam-User: X-Rspamd-Queue-Id: 96065C0004 X-Rspamd-Server: rspam04 X-HE-Tag: 1741618380-142206 X-HE-Meta: U2FsdGVkX1++Y0cIMORhSbIb44GCznxdgI79sSbYX6jlEqHW+iEj5XdoseXbH0XvkGYHBxTbe70jqXoRWqU5mUS52hbJmWJMekQzLdtgFjCZTdI1YEtmPAoUobq3pOgpos/qwwExFgIYnH4hCmCLvfsjJ5Oaw33dEoMS2Xwdq6BFixFLVri79DNEXtJcUdZrmWbtLWpd0I51F0JzWUhG6axbBaUEjEQE8XiXrbv9Vvi+9nVxddzOXLc+lxJ9Ig3aBlhXa07Z8ZAuH+XF76iWesaPEmMrIm0D+Jhw8LGM2DkRRGbvnG7sZBAHonuTeY8MBreCTeDAnPlCZV7YcKwfOsD+eKHCBFwUIlmtWghvail5OVbEUQB7ZZeKT8AcVMp9r2AG+tSmfKkO/rxwB0pbVK0xOqCk+rkAnimKUP+E2izOZHZwUK2uMbOG+eSbbPjyF7cTuy5K1J+HTPIPw8lClL7+CYxHywM4VpBKQ8xsydf1243tCKTNoDwPPGkURvSLm1Pvenl516aC01+JZV2p+NPvTUzaDb+Y+o/bCm/BUF1pXsAFTvzDN0UTsAR1u2DTRY62Q1Nux4BzBh3PbKwRwXGLgIm2ITmabmgg+8+Jd8RgFqGaLmumCLqjL1xC7hg1TN5RJSqrVERdcSHVL/cbv8l5ji6UJPWlfbea85choIu6qaDe9Q2IlRSViySQ7PZgbBv2gFejoWCZHSiiw7DZRduadaRZn7ZBlmkt0t1sdtQXPHfKX570baOnnzvkQJQlQ2Krg0YrtiC8tcrX+C4tTD4FfBVpMTtGuci8pkmxoAsMswz8IOB8oJWcgNYQE8ghkFjiYzcb+geE6CiJCrdsecq/SvsnvpLPT/OG7JRG9irssK5889fYgYGxQ4OUVNTkzwx3naUQ2XwNA/Nk65VmkihBJwNb+wXTE/1SNig61Of/tSynmMedQq+Rzbrlj/40VILEr/GvMbGC2dgEdv5 VeZpUaBM CpBeZrTWw1eWnO8g/DZLdJtSG9418LvfadlO+YjHTEMINv6j2dxGRlUi9g01cdz9Mr2fynBv5fdDCeXGR9V7+fff49J7qeDp4K1sLt5InobEO2WmcbFlwZquxF1v42lmndAP5k+0Pa7sqZ7mJ1gtxgDDOm/rYGEK4QuSMscu8hba3iKNqbZAC/4jmR8NSPi3yf3PkX27GxM8mc+apLPgGTBKXy0pQdPLMjnmH6dQ0QkL2RvRJR9HbX5FXonL/U378vCo3BBtAkfVaWKPF+ntSnF43zWacrECHDJx4WjHB7ONVoZW+0YMrFI06P4zLavBMwOawWWj6zBGxpRm4MAEHZKflE2XeFjje8aGWSWFHi9ZrTmiGHSl4I1jwnBuXB7lGSnf8mX8ZGBJZIeIVcrJ7rJ1aHsx6YU1h7jjUJLVCQrojQ6NjlDBNSzOfDd+yazTFaUC0gnb9i1I6yKc= 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: Userspace specifies CLONE_VM to share address space and spawn new thread. `clone` allow userspace to specify a new stack for new thread. However there is no way to specify new shadow stack base address without changing API. This patch allocates a new shadow stack whenever CLONE_VM is given. In case of CLONE_VFORK, parent is suspended until child finishes and thus can child use parent shadow stack. In case of !CLONE_VM, COW kicks in because entire address space is copied from parent to child. `clone3` is extensible and can provide mechanisms using which shadow stack as an input parameter can be provided. This is not settled yet and being extensively discussed on mailing list. Once that's settled, this commit will adapt to that. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/mmu_context.h | 7 ++ arch/riscv/include/asm/usercfi.h | 25 ++++++++ arch/riscv/kernel/process.c | 9 +++ arch/riscv/kernel/usercfi.c | 120 +++++++++++++++++++++++++++++++++++ 4 files changed, 161 insertions(+) diff --git a/arch/riscv/include/asm/mmu_context.h b/arch/riscv/include/asm/mmu_context.h index 8c4bc49a3a0f..dbf27a78df6c 100644 --- a/arch/riscv/include/asm/mmu_context.h +++ b/arch/riscv/include/asm/mmu_context.h @@ -48,6 +48,13 @@ static inline unsigned long mm_untag_mask(struct mm_struct *mm) } #endif +#define deactivate_mm deactivate_mm +static inline void deactivate_mm(struct task_struct *tsk, + struct mm_struct *mm) +{ + shstk_release(tsk); +} + #include #endif /* _ASM_RISCV_MMU_CONTEXT_H */ diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index 5f2027c51917..82d28ac98d76 100644 --- a/arch/riscv/include/asm/usercfi.h +++ b/arch/riscv/include/asm/usercfi.h @@ -8,6 +8,9 @@ #ifndef __ASSEMBLY__ #include +struct task_struct; +struct kernel_clone_args; + #ifdef CONFIG_RISCV_USER_CFI struct cfi_status { unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ @@ -17,6 +20,28 @@ struct cfi_status { unsigned long shdw_stk_size; /* size of shadow stack */ }; +unsigned long shstk_alloc_thread_stack(struct task_struct *tsk, + const struct kernel_clone_args *args); +void shstk_release(struct task_struct *tsk); +void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, unsigned long size); +unsigned long get_shstk_base(struct task_struct *task, unsigned long *size); +void set_active_shstk(struct task_struct *task, unsigned long shstk_addr); +bool is_shstk_enabled(struct task_struct *task); + +#else + +#define shstk_alloc_thread_stack(tsk, args) 0 + +#define shstk_release(tsk) + +#define get_shstk_base(task, size) 0UL + +#define set_shstk_base(task, shstk_addr, size) + +#define set_active_shstk(task, shstk_addr) + +#define is_shstk_enabled(task) false + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 7c244de77180..99acb6342a37 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -29,6 +29,7 @@ #include #include #include +#include #if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK) #include @@ -211,6 +212,7 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) unsigned long clone_flags = args->flags; unsigned long usp = args->stack; unsigned long tls = args->tls; + unsigned long ssp = 0; struct pt_regs *childregs = task_pt_regs(p); /* Ensure all threads in this mm have the same pointer masking mode. */ @@ -229,11 +231,18 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) p->thread.s[0] = (unsigned long)args->fn; p->thread.s[1] = (unsigned long)args->fn_arg; } else { + /* allocate new shadow stack if needed. In case of CLONE_VM we have to */ + ssp = shstk_alloc_thread_stack(p, args); + if (IS_ERR_VALUE(ssp)) + return PTR_ERR((void *)ssp); + *childregs = *(current_pt_regs()); /* Turn off status.VS */ riscv_v_vstate_off(childregs); if (usp) /* User fork */ childregs->sp = usp; + /* if needed, set new ssp */ + ssp ? set_active_shstk(p, ssp) : 0; if (clone_flags & CLONE_SETTLS) childregs->tp = tls; childregs->a0 = 0; /* Return value of fork() */ diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 24022809a7b5..73cf87dab186 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -19,6 +19,41 @@ #define SHSTK_ENTRY_SIZE sizeof(void *) +bool is_shstk_enabled(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ubcfi_en ? true : false; +} + +void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, unsigned long size) +{ + task->thread_info.user_cfi_state.shdw_stk_base = shstk_addr; + task->thread_info.user_cfi_state.shdw_stk_size = size; +} + +unsigned long get_shstk_base(struct task_struct *task, unsigned long *size) +{ + if (size) + *size = task->thread_info.user_cfi_state.shdw_stk_size; + return task->thread_info.user_cfi_state.shdw_stk_base; +} + +void set_active_shstk(struct task_struct *task, unsigned long shstk_addr) +{ + task->thread_info.user_cfi_state.user_shdw_stk = shstk_addr; +} + +/* + * If size is 0, then to be compatible with regular stack we want it to be as big as + * regular stack. Else PAGE_ALIGN it and return back + */ +static unsigned long calc_shstk_size(unsigned long size) +{ + if (size) + return PAGE_ALIGN(size); + + return PAGE_ALIGN(min_t(unsigned long long, rlimit(RLIMIT_STACK), SZ_4G)); +} + /* * Writes on shadow stack can either be `sspush` or `ssamoswap`. `sspush` can happen * implicitly on current shadow stack pointed to by CSR_SSP. `ssamoswap` takes pointer to @@ -142,3 +177,88 @@ SYSCALL_DEFINE3(map_shadow_stack, unsigned long, addr, unsigned long, size, unsi return allocate_shadow_stack(addr, aligned_size, size, set_tok); } + +/* + * This gets called during clone/clone3/fork. And is needed to allocate a shadow stack for + * cases where CLONE_VM is specified and thus a different stack is specified by user. We + * thus need a separate shadow stack too. How does separate shadow stack is specified by + * user is still being debated. Once that's settled, remove this part of the comment. + * This function simply returns 0 if shadow stack are not supported or if separate shadow + * stack allocation is not needed (like in case of !CLONE_VM) + */ +unsigned long shstk_alloc_thread_stack(struct task_struct *tsk, + const struct kernel_clone_args *args) +{ + unsigned long addr, size; + + /* If shadow stack is not supported, return 0 */ + if (!cpu_supports_shadow_stack()) + return 0; + + /* + * If shadow stack is not enabled on the new thread, skip any + * switch to a new shadow stack. + */ + if (!is_shstk_enabled(tsk)) + return 0; + + /* + * For CLONE_VFORK the child will share the parents shadow stack. + * Set base = 0 and size = 0, this is special means to track this state + * so the freeing logic run for child knows to leave it alone. + */ + if (args->flags & CLONE_VFORK) { + set_shstk_base(tsk, 0, 0); + return 0; + } + + /* + * For !CLONE_VM the child will use a copy of the parents shadow + * stack. + */ + if (!(args->flags & CLONE_VM)) + return 0; + + /* + * reaching here means, CLONE_VM was specified and thus a separate shadow + * stack is needed for new cloned thread. Note: below allocation is happening + * using current mm. + */ + size = calc_shstk_size(args->stack_size); + addr = allocate_shadow_stack(0, size, 0, false); + if (IS_ERR_VALUE(addr)) + return addr; + + set_shstk_base(tsk, addr, size); + + return addr + size; +} + +void shstk_release(struct task_struct *tsk) +{ + unsigned long base = 0, size = 0; + /* If shadow stack is not supported or not enabled, nothing to release */ + if (!cpu_supports_shadow_stack() || !is_shstk_enabled(tsk)) + return; + + /* + * When fork() with CLONE_VM fails, the child (tsk) already has a + * shadow stack allocated, and exit_thread() calls this function to + * free it. In this case the parent (current) and the child share + * the same mm struct. Move forward only when they're same. + */ + if (!tsk->mm || tsk->mm != current->mm) + return; + + /* + * We know shadow stack is enabled but if base is NULL, then + * this task is not managing its own shadow stack (CLONE_VFORK). So + * skip freeing it. + */ + base = get_shstk_base(tsk, &size); + if (!base) + return; + + vm_munmap(base, size); + set_shstk_base(tsk, 0, 0); +} From patchwork Mon Mar 10 14:52:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010201 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 060D6C282DE for ; Mon, 10 Mar 2025 14:53:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DA00280001; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 48A93280011; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2B579280001; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id EBBA2280011 for ; Mon, 10 Mar 2025 10:53:04 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 12FA21CAEB0 for ; Mon, 10 Mar 2025 14:53:05 +0000 (UTC) X-FDA: 83205933930.24.7D31D28 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf19.hostedemail.com (Postfix) with ESMTP id 0A4811A0020 for ; Mon, 10 Mar 2025 14:53:02 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=srNz7gTs; dmarc=none; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 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=1741618383; 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=Zfw9OtoVzzM7Z5oL2c+Ej/yDm51xyr1WNtqXJN3fx8s=; b=V95qthVswfHxsMZlpH9QUUk2yPwBtl/SK7gM178EMBwWvtUNOfng+WGB/rbEDruPoB3J8W wMHabk9mZXKax5wJ+tguoJNxK+sgkxmYcxCoPAf0i5NqMcBYLqxNaYQlz3lHaQNStfRRdS C3Iwrn/tLp4B0K/h/e4WKQwsXsxpaSs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618383; a=rsa-sha256; cv=none; b=ODD1yZlQwza9gpWltQWF7T6F9YgEdYsfQRZSFrxiH1fGcVWx2lEhRZS9SCUr4qRBT0x2DT AWsoE8p+lyLCl6o9LnkVzqU+hSPs16yGL5isO4WozsoP0PNcGNHVhlkIrCVaai2csI9pbs 6RMMfLo1rkwuK/JAiCoLZnRyhuOQfFQ= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=srNz7gTs; dmarc=none; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22548a28d0cso11724685ad.3 for ; Mon, 10 Mar 2025 07:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618382; x=1742223182; 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=Zfw9OtoVzzM7Z5oL2c+Ej/yDm51xyr1WNtqXJN3fx8s=; b=srNz7gTsBeAddjEONaPHIJn7b5/ugTrIkxK1e1DYzxa0kjBLbPpa9cpRfxTYB7dD1X Im0hSEU5KUWUQHyJldSzooGWqKlgBcIXJkaYlDR/UG7Qco0QTU6GeQVknsfqD6dOeCdZ bbuOsJgejzR1W9Ja7OE1gKs2jgR47BDlDyJYWzSZm3HjgJDoFzJb3Vfeb307pejmo6TH D2+0GEnVTdaNplutwuk0DOsJMYID/4Me9n0NE7sTjddMe9eTVFan7gpevwQzWFQJE5fD sNfd2u8WEMQnf7Aq+ysI5xfo9oTiquYBl0kCuL69SDcQFpAA46KjwIp0RwyEI1JXsE04 FnOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618382; x=1742223182; 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=Zfw9OtoVzzM7Z5oL2c+Ej/yDm51xyr1WNtqXJN3fx8s=; b=binw0tuEYp1c6FoueLd6B1UVjuh53MUlr5/NBMlt3LTJ3884v5xuRICQNResKB8PyT OrY6aPqMbY9n+panGdFxVkn3lo4uRR2WbKHNI71gGFxdEGEN/WtUWXT8rzvq+ryG2Pjk qzufxuV1wFwTpV7qz1nf6FF5ZQ+R4NI0TBTJH4nNk2Yn3Bx1uNwat4w+adHrv7m2PNWK zfE1LcB+7iPSr2R16My8RSNjo7zRghKJzycsHNAFWZkCJHVm4mB9WEHPfLxJWGgzIX+f itnP7GYHdmX55dVno+NtbK31EcBkplgqPlGGMZ6kwJMZlD+UlKjJMg32hTVpiGr4hR4D D98Q== X-Forwarded-Encrypted: i=1; AJvYcCWk3f8Xne6MyitlNU9D74iSKhkR/xlDeJK+kJ2vG5EYMUex0mj6s+bAxhETcTM44JmJzDcDXBI0pw==@kvack.org X-Gm-Message-State: AOJu0YzfdFRc1zPj3T1I3PmMlO1QaoHu63qyWmcIMBtdW0AY5P1G339Y HLdn1mVEJSbqm9f8bIAuU93PcB5uMMHJh7c3+Mi8uapDYKNFVd2dj6xy2QL9K9I= X-Gm-Gg: ASbGncvOaZb+2vx5URvPheB2by94zYRTbdyAZIq56hdHANPzdeMn09pR/gYOifXJShA 1u+6xpCIQxiXDVwHfk598X3j+h+S6vYzj8EGD7Bu5+Epo8+48n3sVbbsDKbPy4c286V2VyMurj2 SS/RSOmXdMkL4FD6b8fBXtK7QmbQrgtUfyVVnymMu5s5EKLFN5kFO0y1bY7dHxB/4D33GXh4QfH Oz92DvIGJXyCt4192yZXrzcpa423EVdDBZ1j23VPqPb4I4YIAwkHE1/nSqyHxp1YLMYI7xf+fG4 hl25K6S6rD83PLpfj8PAG99zfszdNC+pBtAroJ1j3NDiYBxI95GrQlQ6RBm7cjF2+w== X-Google-Smtp-Source: AGHT+IHCKzm+H1WuyN4ioLJbIhvG1jyYj+k1eB31ZxZlrJTUkTC6vhrDB22oVaHxl5JQ/hZbQyLd3A== X-Received: by 2002:a05:6a20:430a:b0:1f0:e893:409f with SMTP id adf61e73a8af0-1f544b180dbmr23325177637.23.1741618381901; Mon, 10 Mar 2025 07:53:01 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:01 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:34 -0700 Subject: [PATCH v11 12/27] riscv: Implements arch agnostic shadow stack prctls MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-12-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Rspam-User: X-Rspamd-Queue-Id: 0A4811A0020 X-Rspamd-Server: rspam08 X-Stat-Signature: osgxk5scudd5o9ahm19rmmrj865uy8c7 X-HE-Tag: 1741618382-982601 X-HE-Meta: U2FsdGVkX19863j0dew/INh+IkIOidRvBe75Y7m+qn2wxXxQBTVKQwWsahZHY7gN0qwK3vbMagbdWo+l07M5n+dNK7ZaerLAxJKO451dG9kZhwceBZQgJzrtIGEIHqNWK7kmm5X+++n6TRzTdE/Or9pobTHG1LFrRX1Um09QBbMbWZMZRPTDH82FSxOQGb3/AfUCRpNosRbBNCPDiN/SN3sxyOCAArJd9e/RTcX9iMMQ+Lcrh2u3WXx8g4MV/QgLOVhGkkOzHdzBTYEbjYHZPQp2KrkDx0P1KWmx1oqIP9DwgXTMfrzHDEfqinhxPkHgXNdz7lJE21ztHPqp73Ch79syEpHfLT+LlnM46zvsnih7M1gGce+PxRxvoxWHR5VzCWgbbPbKArJ5KQaDINNT6Wdm8oXti7/1YGp1mfWU+ZwpkSsd4qxOZcHMPZoqe4mIee57st+R73V7sdtpwjoTmiLSeMlKdGCHIx14+xFZDkxtJUB3Mk7forFli1g0ymTyogLXikiNMm26btYsWuzJ9HSUUJ8xGjZML2LyFRN9UDAwWzDxUkGQ368Bz/pkSgOyslhsvwzUt8bhzSP5OZFDZvxJGcJd0bpBhuTMo+2zKfdmgrEs+xDkxGn67sL+jiKBzGGL+REiaE93taklpF+AfOJqS2uMOaRRBoQLTPoP/fG5sEweUTaGpGDUvbvcjMQDRDQcAGsyABWtIR611Zdlu9pSVAJatdETumj9X6J/MZFT6RLtCIusqQ0S2fUbO9f07vODDSeD1YGOND9jOYrqqNPjpXDZqqktYDXrGssl4BzusXBXTA2Y5nP4fLiYilVeiS9PKyMurTrCi1fV6Leb8FgHB/kouzood/6NI4F2MM2xxa4t8xGz+6chVWK88362KuGX1yK/ZF+ZJa3DZ6fyGi+60WCM31CUqh5df7mbYkn+NaykneZyeDzryqu6w9yjnuDGSvSRkWhzmDpe4Bx YCOCSBkd 6ChpAsT4eajyQ5fKXtTXFgbiEiVBMk2RCyLPKKiPoJwHjLPjyfTmWf0L02+k7/IjhPoGq7v9pbVLRsM9Kr/A2nHLIgmA1GXd5GzAmfqft/PGQJJD+T/3Fjr2r4e6yulrT6tU7e4MLh+0NoCBrxIbWkZ/B66ZuXH6eWj0oyHWEyV2OIEFpnFlpq061dN2akPRuq67aM8NQth/lGeCFq9GuAAfp4a73yzzIvzTz7uzaM15E1cuNuKWUjJ0GmzGcnWyJ7bElUv5L7tPHSrDWn30EdRD9xN7CrCNLRLd2Q8zb8pUbnB2S6o/sK50JgfAL3j0vxSRP2nEQi2vcii9aB9ECBIpZxos4xpVH/iX/QeLMLO8QRR6TU75A1A7faIAJCICgR/czAT4TpKkI3gA7c0gIPMhwQlBjL7EjSazniN65yrvotW6MfpkZt1w01Oy0WXZ0PS78a9IoR4yR1cI= 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: Implement architecture agnostic prctls() interface for setting and getting shadow stack status. prctls implemented are PR_GET_SHADOW_STACK_STATUS, PR_SET_SHADOW_STACK_STATUS and PR_LOCK_SHADOW_STACK_STATUS. As part of PR_SET_SHADOW_STACK_STATUS/PR_GET_SHADOW_STACK_STATUS, only PR_SHADOW_STACK_ENABLE is implemented because RISCV allows each mode to write to their own shadow stack using `sspush` or `ssamoswap`. PR_LOCK_SHADOW_STACK_STATUS locks current configuration of shadow stack enabling. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/usercfi.h | 18 ++++++- arch/riscv/kernel/process.c | 8 +++ arch/riscv/kernel/usercfi.c | 107 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index 82d28ac98d76..c4dcd256f19a 100644 --- a/arch/riscv/include/asm/usercfi.h +++ b/arch/riscv/include/asm/usercfi.h @@ -7,6 +7,7 @@ #ifndef __ASSEMBLY__ #include +#include struct task_struct; struct kernel_clone_args; @@ -14,7 +15,8 @@ struct kernel_clone_args; #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 ubcfi_locked : 1; + unsigned long rsvd : ((sizeof(unsigned long) * 8) - 2); 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 */ @@ -27,6 +29,12 @@ void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, unsigned unsigned long get_shstk_base(struct task_struct *task, unsigned long *size); void set_active_shstk(struct task_struct *task, unsigned long shstk_addr); bool is_shstk_enabled(struct task_struct *task); +bool is_shstk_locked(struct task_struct *task); +bool is_shstk_allocated(struct task_struct *task); +void set_shstk_lock(struct task_struct *task); +void set_shstk_status(struct task_struct *task, bool enable); + +#define PR_SHADOW_STACK_SUPPORTED_STATUS_MASK (PR_SHADOW_STACK_ENABLE) #else @@ -42,6 +50,14 @@ bool is_shstk_enabled(struct task_struct *task); #define is_shstk_enabled(task) false +#define is_shstk_locked(task) false + +#define is_shstk_allocated(task) false + +#define set_shstk_lock(task) + +#define set_shstk_status(task, enable) + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 99acb6342a37..cd11667593fe 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -153,6 +153,14 @@ void start_thread(struct pt_regs *regs, unsigned long pc, regs->epc = pc; regs->sp = sp; + /* + * clear shadow stack state on exec. + * libc will set it later via prctl. + */ + set_shstk_status(current, false); + set_shstk_base(current, 0, 0); + set_active_shstk(current, 0); + #ifdef CONFIG_64BIT regs->status &= ~SR_UXL; diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 73cf87dab186..37d6fb8144e7 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -24,6 +24,16 @@ bool is_shstk_enabled(struct task_struct *task) return task->thread_info.user_cfi_state.ubcfi_en ? true : false; } +bool is_shstk_allocated(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.shdw_stk_base ? true : false; +} + +bool is_shstk_locked(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ubcfi_locked ? true : false; +} + void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, unsigned long size) { task->thread_info.user_cfi_state.shdw_stk_base = shstk_addr; @@ -42,6 +52,23 @@ void set_active_shstk(struct task_struct *task, unsigned long shstk_addr) task->thread_info.user_cfi_state.user_shdw_stk = shstk_addr; } +void set_shstk_status(struct task_struct *task, bool enable) +{ + task->thread_info.user_cfi_state.ubcfi_en = enable ? 1 : 0; + + if (enable) + task->thread.envcfg |= ENVCFG_SSE; + else + task->thread.envcfg &= ~ENVCFG_SSE; + + csr_write(CSR_ENVCFG, task->thread.envcfg); +} + +void set_shstk_lock(struct task_struct *task) +{ + task->thread_info.user_cfi_state.ubcfi_locked = 1; +} + /* * If size is 0, then to be compatible with regular stack we want it to be as big as * regular stack. Else PAGE_ALIGN it and return back @@ -262,3 +289,83 @@ void shstk_release(struct task_struct *tsk) vm_munmap(base, size); set_shstk_base(tsk, 0, 0); } + +int arch_get_shadow_stack_status(struct task_struct *t, unsigned long __user *status) +{ + unsigned long bcfi_status = 0; + + if (!cpu_supports_shadow_stack()) + return -EINVAL; + + /* this means shadow stack is enabled on the task */ + bcfi_status |= (is_shstk_enabled(t) ? PR_SHADOW_STACK_ENABLE : 0); + + return copy_to_user(status, &bcfi_status, sizeof(bcfi_status)) ? -EFAULT : 0; +} + +int arch_set_shadow_stack_status(struct task_struct *t, unsigned long status) +{ + unsigned long size = 0, addr = 0; + bool enable_shstk = false; + + if (!cpu_supports_shadow_stack()) + return -EINVAL; + + /* Reject unknown flags */ + if (status & ~PR_SHADOW_STACK_SUPPORTED_STATUS_MASK) + return -EINVAL; + + /* bcfi status is locked and further can't be modified by user */ + if (is_shstk_locked(t)) + return -EINVAL; + + enable_shstk = status & PR_SHADOW_STACK_ENABLE; + /* Request is to enable shadow stack and shadow stack is not enabled already */ + if (enable_shstk && !is_shstk_enabled(t)) { + /* shadow stack was allocated and enable request again + * no need to support such usecase and return EINVAL. + */ + if (is_shstk_allocated(t)) + return -EINVAL; + + size = calc_shstk_size(0); + addr = allocate_shadow_stack(0, size, 0, false); + if (IS_ERR_VALUE(addr)) + return -ENOMEM; + set_shstk_base(t, addr, size); + set_active_shstk(t, addr + size); + } + + /* + * If a request to disable shadow stack happens, let's go ahead and release it + * Although, if CLONE_VFORKed child did this, then in that case we will end up + * not releasing the shadow stack (because it might be needed in parent). Although + * we will disable it for VFORKed child. And if VFORKed child tries to enable again + * then in that case, it'll get entirely new shadow stack because following condition + * are true + * - shadow stack was not enabled for vforked child + * - shadow stack base was anyways pointing to 0 + * This shouldn't be a big issue because we want parent to have availability of shadow + * stack whenever VFORKed child releases resources via exit or exec but at the same + * time we want VFORKed child to break away and establish new shadow stack if it desires + * + */ + if (!enable_shstk) + shstk_release(t); + + set_shstk_status(t, enable_shstk); + return 0; +} + +int arch_lock_shadow_stack_status(struct task_struct *task, + unsigned long arg) +{ + /* If shtstk not supported or not enabled on task, nothing to lock here */ + if (!cpu_supports_shadow_stack() || + !is_shstk_enabled(task) || arg != 0) + return -EINVAL; + + set_shstk_lock(task); + + return 0; +} From patchwork Mon Mar 10 14:52:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010203 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 E6E1EC282EC for ; Mon, 10 Mar 2025 14:53:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 715C1280013; Mon, 10 Mar 2025 10:53:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A04B280011; Mon, 10 Mar 2025 10:53:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A6AE280013; Mon, 10 Mar 2025 10:53:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 26D16280011 for ; Mon, 10 Mar 2025 10:53:07 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 82DF0B87D9 for ; Mon, 10 Mar 2025 14:53:07 +0000 (UTC) X-FDA: 83205934014.23.E58C6D6 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf07.hostedemail.com (Postfix) with ESMTP id 92B7240006 for ; Mon, 10 Mar 2025 14:53:05 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="OcHQSmJ/"; spf=pass (imf07.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 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=1741618385; 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=n4wOXS0/20DvZRxruHD7mFnd6lRzln/dV2wTFJ6STYc=; b=U3WBSuQtxCrqWO4AnVqRDRAjUKt9RcjlliTBkJ9pSIkGoVPNHCtrxNepUDvNfHpOU0lNDn bV+UuhlEq275VSQzFhDyhhjHZ4TkOooFJyW0nxaMBPN3jjz98pMex6KKgr4Dq3j2iNvsBN +Dimf1UcL03qH9Y/fefsfJxmIQMVOog= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618385; a=rsa-sha256; cv=none; b=YTPhf35/BJ8zmd0KJXwM6VTie2qFldUbkp3lYHqWmwKefY0LgIHBVRen08oEft0WVNcFap 5B81hYS1PmWeHMnz0SyGpT9Vdmh61J5Ottc9xO/beVJPu44dr/D1RraVPZiPBV4gm69446 hXvNWT4Ol1/WhWgLvBeJFlQn0CCXNSg= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="OcHQSmJ/"; spf=pass (imf07.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-22334203781so95786795ad.0 for ; Mon, 10 Mar 2025 07:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618384; x=1742223184; 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=n4wOXS0/20DvZRxruHD7mFnd6lRzln/dV2wTFJ6STYc=; b=OcHQSmJ/AUl47LYFWPlI7lGpYQcgh49BfxIQgxfeVExPOAMjUh2Njkru9zs+OZvYS7 EkK4s6Ld/eKpHgFR4QfegkwqroHPyuwaB7M/yff2EVBrcf1b6JTU7GZGgtrAlxUyOGEz MFwFyByh72pLTbUHU7p6EKFfhh/b2/+vOpEgcmfjH+ZoLiXdHjDQnLga1rT9jWOBM9DH H9xemj5LfGfaKFs9rSfJlsZp6X0XbC33h8KEOeI+HlRcmNpWqAI1DOF1V0tOb7q6E9jO Fo5+CErKgztNZQm/i8Qm0Xtrk3y5m2//lTrwhfKLdm9hAyDrFqVsH7gr0byFCPt1IweZ pUew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618384; x=1742223184; 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=n4wOXS0/20DvZRxruHD7mFnd6lRzln/dV2wTFJ6STYc=; b=p0gWkWQPGtH+IKS524I/+6Mv3PknhSsfMP189KwzMfkcocFHSNKUm0GFCVK2UXG14A nH5xPqwbBKoVlmk0o0Oxndxm2E9os/hkJGBL0oBWjT8y0A7gBiL4dqoqbrfvjzMGAfhj g6UQBNtBafLdyn3RJNL5h7fAUC2JJdV6NZ+hb+vqxl1DYjX5O/oh0eHC81ZYIhKXNxvg qjIH88Pv/yodxmymH++2f/hyOeu30oFjTIqBRelZBl0LN6yvC1FmFy3EH9vgkp9VoSEt uxf4AEywaLqf3Wv73i8mUWw2Sah8Vbo46j+0Kd1boT8yFd/q/qk/IYy2HQWaUsfUFUs1 Ed2A== X-Forwarded-Encrypted: i=1; AJvYcCUceQgXfAVRH4bv1XKcZvf34k7ZLwvwGiw1JwRCCuCZVCmvNBG8EkcB8PC+6Y8gIIikef1f7A0qZA==@kvack.org X-Gm-Message-State: AOJu0YwnbYEWprXiocIc4GF5TIVDYL2TQmJd4mzNxCcQ17jdrtmph35h 5JP9TCZRiqNDewZ/AeBvHX7TV2nWdIXC7xHt94KPrKBs252c0qJ2xFup5HbcI+g= X-Gm-Gg: ASbGncvj2zjUukA4WL1DOzI+45oEynpXQZ2uuBEaIx+icaPyMQlv1fd37BOi7DCeOps DUCu2KIo5MmbdblLPMKnX4nXGLobbF4A3ing1TK1P9r8WqL8Tdxc+pbXosLpbR5VNXo5ADDui+f i+RqYRLYtnwyrx1IzajXDEh4SD3UWukkl0Yhr8hKxQIQj46iLkxK7f6UCwqSE+mwwDTiYOoElQa cYEYOgNw0c7lqjD9mNkvX8af4WepfnClF20mGvrBkd0BHmzTFTsTpt3aCpEiln62RWLPeyqgwaE tZm6PHc3I1PJFpk0WlLXucxQU+Veq41FLo6HN2Wl7jhIn+ZsUHHhLy1v6iobj7acFw== X-Google-Smtp-Source: AGHT+IFPcCScpuJQuODEjO5ogKF+7rsG+dE6AGDUyxV2l5MZI+A8WNThCUXQtc0yXYjGKQnUtdvO1A== X-Received: by 2002:a05:6a00:13a5:b0:736:9f2e:1357 with SMTP id d2e1a72fcca58-736bc0d54eemr15283735b3a.12.1741618384358; Mon, 10 Mar 2025 07:53:04 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:04 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:35 -0700 Subject: [PATCH v11 13/27] prctl: arch-agnostic prctl for indirect branch tracking MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-13-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Rspam-User: X-Rspamd-Queue-Id: 92B7240006 X-Stat-Signature: ym8i9nor7ebw8g3mfp1adgfdtzsznuut X-Rspamd-Server: rspam10 X-HE-Tag: 1741618385-881029 X-HE-Meta: U2FsdGVkX19fvx64OeaOY+USz/mTPlDjFSXGskOVEUMbDTrN96EL3oUdNJdYo48DTP7BNaTIzCY7gIk2l973ivZs7Xmsgxp7QVACuSjv/SVpsvglPDVeOjh3Z2yF+CjVqlTIBPa6rujD2BB2rtXLHa7OPwPzlI+mooPc2MPWXwLjsq5CnbQV1V42qDmmM9MAjcpphQ/tFtEOXn8ibtsKSm9TdFE5rtLeVD/iPdOlRQC1J21Ri6LH7G+EFeEe++kp+LgXK1JVsYsfaIJKUM+qjsqdOHrIZXlga4JmkrsMosvh8+9SjJPZAXGtFY6ryrFRkknmfIjETm+Y7GJIGcBWijZ8s76cIRLQQh4zroQ/JoiAOru8FqT4gFyXA3Zad5HtO4G1E5F+AO1GHjAaZTtfcYFwN5MeygiYVt8NPe9rDb7d3o1+cl38SHYFn/90iYQesoquVxiyP3Kp+nVXrFYkQSSl79Ixl9m1+kgd94VsrQHA4IA0zOUcZ1Zw7nRJuXQxRzMmUTUSLg7ua5tLLQpaNNc1xmnUS5Mgs9lSTBpK6YQKbwWOr6LVhwUnupTgrgz6qyW304R6xRHxOgR1dw83ealq4UmY3z/p7eLLSWU3NxLxDbQcNpIYPqtYDGnffhItii0AG5XN+vRhi/d9D63uXiDF+UANnx24z8twqI1i18c/SAKwkMCGmp96DTMxwoHNnQedMAwqcRhXrnSr8+8Eo3NIh7qntyv5t/yRhRYWIRsNDtewS9TIqEqU9ErXOmq/1RMp8QwTLqs87l8avm67/6YoMwuh0IfHObMGumuCEPsFcPBlOmfgRzeRLS7FRi+XoT/ayy+hoKdtezbm7UQXJV8BZZhgljf18hsUkweAVnWgm3iAUl5nwbUcJTiHR1LEae8GPKNs8DWccTTOZvCvvsYNwsf1xosYPFa1wnr+kRyIhoeb72ohbhKQP6ZgRrkld87y1qV0kG49ytv/Q+n aFGq7UMy XlAolPKeJstCDXgDNxW8okw2iFx0Cda1WugFIWA5lliIRAfq3kO9KpzWCiWQSqOaP6FAqLkhJj5DmIjOrR5fWKR9tQzIaKTiXsFobudINqi6rJCgL4lvK3RvpYWCdLFlV/AkQb9jPIomBwDLE70BCHxcEfWSHeV+iyaTcHci1l8eguH1DWTehOnvSp9sPpG1my3mNiIVM4niRZNKXknstLEyhCTBSWSWAatQ7BoZWm9eXd8Fkm9AzHgIeGuQWZQxIwqX8epSJLKdBwWXBm5V5upHCXPLgQ8tfpxqDBsNywqw91W+Yyg/fvNE/1eztBwB8z6mCQph+dcB5CzL1nQ+C4tVRvj+cs0OizKQ9LagXtuvEOIhEtqmrykhUnjXP0l9pDKObkzEKE7u2HIuokaMTLt2AB9RzeavJvALAaMVTUAhkPKIo8wJWmFu2BO5k6Ts9RKrxc1cq3J/2fzLSZgq8FPtb1KQFkS1asQP0TlOTDlOukpY= 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: Three architectures (x86, aarch64, riscv) have support for indirect branch tracking feature in a very similar fashion. On a very high level, indirect branch tracking is a CPU feature where CPU tracks branches which uses memory operand to perform control transfer in program. As part of this tracking on indirect branches, CPU goes in a state where it expects a landing pad instr on target and if not found then CPU raises some fault (architecture dependent) x86 landing pad instr - `ENDBRANCH` aarch64 landing pad instr - `BTI` riscv landing instr - `lpad` Given that three major arches have support for indirect branch tracking, This patch makes `prctl` for indirect branch tracking arch agnostic. To allow userspace to enable this feature for itself, following prtcls are defined: - PR_GET_INDIR_BR_LP_STATUS: Gets current configured status for indirect branch tracking. - PR_SET_INDIR_BR_LP_STATUS: Sets a configuration for indirect branch tracking. Following status options are allowed - PR_INDIR_BR_LP_ENABLE: Enables indirect branch tracking on user thread. - PR_INDIR_BR_LP_DISABLE; Disables indirect branch tracking on user thread. - PR_LOCK_INDIR_BR_LP_STATUS: Locks configured status for indirect branch tracking for user thread. Signed-off-by: Deepak Gupta Reviewed-by: Mark Brown --- arch/riscv/include/asm/usercfi.h | 16 ++++++++- arch/riscv/kernel/entry.S | 2 +- arch/riscv/kernel/process.c | 5 +++ arch/riscv/kernel/usercfi.c | 76 ++++++++++++++++++++++++++++++++++++++++ include/linux/cpu.h | 4 +++ include/uapi/linux/prctl.h | 27 ++++++++++++++ kernel/sys.c | 30 ++++++++++++++++ 7 files changed, 158 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index c4dcd256f19a..a8cec7c14d1d 100644 --- a/arch/riscv/include/asm/usercfi.h +++ b/arch/riscv/include/asm/usercfi.h @@ -16,7 +16,9 @@ struct kernel_clone_args; struct cfi_status { unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ unsigned long ubcfi_locked : 1; - unsigned long rsvd : ((sizeof(unsigned long) * 8) - 2); + unsigned long ufcfi_en : 1; /* Enable for forward cfi. Note that ELP goes in sstatus */ + unsigned long ufcfi_locked : 1; + unsigned long rsvd : ((sizeof(unsigned long) * 8) - 4); 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 */ @@ -33,6 +35,10 @@ bool is_shstk_locked(struct task_struct *task); bool is_shstk_allocated(struct task_struct *task); void set_shstk_lock(struct task_struct *task); void set_shstk_status(struct task_struct *task, bool enable); +bool is_indir_lp_enabled(struct task_struct *task); +bool is_indir_lp_locked(struct task_struct *task); +void set_indir_lp_status(struct task_struct *task, bool enable); +void set_indir_lp_lock(struct task_struct *task); #define PR_SHADOW_STACK_SUPPORTED_STATUS_MASK (PR_SHADOW_STACK_ENABLE) @@ -58,6 +64,14 @@ void set_shstk_status(struct task_struct *task, bool enable); #define set_shstk_status(task, enable) +#define is_indir_lp_enabled(task) false + +#define is_indir_lp_locked(task) false + +#define set_indir_lp_status(task, enable) + +#define set_indir_lp_lock(task) + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 68c99124ea55..00494b54ff4a 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -143,7 +143,7 @@ SYM_CODE_START(handle_exception) * Disable the FPU/Vector to detect illegal usage of floating point * or vector in kernel space. */ - li t0, SR_SUM | SR_FS_VS + li t0, SR_SUM | SR_FS_VS | SR_ELP REG_L s0, TASK_TI_USER_SP(tp) csrrc s1, CSR_STATUS, t0 diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index cd11667593fe..4587201dd81d 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -160,6 +160,11 @@ void start_thread(struct pt_regs *regs, unsigned long pc, set_shstk_status(current, false); set_shstk_base(current, 0, 0); set_active_shstk(current, 0); + /* + * disable indirect branch tracking on exec. + * libc will enable it later via prctl. + */ + set_indir_lp_status(current, false); #ifdef CONFIG_64BIT regs->status &= ~SR_UXL; diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 37d6fb8144e7..3a66f149a4ef 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -69,6 +69,32 @@ void set_shstk_lock(struct task_struct *task) task->thread_info.user_cfi_state.ubcfi_locked = 1; } +bool is_indir_lp_enabled(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ufcfi_en ? true : false; +} + +bool is_indir_lp_locked(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ufcfi_locked ? true : false; +} + +void set_indir_lp_status(struct task_struct *task, bool enable) +{ + task->thread_info.user_cfi_state.ufcfi_en = enable ? 1 : 0; + + if (enable) + task->thread.envcfg |= ENVCFG_LPE; + else + task->thread.envcfg &= ~ENVCFG_LPE; + + csr_write(CSR_ENVCFG, task->thread.envcfg); +} + +void set_indir_lp_lock(struct task_struct *task) +{ + task->thread_info.user_cfi_state.ufcfi_locked = 1; +} /* * If size is 0, then to be compatible with regular stack we want it to be as big as * regular stack. Else PAGE_ALIGN it and return back @@ -369,3 +395,53 @@ int arch_lock_shadow_stack_status(struct task_struct *task, return 0; } + +int arch_get_indir_br_lp_status(struct task_struct *t, unsigned long __user *status) +{ + unsigned long fcfi_status = 0; + + if (!cpu_supports_indirect_br_lp_instr()) + return -EINVAL; + + /* indirect branch tracking is enabled on the task or not */ + fcfi_status |= (is_indir_lp_enabled(t) ? PR_INDIR_BR_LP_ENABLE : 0); + + return copy_to_user(status, &fcfi_status, sizeof(fcfi_status)) ? -EFAULT : 0; +} + +int arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status) +{ + bool enable_indir_lp = false; + + if (!cpu_supports_indirect_br_lp_instr()) + return -EINVAL; + + /* indirect branch tracking is locked and further can't be modified by user */ + if (is_indir_lp_locked(t)) + return -EINVAL; + + /* Reject unknown flags */ + if (status & ~PR_INDIR_BR_LP_ENABLE) + return -EINVAL; + + enable_indir_lp = (status & PR_INDIR_BR_LP_ENABLE) ? true : false; + set_indir_lp_status(t, enable_indir_lp); + + return 0; +} + +int arch_lock_indir_br_lp_status(struct task_struct *task, + unsigned long arg) +{ + /* + * If indirect branch tracking is not supported or not enabled on task, + * nothing to lock here + */ + if (!cpu_supports_indirect_br_lp_instr() || + !is_indir_lp_enabled(task) || arg != 0) + return -EINVAL; + + set_indir_lp_lock(task); + + return 0; +} diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 6a0a8f1c7c90..fb0c394430c6 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -204,4 +204,8 @@ static inline bool cpu_mitigations_auto_nosmt(void) } #endif +int arch_get_indir_br_lp_status(struct task_struct *t, unsigned long __user *status); +int arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status); +int arch_lock_indir_br_lp_status(struct task_struct *t, unsigned long status); + #endif /* _LINUX_CPU_H_ */ diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h index 5c6080680cb2..6cd90460cbad 100644 --- a/include/uapi/linux/prctl.h +++ b/include/uapi/linux/prctl.h @@ -353,4 +353,31 @@ struct prctl_mm_map { */ #define PR_LOCK_SHADOW_STACK_STATUS 76 +/* + * Get the current indirect branch tracking configuration for the current + * thread, this will be the value configured via PR_SET_INDIR_BR_LP_STATUS. + */ +#define PR_GET_INDIR_BR_LP_STATUS 77 + +/* + * Set the indirect branch tracking configuration. PR_INDIR_BR_LP_ENABLE will + * enable cpu feature for user thread, to track all indirect branches and ensure + * they land on arch defined landing pad instruction. + * x86 - If enabled, an indirect branch must land on `ENDBRANCH` instruction. + * arch64 - If enabled, an indirect branch must land on `BTI` instruction. + * riscv - If enabled, an indirect branch must land on `lpad` instruction. + * PR_INDIR_BR_LP_DISABLE will disable feature for user thread and indirect + * branches will no more be tracked by cpu to land on arch defined landing pad + * instruction. + */ +#define PR_SET_INDIR_BR_LP_STATUS 78 +# define PR_INDIR_BR_LP_ENABLE (1UL << 0) + +/* + * Prevent further changes to the specified indirect branch tracking + * configuration. All bits may be locked via this call, including + * undefined bits. + */ +#define PR_LOCK_INDIR_BR_LP_STATUS 79 + #endif /* _LINUX_PRCTL_H */ diff --git a/kernel/sys.c b/kernel/sys.c index cb366ff8703a..f347f3518d0b 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2336,6 +2336,21 @@ int __weak arch_lock_shadow_stack_status(struct task_struct *t, unsigned long st return -EINVAL; } +int __weak arch_get_indir_br_lp_status(struct task_struct *t, unsigned long __user *status) +{ + return -EINVAL; +} + +int __weak arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status) +{ + return -EINVAL; +} + +int __weak arch_lock_indir_br_lp_status(struct task_struct *t, unsigned long status) +{ + return -EINVAL; +} + #define PR_IO_FLUSHER (PF_MEMALLOC_NOIO | PF_LOCAL_THROTTLE) #ifdef CONFIG_ANON_VMA_NAME @@ -2811,6 +2826,21 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, return -EINVAL; error = arch_lock_shadow_stack_status(me, arg2); break; + case PR_GET_INDIR_BR_LP_STATUS: + if (arg3 || arg4 || arg5) + return -EINVAL; + error = arch_get_indir_br_lp_status(me, (unsigned long __user *)arg2); + break; + case PR_SET_INDIR_BR_LP_STATUS: + if (arg3 || arg4 || arg5) + return -EINVAL; + error = arch_set_indir_br_lp_status(me, arg2); + break; + case PR_LOCK_INDIR_BR_LP_STATUS: + if (arg3 || arg4 || arg5) + return -EINVAL; + error = arch_lock_indir_br_lp_status(me, arg2); + break; default: trace_task_prctl_unknown(option, arg2, arg3, arg4, arg5); error = -EINVAL; From patchwork Mon Mar 10 14:52:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010204 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 B6EF5C282DE for ; Mon, 10 Mar 2025 14:53:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C80D5280014; Mon, 10 Mar 2025 10:53:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0A4A280011; Mon, 10 Mar 2025 10:53:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A8390280014; Mon, 10 Mar 2025 10:53:09 -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 85F25280011 for ; Mon, 10 Mar 2025 10:53:09 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id DAD26C0FCB for ; Mon, 10 Mar 2025 14:53:09 +0000 (UTC) X-FDA: 83205934098.22.779B1DB Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf24.hostedemail.com (Postfix) with ESMTP id ECB0C180008 for ; Mon, 10 Mar 2025 14:53:07 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=2hxfi+Gj; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 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=1741618388; 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=M49HWf8gzr6wWBf1Qtr4VOivQAEEQjfyuWgORGOVTSw=; b=DuOOVXtwug18pglvrtLojD8wzhhjI6Q494OEB3X609VKwOqYH2lsgn5UYFmhCmdLcaQMSv mOoB/5NXjfHzzRa+gLmrcFymH9wwIDDKvlrQDPU495QrhXJyeP+RwJsbhb5wSdAcizdzpp XJ7WmbU2xu6GxE+Dr58JDV6iKOaHYhg= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=2hxfi+Gj; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618388; a=rsa-sha256; cv=none; b=2jmlX+F6+uSxiykiL6M9eQ5Scax9OEFOqAmc23toqVI9lNXp6aSbHWTlIrruhk0E19ng2w wkp3GKEOE3Pj9nkq1vkujAjRcBxmtXFJ0xOMd8+/mlIMwT9DGKplJH5x/AkbIl1X02O3c4 k/bwtYGvYKwm24Gpmek2uaMPEq5Qk04= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-22349bb8605so78595545ad.0 for ; Mon, 10 Mar 2025 07:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618387; x=1742223187; 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=M49HWf8gzr6wWBf1Qtr4VOivQAEEQjfyuWgORGOVTSw=; b=2hxfi+GjCfj9Ip40VAqakOEqRBk12ttkGaMEZuifunk6D90260p5LIJjFfmnF3IZdp dl342qTNoxKaRYSEP69yGLL1FbxFVWpKUiB4TyP26H0qmUQ5aJyqjWtkCSXcCpiPAUZr heKMbiU6TQGpQRk2VEy9bJGqHxKH+u6rw3ELwTg/nuY8JiQnTIS/0RBSdpM6eht+mxYh 32EupwWL00nbZl1A3s72uzZQASWmn1e9O/C2jIPSAXXm2Zm2iWWCcXqlJH3ON4Qhc1yq QG1wmShbAIV247hMTwCk5XNViuuLAKIoTpqk1TfoXFE8qStbqw4Y+Tp//dhCyAhKLNJT vnqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618387; x=1742223187; 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=M49HWf8gzr6wWBf1Qtr4VOivQAEEQjfyuWgORGOVTSw=; b=uRBB9quxKoYMF6AstXPCCcqhY9+X7YvOSkcbujm/fvfqh9tJjjwV/qX4KNmfrw/IRr t/1+x3KIv/xJrmau0FYg9E0A6j42kavKioIDRZj5lOl6trDscQ3e7eTTFFCcJVtr4ISn XtCz4E466gODiNszX3dDESId+ba9a9kjkcPOQY7So8Ua7zaJBVhrWNYE5RPuGyfZeD98 r/NVpn5mzVnc+IiObhgSzjOqdGDIy3bIoHuMectinteRDqn0urDEuyWc9gXOlgIJ54OG mLyP25TCP84cRAUBpnW/YuAtQZgDeV1kHClVaQc7g2EX+BYrzSyX4r8PSu0Gk8Y03ysI tkeQ== X-Forwarded-Encrypted: i=1; AJvYcCX276ZODB0ERVZGT/h9AEKNIZlnTdHytZG5Bp0vOfeVLoLkK30w66uLjS+mqiU6dGpDyvbk9VLthw==@kvack.org X-Gm-Message-State: AOJu0YzVgVjNRbRZ7gmcxUmQu2lj5o19+jy3ocmrKUK2t2gTPW2RIF/k ByDx3gJVxmRd3GvsH9HTdxXBsqe6HJ8GTWD8fPpbD8w6u6ujjXJmBbY9ggt5dg0= X-Gm-Gg: ASbGnctaVo96WhbQpBcgT7FkBUulhwXSeBFaUFC11hZ6QGPdq88h9XgSD6rDsNXjRC7 13U1AO1SfxjWL3iXLPTc+N4PfOKAkBrZL/xHV4J7NUSZgInLCM7J/beCD6E3Ai9hZBZAtvrBB5i Vu1dLopiT4dVfxEZlvrleHXQBIOvfywSm6b2DKutfdchQF/stwOeADqvVC+F7i11Wz7d0jTL68l xrJGnyrgnUVcJnWVYx4QQS6c66I3Og3dfqLVZOthcQlA9Af1WsQqb3tdVZEiJ27zEW9Y2Z2xLE1 NSOdVYVeOzUkLn3nr8WS9NBGqMGmQbOt38BwMihGtsVpPpx3v6MZXyY= X-Google-Smtp-Source: AGHT+IFsZxG1TWVrNQMrqkKpccFn2JJPQ/WSJPQEXgIDTpBCMBrYmD46kiCZqmMB33SVFrCrhoe36g== X-Received: by 2002:a05:6a20:2d2c:b0:1f5:8221:d68c with SMTP id adf61e73a8af0-1f58221fee5mr5284959637.3.1741618386923; Mon, 10 Mar 2025 07:53:06 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:06 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:36 -0700 Subject: [PATCH v11 14/27] riscv/traps: Introduce software check exception MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-14-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Rspam-User: X-Rspamd-Queue-Id: ECB0C180008 X-Rspamd-Server: rspam03 X-Stat-Signature: uxenpaji7fpfbe5mf3me1n7kddoywfnn X-HE-Tag: 1741618387-56576 X-HE-Meta: U2FsdGVkX19sgpe9v7A6b/RFgC3JC2D8R9fo965UiTZhNYEUhxVSfBUstXKsu/q/ewzA1Hm55nJqslJZXO5zJ3lxUmS7RkwG7MUdCSLXjRjj3jsWs4YjZrrqrywlUlcXPcwUvA71svuePRX5NZoQYaBLjnSOUq4A0y9QVFREDOzkEhd+qVWD/TQLWrxSvUHE8nWYJaJ2i1FKhIoa0CjJlLtmUkYJDIfLLK1LoGAPpUrOzw9ioD3arFtzZTmEqJ2CsPH/xhgas8gyx4yc9SN3ncN1qFEQqm3tJ9sBy8Tkkk5wnvgy1ZxcwCTjHOAHZcO+OWJ34wcOIt2VKk1J+G2pLCVDnKgfeo4GStHj5Idx6eckDsvzI3pp/O7FLoTqDRfp6KYuYHS1ITwSP2XksgaMpErAq/vEnLVFTmViq0D1vVEMjL0ON5y9bAvqIV3gCfrGBElFUlbZe3HeYyVlyUNu6FSgmQTxn8PLRH+mzCjfNIhVMDEFb+r4dn+dDi4eoxuc99uPp9PLqcp1EFeLm+4v1wt/iA3+gsykyb9WdUYYQsQrR77x56gecBWy1kJtrPZBIm2XNWAkUW2g2X4KVl67rpKF4490+2iGaWwnL1MqNRob3718DLVEBs7dgTapnBQmqF2xwvWQ14cpy9vKq0TLCkTNXqVYoD/jsI5YpxzCeTwPDLpXppB8Q21apaxSBSSHRwqExFSLaFuflnMz6cFjtZwUtCXQCFzTuLWH37neNSv5PtgqSOPAPndr7inQd4d/1RuOJi7VMCnvtaHEF6av/k4dskrmt8vMW4xSZk4M2Nh0dmtzV1BGa0inMPpiBNcDOIO7QRaCupBPLvE4dYrcrGAhOXXjZC3ZfLtnBlA/v9NKS8j2RPtf4H6SvvET1xnzhKK+pG/w/v6OeE5UmhDVigPZPkNg77IMSA0K+DofEZnAnq9nraqADHg24THgu5C2e0NFt0Ew5UXOg2fmkUR 1dFye8ZU u1r/eay32k3Bpw4MnqyzIeQfrSQ1jDIMtvD9jI5aVV6keM96KDOgGPOqWR3uqF7kYzjStMihDGmTyJZ8cfieR74Hevkoi80YTYT8i9XvXonwos2X6/tTrQ7g4meLfkq+wKhyXkn9MW+8THUvUWnd5yabUmtFRsHHelx2NqDkdagh80ppxnB5+zkwQfzZspMduxxXfcUmOvJyYBDVcQW2GAyV8X/3jnMVnV8tbG5PBZUwlwFAM6xW+ozzfRGKNDAZ/JrcC0rzcs0bIABZCch7Cw8PRiQoOZ28kXlbmW9tf0SpYCkhDPCCZ289k7RF064/bikzuoUZkiS4Ff5IqoPbqkUPfHfjad0yB8fbEoVzK2Yp1znOyIKVTzWD0BSdvFoHK7DJ4BhEcytpTrfF3mp/6TUiBMUTTRzwQ/SNtnq1XQwxRG+OCWdX2vOgfQt/D5IZ9XSJOUM3P9TJaQ1Y= 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: zicfiss / zicfilp introduces a new exception to priv isa `software check exception` with cause code = 18. This patch implements software check exception. Additionally it implements a cfi violation handler which checks for code in xtval. If xtval=2, it means that sw check exception happened because of an indirect branch not landing on 4 byte aligned PC or not landing on `lpad` instruction or label value embedded in `lpad` not matching label value setup in `x7`. If xtval=3, it means that sw check exception happened because of mismatch between link register (x1 or x5) and top of shadow stack (on execution of `sspopchk`). In case of cfi violation, SIGSEGV is raised with code=SEGV_CPERR. SEGV_CPERR was introduced by x86 shadow stack patches. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/asm-prototypes.h | 1 + arch/riscv/include/asm/entry-common.h | 2 ++ arch/riscv/kernel/entry.S | 3 +++ arch/riscv/kernel/traps.c | 43 +++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/arch/riscv/include/asm/asm-prototypes.h b/arch/riscv/include/asm/asm-prototypes.h index cd627ec289f1..5a27cefd7805 100644 --- a/arch/riscv/include/asm/asm-prototypes.h +++ b/arch/riscv/include/asm/asm-prototypes.h @@ -51,6 +51,7 @@ DECLARE_DO_ERROR_INFO(do_trap_ecall_u); DECLARE_DO_ERROR_INFO(do_trap_ecall_s); DECLARE_DO_ERROR_INFO(do_trap_ecall_m); DECLARE_DO_ERROR_INFO(do_trap_break); +DECLARE_DO_ERROR_INFO(do_trap_software_check); asmlinkage void handle_bad_stack(struct pt_regs *regs); asmlinkage void do_page_fault(struct pt_regs *regs); diff --git a/arch/riscv/include/asm/entry-common.h b/arch/riscv/include/asm/entry-common.h index b28ccc6cdeea..34ed149af5d1 100644 --- a/arch/riscv/include/asm/entry-common.h +++ b/arch/riscv/include/asm/entry-common.h @@ -40,4 +40,6 @@ static inline int handle_misaligned_store(struct pt_regs *regs) } #endif +bool handle_user_cfi_violation(struct pt_regs *regs); + #endif /* _ASM_RISCV_ENTRY_COMMON_H */ diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 00494b54ff4a..9c00cac3f6f2 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -472,6 +472,9 @@ SYM_DATA_START_LOCAL(excp_vect_table) RISCV_PTR do_page_fault /* load page fault */ RISCV_PTR do_trap_unknown RISCV_PTR do_page_fault /* store page fault */ + RISCV_PTR do_trap_unknown /* cause=16 */ + RISCV_PTR do_trap_unknown /* cause=17 */ + RISCV_PTR do_trap_software_check /* cause=18 is sw check exception */ SYM_DATA_END_LABEL(excp_vect_table, SYM_L_LOCAL, excp_vect_table_end) #ifndef CONFIG_MMU diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index 8ff8e8b36524..3f7709f4595a 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -354,6 +354,49 @@ void do_trap_ecall_u(struct pt_regs *regs) } +#define CFI_TVAL_FCFI_CODE 2 +#define CFI_TVAL_BCFI_CODE 3 +/* handle cfi violations */ +bool handle_user_cfi_violation(struct pt_regs *regs) +{ + bool ret = false; + unsigned long tval = csr_read(CSR_TVAL); + + if ((tval == CFI_TVAL_FCFI_CODE && cpu_supports_indirect_br_lp_instr()) || + (tval == CFI_TVAL_BCFI_CODE && cpu_supports_shadow_stack())) { + do_trap_error(regs, SIGSEGV, SEGV_CPERR, regs->epc, + "Oops - control flow violation"); + ret = true; + } + + return ret; +} + +/* + * software check exception is defined with risc-v cfi spec. Software check + * exception is raised when:- + * a) An indirect branch doesn't land on 4 byte aligned PC or `lpad` + * instruction or `label` value programmed in `lpad` instr doesn't + * match with value setup in `x7`. reported code in `xtval` is 2. + * b) `sspopchk` instruction finds a mismatch between top of shadow stack (ssp) + * and x1/x5. reported code in `xtval` is 3. + */ +asmlinkage __visible __trap_section void do_trap_software_check(struct pt_regs *regs) +{ + if (user_mode(regs)) { + irqentry_enter_from_user_mode(regs); + + /* not a cfi violation, then merge into flow of unknown trap handler */ + if (!handle_user_cfi_violation(regs)) + do_trap_unknown(regs); + + irqentry_exit_to_user_mode(regs); + } else { + /* sw check exception coming from kernel is a bug in kernel */ + die(regs, "Kernel BUG"); + } +} + #ifdef CONFIG_MMU asmlinkage __visible noinstr void do_page_fault(struct pt_regs *regs) { From patchwork Mon Mar 10 14:52:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010205 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 7ABA4C28B2E for ; Mon, 10 Mar 2025 14:53:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D140280015; Mon, 10 Mar 2025 10:53:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 65668280011; Mon, 10 Mar 2025 10:53:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4531A280015; Mon, 10 Mar 2025 10:53:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 264E2280011 for ; Mon, 10 Mar 2025 10:53:12 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 7F3B1A984D for ; Mon, 10 Mar 2025 14:53:12 +0000 (UTC) X-FDA: 83205934224.16.8919CEB Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf10.hostedemail.com (Postfix) with ESMTP id 72441C0019 for ; Mon, 10 Mar 2025 14:53:10 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=f4dEWaGL; dmarc=none; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 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=1741618390; 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=N78rd5bu5L3Nb7UCylb6NhXzPkib+ej1wIZfC16ALRg=; b=VUK4AfhH6a62ReLM+AHtCyXL9yCTenljykWFdqIXKPsbBeIa6p6Nu8+fcY9ZH9qwUcmuT3 BixENmIdreGjqA17ZN8kLTvH24OGvvWKsm1gTDMCo9HQYoDuXkmcQy2qbx644t8hqguoFz OB/TP7MfLxeE0Wd2+xcqIDhtO9a8j7c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618390; a=rsa-sha256; cv=none; b=7HsefF1CqzNqvtzhd+ybjYjDVQiR9lBandtHvyVvFftfXVgl7rqK7kkCVYYpa+tD7nPlZm yjeujErUiKrpoAItrH4KehvIcvkSZpYZCsVceEjsIJHw5sCvMWBmF99er9PRSErulr1wp4 y8PI8Zux1G21122EyHVYJU5SZJYFDy4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=f4dEWaGL; dmarc=none; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-223a7065ff8so3881785ad.0 for ; Mon, 10 Mar 2025 07:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618389; x=1742223189; 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=N78rd5bu5L3Nb7UCylb6NhXzPkib+ej1wIZfC16ALRg=; b=f4dEWaGLYFdj4GD6s9sdalCw5YjVKchMNBM0RxHb9/Lnvw5soqpv8nYj3mF8owXA/C UlVAxHeSmzwpQHxkARITiXr+G+xcZRENpMuB0EsrpzYYkja4MIPLdtNRxjgpVq+5wobK Pk5RROID5y96sd9Q70nc8wS/gAS9A/1QKMjWliuYGO41dQtmaxQ6gOCs8svvmiuLm+p+ n6g0ucG4JW8dNnRLyjBzwmDLAcCBVcbD/HnHL1Y0XBpdYPcE9SAjtMQ2FcvdpSZGoLGn 4vnH0O2CYOfR7ChPY4ZtYxK6brtZ2r7FDd2EZlUvgaP/syTbQSMjiIo+R6wRHq2VlYP1 l6+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618389; x=1742223189; 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=N78rd5bu5L3Nb7UCylb6NhXzPkib+ej1wIZfC16ALRg=; b=DBfMJQq6AC1J4Sg/DAbjgD9cG2wYvFUugsK1fgYkCW8lznEuEyPBS1u747KkPkjQWo LajTdij8nzm79c4zcERXJvJQhHjjGw83ZTNegJBE1WgTDgpE6geXJiV3Gr6ZlHpKTs2B hrsbp7dsIzDdkerS/xhiNvwV4PsfsP1SaSjEX+6hG2ZbERBL+7VVQI2hBvtHU9qcedYq YRtLovbFB0l0L4shUM/b/k+alqiCYLi/DM+A9bG3jRVmNMfVEA9goiMUQ7XSwhXp5ZaG O+lY9lGbdxOcBvI53hRX7pxq1hp0b3juPQzunENDYKDIqZlS5Tf3R5PXsMIveWvgOoYq WKyg== X-Forwarded-Encrypted: i=1; AJvYcCXGfRJRbT16hoPu+K20kcl/D/3xlS3iJOwZKHl+EXRlSK/DLVXKC9vSEj4GAF0gVYKOIhRSAM0OnQ==@kvack.org X-Gm-Message-State: AOJu0YwwVJUm58V097G4ZEFIsIb35UGHVHYfubbLAYur0cVfsNxakL8m /kybhYG9PTXJ3batXf9cwzwbFr/6F7oNDQ7S2pBHTAY3+IHau3JFP+xIP5wjvUc= X-Gm-Gg: ASbGncuRZTA1MplPmWSoNBNRBjiUGsjhn76u0Qbmpo1/VFTNgSHMpkmMAiJEtZX9fNY XvpP+qZTISBrD43t976HfyJaP0aStFk69a0yFo61kGHKdXZxCu9KUMZ9VfdcS7k9cFpUk31L6Xz ggGby2w7+n5aU43tjJISxeKPOqK0qYq2s0tuMPGrJlvlD88wsgKtVCMDx0+ocD/bOBIaYrrinZ+ qk+EPNYiks1VWTEH78DFHF1qEJ2EpSWp2p3a5koQXAu5DWnsok0WH/w1faWZN5xSq/L0mpLVxXv ijnsHFsGfB7D4Tkr1KSXaAHIj3+sCebogI7MrVee7OPzKpYfLoHJ/GhiCJG3YKSTIg== X-Google-Smtp-Source: AGHT+IFeD/HgCjO9LcRex1YUUmRruVxizMZhpwj5TvOctT1vNUnUY9bR7/1JUpOvPThhyzvn2X9ItQ== X-Received: by 2002:a05:6a00:1703:b0:736:a6e0:e669 with SMTP id d2e1a72fcca58-736aaad3bb2mr22481649b3a.20.1741618389332; Mon, 10 Mar 2025 07:53:09 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:08 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:37 -0700 Subject: [PATCH v11 15/27] riscv: signal: abstract header saving for setup_sigcontext MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-15-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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 X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: 72441C0019 X-Rspamd-Server: rspam08 X-Stat-Signature: 37s8mfr9ay5egd5zwyqp1ns8m4th3u3t X-HE-Tag: 1741618390-718111 X-HE-Meta: U2FsdGVkX18kxRVI0Ty5q5vIR3I6zj00SPTnGLtNHVrS+8oALxiBzcvYqTwdE5xztJKh6wFgNfj97J2XzYvNIOWh4i1CeyhcC04NlZOKUuRBPAw+WQxOGBPE/B4LvsCxL7ONvuYK2xipyuG6GkomDd63lu0G3y0GWT5+O1QqWbXZ1wCL/ZEYeC3f3tFc6/QuWsAW+d8qTOYP4QGjWJ971Gb+aade0Pvf0kqYfugPFR0Yia5PKFK5jSzu4/mCcTh2pysqlrgMOycsCIwUYtg1mO1dZfcvRA/AwGvKhJcPIi9390nVMkE4qoPFgy32dmQxgjtp66TH6V2GpVbw6FLzw9sUZ0bFz1kzoW8WO2AZEiXa8ldPm8meUgQA6CQOt/o6BooD1mWw2rZ3BddfeaQNdTKJRQLz9PfuOVIpZorc0PZutKFYOZZ2WvKNWX9c4b8A7hf2VTiP63qJOv3HNQ6e4ZL5XE7q85HD5hqX7Rq0T1jfZaDYCiKdeI3pQ9N/S1Rdu72gVtMMQ9lhzz8AxXo10UnQ8sCPFFs9F0p/5o1M7z502GVGwzxXGAsuI0MkFoJmGiTgcsw9x5FEOaTrnbhpDu1yKIae5E4ut0u9JcYL5nGyFSOI0221Px1Y8XawmfI5oduLMr/xVcTCaTMYf75DWjBsUco+E4/eCaIB+n7BoeiTZ1vNOAgrYzj95c9QoNYnO/qVa3PCi/fXmcZl8mjtJHJOYsHYA2EuynSC+3BDdeQwdd4OvWcQlPitsalM1mrkwea/AdDBoQn2o2YegNxc/XroV5POZl8Sc0FNMRiSIDVudBF4borTXEkj6J0mw5HFt4OqSIPeNz80ZRUeeyBzwLLLNEqsjXbqPu8bnXRGbD9iXA7ww2k090Y66A0arB6OIRZs9Ucdompn4z3mhHAa9gtKOY8pI9BX2pjfQ6m8aYrq+ONQt9OaLUBgP0hnwExEHrsMDD1AiQjKqgj2c9O pxIuuXox eQ+PGEFrgT/py9VqK1KFbFprKnIESGsYUPZb3jLBPa0NLGrhvFbPtg9ukGkxF9jrIxfMHrnEQxadsklkqB4LNEIUOakKEBBtnnQXvpK2EVz5SseFafy4muvG6U4UVYA2hMialKweqst3XdE2TTqt7nrEsm9knWtoanORbru10H69z5eAS9RF6tfBlVff9y7dRLflKnZzRH+chd1PCGPUfNtPkFuA+vckctHYYqObRL88NM5DENd7PxuI8dzokbWJOaMqZo6iD5ZbGyxgOoWIhMA78YFkkR4BSVfZK8J26q8leREaBttOI/oh4Giip/l3tqBCTjwiXI3hJJugauWhrJue4elUdAkgyqtCUM1ajKOH1FHyqSWY6B25CcT5IpfE9ihWZLiQZGLHz/4Q8Ns0RXXaW5gGMj23yLxdRMtoCTKiC0J1fjXzEcNnZsPmvJFldmpY8psb8GXd+9o85timwZihcg1mr4YxfxTbY 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: From: Andy Chiu The function save_v_state() served two purposes. First, it saved extension context into the signal stack. Then, it constructed the extension header if there was no fault. The second part is independent of the extension itself. As a result, we can pull that part out, so future extensions may reuse it. This patch adds arch_ext_list and makes setup_sigcontext() go through all possible extensions' save() callback. The callback returns a positive value indicating the size of the successfully saved extension. Then the kernel proceeds to construct the header for that extension. The kernel skips an extension if it does not exist, or if the saving fails for some reasons. The error code is propagated out on the later case. This patch does not introduce any functional changes. Signed-off-by: Andy Chiu --- arch/riscv/include/asm/vector.h | 3 ++ arch/riscv/kernel/signal.c | 62 +++++++++++++++++++++++++++-------------- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/arch/riscv/include/asm/vector.h b/arch/riscv/include/asm/vector.h index e8a83f55be2b..05390538ea8a 100644 --- a/arch/riscv/include/asm/vector.h +++ b/arch/riscv/include/asm/vector.h @@ -407,6 +407,9 @@ static inline bool riscv_v_vstate_ctrl_user_allowed(void) { return false; } #define riscv_v_thread_free(tsk) do {} while (0) #define riscv_v_setup_ctx_cache() do {} while (0) #define riscv_v_thread_alloc(tsk) do {} while (0) +#define get_cpu_vector_context() do {} while (0) +#define put_cpu_vector_context() do {} while (0) +#define riscv_v_vstate_set_restore(task, regs) do {} while (0) #endif /* CONFIG_RISCV_ISA_V */ diff --git a/arch/riscv/kernel/signal.c b/arch/riscv/kernel/signal.c index 94e905eea1de..80c70dccf09f 100644 --- a/arch/riscv/kernel/signal.c +++ b/arch/riscv/kernel/signal.c @@ -68,18 +68,19 @@ static long save_fp_state(struct pt_regs *regs, #define restore_fp_state(task, regs) (0) #endif -#ifdef CONFIG_RISCV_ISA_V - -static long save_v_state(struct pt_regs *regs, void __user **sc_vec) +static long save_v_state(struct pt_regs *regs, void __user *sc_vec) { - struct __riscv_ctx_hdr __user *hdr; struct __sc_riscv_v_state __user *state; void __user *datap; long err; - hdr = *sc_vec; - /* Place state to the user's signal context space after the hdr */ - state = (struct __sc_riscv_v_state __user *)(hdr + 1); + if (!IS_ENABLED(CONFIG_RISCV_ISA_V) || + !((has_vector() || has_xtheadvector()) && + riscv_v_vstate_query(regs))) + return 0; + + /* Place state to the user's signal context spac */ + state = (struct __sc_riscv_v_state __user *)sc_vec; /* Point datap right after the end of __sc_riscv_v_state */ datap = state + 1; @@ -97,15 +98,11 @@ static long save_v_state(struct pt_regs *regs, void __user **sc_vec) err |= __put_user((__force void *)datap, &state->v_state.datap); /* Copy the whole vector content to user space datap. */ err |= __copy_to_user(datap, current->thread.vstate.datap, riscv_v_vsize); - /* Copy magic to the user space after saving all vector conetext */ - err |= __put_user(RISCV_V_MAGIC, &hdr->magic); - err |= __put_user(riscv_v_sc_size, &hdr->size); if (unlikely(err)) - return err; + return -EFAULT; - /* Only progress the sv_vec if everything has done successfully */ - *sc_vec += riscv_v_sc_size; - return 0; + /* Only return the size if everything has done successfully */ + return riscv_v_sc_size; } /* @@ -142,10 +139,20 @@ static long __restore_v_state(struct pt_regs *regs, void __user *sc_vec) */ return copy_from_user(current->thread.vstate.datap, datap, riscv_v_vsize); } -#else -#define save_v_state(task, regs) (0) -#define __restore_v_state(task, regs) (0) -#endif + +struct arch_ext_priv { + __u32 magic; + long (*save)(struct pt_regs *regs, void __user *sc_vec); +}; + +struct arch_ext_priv arch_ext_list[] = { + { + .magic = RISCV_V_MAGIC, + .save = &save_v_state, + }, +}; + +const size_t nr_arch_exts = ARRAY_SIZE(arch_ext_list); static long restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) @@ -276,7 +283,8 @@ static long setup_sigcontext(struct rt_sigframe __user *frame, { struct sigcontext __user *sc = &frame->uc.uc_mcontext; struct __riscv_ctx_hdr __user *sc_ext_ptr = &sc->sc_extdesc.hdr; - long err; + struct arch_ext_priv *arch_ext; + long err, i, ext_size; /* sc_regs is structured the same as the start of pt_regs */ err = __copy_to_user(&sc->sc_regs, regs, sizeof(sc->sc_regs)); @@ -284,8 +292,20 @@ static long setup_sigcontext(struct rt_sigframe __user *frame, if (has_fpu()) err |= save_fp_state(regs, &sc->sc_fpregs); /* Save the vector state. */ - if ((has_vector() || has_xtheadvector()) && riscv_v_vstate_query(regs)) - err |= save_v_state(regs, (void __user **)&sc_ext_ptr); + for (i = 0; i < nr_arch_exts; i++) { + arch_ext = &arch_ext_list[i]; + if (!arch_ext->save) + continue; + + ext_size = arch_ext->save(regs, sc_ext_ptr + 1); + if (ext_size <= 0) { + err |= ext_size; + } else { + err |= __put_user(arch_ext->magic, &sc_ext_ptr->magic); + err |= __put_user(ext_size, &sc_ext_ptr->size); + sc_ext_ptr = (void *)sc_ext_ptr + ext_size; + } + } /* Write zero to fp-reserved space and check it on restore_sigcontext */ err |= __put_user(0, &sc->sc_extdesc.reserved); /* And put END __riscv_ctx_hdr at the end. */ From patchwork Mon Mar 10 14:52:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010206 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 6706DC282DE for ; Mon, 10 Mar 2025 14:53:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B9670280016; Mon, 10 Mar 2025 10:53:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B254D280011; Mon, 10 Mar 2025 10:53:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9982D280016; Mon, 10 Mar 2025 10:53:14 -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 6D005280011 for ; Mon, 10 Mar 2025 10:53:14 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id CEFB2A9ADA for ; Mon, 10 Mar 2025 14:53:14 +0000 (UTC) X-FDA: 83205934308.02.55D1417 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf27.hostedemail.com (Postfix) with ESMTP id E44614000A for ; Mon, 10 Mar 2025 14:53:12 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=2e8jKimI; spf=pass (imf27.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 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=1741618393; 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=FZizf8oZeAex4CEwHeMnGWZudkjFQvNzoIsL7CfIy1g=; b=hXa9BUqaOwOQOcmHQXqDVhQd4hdqw+W28d/pPXlT+MgdPwABdYz9F81Pd5h2/PrZDdhLRJ eSlPugqpEW+G9XEuQPtFfrbgnqdz2lch/VKgoOPBv6zy2RR0g7buA6R8LcczPTpNGCYl4g 1/MePJoZ2HWpdV/+vs6SwK8LeNLQAjU= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=2e8jKimI; spf=pass (imf27.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618393; a=rsa-sha256; cv=none; b=sqoyaRMhUsfRpgkb1oq257rVesukEvPMJGL1CRBMm+4sUDpS2Ll1MP0ZlqtFQaPPAwkWYG 7lticzWCB/io//p8NpDQY0kEJlNYPnLP35bOQkzGyFvGuB3WhaeS44T/cFegmZSAu2fHb8 4HI0aCvAMI1kBJG+OYHQhqkbwrYyJeM= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2239aa5da08so68485235ad.3 for ; Mon, 10 Mar 2025 07:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618392; x=1742223192; 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=FZizf8oZeAex4CEwHeMnGWZudkjFQvNzoIsL7CfIy1g=; b=2e8jKimIrzyvjI9uVCqbgV+aL8qTP/+2Kmt9od7SV8nT5ccy8AklLkPQOY6jisheDR 0Yz0fxkJFj4u4EbbbeGPy3KzFJSs3lxAh4n+VPZ7F465UOeOy3MAH+3Z1quem0QZmAad C56lFPu0Mlu5K/seZlxc0bD1BSeQlxbCGlkuk9OoJoBTrOawMtew3TpzprOOGVx+FIgP XvIVfSiiq0/d7EXjTWzcAguWMPk7VyCtyxJBvEVJ62mP8HmUkgrev1DSKWiQPHXIKTYH 1aPtk4lACufkPU+9CcrcneYfnId3V//flGN86l6TzMY0G1NQ52MBnOotIjBarKWfiAK1 BzbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618392; x=1742223192; 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=FZizf8oZeAex4CEwHeMnGWZudkjFQvNzoIsL7CfIy1g=; b=RtgcF45G+oSK2KQ1P7EbW2F9P0MLhAnnyzFI/LLMfrLtjHrf87OwcCoSOlrd4NKSVD oksxcfyFWPCJVplCgHdFqP0FOcFVWDHr82yAsInXPea4iH95PaOa2xoydOurWzb1lKhC EQy3GpcgWFsawRwwVBafDz0buUqIdtMUSMkkY5dXrDocDQv4ZJOYJzxJyZ6AF1vcGXCq B3eRjn4AddT4h2bAvv0PDg7sxGfnnDWAqQz4BVESouKmBmH+H8Hj82wtJH48KYFoc4hI gdxCO73N6iSxgKKSsrTdgeyzSI/SGdToPngtGBJKUcfniWnTQW0efTGWAt9XWQVqMYpW PxbA== X-Forwarded-Encrypted: i=1; AJvYcCVsD6Jiil8HpL0uNTbN8vUMkiU7rFyYP5N+BoWZnOIWxE0AHUcpK3+CfIpwR4mIz0sHLkHJWfecDQ==@kvack.org X-Gm-Message-State: AOJu0Yz1q1W5XRQ2KRywXDIygP79aczyaRK0ZJ0ntZOhzkIgoYRY8+UL 1ekW+QOs0VMLNieeLxO2C3aH62J7jtVdi/9zGtyYffUfgUEZbUrTov2r+wKCSUY= X-Gm-Gg: ASbGncvbcJnuFrtWFSnQYVKFJQat2q6hl11fu3G4+0vCQzdaau6Xwcmq69PnluZYA+v kdPq4LZkJsQkOpKud6/aSMFaKEDwvcya1ORsnbP7LolJoYmlrOSh8lvvk3BE1YenCWnJeGropDi /dp0Bv0fOdVscwLpGNRzw3/VQDK4OedYMkg2Tv6HD33WGqOciyCb2Y41P3lCRgmz8r071QFLzzT BPqw7ZiNQ/LTXlTBgcoHF/jtA4/GoRPUPlJHG6gIUQv64IUMQHQAujh1leQeOxG+V4c7NNdy74t vLJWFe/gxGkXMJV5sWKGWg39j4VH0jz2vBQwfTqoT0OizlpCr/wXs7Y= X-Google-Smtp-Source: AGHT+IGtoWSwFQXp42Jt7uQ+iD9QmR3QbXX6mHvaYDmjRmHhCAWQmnMnksRJhwAUzL/h4lDxdU80yg== X-Received: by 2002:a05:6a21:4606:b0:1f5:7df9:f147 with SMTP id adf61e73a8af0-1f57df9f49dmr7383711637.40.1741618391807; Mon, 10 Mar 2025 07:53:11 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:11 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:38 -0700 Subject: [PATCH v11 16/27] riscv/signal: save and restore of shadow stack for signal MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-16-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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 , Andy Chiu X-Mailer: b4 0.14.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E44614000A X-Stat-Signature: bzrkw7bucwbu5nx61du1dhpmnw4fxkaw X-Rspam-User: X-HE-Tag: 1741618392-569600 X-HE-Meta: U2FsdGVkX19CB7E1zPxTyEBCzHY6kqfQrwFlmlZw/KIi3ccsP+2ybnm8lQ+7tUu++EFyc9F+aQndSrktePBg2NJk2gDz14ACp+x+vNsyaY5sAtLmI2amoNMx5MaPlJTs1kRoqC/9oEaB1dri/VuwM49en4h8l46PCyPrim2hN+w58FvqmOlBC6agcaMgDE8ok7TdBCEN2bEwhIp2lmjC9H4KQIhv9Fyn/RTEd4Lp/b//rXr5JFEgkgmgND6bLKP5X2XiQA6pxjl5xrhl5x7KS/m8+s83LTzeuJ2rNDCqXQurKRmAvrTqQvVNOIm4WSlK2++TyxK/P4EJx7FK5GLx1kZh5YaSrlCgTlfNVE99Jc4Ry755MlBCslZBNOm8vEjKiPdIpS5vaY5ixLCrrbHc5UndQdVHXTXpZYuoS9upjDlxwdTweeRICC2G99TD08gxExNgm0TcDINTetKMCor92b0UqU7BxQJBG/aNod31qc0aJwfwn9b7YmSEeAxHH3AP1NHosCS72k0/13MkQVszR92dC1YAtW0g4B+HDNRMyaK+5IPSZk4heVn9XOztWTIMf9/zTsq3dae7/i+XCcGDBubb+EZFPL72hYbl0KnpvOiDm5/dxwLXwgpAdB49SSvGu6BFL5WSHaWQfTOWtGsvlt+4VpxX/0osGYDT0kbXQkOR7BWpU3qewvSkJPbJJFMvxK1J39qJnkWc2I0Zx4zO9Pc/wkROCbUw604S2EQHYIajW4ztE5XxSKMpdzDmhrhehvbPLcCnS4v2kxnTHmcOR8439pljHbBdpp9NJyqYS4ZK8Odkh3ddPbn6U/rsDzdkWUHIleyABdUNMoClWMMuUg/cUE5vJriZ9PvNkdOsXUHD0yPI68Y9WKDuAj562t/z0/AD7vWLYv4kYd9dR1RzhPifgyMJS3ncLb4Al0Wo9pWztStGOmEQhxGJiIcLmaQxs3vcj4D3A8ct8qNIRCO p5X+BJQZ 72iJMboUCi01KEj7y8oXPEIKDjlJ7EVzVTQEmO2xCwkbuWyUyRbg6thZRQtII+GBcZ60kW/G/HmL4ED+oMRtONNy/0LZ1EudW/rOAdyqNPqghX0JSmCXZAXA8rixTYfpNp2MobhJQrdc9+Zfb0XjuI5FsxjTAyAzs+yoGb461Ea1VRRCKXqQGaNVNHjqrJDGWL2e+A/Ye7MdF13ss6hm9T5Hc4+rmfVZ2i9jzNLxL6qzLFLGwDuY6W9W49RK4LWEl2v0nHWivNME0oR/LCYjX3eQ5wwQgoZPPWuxUggNgdI0z8wxJ8J3FK4JjA9IsbblVzxCNc+I+JjEMSZ+QXlgJGDxu0ZjZrLy7RKc+EPCnid6GSfR0l81lrb87/fJjoDme1d6uvRCP7cq0kWspDTqVYBSz2TgnANnnCYph1yrcufIQ/xPpPhnvP9APFugyaAiZZsi7psuz28sBq0l3EKfhgjTMbrXpA4++QWEgD8Ehj3+K9z0xJou1IR8NRikLtIylrHX7dQCvv+bXswo= 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: Save shadow stack pointer in sigcontext structure while delivering signal. Restore shadow stack pointer from sigcontext on sigreturn. As part of save operation, kernel uses `ssamoswap` to save snapshot of current shadow stack on shadow stack itself (can be called as a save token). During restore on sigreturn, kernel retrieves token from top of shadow stack and validates it. This allows that user mode can't arbitrary pivot to any shadow stack address without having a token and thus provide strong security assurance between signaly delivery and sigreturn window. Use ABI compatible way of saving/restoring shadow stack pointer into signal stack. This follows what Vector extension, where extra registers are placed in a form of extension header + extension body in the stack. The extension header indicates the size of the extra architectural states plus the size of header itself, and a magic identifier of the extension. Then, the extensions body contains the new architectural states in the form defined by uapi. Signed-off-by: Andy Chiu Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/usercfi.h | 10 ++++ arch/riscv/include/uapi/asm/ptrace.h | 4 ++ arch/riscv/include/uapi/asm/sigcontext.h | 1 + arch/riscv/kernel/signal.c | 80 ++++++++++++++++++++++++++++++++ arch/riscv/kernel/usercfi.c | 56 ++++++++++++++++++++++ 5 files changed, 151 insertions(+) diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index a8cec7c14d1d..361f59edbdef 100644 --- a/arch/riscv/include/asm/usercfi.h +++ b/arch/riscv/include/asm/usercfi.h @@ -8,6 +8,7 @@ #ifndef __ASSEMBLY__ #include #include +#include struct task_struct; struct kernel_clone_args; @@ -35,6 +36,9 @@ bool is_shstk_locked(struct task_struct *task); bool is_shstk_allocated(struct task_struct *task); void set_shstk_lock(struct task_struct *task); void set_shstk_status(struct task_struct *task, bool enable); +unsigned long get_active_shstk(struct task_struct *task); +int restore_user_shstk(struct task_struct *tsk, unsigned long shstk_ptr); +int save_user_shstk(struct task_struct *tsk, unsigned long *saved_shstk_ptr); bool is_indir_lp_enabled(struct task_struct *task); bool is_indir_lp_locked(struct task_struct *task); void set_indir_lp_status(struct task_struct *task, bool enable); @@ -72,6 +76,12 @@ void set_indir_lp_lock(struct task_struct *task); #define set_indir_lp_lock(task) +#define restore_user_shstk(tsk, shstk_ptr) -EINVAL + +#define save_user_shstk(tsk, saved_shstk_ptr) -EINVAL + +#define get_active_shstk(task) 0UL + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h index a38268b19c3d..659ea3af5680 100644 --- a/arch/riscv/include/uapi/asm/ptrace.h +++ b/arch/riscv/include/uapi/asm/ptrace.h @@ -127,6 +127,10 @@ struct __riscv_v_regset_state { */ #define RISCV_MAX_VLENB (8192) +struct __sc_riscv_cfi_state { + unsigned long ss_ptr; /* shadow stack pointer */ +}; + #endif /* __ASSEMBLY__ */ #endif /* _UAPI_ASM_RISCV_PTRACE_H */ diff --git a/arch/riscv/include/uapi/asm/sigcontext.h b/arch/riscv/include/uapi/asm/sigcontext.h index cd4f175dc837..f37e4beffe03 100644 --- a/arch/riscv/include/uapi/asm/sigcontext.h +++ b/arch/riscv/include/uapi/asm/sigcontext.h @@ -10,6 +10,7 @@ /* The Magic number for signal context frame header. */ #define RISCV_V_MAGIC 0x53465457 +#define RISCV_ZICFISS_MAGIC 0x9487 #define END_MAGIC 0x0 /* The size of END signal context header. */ diff --git a/arch/riscv/kernel/signal.c b/arch/riscv/kernel/signal.c index 80c70dccf09f..a7472a6fcdca 100644 --- a/arch/riscv/kernel/signal.c +++ b/arch/riscv/kernel/signal.c @@ -22,11 +22,13 @@ #include #include #include +#include unsigned long signal_minsigstksz __ro_after_init; extern u32 __user_rt_sigreturn[2]; static size_t riscv_v_sc_size __ro_after_init; +static size_t riscv_zicfiss_sc_size __ro_after_init; #define DEBUG_SIG 0 @@ -140,6 +142,62 @@ static long __restore_v_state(struct pt_regs *regs, void __user *sc_vec) return copy_from_user(current->thread.vstate.datap, datap, riscv_v_vsize); } +static long save_cfiss_state(struct pt_regs *regs, void __user *sc_cfi) +{ + struct __sc_riscv_cfi_state __user *state = sc_cfi; + unsigned long ss_ptr = 0; + long err = 0; + + if (!IS_ENABLED(CONFIG_RISCV_USER_CFI) || !is_shstk_enabled(current)) + return 0; + + /* + * Save a pointer to shadow stack itself on shadow stack as a form of token. + * A token on shadow gives following properties + * - Safe save and restore for shadow stack switching. Any save of shadow stack + * must have had saved a token on shadow stack. Similarly any restore of shadow + * stack must check the token before restore. Since writing to shadow stack with + * address of shadow stack itself is not easily allowed. A restore without a save + * is quite difficult for an attacker to perform. + * - A natural break. A token in shadow stack provides a natural break in shadow stack + * So a single linear range can be bucketed into different shadow stack segments. Any + * sspopchk will detect the condition and fault to kernel as sw check exception. + */ + err |= save_user_shstk(current, &ss_ptr); + err |= __put_user(ss_ptr, &state->ss_ptr); + if (unlikely(err)) + return -EFAULT; + + return riscv_zicfiss_sc_size; +} + +static long __restore_cfiss_state(struct pt_regs *regs, void __user *sc_cfi) +{ + struct __sc_riscv_cfi_state __user *state = sc_cfi; + unsigned long ss_ptr = 0; + long err; + + /* + * Restore shadow stack as a form of token stored on shadow stack itself as a safe + * way to restore. + * A token on shadow gives following properties + * - Safe save and restore for shadow stack switching. Any save of shadow stack + * must have had saved a token on shadow stack. Similarly any restore of shadow + * stack must check the token before restore. Since writing to shadow stack with + * address of shadow stack itself is not easily allowed. A restore without a save + * is quite difficult for an attacker to perform. + * - A natural break. A token in shadow stack provides a natural break in shadow stack + * So a single linear range can be bucketed into different shadow stack segments. + * sspopchk will detect the condition and fault to kernel as sw check exception. + */ + err = __copy_from_user(&ss_ptr, &state->ss_ptr, sizeof(unsigned long)); + + if (unlikely(err)) + return err; + + return restore_user_shstk(current, ss_ptr); +} + struct arch_ext_priv { __u32 magic; long (*save)(struct pt_regs *regs, void __user *sc_vec); @@ -150,6 +208,10 @@ struct arch_ext_priv arch_ext_list[] = { .magic = RISCV_V_MAGIC, .save = &save_v_state, }, + { + .magic = RISCV_ZICFISS_MAGIC, + .save = &save_cfiss_state, + }, }; const size_t nr_arch_exts = ARRAY_SIZE(arch_ext_list); @@ -202,6 +264,12 @@ static long restore_sigcontext(struct pt_regs *regs, err = __restore_v_state(regs, sc_ext_ptr); break; + case RISCV_ZICFISS_MAGIC: + if (!is_shstk_enabled(current) || size != riscv_zicfiss_sc_size) + return -EINVAL; + + err = __restore_cfiss_state(regs, sc_ext_ptr); + break; default: return -EINVAL; } @@ -222,6 +290,10 @@ static size_t get_rt_frame_size(bool cal_all) if (cal_all || riscv_v_vstate_query(task_pt_regs(current))) total_context_size += riscv_v_sc_size; } + + if (is_shstk_enabled(current)) + total_context_size += riscv_zicfiss_sc_size; + /* * Preserved a __riscv_ctx_hdr for END signal context header if an * extension uses __riscv_extra_ext_header @@ -365,6 +437,11 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, #ifdef CONFIG_MMU regs->ra = (unsigned long)VDSO_SYMBOL( current->mm->context.vdso, rt_sigreturn); + + /* if bcfi is enabled x1 (ra) and x5 (t0) must match. not sure if we need this? */ + if (is_shstk_enabled(current)) + regs->t0 = regs->ra; + #else /* * For the nommu case we don't have a VDSO. Instead we push two @@ -493,6 +570,9 @@ void __init init_rt_signal_env(void) { riscv_v_sc_size = sizeof(struct __riscv_ctx_hdr) + sizeof(struct __sc_riscv_v_state) + riscv_v_vsize; + + riscv_zicfiss_sc_size = sizeof(struct __riscv_ctx_hdr) + + sizeof(struct __sc_riscv_cfi_state); /* * Determine the stack space required for guaranteed signal delivery. * The signal_minsigstksz will be populated into the AT_MINSIGSTKSZ entry diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 3a66f149a4ef..6e561256bfaf 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -52,6 +52,11 @@ void set_active_shstk(struct task_struct *task, unsigned long shstk_addr) task->thread_info.user_cfi_state.user_shdw_stk = shstk_addr; } +unsigned long get_active_shstk(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.user_shdw_stk; +} + void set_shstk_status(struct task_struct *task, bool enable) { task->thread_info.user_cfi_state.ubcfi_en = enable ? 1 : 0; @@ -164,6 +169,57 @@ static int create_rstor_token(unsigned long ssp, unsigned long *token_addr) return 0; } +/* + * Save user shadow stack pointer on shadow stack itself and return pointer to saved location + * returns -EFAULT if operation was unsuccessful + */ +int save_user_shstk(struct task_struct *tsk, unsigned long *saved_shstk_ptr) +{ + unsigned long ss_ptr = 0; + unsigned long token_loc = 0; + int ret = 0; + + if (saved_shstk_ptr == NULL) + return -EINVAL; + + ss_ptr = get_active_shstk(tsk); + ret = create_rstor_token(ss_ptr, &token_loc); + + if (!ret) { + *saved_shstk_ptr = token_loc; + set_active_shstk(tsk, token_loc); + } + + return ret; +} + +/* + * Restores user shadow stack pointer from token on shadow stack for task `tsk` + * returns -EFAULT if operation was unsuccessful + */ +int restore_user_shstk(struct task_struct *tsk, unsigned long shstk_ptr) +{ + unsigned long token = 0; + + token = amo_user_shstk((unsigned long __user *)shstk_ptr, 0); + + if (token == -1) + return -EFAULT; + + /* invalid token, return EINVAL */ + if ((token - shstk_ptr) != SHSTK_ENTRY_SIZE) { + pr_info_ratelimited( + "%s[%d]: bad restore token in %s: pc=%p sp=%p, token=%p, shstk_ptr=%p\n", + tsk->comm, task_pid_nr(tsk), __func__, (void *)(task_pt_regs(tsk)->epc), + (void *)(task_pt_regs(tsk)->sp), (void *)token, (void *)shstk_ptr); + return -EINVAL; + } + + /* all checks passed, set active shstk and return success */ + set_active_shstk(tsk, token); + return 0; +} + static unsigned long allocate_shadow_stack(unsigned long addr, unsigned long size, unsigned long token_offset, bool set_tok) { From patchwork Mon Mar 10 14:52:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010207 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 5E9A0C282EC for ; Mon, 10 Mar 2025 14:53:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 39542280018; Mon, 10 Mar 2025 10:53:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F609280017; Mon, 10 Mar 2025 10:53:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FCC0280018; Mon, 10 Mar 2025 10:53:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E1882280017 for ; Mon, 10 Mar 2025 10:53:16 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4BA9E56802 for ; Mon, 10 Mar 2025 14:53:17 +0000 (UTC) X-FDA: 83205934434.04.D700AA9 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf08.hostedemail.com (Postfix) with ESMTP id 56E4816001C for ; Mon, 10 Mar 2025 14:53:15 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=rkR86jBc; dmarc=none; spf=pass (imf08.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618395; a=rsa-sha256; cv=none; b=esgXnqA130OKCmCOBKfQI5axENz4nRwLb2HkttkIKMATo/zMSziMoMCYJJOL2PD4wm1Q+D OgIdeNN16Ya7aV6I9cfO1QN3Nel/pE+OejALFTh368IXNQQrJPmcLRWkjgrWlpne/Qi9VH LNpqk8T4vGBmAyZ+9p4UT2o457lNMg8= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=rkR86jBc; dmarc=none; spf=pass (imf08.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 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=1741618395; 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=hU6IAlGSwKWKw5iWDrFBqBdwaJZ69/+Cs7+/DXu3do8=; b=OsGqcPpcJAteI3zX9uGVRL2rtSq+OEcnnGal1Gh2TDveYwm0sQMFKSZrm9MUBo1vImiiTT w1MxM4yQjhWj3vI71BzeEKR5OlQ3JSgAheWtiW8s1+ZiryOavs3erUMc4xyqCz+JlqxWgd MPX8WTz9xnMYQcfanNlCS0ZOCQkmLvw= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-22438c356c8so47041665ad.1 for ; Mon, 10 Mar 2025 07:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618394; x=1742223194; 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=hU6IAlGSwKWKw5iWDrFBqBdwaJZ69/+Cs7+/DXu3do8=; b=rkR86jBcfbPV/4Dc1SCXM8pU6fjNNaOlmFdhvao+aegAUDyLYct+IMjVCiJ2wHtZiq pyYXJIAxRCR8n5PCtviShmLmUNaZWHaAfyiVxoiw6jVnGywEsEtlUb3a38zzhDuwr6bw Z48ua1E09I4SBk5Q4+VofiPakrFmWS93Fj2C4VtUs1D/4FW1M2PprbkWunIOWA3oZrGE nO4tM/2lkvPyek1AQctWByScuUdFAvIUqbhVFgyXnUkp5gKZYRxa2HamLBET48jRKauT TNwJ6EQifl4xNYBCbKu4OJirGS3HSyd4zwTbi9KWN5xT2OjqnXk/CZJwOhflCejTfYYv bjYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618394; x=1742223194; 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=hU6IAlGSwKWKw5iWDrFBqBdwaJZ69/+Cs7+/DXu3do8=; b=BOxCdgN0ZNBNopcUVQQwE9VaHb67dTvAV8BHgCK5hR4xm8fkfIiIvoPui1CMU9yoAY TZrICSWM8/0ayXqW4nM2X0X7y1C/68lDW62Rq+OBMAkyJMa3jNBs8RrxjOq+lYuTCULF cbnDd60vOm3NQiXS5CvtQmd3uv4uknG/bgH81WqtwssF3D7eh55r5QZNEuOFt5qPCtNL d8VxMRtqQIY+GeQOccc1JudyQdpW6MpDnB0mdG9+dLjxK+cNS20NT425PzkcW9dsETt6 Z54eF/rIqZA4iH097DAziA5d+vJ4khBbFfc+kGfyK5IZcb6REPwOSb9pYlUAX8QysiA9 llIw== X-Forwarded-Encrypted: i=1; AJvYcCVXfFJEoIbLtU/f+AQf2WA5s14CIxet8x+6hJS7UWFTcdB32lshc8+Aig3oD1uJEwk2wL6ZSVXiBA==@kvack.org X-Gm-Message-State: AOJu0Yw/X6e3MGpqS2I9G7vJAfSSseSbQYwJN1DZ3vhZxgrlbefm1mv5 NexYPJD5WtzOb9Paid4++rTfwEKfZbtG4TA6DpQXydJ2j0XzGR9kA295Io4nmmY= X-Gm-Gg: ASbGncuTBaeOEBZv+tVWEzSUe95c4g6LjvGER0F5/EzxmM8VJiv6D8BDlJXUUZyCIQL L1oVxAW3VbgCi0+Mxv78VDtYgEIm4LbFsfIHpXmmGDtLfjFRXBrsNpnCBetg4cT5sxoXMNw30An 6YjhR0DcYkBByvKbMUXoc1/qnlv9uFH1lMc4QEgFxRLmEeiDk14LVTTsw5cmbLyw7ipWaqpfZkw LpXCPNTBahvvJoonge0d40NaG10XpVPjniUY4abaULpCguGhvBQkFqqk+C+guI+xLqNNjlMER/l mSztFsje5qhOHWstCUOVjpE4VunTKjdm0LbmCl7kRZL5uiV+QGvOeVM= X-Google-Smtp-Source: AGHT+IG6aOZPbFLpYB6hUt/uNP0xUDOJ3SJhAN3Hb+FAwmeol3/+ZPXWsjDkyF4qiBV6yJ/cwzujRQ== X-Received: by 2002:a17:902:ec89:b0:224:10a2:cad9 with SMTP id d9443c01a7336-22428bd5852mr262786715ad.41.1741618394280; Mon, 10 Mar 2025 07:53:14 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:13 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:39 -0700 Subject: [PATCH v11 17/27] riscv/kernel: update __show_regs to print shadow stack register MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-17-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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: 56E4816001C X-Rspamd-Server: rspam11 X-Stat-Signature: 8aotoexa8eeymm9f8a87qqwk65wz6io1 X-Rspam-User: X-HE-Tag: 1741618395-317569 X-HE-Meta: U2FsdGVkX1+6vqUqmlvZoKqNHU7SW+QiCV6YwQ6cQZTfyZIAbObpi8odPdG429DrT2Y2jTMeNQ1nvwSOud26XiV5bSGVF8lMAsSgAP9WnLZb4odOI5vq2ZxtJnGe7Ik1faHKj6xAS3QXi9QCXGdSqWVGKa+lnDbNQLQ6mEKScWQ4eHU6FYnVhQdGFce6O9z9YYH9EehhONSMjkcBz1FD42z1L93YAbrpUSWAn4S/CLQX/++ylpurlqpODmeTdmW10W8lftN9VNNvs3shK8Sr13bSZD5kq1C/aQ1Y3kJLZ9tNObzScrSlh6PW2me0Z1+oat8E8zH/nSRyCyf1v63JebbcyhyK8oqhibazukmECHdO5ow+JXbjxY27yGpLTPKHZXfOU7K//Hlm4Bdg+dK93m3BgMdyg0gYVwN3OSTIW9LUVu9J5xGsc4ad/JeXJaNNXRuz6oJC+yOHHuzbWBsHrgc/2fp1LF+rkeAiaQlGDbmeFjEdjEckgjtKSXF6U2ovyKxODVLiinuF/gKyLHUrff/TDfWeVDg97mQbqsUJ8iqEVI4WL1/2ejMWY/LdXNLsTj9CvVu1PBxUjflJohhnmEmHNPxzSiu41grjvKvi7BjOongG8aUHR52S0HTfVLRYh141PIwaOYvXjLsH+bXo/XR5u0E42DZDs5aihDCNIIrgEMKEpROwl1VBgfMCbQX7bZQ04SvFbzlJifLjTY/Vv2l2iaztbn237Isx6xfbiN6ryn/cFejq3dMUhTUuREW9+Da24RLgGfWGOceP1jnhta9ylpFUBfo3IV8XNIFHipuVvgYkXmc8LZV0oh7b87PAKDf1tTcJmSZJqDp0CuPYrEcszTh1nLbw/kBKBz8+DmV4dNUHT2bujOCmKLhPbanlwHS12iwyzKxwofnbpyBUpTjYllln1JZjBzMp86XrzNOY6g8KxozwI76AZ+/WirQ1AOiW05qksrERZeHcrPY WQvjBcJt mWavcu4jODwh7QmEvktoObwSS5CYnHkTdIBp7dsA/ZP1syV1lfIZiAiAWt2C1k9EnNfjnkJb8G2WE3Y7O/yTxMen9gpv875M+KVlXXgCD/ixdmptlTVLZxvurKKh2oF2xjpHTllZ9EMZz/IBr3Ly3/a3eXZ6vxrSv4t0bPvEl9aVSNKodKukue27VAjR9buFRPWu4QIqFEJqOCuBCuEFa983l0ckuaTSn6qaoqIUei4NZwolhjj69PeuWaQZdFa6vV2ZNk3GRejluxI4Eo1GofSfjaqEFmCY9AE8pA/kJzCEZG0AYKnB4vt8/6B9BhkeUdA8graX8uNAoHPxMSKvW3TFzsEtHmNMW/RIRhShxLRRtaRW3Gi4pblX8S3bGK/0P/ztB33oVsIOckmuUNXXodSqaei1yK4J08Tizdg3gNMkAxI8yf0EBn/bJ0dHFMGXslXEa1JRPNUGCZHT2d/L65qhAdXfQ3FrlzSItLLmcGzFloHJ0M6y8fyhuTEuNrSh7HVDB 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: Updating __show_regs to print captured shadow stack pointer as well. On tasks where shadow stack is disabled, it'll simply print 0. Signed-off-by: Deepak Gupta Reviewed-by: Alexandre Ghiti --- arch/riscv/kernel/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 4587201dd81d..6bb53ce72ed5 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -90,8 +90,8 @@ void __show_regs(struct pt_regs *regs) regs->s8, regs->s9, regs->s10); pr_cont(" s11: " REG_FMT " t3 : " REG_FMT " t4 : " REG_FMT "\n", regs->s11, regs->t3, regs->t4); - pr_cont(" t5 : " REG_FMT " t6 : " REG_FMT "\n", - regs->t5, regs->t6); + pr_cont(" t5 : " REG_FMT " t6 : " REG_FMT " ssp : " REG_FMT "\n", + regs->t5, regs->t6, get_active_shstk(current)); pr_cont("status: " REG_FMT " badaddr: " REG_FMT " cause: " REG_FMT "\n", regs->status, regs->badaddr, regs->cause); From patchwork Mon Mar 10 14:52:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010208 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 2ACD8C282EC for ; Mon, 10 Mar 2025 14:53:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C83E5280019; Mon, 10 Mar 2025 10:53:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BBD1F280017; Mon, 10 Mar 2025 10:53:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C589280019; Mon, 10 Mar 2025 10:53:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 74BAD280017 for ; Mon, 10 Mar 2025 10:53:19 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D6C3CC114D for ; Mon, 10 Mar 2025 14:53:19 +0000 (UTC) X-FDA: 83205934518.15.2F96054 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf27.hostedemail.com (Postfix) with ESMTP id EBFFA4000C for ; Mon, 10 Mar 2025 14:53:17 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=fNkNXvcE; dmarc=none; spf=pass (imf27.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 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=1741618398; 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=qihiC//CQppmEvCBgeNt37whYo0mSsmsLXBW9eHBYhI=; b=rpNGlKlVdyQprdaTI1A5wMFB220YFKXoIOyoFJ7ReY8jrXtjeXDYL2oOTaJdIg/PdN1O0L jkEULXqvfx8dTIcvq5FLA/CCzC0KRJPwhPm5SnUBcgObA3LP2md30vo5HZZ28cDO4ELt6C 8HrKUr6YoIscZsGQ+UtAUcvvZn/huHQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618398; a=rsa-sha256; cv=none; b=xVGjw7UZH6HcOA+oxw8DDZU1MqfwxJiWG5wlpKJ88WRzW9mIz2UqmTX3nQ+8171rK2DmSf 0+G3Z6pF6I7AJny5FEcWnNRZ5xxaHZPmA6P+TjsoEvs51GagucRBctil+IqpAPCfyr3dTA POuBOMRIYGWJR/On6Z5shxf73N3GYrU= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=fNkNXvcE; dmarc=none; spf=pass (imf27.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-22401f4d35aso76683745ad.2 for ; Mon, 10 Mar 2025 07:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618397; x=1742223197; 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=qihiC//CQppmEvCBgeNt37whYo0mSsmsLXBW9eHBYhI=; b=fNkNXvcEQC0oq+I2M0HgoB0IcZ4/wLg6OjM5PSZgJhrtMvPPIQCzRel6g5obubcQK+ 7+XSTlXoY5MMqxDp79VgUtnChuxC0uKCeZE0yj1n5vvAbIr080zAcQGUOkosSFkpjNNT Y98Dx4b7aNMFs5Qfd1uuA8Y1pFRu7DdPA5zi5VdfjODB1yapG9lJZTdXS6ENN09ng3pR M2RHtoqxgiTaVlD7d77Wq/HuXCN3uJi4UUdop3vceUCxeKAW1wySQmGXtRzz08J9JmzZ AZejGrwvL3Ou4GQ531acsghYIxH+nMCvMwyiwXwm9YpjoyIfJObOiKcdXB/QCEKEwGwD R5uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618397; x=1742223197; 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=qihiC//CQppmEvCBgeNt37whYo0mSsmsLXBW9eHBYhI=; b=FVqDhcaZmOQGgGol+LyBURJd+BBdcMQ/7vrHd+S/LZHHJYtiNCB0OQ/OcT77MUy2fp R6MlbGii/kwAbLJOJi++pu1MajmlXnkQ7zvyP2hWbRQqH0O+V/w4OzSsvR7kV/f0U/1Q 4T/w3RTg+jp/AHxzfuv+2d8dm7zpLjra6f9R9ZOjyciXiACJlRZQf/AUYZXu46lMe2Kn D/BsAbI+4x7y6TGGHzRmKpekduX3ZFFMaZl/HRCvbEqLIO2HoK7qxJbpJA+rNf8+3oPr lVRugmF10PxFI9ZkVgaSqrCgHJ57JYRzFkIbriSw6QMOQiwC9maBQT0q5EitL0BxVxXm l3kQ== X-Forwarded-Encrypted: i=1; AJvYcCWkT7q1RmiK52EWWioAiaVvqIO+4atxht1OT7AXiYdfTImB3//j6O0t/SY2G5uxWZnkVu5cSDf+Tg==@kvack.org X-Gm-Message-State: AOJu0Yzl63yO+BW96woDZMsoJZcSPiqsRYk9A59NL6uXxXeQFRWUV2/E tOLniXWblmyvv1LQN252rzjDtatWIh3fVXhXMSdNxY2OBfpGpFS50uxedTMuEms= X-Gm-Gg: ASbGnctUzKoSRhynOx+JMSMwmUyOF7o2x1PVid7t/Wlw/ME2xrH8xF9ROn13b9QpINI 9v3aoCK8W/g/avhuOKG/eabI8/CsUoINQ5FOTY1Bn/ONSewrXiHirno+8O7GVFOHtbZiyIUzmpl 91EC/5IRmt5JhEeVjhFeQrUnZF3YqUYmHDJfi+NrF9qtlIBh2vRs/cAQBdlmsbj8KdWSaNr/QiR frAjEpj1FwpUUu8O/OqeD3NGTta9av+pVXOpfB7a/OTx1bp820aozIXG5wx6QO2kPM+vQpUHUjB lYoir4Wibp/5D6Rv5oUWEwz+rDSGDwqxhjjUBGAQuaDDMnjhetZLJD0= X-Google-Smtp-Source: AGHT+IHLu0RD5d4MddLFDjOWYpbnLGPGC73GF+e3WfGfDfnCowno5o+D7aYjLyREna2LMovQQemWaA== X-Received: by 2002:a05:6a00:c92:b0:736:8c0f:774f with SMTP id d2e1a72fcca58-736eb8a1ccbmr221171b3a.22.1741618396770; Mon, 10 Mar 2025 07:53:16 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:16 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:40 -0700 Subject: [PATCH v11 18/27] riscv/ptrace: riscv cfi status and state via ptrace and in core files MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-18-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Rspam-User: X-Rspamd-Queue-Id: EBFFA4000C X-Rspamd-Server: rspam08 X-Stat-Signature: 3b9rt61xo9ou5psswa619n76xarhsnjd X-HE-Tag: 1741618397-514440 X-HE-Meta: U2FsdGVkX1/+eR4KhOQdS8Qv8a8xLluo0972NyWofovxppOSYuHgX4mfN5Q/yJKsujY7pkjOPg5XxJVNwmJMhxRrlVESaXpI34YCRfziWh/wDxpujp1Bnz1l9spb4AUiaYn6cnapvXuH0zJ4xCuoaB3EWsj+uc014Tu+MGK0p+RLBj1Xn8+TLxVXF+m4AkeJcZHIKhlTP/GqAYArVFERP5RBpUtl0apncW+y6aykVSm/Z1Jq/A3E49yLpTHDds/wh5d6ZTIdOC5pq9ijwvmzsLIQsZRpKjwj9d5O8lrPihDAC1kShSVHlbmPIL/jNiEtc8jxxqlWqMeTFpkFd64+dQQJ9NbvjviUl7mmKhpm2DbuqySf0TjuW9W8Cudu9RLA1biP8mT6bM0XuTjDXdItWQXxXX2/RX0/4KcQgE7EWRVQHOQ/AZOrbk04FWEJM/aFpEoMJxAx7qQ5GK10egc+zaA8w6G6Tvdde7x0bqxj6jUcFWdjANDoS5blJP2nQQdnAqJTVmdhiQbxz+hHuG3NK/NL8pLCMCYQXtFX5VvHMNrKdmyk5frjOBNKVk/ZBOnYPUhRSN1gvYRlVet+X+qlzzjc2079TGsc+tybIA1/P34bPV5kWlvFX5vfbq4jw1J1birA+0IvAyWBUl5GCYoBfyvGMNHm7yah7NEPIwMRpY4xaZhx0l0b1ZwTzS9lvEccvmflk+frwW85wmk8FRr2ZGOvd85z6IHudJ2EbK2TXGqA+pDEWl8YFLRZok8NelE5EeGSMI7/fnDtMhOxADwELKRQ01XlC5aOYQPTHnZ7AjUBZS1glliqtzyS0PdO4xeAxGbW18w7fG9zNZ1GRbYQi/fenMWAFN+6MLBkvWEmC46nSk4wObdK51DWc9z4hoeusy1/BbKrR+xzhwZqrpTlbPuCBGPipIRp5NNEpTf2zwSTVCi9AqTRky6bhKysAhTzg/W0OmdyTAtDXwWqf8K WTsZJFvG UdLaetGwOw9l2POQXgqTmAbuRkm6Tb/YOBAAQN5Q8Zijt32jxc7kc1al5en/ItKbduXknOm4H/ronrbOuLA9bTUlJQRuKJhtnLnhA756u2C0bKn7nTFeMn767H1XZswu0btk4ZVeUI2e5cNxKUpeTch5/t2Wi0B0w8EQhapQFlt4GBPn9AGkFcD09UYxuMoNgHYk2aoqi+3s20z85mp97+x5VFb7s7Oh9PUBUzsJ4zZMhBL4Wubi5RtBnBpF1iAnRoJ03CHg4LSuso/qvJFXr4QcKnLu0fKaHO4hmnl8W5WTB+OdTgMKnnN1mQPZgyROGONo4Rub97W8L3OPIulo0Czkovit8nm02YfAA0oZg0GQ56A6DLFjGIhoMJ4a65F1xYMZZrU2LT+UctnUfwntd4SKHXGNmFfuwLbU8kPhUwi35/EqopA95CerPN98w92YY62bpqmQ9b05fSXI= 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: Expose a new register type NT_RISCV_USER_CFI for risc-v cfi status and state. Intentionally both landing pad and shadow stack status and state are rolled into cfi state. Creating two different NT_RISCV_USER_XXX would not be useful and wastage of a note type. Enabling or disabling of feature is not allowed via ptrace set interface. However setting `elp` state or setting shadow stack pointer are allowed via ptrace set interface. It is expected `gdb` might have use to fixup `elp` state or `shadow stack` pointer. Signed-off-by: Deepak Gupta --- arch/riscv/include/uapi/asm/ptrace.h | 18 ++++++++ arch/riscv/kernel/ptrace.c | 83 ++++++++++++++++++++++++++++++++++++ include/uapi/linux/elf.h | 1 + 3 files changed, 102 insertions(+) diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h index 659ea3af5680..e6571fba8a8a 100644 --- a/arch/riscv/include/uapi/asm/ptrace.h +++ b/arch/riscv/include/uapi/asm/ptrace.h @@ -131,6 +131,24 @@ struct __sc_riscv_cfi_state { unsigned long ss_ptr; /* shadow stack pointer */ }; +struct __cfi_status { + /* indirect branch tracking state */ + __u64 lp_en : 1; + __u64 lp_lock : 1; + __u64 elp_state : 1; + + /* shadow stack status */ + __u64 shstk_en : 1; + __u64 shstk_lock : 1; + + __u64 rsvd : sizeof(__u64) - 5; +}; + +struct user_cfi_state { + struct __cfi_status cfi_status; + __u64 shstk_ptr; +}; + #endif /* __ASSEMBLY__ */ #endif /* _UAPI_ASM_RISCV_PTRACE_H */ diff --git a/arch/riscv/kernel/ptrace.c b/arch/riscv/kernel/ptrace.c index ea67e9fb7a58..df8b7c6ab671 100644 --- a/arch/riscv/kernel/ptrace.c +++ b/arch/riscv/kernel/ptrace.c @@ -19,6 +19,7 @@ #include #include #include +#include enum riscv_regset { REGSET_X, @@ -31,6 +32,9 @@ enum riscv_regset { #ifdef CONFIG_RISCV_ISA_SUPM REGSET_TAGGED_ADDR_CTRL, #endif +#ifdef CONFIG_RISCV_USER_CFI + REGSET_CFI, +#endif }; static int riscv_gpr_get(struct task_struct *target, @@ -184,6 +188,75 @@ static int tagged_addr_ctrl_set(struct task_struct *target, } #endif +#ifdef CONFIG_RISCV_USER_CFI +static int riscv_cfi_get(struct task_struct *target, + const struct user_regset *regset, + struct membuf to) +{ + struct user_cfi_state user_cfi; + struct pt_regs *regs; + + regs = task_pt_regs(target); + + user_cfi.cfi_status.lp_en = is_indir_lp_enabled(target); + user_cfi.cfi_status.lp_lock = is_indir_lp_locked(target); + user_cfi.cfi_status.elp_state = (regs->status & SR_ELP); + + user_cfi.cfi_status.shstk_en = is_shstk_enabled(target); + user_cfi.cfi_status.shstk_lock = is_shstk_locked(target); + user_cfi.shstk_ptr = get_active_shstk(target); + + return membuf_write(&to, &user_cfi, sizeof(user_cfi)); +} + +/* + * Does it make sense to allowing enable / disable of cfi via ptrace? + * Not allowing enable / disable / locking control via ptrace for now. + * Setting shadow stack pointer is allowed. GDB might use it to unwind or + * some other fixup. Similarly gdb might want to suppress elp and may want + * to reset elp state. + */ +static int riscv_cfi_set(struct task_struct *target, + const struct user_regset *regset, + unsigned int pos, unsigned int count, + const void *kbuf, const void __user *ubuf) +{ + int ret; + struct user_cfi_state user_cfi; + struct pt_regs *regs; + + regs = task_pt_regs(target); + + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &user_cfi, 0, -1); + if (ret) + return ret; + + /* + * Not allowing enabling or locking shadow stack or landing pad + * There is no disabling of shadow stack or landing pad via ptrace + * rsvd field should be set to zero so that if those fields are needed in future + */ + if (user_cfi.cfi_status.lp_en || user_cfi.cfi_status.lp_lock || + user_cfi.cfi_status.shstk_en || user_cfi.cfi_status.shstk_lock || + !user_cfi.cfi_status.rsvd) + return -EINVAL; + + /* If lpad is enabled on target and ptrace requests to set / clear elp, do that */ + if (is_indir_lp_enabled(target)) { + if (user_cfi.cfi_status.elp_state) /* set elp state */ + regs->status |= SR_ELP; + else + regs->status &= ~SR_ELP; /* clear elp state */ + } + + /* If shadow stack enabled on target, set new shadow stack pointer */ + if (is_shstk_enabled(target)) + set_active_shstk(target, user_cfi.shstk_ptr); + + return 0; +} +#endif + static const struct user_regset riscv_user_regset[] = { [REGSET_X] = { .core_note_type = NT_PRSTATUS, @@ -224,6 +297,16 @@ static const struct user_regset riscv_user_regset[] = { .set = tagged_addr_ctrl_set, }, #endif +#ifdef CONFIG_RISCV_USER_CFI + [REGSET_CFI] = { + .core_note_type = NT_RISCV_USER_CFI, + .align = sizeof(__u64), + .n = sizeof(struct user_cfi_state) / sizeof(__u64), + .size = sizeof(__u64), + .regset_get = riscv_cfi_get, + .set = riscv_cfi_set, + }, +#endif }; static const struct user_regset_view riscv_user_native_view = { diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h index b44069d29cec..b9daed4ab780 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -452,6 +452,7 @@ typedef struct elf64_shdr { #define NT_RISCV_CSR 0x900 /* RISC-V Control and Status Registers */ #define NT_RISCV_VECTOR 0x901 /* RISC-V vector registers */ #define NT_RISCV_TAGGED_ADDR_CTRL 0x902 /* RISC-V tagged address control (prctl()) */ +#define NT_RISCV_USER_CFI 0x903 /* RISC-V shadow stack state */ #define NT_LOONGARCH_CPUCFG 0xa00 /* LoongArch CPU config registers */ #define NT_LOONGARCH_CSR 0xa01 /* LoongArch control and status registers */ #define NT_LOONGARCH_LSX 0xa02 /* LoongArch Loongson SIMD Extension registers */ From patchwork Mon Mar 10 14:52:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010209 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 199FCC28B2E for ; Mon, 10 Mar 2025 14:53:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 36E7428001A; Mon, 10 Mar 2025 10:53:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 31E02280017; Mon, 10 Mar 2025 10:53:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C14328001A; Mon, 10 Mar 2025 10:53:22 -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 E9475280017 for ; Mon, 10 Mar 2025 10:53:21 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 62B4AA9ABD for ; Mon, 10 Mar 2025 14:53:22 +0000 (UTC) X-FDA: 83205934644.15.B4DC801 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf24.hostedemail.com (Postfix) with ESMTP id 5A27518002D for ; Mon, 10 Mar 2025 14:53:20 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=MCZUKm2Y; dmarc=none; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 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=1741618400; 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=BEoq6zqSeLFMaXOoiuM7yp6ZSaKHVlNR4X3PvApIHRU=; b=WaM1byCr8oXpWo34IDMUzx94NpMYOm565ferrw+BvnowAPVCU4EkwuH4JTBJGYXtiO1lGE Pfh0iYHMz94/EjPO+hdkhptRoKFf7CNwP6J//a5O2xf1NVLPOlPpWkjONC01n6Q9W/+KjX CMckbWlahW/KFwBQ04tixChM/ebvA8E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618400; a=rsa-sha256; cv=none; b=x73nWnyW1fNC8DLOu7OopeJfgEFG4M3E1NqS+VKzXit8lVnc/JM86xdiF8/ctBi/wYsVuZ hpE+iUc/tgUr8Q6Y+kB4uOCQO41zdtEbcgdA11o8bJ+8zuEVj8DWmA6t1cEDT9n938Qa4V lycUeOXMLAuxe66NvwRXZ7x6F7YrRJ4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=MCZUKm2Y; dmarc=none; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-22334203781so95792045ad.0 for ; Mon, 10 Mar 2025 07:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618399; x=1742223199; 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=BEoq6zqSeLFMaXOoiuM7yp6ZSaKHVlNR4X3PvApIHRU=; b=MCZUKm2Y1zqnYpKN9XlZIHOjgGezAk9xKPYY2nLHXVYDvU4X0KK/PPkcpqfV+rBIF6 6gJ/pSgu+0J6m/h4BgQFIo5RvcjzgZN2ag7XFVYabhxFi+4wzP0CJcLP546YYmagiNDE Td6kR8bsdH3nbxZxmkU1/ap1kTyO6K9jLgwP1A8tS3DvZVMWaJXdnm6YWzaNAXlGlWRc NdpXxsHqKidvvjlXx8SrZvox6sttJUXcq4oFue87s+E25H0jWfhZApA8Q4jv43YJDflk TyphWOFquhOBKDG+bISRWB9znzJ10syumCOZPlY/TOTjrb9dxEOr8saxpgf5QgccbgVU QxoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618399; x=1742223199; 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=BEoq6zqSeLFMaXOoiuM7yp6ZSaKHVlNR4X3PvApIHRU=; b=oJHwNe+fuuzcOGiAKWMVNVzqaKfJUcnbUMbQ5gR635l+8zxaPjoDkVKoXX3TmksWQH /unvy3/fR/VPT4mbknmO4PNAu+Rw+UqnaRLmvy2bU5Az+wKyFToIPD/7kSc7TxtIzgCp 1rq8ZUOs1m8NiQYbTaxL5139IfP5gBRJdNRTBTyNNU24rzS3gCyZRhFHNA1zPZWCuUcU mChjrwfE76Rwle4m+wOfACrMmAVqQvDInbZRIjROW+OhLD0OUvfr9YWznvCg60yC3lus OQ1XNbWV4hn81/1YHT0AEvVgoVWWlAZQ1y3Zu2MuK6FN7zMUEBO6xptcaKRMG83pDIRk FEaw== X-Forwarded-Encrypted: i=1; AJvYcCVP7XqiYiEtdQAZL3XIa1yDj7gds75aKR64ixWDjdfumUFyXwlhpI/cvHYEY8P2K8d0rqzyA2aYRw==@kvack.org X-Gm-Message-State: AOJu0YwTV1J9Sn6sh9pfVDzGK+y88uesyQ/ZszykCBHXT/Om5TcUBzcF FZo765k/rFLbFp/TTdq68bYH4BjZSuQk+NwrZDc9GiycCtX8M7tiZX7cb1Zn3xA= X-Gm-Gg: ASbGncu/l1ax7i9i2ErCIGpABMQlAsRXn5o4My23zcAvaYCe8rePzBGvaEYJl4vz4pr 59jBYkhB2ciALgR5tfjVxgajM7POog2lgPNWyiGsBk3CMhKabOQvJ3QokN/gLV0vKH8ya7GOm9l Hc51Or+RpYrpYGfQIdLsJ9jgzYxXhkZBE7HsLY5CbOgxz8zelqLK4c7z3Jh+nURW8IujSRYcGdO iRpDhawRLIEUhFI+aDvJqF5rssQGPYp7yh9xhoKxpJVozfewRxe7hJ7xIvJgGes12dSoAF0v5C2 gtUJyoFNcOmKHp5pEKwMNhCDyQEvOfXALEHmj2jVIqYCUPQnu8QaDIs= X-Google-Smtp-Source: AGHT+IEx/P9VhGmpM9Qve+8fxlnJz5OWfBkRKBtIDANK/IPRQR8t6D11CbRKG5Xc1EPx3A5RF0LL1A== X-Received: by 2002:a05:6a00:2b4f:b0:736:b923:5323 with SMTP id d2e1a72fcca58-736bc0fb12dmr15850983b3a.10.1741618399230; Mon, 10 Mar 2025 07:53:19 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:18 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:41 -0700 Subject: [PATCH v11 19/27] riscv/hwprobe: zicfilp / zicfiss enumeration in hwprobe MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-19-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Stat-Signature: ngudyighkc68e5farpckwuh658ae9jxj X-Rspamd-Server: rspam05 X-Rspam-User: X-Rspamd-Queue-Id: 5A27518002D X-HE-Tag: 1741618400-765010 X-HE-Meta: U2FsdGVkX1/ZWFc5pqO94fwNbPpjjkdc8DZCZcR32wClRYD7faaedaPJWQyCv/owhgtb50d4QSTzoJlObxgb++w49oIM9LybFZNq5DOm1K9WzgNKdch3aV1b61nZVLE9vfWkHydaXB/XbNEedT5ucIl+Va1+EpZYZJ1Bn1jnPwItOiiiIDX/opWWnb8fNN8cmp4ArcIaSNJnj2417fdjlSxuDBjYHax58ljpXaTN3z64ErhdEIinZopENHUmNvFcAVvikQsnGE9cR9I8n/Hy4T2FBlna/bZJvdPdVg8+qY1x3kV2JJ7YoLFodgniaZFzKwm9n3Njii4dDFA1IbpMDDYpXKBDMtt+sJxvXvxSzAgUrbs1HvaonZEmi3vRdsk9z5s3R7qwTpsrbE+TxyigWbY/4kYyB/cP6G/8J0CVMrWLAlVCcIS32bwwjafEwrjOOmvpiRBaxJeu7yNhN6b+raf+Ioo0aGw3zwF4bDfguDC7R13WU74mYUKAhCuTOsjKyMfmgwth+BkHcbRNwYCaGYphr90kogeT28yzjBrBaPgEyhE1YMmFZc/QtkYk9bUpa1NXGqcz2jhgimbMNFpM0ZPHxby3eLMXVAeQ0HoQ3dICU1whneIURdWEeQyIgoUjcoP6cj17bcoIrFdX0rpycV96sOfLTZCKGxMAQ+6yN602nztDY0HP9z0GoSEQAqjvbkL243IDlDwWChjJVNWBUt43eRuX1GHuAwoenszT9heoL/vFtl5D5vSawk0zJ0Z0XgVw8nmuuLqfzO6ReatJEbwddOGBWyTzYbisCEFzb6k8N7+1VHQyySm6vzf3YFHUGBG+pE0B+ado9jjIvhS7KD+UCG/jkPK0LG9ZrbTu+oZwnen21MinkOnfTUyIDLdMnLlU5zTHf1HGMEqLtHOOmHdl7FvEUwhN6iKhWnAYZDi+ZH6YiYnvKJZcie3XVoO9lYnpWl4AVmUkdR4UyeV 6hdVUeth UDV07CLBftkRAjqkXnsT9njfE4X6jIeuWJ7COTor3/DmZuMrzZDq1Uj5z6P5EryJqrRXJpTGPaFW9zMetcHp0GwoYhiK27NUWU9EIpPyReeIQbAFRGi+b6nwXTfrys3yUEY08KwWMOILyfaZ+KXKs+I+yfRdY4Bqq5hIhdy018SEudS0AABf0YqLhQwvZfS2ZVrDi1BodFX/VvjYv8vcnznbRckIlHcLMHj3HKvyZo84g0kUb0jKJNaRzXTON5clpomDdC7vPertT8XHvUewhmcRhIqckGaFaezitrccMMNCxxJQbUsDvYGm/SUsPXaVw5uorS2ECG2jQs90dYU7dayIdnYia1b89uwWrHsWFk4KNsj/QZn5Nw0hoitWTNQHF5VF3Up3ti9plqXwKbjrtZBiI69fjpWY9vb4tfySEt7tPACTnjk5swjQgBzjWLOR7qKbeoB+8GPWmXBA= 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: Adding enumeration of zicfilp and zicfiss extensions in hwprobe syscall. Signed-off-by: Deepak Gupta --- arch/riscv/include/uapi/asm/hwprobe.h | 2 ++ arch/riscv/kernel/sys_hwprobe.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/riscv/include/uapi/asm/hwprobe.h b/arch/riscv/include/uapi/asm/hwprobe.h index c3c1cc951cb9..c1b537b50158 100644 --- a/arch/riscv/include/uapi/asm/hwprobe.h +++ b/arch/riscv/include/uapi/asm/hwprobe.h @@ -73,6 +73,8 @@ struct riscv_hwprobe { #define RISCV_HWPROBE_EXT_ZCMOP (1ULL << 47) #define RISCV_HWPROBE_EXT_ZAWRS (1ULL << 48) #define RISCV_HWPROBE_EXT_SUPM (1ULL << 49) +#define RISCV_HWPROBE_EXT_ZICFILP (1ULL << 50) +#define RISCV_HWPROBE_EXT_ZICFISS (1ULL << 51) #define RISCV_HWPROBE_KEY_CPUPERF_0 5 #define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0) #define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0) diff --git a/arch/riscv/kernel/sys_hwprobe.c b/arch/riscv/kernel/sys_hwprobe.c index bcd3b816306c..d802ff707913 100644 --- a/arch/riscv/kernel/sys_hwprobe.c +++ b/arch/riscv/kernel/sys_hwprobe.c @@ -108,6 +108,8 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair, EXT_KEY(ZCB); EXT_KEY(ZCMOP); EXT_KEY(ZICBOZ); + EXT_KEY(ZICFILP); + EXT_KEY(ZICFISS); EXT_KEY(ZICOND); EXT_KEY(ZIHINTNTL); EXT_KEY(ZIHINTPAUSE); From patchwork Mon Mar 10 14:52:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010210 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 D6050C282DE for ; Mon, 10 Mar 2025 14:53:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7D25F28001B; Mon, 10 Mar 2025 10:53:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7519D280017; Mon, 10 Mar 2025 10:53:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5CD4028001B; Mon, 10 Mar 2025 10:53:24 -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 38EB1280017 for ; Mon, 10 Mar 2025 10:53:24 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A01AA1CADB6 for ; Mon, 10 Mar 2025 14:53:24 +0000 (UTC) X-FDA: 83205934728.25.762DD07 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf23.hostedemail.com (Postfix) with ESMTP id BAD63140011 for ; Mon, 10 Mar 2025 14:53:22 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=XDuMVfeX; dmarc=none; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 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=1741618402; 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=a5uI84SXblQRDID2BHNWhhHsRc7xVUDdoiei4kS9c/0=; b=X8oM7TREwXA2121MAB7BPGesZbXO4IAXKuI0CAXjsWQeY0RWUvehZ4Mr/IBh15aMVi2csu uUrA5Pl2vo8yQbkLbS90ig0m0oTLfs0mdIRuU9cuKQ9jHD4itAgaleTTS22JR1i/L4IkgI X0zZ5bxm5O2xFtfLIjIFseapXf6xBQI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618402; a=rsa-sha256; cv=none; b=i58S41XEWhiPxdiaLmki31dEMOdCni/oAmLqtlpKFYQ1rv9E9BUX9k/9aHtheTYJXkSZ01 KQunVt9d05lirdo7sI5Yc7f/QBt4rwGs+8YEQQlER9L1OjsyUDpgXT6frX4ISyGWuw0qXg eJD5S0Dyt0DNWAiG50L8uCoaPK+KgTw= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=XDuMVfeX; dmarc=none; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-22349bb8605so78603815ad.0 for ; Mon, 10 Mar 2025 07:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618402; x=1742223202; 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=a5uI84SXblQRDID2BHNWhhHsRc7xVUDdoiei4kS9c/0=; b=XDuMVfeX1FwCZrHHS0ZGjLo0NXBEkA4zlrVOCFPpQ0f1hVCYzNdFjvf8WzONN2x+Iw 6DxNRUtuYrceW+rUR620Rp2GJrf36flqt0Ly/TkeIZGZZV1wKpOE6kl/sDLd3tW14ENG C663PxLCMwIQjUcaSM0fOo51yU/nllykv2P4Q3vBpYCyiQmVb5Di8vJKPj1Yd/z7xfof e/tcwgHcYHejob7YEQuSfasS1RssQ3PRB02aweclXTiaJhI1JmVwTSbRisBoneppaE99 BAxltQaHRwpVWc1BOQu0WgTKT4Vqf6RSUA+VPR/3SL13XrI3TpZ6iqGbj5NcNF4TcgOx lmhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618402; x=1742223202; 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=a5uI84SXblQRDID2BHNWhhHsRc7xVUDdoiei4kS9c/0=; b=a4nlwplmLJY+OcndAGmWd66fLBm3Fx7bxqLXCtah/Lqx0MIdaJa1ZGMgUUvlzTRnbU Oik8+DdaU2QfM84kDsiwp6haSzYiBJmjrAgs8+Cfevc1/rcrL4Ce989gTOsQuAXZIja7 zgTvITP+oaIO+fvuZvHoym8jkhx1WZoTEGF5cbuH3b3V15AfhyhuPx0gc+E4yRXiZCeF FUKqJl+W6c/2nn6haGNmeEP7HZRFVlC+GC0sxpNY+CzUDqlCEKHrqm8qIRRgK554EUtU I8od/fTRE6sU2vThVW8I0MYr62YUfAHWufVyP0xGWLU73mG70zqctAPjjVK3faIp/I05 2+5A== X-Forwarded-Encrypted: i=1; AJvYcCX1lLmPY2NYdBg5qy0IbSPJpYNQKFA454ZDhnVMauSfeKzULskLiU7gH/96k8ODZH4Pe2TFlgaSGA==@kvack.org X-Gm-Message-State: AOJu0YwyqdNc5JtxnLMeQwXVGbecVEfIk4n0EYYXio0SVqTiCOClK80i R+fklgJSxLfL1wCAqzr+3CX/GLJJb9dxl5gR3RtwTX0xCe4Plbaa2I559GbYBic= X-Gm-Gg: ASbGncsenKxoQMxa3TmkjxBuojMxcjuVJ8veQm/XMQjxEwI3tOGHD/wjZrnuxITsPwK WAXG7QBk/W7KSBam/AWRYTUHvW5xLyQQo7LauFzHhU58v9SpQXRauSm0LqpK/p5WI9GtmYYgz13 71IuhUg/ICJ27dqyQQ0kovnn9LQe71SEXWZ50tp92PNsBq2fefohyHW1WTcchdf+nyNB04OsdlN zsEGo0Rec62ZB3Y0BqCaPiZZNHmoAL1AGA7O7MU7+8iTcPS+lPORv2tBOgEwZMB1aK7bJjLPfMQ Lvw7G/0pYcVPjTxS30peaNLruEmloyeSfudzWNdxUqby0dlzHKpyOgg= X-Google-Smtp-Source: AGHT+IFjDwjQ9fbG75ByIkC5Z62BpsOlmfgaoy0NDr7CGAoT4eOeNPAoaYep0Q4HRAItC/SdOQSQyA== X-Received: by 2002:a05:6a00:4b4a:b0:736:54c9:df2c with SMTP id d2e1a72fcca58-736aaab75e8mr18259867b3a.15.1741618401679; Mon, 10 Mar 2025 07:53:21 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:21 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:42 -0700 Subject: [PATCH v11 20/27] riscv: Add Firmware Feature SBI extensions definitions MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-20-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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 X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: BAD63140011 X-Rspamd-Server: rspam08 X-Stat-Signature: yyanbe88cc1mnsf87pxnz7z95rkwotiz X-HE-Tag: 1741618402-556269 X-HE-Meta: U2FsdGVkX18uzqjicnvUn/qaUvPZJPa45pqIAdsSCI/IAVcJpSMKwKFj1/AG2P4+w8nzmLgC4iOZcs9rGqREhZtp/TlN7Ja0ulg2weXs1CgHnMhRN/a1spT0hE7Vqus4ZSViLNdKcHF6Kl9FEJ3qWsphxt++cxvKENDfK/0gMtKO2sWfCWkRR2zKS/LPGxy4DtdK7Ov7rIkGr/if3tklrcfv7xIgJlKjQ1Saq1gMdFUd8EtQ5RhhDYIGoyCRx9GZY5/mALsLKspxtmfcztFj+wjNcrh8R1mjL1WDSZwwXbmQxLg6CIIqJi/eEcmDsFh1raE+vOSRL3tRRVS4NyKBlRVUob2S1elQejcnOI/vabCt7wFltmRtwzBi25hVuFZKk6j+VUeMeC2RglAzbBPxXdMGKBAmh5w7qv/s3w1cehdX08NHhKJUjOX9aKWWgGFSKIZlEBYwJ7XN8AxM3Wuq9Czmqb0C/X6n0MVPZS0WxcsQq8ISMoq9MqjT0AhvrZAQ8gmBlwGlDiJ/SYf8aJ9srvCXA/L6sAk8IeoCbgqqlkqUnA6EUCdQrJO1gm6PIh4ZF+wF+ZEDnn31u/Sh9Z0yLczGk44bCMdtVET9LjafXMUcC4ZMqnZs4sFXerAZE2LPRDD7Lh1C1C36DCTd9k3xMTRLEdWpS7ZnXh55Pu5mJRv/MxKzt0SaeFeQzlhzG3a7NE8H9oLwh6tRonFdsOmyzJq1NUv1r6aNlcGT7An8ttSOp66APBimwp7tdrB7t+Rqg/GgvF+Bf/O5Q9N66VfjIxwVF2+5kgKjR3wQ7aWQaRj5U05OigRSKINCR/AAQFY2exToTTZBnKZ6Sa+rUt1d8dOENAmHTS1LGdzhraj9ThhjipdM6ldCifDi8k0OXTaLhgZd69ri1fMGjfX0ZYbEXFDrvgfYeNnR45wIiRg/FWUj2L70soJ8P1gJLcgXEbqpA6KCTzxMjK/Uc3Nk1zf Ym60ymvj xiYR3dzPqdoHNPZwuNo3iRr4ArngjrHjJ/0XHA4/8mabKNrJFBA9kk1TmqDJnKmTussbyBR31/ocLMYQdW6dWTXCi0131YzqO7gdimlyyDtAvJu6dvYEx6xsU6i9QrnwJFSkwgQDpz5UAJuID1w9BiWDLaaFTJuSIIA5SPS+ju9UK2KZGwjYi6hhRGof5BKRz/MkSNFYuPIO7h1ldkliyC4Rr+UADS6rp1eS9lW/3ZRuy9Vi1GNyYoTgW4JjEVTM3BZvRN9GbXfHOhDH3wo8UuME9V0pTy/vLAzt2RRX9glJnQPwNQUhNljYzm7UtylkDaEfq+P6Vl3qjF5I0sOKcGKJ24oWdBrjErUfVcob6DWq5Fez/kIzut3O/NzphMNqjzeqweXS8xvnrwo8zCEUVDgJ3xpeh3kQ0hwMbYV3f+OANEj3KTdBXlJ5JxTlsKrpgUZzVSIZvp4iTqcroUkL74ZmvAHw3BSvs3iOkPWT6fIN6YHc= 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: From: Clément Léger Add necessary SBI definitions to use the FWFT extension. Signed-off-by: Clément Léger --- arch/riscv/include/asm/sbi.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index 3d250824178b..23bfb254e3f4 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -35,6 +35,7 @@ enum sbi_ext_id { SBI_EXT_DBCN = 0x4442434E, SBI_EXT_STA = 0x535441, SBI_EXT_NACL = 0x4E41434C, + SBI_EXT_FWFT = 0x46574654, /* Experimentals extensions must lie within this range */ SBI_EXT_EXPERIMENTAL_START = 0x08000000, @@ -401,6 +402,31 @@ enum sbi_ext_nacl_feature { #define SBI_NACL_SHMEM_SRET_X(__i) ((__riscv_xlen / 8) * (__i)) #define SBI_NACL_SHMEM_SRET_X_LAST 31 +/* SBI function IDs for FW feature extension */ +#define SBI_EXT_FWFT_SET 0x0 +#define SBI_EXT_FWFT_GET 0x1 + +enum sbi_fwft_feature_t { + SBI_FWFT_MISALIGNED_EXC_DELEG = 0x0, + SBI_FWFT_LANDING_PAD = 0x1, + SBI_FWFT_SHADOW_STACK = 0x2, + SBI_FWFT_DOUBLE_TRAP = 0x3, + SBI_FWFT_PTE_AD_HW_UPDATING = 0x4, + SBI_FWFT_LOCAL_RESERVED_START = 0x5, + SBI_FWFT_LOCAL_RESERVED_END = 0x3fffffff, + SBI_FWFT_LOCAL_PLATFORM_START = 0x40000000, + SBI_FWFT_LOCAL_PLATFORM_END = 0x7fffffff, + + SBI_FWFT_GLOBAL_RESERVED_START = 0x80000000, + SBI_FWFT_GLOBAL_RESERVED_END = 0xbfffffff, + SBI_FWFT_GLOBAL_PLATFORM_START = 0xc0000000, + SBI_FWFT_GLOBAL_PLATFORM_END = 0xffffffff, +}; + +#define SBI_FWFT_GLOBAL_FEATURE_BIT (1 << 31) +#define SBI_FWFT_PLATFORM_FEATURE_BIT (1 << 30) + +#define SBI_FWFT_SET_FLAG_LOCK (1 << 0) /* SBI spec version fields */ #define SBI_SPEC_VERSION_DEFAULT 0x1 From patchwork Mon Mar 10 14:52:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010211 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 3BAC7C282DE for ; Mon, 10 Mar 2025 14:53:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EE26928001C; Mon, 10 Mar 2025 10:53:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E6D1C280017; Mon, 10 Mar 2025 10:53:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4BF828001C; Mon, 10 Mar 2025 10:53:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A4360280017 for ; Mon, 10 Mar 2025 10:53:26 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 2900D1CAD7A for ; Mon, 10 Mar 2025 14:53:27 +0000 (UTC) X-FDA: 83205934854.01.8E388B7 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf03.hostedemail.com (Postfix) with ESMTP id 2E6E220003 for ; Mon, 10 Mar 2025 14:53:24 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=wJlXdIOO; dmarc=none; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618405; a=rsa-sha256; cv=none; b=ohkvERM3TNjBd7ThAY6bLjq2b+jqqyB1EDg7Rx8FxgA9FdzvUYKMK1oc3VtY6bLRXr/WFS 1BZap0eo9k3FO0JTjoWJt1fbWEokDVplOtuU8lzeEciCMZEqezu+xdh6/4FZNTXFl9bM1J kx7zJ19eBP1RE+a+MAWpygN+aTQb/BE= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=wJlXdIOO; dmarc=none; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 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=1741618405; 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=YHkNmM6XuphgUqeYDdwRc1f9MaOV9mSfy6OUDBv2dEo=; b=jtC7JO/ADsnyudYrAuvL3HPxG1nJ/b588SEr7bRJZTPR1DXrJBqtWct/OOA3X6FNmlhTOS 6mVbNiccRS1EReBhmNcBHBjUDY4vqq1mVB+tD7hiC253EoSg+6gxwftLrBZuiA/EcisnMu CRPQZDR73bAcykV3Fjl1/XTELQ83A6I= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2241053582dso69053965ad.1 for ; Mon, 10 Mar 2025 07:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618404; x=1742223204; 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=YHkNmM6XuphgUqeYDdwRc1f9MaOV9mSfy6OUDBv2dEo=; b=wJlXdIOOP3NMu92h+Uo59WXG1Yo1Bc75I2yrhPvTZuz7aCADKX+FKA5jyYL66b86yk 3497id5zAo0q16onhKxm9aFObXC/QMw6ABdWE37+IwXu7XnzTvkRKtzDHRL8CVW/u34Q 3GBeGsE8ZwFkRI2sr284oTT91VuMJhDp7IjilhqwpH5KJKYPAC2O6PJY2c5ZiOUeFu04 rhqo868Z0brdzFOuVqM2eOTubWsjJ8ZhpfSrtuLWSAovSIut6FKOhOmADXrnIGiPu+m7 EYeZOhqqngknw5URSMVIBgCFmMjB8ZjAZn3JBg7riGZz7/wlInaZnhfSQA1X5uswwDuM ncNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618404; x=1742223204; 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=YHkNmM6XuphgUqeYDdwRc1f9MaOV9mSfy6OUDBv2dEo=; b=HvqaTd+927xc19ycaoEU0skW05Dd7B5cO3k4EYj2hNkNAsJtV1irNeEz9q8o2P2HZd xNZr2DNelXMMW7NHbIoDLUI6+iA2q7hda7dPfpGbXvVdIFTX68fHgtvy4vWJq2F9CUKh c0/atPh/dWNzh/Wo3X0JkWnsk43hJtB3OSNPTgrWFDpltMwcEnTMVSBEgVxzAWLFPzqT EkPF/krsyIIWlmYC0J5E3HM9f0Ih/BweiEAKT41vQawOkfxrNLLShIi1qJ7UnvRRxqSP 8cOmPw3it13ie78eJqJARjQeMu5YHAEKsTgJqSpou26NBRtnaLbopYLVV4Vr3Jj63cS5 Ykag== X-Forwarded-Encrypted: i=1; AJvYcCUxSD6XBv2l4N1U34+shRFdhvfenV/jt9DXzqC+Yk72x+va48EVX1kInY0O6/wKy2HBbHLeY2xq7g==@kvack.org X-Gm-Message-State: AOJu0Yy2qDjvvHDaPMY7n4WqI2PebhguADjSxdsvkIB5tsyIvscuH2UW OVH5BBdOcbZhnzp3NMKMmJVieGsP3MFD+lgNflVw6ukyQAUktkh4ud/1gE9Jo/XMmFLslZOUKXO 7 X-Gm-Gg: ASbGncsBJRLk+zphpzP9mCpCfGzjJZBgRdDGxJSxWj2EYJ1SW/vj2TBRUjbz9yg+xOl O0+/UaqRrNj4IOwg0AD9OPjvMk3ueRFbgRd/LQx0IUfvbbswqW4ASCJhP0EMTTztgDwnnP2lV+L 2Vdel6WgN54JnbStHkER2KS0Dhdz5GFfbP7ZrY+5N8m/EhEXQZ3MevSMx23YgZk7NfBtHTU7M0w c7gsdvE8mb3uw1/mKOBL8j+ekYERXa6Emac9PZ0IkIu/Uf8sHxAQc+WpI0hQbXTvEnAE/IGyYBy GG/tUfxjfljfv56Qs84d9BcErohkxLhBJ1fFTG+rfSGWrTzLYWdHYI4= X-Google-Smtp-Source: AGHT+IEufhMFpKiNcPYaN1q7fnoyb0yGUoGedR4PcX/LQ5rFfhM8NE7LJbQGAfjZIn8NhFa9HTR7qA== X-Received: by 2002:a05:6a21:b92:b0:1f3:3f0b:8abe with SMTP id adf61e73a8af0-1f544acd261mr21823779637.9.1741618404090; Mon, 10 Mar 2025 07:53:24 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:23 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:43 -0700 Subject: [PATCH v11 21/27] riscv: enable kernel access to shadow stack memory via FWFT sbi call MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-21-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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: 2E6E220003 X-Stat-Signature: tzquxnrbcr5ryj7e8eamg8oo54jeqh5p X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1741618404-247033 X-HE-Meta: U2FsdGVkX19zxFqjqnANKHTSnMlOITzv1/g5Q/wv7yNm5RRakxJuaN8O2vM5qmPdBCy6qwHmshyWJg66RKuT2KOwLMgA88cGW8mwbErBUwHcHjZXN4FaVDBZyZzKlsPw5drxCNN0g5sUNp000gmq6xCsnSxNp1CNYwGcNJbJlN0NNMK4l3VtKiRpKME22UYlv2RBb+MD77thkNbZ8S3boX7PhdID4og9CVlWt8hJ4+naLnmHXw8j0SGSn7prmkKwH2i2yZNbYqEAaVHtRTshpov9b3jmmSf944gb61vXnaY3ong4K2e/Pi+Ra5Zf+R1RthzofhaimE+aC9tt7D6PzSd/gGrxVLWCL3X8R/zNbLBXHJx5KFK/4eUnvBwZQp6jEXc8GgqtKJThhkAy1lvtnOB7E6EPyp/dtBf2Ww1C1ncXj6NzgRoMY5buQCx0sZB1OoU//6TA80cN4pcPknjrKbszwE7Bknrbt6i/mhwUmSgcu/+EeZ/IJuOtpvgJ9H7yVh/pUYY/VRBu+uwjQ6P24gB2JIhSF/ZZnlR/1f9zgJeK680LdYR/KWMvis+JnbwKT1m0tNnrOgnIfMm0MHgkbAJX9RnwRrkwmYYHG/G4z5OzXfIRLr56vAshtKZKYJv1gcJIQrTF+P9lxKnue54vsShsT2nlftxnAcHE7eAFIFmcN1fXfPO9kW7ZSb8Z/NqryKpoCNe0E/fx2BINRTBdZETxRtDi9cmlOlQikM7C6fHOQ46CpXuS6o8jwJio3tSuO4h2BygsbaRLnhPM7D8x8YUsTeuufTWdVAt6cfHVLsgBDibHj9iEG037SqHnXv+Z4hSqYmsgmTtVmfa4sgVqmpEgSsJEHHgdLp/KPM6zCislpWN8V2Uix9p8HXuOtXpeoGBTdX7TthSz7/wRJaGVr0YsTAE1poZRS0kUN/Cr6RxUsQX2NOKrXVU0A+0hme2TLo8QNrqKcT9AJfoiYyw IIFcqaJY uXO99y+PtvNCmut7DEpKmGNpy4m2Z6T4e6ah3LXggRr8zYOPS9qhh1zwTf6k+stHl803KbrWoVmeOKZ1j+L9IWgI89jL8TP2OrbPJ/PPDZqI64cYq0SqK/TGzh22/LZFHkHraG38vh7daSY8kEnVnlebje1oxElkvjQFXf2n6x4CLcDaDZQMWWe38Lld7RrsinnUP92x9py8JeHgo6iZD1d6aQ1Imxr+Kd3H3BbX58r4oq+63LhVX47FcXQAn7Dg32rPkxSt7XoT0HlmAAKeG9R7dAPc5Zz6nBo51E8LBsd3W2iQn8rM3uoyswiZemMKxf53IpT/eh2quxpcdGDaSo0Wm4l5pXiM0Ux7PpTL+5Pw8h8bM5sjrXqh8lGXoPRvPO5ErZ/VRbVhnQZOT23+2LFE7hBl8yVj/exSmyoolsPZH9lswEmKwOVBBqb6n6WUvToRwyBYUvlIPAvM= 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: Kernel will have to perform shadow stack operations on user shadow stack. Like during signal delivery and sigreturn, shadow stack token must be created and validated respectively. Thus shadow stack access for kernel must be enabled. In future when kernel shadow stacks are enabled for linux kernel, it must be enabled as early as possible for better coverage and prevent imbalance between regular stack and shadow stack. After `relocate_enable_mmu` has been done, this is as early as possible it can enabled. Signed-off-by: Deepak Gupta --- arch/riscv/kernel/asm-offsets.c | 4 ++++ arch/riscv/kernel/head.S | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/arch/riscv/kernel/asm-offsets.c b/arch/riscv/kernel/asm-offsets.c index 0c188aaf3925..21f99d5757b6 100644 --- a/arch/riscv/kernel/asm-offsets.c +++ b/arch/riscv/kernel/asm-offsets.c @@ -515,4 +515,8 @@ void asm_offsets(void) DEFINE(FREGS_A6, offsetof(struct __arch_ftrace_regs, a6)); DEFINE(FREGS_A7, offsetof(struct __arch_ftrace_regs, a7)); #endif + DEFINE(SBI_EXT_FWFT, SBI_EXT_FWFT); + DEFINE(SBI_EXT_FWFT_SET, SBI_EXT_FWFT_SET); + DEFINE(SBI_FWFT_SHADOW_STACK, SBI_FWFT_SHADOW_STACK); + DEFINE(SBI_FWFT_SET_FLAG_LOCK, SBI_FWFT_SET_FLAG_LOCK); } diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S index 356d5397b2a2..6244408ca917 100644 --- a/arch/riscv/kernel/head.S +++ b/arch/riscv/kernel/head.S @@ -164,6 +164,12 @@ secondary_start_sbi: call relocate_enable_mmu #endif call .Lsetup_trap_vector + li a7, SBI_EXT_FWFT + li a6, SBI_EXT_FWFT_SET + li a0, SBI_FWFT_SHADOW_STACK + li a1, 1 /* enable supervisor to access shadow stack access */ + li a2, SBI_FWFT_SET_FLAG_LOCK + ecall scs_load_current call smp_callin #endif /* CONFIG_SMP */ @@ -320,6 +326,12 @@ SYM_CODE_START(_start_kernel) la tp, init_task la sp, init_thread_union + THREAD_SIZE addi sp, sp, -PT_SIZE_ON_STACK + li a7, SBI_EXT_FWFT + li a6, SBI_EXT_FWFT_SET + li a0, SBI_FWFT_SHADOW_STACK + li a1, 1 /* enable supervisor to access shadow stack access */ + li a2, SBI_FWFT_SET_FLAG_LOCK + ecall scs_load_current #ifdef CONFIG_KASAN From patchwork Mon Mar 10 14:52:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010212 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 C4D53C282DE for ; Mon, 10 Mar 2025 14:53:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 645B828001D; Mon, 10 Mar 2025 10:53:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5F3EE280017; Mon, 10 Mar 2025 10:53:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 46E0F28001D; Mon, 10 Mar 2025 10:53:29 -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 27C7E280017 for ; Mon, 10 Mar 2025 10:53:29 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 90A8C121122 for ; Mon, 10 Mar 2025 14:53:29 +0000 (UTC) X-FDA: 83205934938.03.E39B2B7 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf10.hostedemail.com (Postfix) with ESMTP id 9F6D3C0015 for ; Mon, 10 Mar 2025 14:53:27 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=0kzW5mPi; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 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=1741618407; 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=opxHamP1ejpgUrZttGLg4zwDHWHLF3xPs1/Qb/08WRM=; b=qDF4N83tkvHEKwCa7O/aylP9WgfdYNUCCGmoH3W8/kmmkf2sZuCRV6OpZDSUqjkqHvkLv3 a1whMskPWlelN7jses3Q8z8bGLavEVEhaMS5MYOADqxSZkl1OqKdt9Dm6OGHBB2X1iGRfp N8Vz/z+KnnZ7ygooXsjVDO2b3ecNcno= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=0kzW5mPi; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618407; a=rsa-sha256; cv=none; b=JY1s1XJwbTl1vT6Pi1qjJ8Kja25SX34hRLJKFHTqAmEdSZdSr+XQzjEfFwH1jxMx7ncPHU FQkFE4NZriYeiZ+y5VT4fDaf0zNE8RngqUv1C/em7IWQV5eb0EtAhEbjV2ZZ+VU2HUt41s pK2i6/UTfe0jHgqHtrZ3jxk9nMljKEc= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-22548a28d0cso11742435ad.3 for ; Mon, 10 Mar 2025 07:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618406; x=1742223206; 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=opxHamP1ejpgUrZttGLg4zwDHWHLF3xPs1/Qb/08WRM=; b=0kzW5mPiP1c9fW/ZsOigbaY9EhtMXBwJpDYl96spAlwZLKVdM/6OLCfjwGnSz0hSAV rBGhKXRzgEkV/2nwp0mTma4i8iOWW9JznGfgp8j4vny0YEd1+CGcZoBu/slo9lj5h0jE jSuX9qkgd8k+RSpqiwKIsmhpjMaLOSXnffV65ZcoLcNoA+71VI9fSFUuWEqc7s80kWr5 2ouDlBZQJgI3QQSFevBiG8tDvkx5ZVpGjG/xmhY7b8hcw1DF4sVThVvhWfpPZIy4vCSz 51qtJOuiVpJj9kEfDbfd+mBwgA7b8okSMrq8krjaj6mE10k+K1uXpkDMHBqY5HLO9R36 XQMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618406; x=1742223206; 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=opxHamP1ejpgUrZttGLg4zwDHWHLF3xPs1/Qb/08WRM=; b=aM6poEFpuXe0W7y2liz1iV4ovIlQloHm3ZU57QWbq85L6ZRjXDkU3zDLoIl07+72RH Fkw3MbbgVLb3o7cQQ0zgDZlE8s03tULIROgOVyeRy8A98MkjFt2qegIYEUyKjnv3NFe3 GqiqTN0vPKev+WPha5HCj7NrTvGcU77XjqJ/ivPfolIUBdg4op1jQgmN5ujSBR9q7brN nU+eekOW7Nv1Zc2746Kdj7Fike2D1j2AEEPDcL6xzNhOYmFZdkF1DyTvlGSrU6JW2JlW UrWxjkDP8mwk+tVVE+0Kr4ykTkgsxllygyxhz9fLbWOJ+sWRPX9iGQL2VT0GuJJHPaN5 swoQ== X-Forwarded-Encrypted: i=1; AJvYcCWMCkLFtkqx0lNIW9KAvnV+eizoZrT3MTDaFJ8wdxbN+pWlMgYGdHC6ZFbACnfM64hW7VEYsG3J2w==@kvack.org X-Gm-Message-State: AOJu0YyTodbyc5oYGMO0GSlcHCPntbGL7xKac5aGheSLgPIt+wIOJdbz zp6fJCPty9Az+XTawyUL8q2j76bP1M2oPXwgFDIgCUXo7EMIhOUyAoslNCGOjtw= X-Gm-Gg: ASbGncusaKH9NKO/PDUFB0eMP6m3t0Kq8+jwTsB+CX923+XD91R+jOgFTDSd58VQ7rx Jj5RHc5OKAyNjEj0OT2kHfr8upCotVlHjEoqz98hEHw8r+8WAi5KFku/D4q3mb8K3hlIsoHp//p 5X5d+bUjJ3aEiVEqLx9IAvjUrrWI1VAcQlhwxyIAicycFnni2g9bNzBGrqj1edMZWUAUOgw8U7R igMX93VsS5/8mLxtxPa7A6QsnmjIHzlJZnivptkqwFc+I3D3e7myKVgJJM5nyuQkaVkybQOZjok VrV+8Tq3x0qngLI0BlG+O+7hiFfyXd4k9o8xxF8gH8rLmDNOgz9xyO8= X-Google-Smtp-Source: AGHT+IGghOp+j7sQ0Qt7sq7k8fXJkHLz3hwRxKC8iR81NfpyoYASRowQ1NRmeDSzKjKxRLkZDMtKZA== X-Received: by 2002:a62:fb06:0:b0:736:baa0:2acd with SMTP id d2e1a72fcca58-736baa02af4mr14991022b3a.20.1741618406530; Mon, 10 Mar 2025 07:53:26 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:26 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:44 -0700 Subject: [PATCH v11 22/27] riscv: kernel command line option to opt out of user cfi MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-22-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Server: rspam06 X-Rspamd-Queue-Id: 9F6D3C0015 X-Stat-Signature: cfk7js8zgouqqaaniq3tqbzf6ap6csa8 X-Rspam-User: X-HE-Tag: 1741618407-971828 X-HE-Meta: U2FsdGVkX186o+w9makORLi1QGcQB3YcW++VJYp5zTaNv+PYBnJLaAY0yMPeUvMcod/klBONyvNC/afDc0JTZ0YbDZ/vTxg5TJsLrY3rVpqyFEpgLJ87f37nYhlvjt5aFKVhNJJjFS1KS0alk+6X1+3fd54kJGmgcGSxXwR7mEksnun1AgdJVPNUgM2xe6p1WuC3xUmwQewrkYthvSTBdJmB/PM3LDYbV7hbyjQlvEe6rN0y3B7gC6R96eoEE3EJNxxq/4aO7XBlP8rB2vj4PJRw9sq4ZCnyHzrULgXuBqKXF/OuVyJlLUlz5J6/SbDef78tTBxHBlwEWqQsvOoGt0ZyQKrFxvFuWXTXH5uOwrgTIEuuhnQh+TurVP0NGcD/fyaFSrB4iSXlz3CwtYakutUgqjD3K/kaMxmbg7X3II1/4tVZE8qQa3ZBoaJXLX+z+hZDsOwRtQMGeIOiqBpiEEpj27DAi+cuwCS5hYSLoygSjUTzeV6I0eDUB8ZO6U/+Huk05QibtDt/6J/xjS6N+5xzJ7GuDd0oZzoMY77ioykIPl3kaaFHxn1GG13BACUZor4w+wKBYGqb509R9InMhqU27NM4noeH/EZIv2VLpo3tunZ+teh8G6Q9POjlS9PVCp4QgHZEilTuippEuSKyzqLqRWkK50b9NX8M8ui9BgO5pC9rOOa+6QEO8wKG545ucjfj7JbL+FqRzXddZa707PwiYiZNe3EcGC3jEL78igLkB0ER+DDqgc5koiJK8NrDraUL0msD6cU7ZWoO+gQ7DmSZJbjuq5nicLeH6WI/h5RoayjD5NcfD6j5O7YWqHPpgCJXuVsBMrthKAHUDoChPOL48C9sePHr0QHwtc1CbS6syZ2WGAhApXeXS5KSTHzXxzIWFBOxvGi00rcoZRim80m0MealusyeXPB2M69HzNGDlDM/0LvXOdtRIx/6gtfr2Lb+grNowE6jVnCLca5 q7ba7k8j 8ovoU2SqLzSuGTSF++p3xxOgyEsBGGZgtg9VKR3RVoEAX9mB8Fa5meafNjHP/nLGlTaImSJVqZu4PcNrXWWBr+wuinIVGe1x4Oh6I2VgM5TXZ8ulACMH2qaEsSqbTMOco1JIbqrU16drr3IDh3KP35mEYP7k+BJZRxFlMcyeNlIRkALN8JQG5/WAXHL8nWVFJ8qEdGRPe9wlfR+2I3ZVpDV3KiBzrySb2ovyalueqOXAUZv4opwkgjb7mD4P8foAjfjk6wrkscANVvrb8RBnrLM+8+5lePO+Hw9TlBaa2td82rI8UCouxko4Tb4WUD2zBeGb2BgjdCRzKj7hnc3Jgggmk9eRAWzX3Mt4jpNTnNpW3R3JUkTNL8EA5GVtR6DukknlO4fACJ3Y/C82ZZ9EX8KBH2WPuFjcC2Orane9UehNOBAPIvDG4A9k0nvVkUTGxGGL7dotEkTF0ldY= 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: This commit adds a kernel command line option using which user cfi can be disabled. Signed-off-by: Deepak Gupta --- arch/riscv/kernel/usercfi.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 6e561256bfaf..be08e5bb6e62 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -17,6 +17,8 @@ #include #include +bool disable_riscv_usercfi; + #define SHSTK_ENTRY_SIZE sizeof(void *) bool is_shstk_enabled(struct task_struct *task) @@ -390,6 +392,9 @@ int arch_set_shadow_stack_status(struct task_struct *t, unsigned long status) unsigned long size = 0, addr = 0; bool enable_shstk = false; + if (disable_riscv_usercfi) + return 0; + if (!cpu_supports_shadow_stack()) return -EINVAL; @@ -469,6 +474,9 @@ int arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status) { bool enable_indir_lp = false; + if (disable_riscv_usercfi) + return 0; + if (!cpu_supports_indirect_br_lp_instr()) return -EINVAL; @@ -501,3 +509,16 @@ int arch_lock_indir_br_lp_status(struct task_struct *task, return 0; } + +static int __init setup_global_riscv_enable(char *str) +{ + if (strcmp(str, "true") == 0) + disable_riscv_usercfi = true; + + pr_info("Setting riscv usercfi to be %s\n", + (disable_riscv_usercfi ? "disabled" : "enabled")); + + return 1; +} + +__setup("disable_riscv_usercfi=", setup_global_riscv_enable); From patchwork Mon Mar 10 14:52:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010213 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 0F10CC282EC for ; Mon, 10 Mar 2025 14:53:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3243E28001E; Mon, 10 Mar 2025 10:53:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 28B06280017; Mon, 10 Mar 2025 10:53:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B18D28001E; Mon, 10 Mar 2025 10:53:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DEF38280017 for ; Mon, 10 Mar 2025 10:53:31 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 60EDBB877E for ; Mon, 10 Mar 2025 14:53:32 +0000 (UTC) X-FDA: 83205935064.28.D28FA10 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf14.hostedemail.com (Postfix) with ESMTP id 23178100011 for ; Mon, 10 Mar 2025 14:53:29 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=eUCri1oR; dmarc=none; spf=pass (imf14.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618410; a=rsa-sha256; cv=none; b=gAnzJqiW7WfQT/42LxhzaeJuY7OuAguD3n/wnPwTIz1FEypEWlQO2GhPxCSFgrTBrQ4oY6 WANQipHCagXjrFDE6iotdt1ndii1dd74kpxV6OXFWaNqerDsANtGIUubdKBBGleUdiOp6X TCnhqjBtz1tRI0nmj3ck6mOJRq+g9Pg= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=eUCri1oR; dmarc=none; spf=pass (imf14.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 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=1741618410; 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=U5ByeyW+YvFTHyUcGUYHAQSBVf/eKXKcnHA82UZlOkk=; b=BdhQ3yzekWC+Dk1tj1vhRSgENiBGmlFObda5PO7aQFCTeS+Bc6dXhzuZNekHzDYv0GIvkI spxzFH+OUMHw09z8fBZ8ANAIN6HaFV3N3yAkWJwhrvX1QZIBnA7EHtPKb55e5Va/UL5Tlt +HBmW70A+v51CtyFsIKrpFOcYY90B1c= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22337bc9ac3so82666305ad.1 for ; Mon, 10 Mar 2025 07:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618409; x=1742223209; 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=U5ByeyW+YvFTHyUcGUYHAQSBVf/eKXKcnHA82UZlOkk=; b=eUCri1oRlVQ2NWbGrWCAbEtlYKeIHciTmBjuQZSqipR8XmmTT2cSxxtDBSHA5tjwoU A6hRZ28HKmqWa4EW8D/p+4M6QRRgWVzOooiGa5A0rKifQhUaQPP7aVpIPoulS5+ezsT6 s4JcRfwmy/9cqmWEzueA0tWCfAYdc3VWlpoGsJ1fKoAkNWkEPUjQor9xAm5xhnSLPqjT 5YsyCMXWAX1UvH6PWX/evJLsCJ/z8oS/AIrug820L+dm5yyk/GC1Mhwkg/CtpkH5+1Bj HjeQskyET9HPCaikMr7dDxJFMEho+f7RE9AeUt0HBiJZPYDs8DdeqIRdboHi/GXeemr3 3c5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618409; x=1742223209; 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=U5ByeyW+YvFTHyUcGUYHAQSBVf/eKXKcnHA82UZlOkk=; b=XM1cMCw+LYS9sv1XLtawGqkPu53tJK/lUWpZ06aWXxYDs9/9Lxh5EYK79rXzLEzVOr ifDhRBxjWfiWK0EgHPGhwR+M99vwHKgnY8EQ52/1ox3MpIznKp+s17QuAicZEgz4x1/R eOMtWqWoNF69rYECGjlQKd8WkhHfs701Q4YqxqFA3eAtSaGcQTwQxDhAegXVOgqrK4lA XcunyfDZclpomIl4myiR8wuPq65e4+cu3JobgZV+nb5BKVN70Ps1+TZAxVIWiQFMLaPL nJXxxhHzuylSk0SPofE+dtOXZoNfxOGpVI8I9F4uEslx1mYBnrX/dxsMc/FmZ75Eezxy Y6eA== X-Forwarded-Encrypted: i=1; AJvYcCWn0p4vyn8XnsN8yOjUvHzh1dw/uQK2WITBKBodItCs8IiYhBb/RY2kk7cXYMSSgUXWWOO/9MtSHA==@kvack.org X-Gm-Message-State: AOJu0YwY3+ksYvlk3I0PWHwjrkcHzg2BUXu9xeCUjXbJHalH/9FZNS/s BCditgBdP3dtlf9MpNp5d4DOrbT6/GA0/VybPGBn4Qi1eJXexXah5ord6dIrqPI= X-Gm-Gg: ASbGnctkycU0I8ijwN//kdyOFftEIxcKUQSH3U2PMfGN83F/k92vBsUdZZzaYs5eFjc BHhDH3cFSrtRe4Kqs/2gnvYxqvS2t1SV7CqyVHY9F7hZIGtQ+C8LaqmV12yhMV8hmL1cl/MSO08 DYg5vgmH0NPdloPxCWTN/+/sBCrHVxznypl9k0ZcGnJJ8uGH8IY7SdVjh9U+5fsUFasdmDpk70n nyN+WJUDAhMn0sRw/spPKmXGDhsteuIGvUJ6+pyHfEKnkBCuBz5iMMePjEZdYSRYNEYMAqzCdIp F3IeQGBAz1TcGGi8wEXPb4zk0/V5M8BVnEGoAt/oy/So50IU43tsXQA= X-Google-Smtp-Source: AGHT+IGKXHgNMuKPuSz9mbzSVY6kbhzly1ukgPS10UZrRIAfMtlVXU0y2E7jj8WGEeH+e3hYVRFUmw== X-Received: by 2002:a05:6a00:10d5:b0:736:47a5:e268 with SMTP id d2e1a72fcca58-736eb7b363bmr272521b3a.1.1741618408950; Mon, 10 Mar 2025 07:53:28 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:28 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:45 -0700 Subject: [PATCH v11 23/27] arch/riscv: compile vdso with landing pad MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-23-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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: 23178100011 X-Stat-Signature: gd31x7hphxtwp4s3c6pwr3mckwuyotf3 X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1741618409-562650 X-HE-Meta: U2FsdGVkX1+jOBofCrpu+H53mdlNg7C8eraIk4tlwZNgOQTJofd5FHi6f0gV4mTodCy4G+O8ZGGFaNybj3tXldADOdpc6M1i5vhZU9cCx46WJrk3l3kE9av3XummG9qmnOkguKXjqa9VjZadV+dPi7ej7HWAsuR+bSp7eZFqEWRDeoDc482mDgQcwRqmSU7NndzS5zjbuKWuXyDkuBexVWddtqaw1IbO2/l4lA7qfqZwGh2SEkS3Ulxt2iP7ps9yOz5FzO/96G/grHU7CM3UCOaveKMkDNy+Q1945tjZ1Wzkm04sKgI4x3xQTG5p5sWfVYDMuVmTkznt4fRNIEJ0pc8b7ms5EMPZsYkruj+nnnefUffiiqvScec2L9OCfavpXZofsG4BWvqeAZwA7+j+Rfih4X1C2TQTZipGp5/L8eY7MWwueYn7P/eZloMuFCiT1dKaOjax/wgOzm686VVOQcXzPZ41gO5qeFvXCmXqZsEDC1/60rrjTXNOzhK1vRvgChU+HoKTgK9R3+HqkeYqIOCmugl0SItZom92fRDD3J39chP979FFCR2n7W69AEhSeLBe9giLWAetWfT5jwO1yKkjWwvOCWQG2brEgM+CAf5Y2MCPDTB6IizgFWLIjkhWrj2bT2QMFfpoa/VPC/66F+A9TncZ1U3yJAbcllZuH2Ik1tSGNinYSzFdYCU0EUsHlcSI0DtG+ZwowbHuymj0+vTmSYUCrBONAjWbd+fg2B5IJQtMmnW83jIHzBWydNcgtHQGo4Mpb7HBXp71dZTJeRZx3yVFN5nuyQ16y4Czug+65cijAWWj5GR3MuSICH2Yi7XW6WulURlVeZYl+vjyzDkPDpnn1CrfOLumwqJpO6kPcRkcH3UmYTiv7UTWFQFZazGa5i41C3F7KVKdRtz6pGj7DSxw91JPYBiQCRSLkNfgogebKmVsJ3OW0xw3Ii14Ne9yL6Y32NjebVLg1Aq bFoWozb5 TasoF18SsqQCbdH4YPtip7ZZxrHWXFAXielcQOHhDxkwnmKsaWwI1LsNHkyLVVeKQvwZyAjhJ29RRXu1ujuyyfjR3RaVAlab26NMNENF7Haz+ZFpPG86bNyK4ph78Mh2bt3JgeDo8l0fWNfqn3G2ZkyMS5zZhyaqnx6EKQfwNWN4H2eQ7BCGFqE0YRiI7ZPRmyHoHjC6sRqa0aktQmKyAyWL5FDxnSa3Z+w6Ht42JqdRKSnv53tnwuUzNRugF3/K1rtV8QhQG0rtH1hMy6aKI4VlqJWGAc4wxBhWtDGnbnfgrWgWApUQiY9FTHKYEcmIhr/JVxUWbetMa62MECMEW7q5IRfkVMm9xiPkRf0sf2KB/c65JaB1lChR+U9EZa93lv63x0iR2pdNjLZLzL64LC5Ut2bnLombSdCVBzSR12lHZbWrdmMUXXSSMnaOz6wNESTo6vjH4cd3AdOITUzQk2HIWuXlX7wAc9T++zJoTNnGwKPQA/IQA0biz24uMULbdrJcwwrxykIHd8XQ= 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: From: Jim Shu user mode tasks compiled with zicfilp may call indirectly into vdso (like hwprobe indirect calls). Add landing pad compile support in vdso. vdso with landing pad in it will be nop for tasks which have not enabled landing pad. This patch allows to run user mode tasks with cfi eanbled and do no harm. Future work can be done on this to do below - labeled landing pad on vdso functions (whenever labeling support shows up in gnu-toolchain) - emit shadow stack instructions only in vdso compiled objects as part of kernel compile. Signed-off-by: Jim Shu Signed-off-by: Deepak Gupta --- arch/riscv/Makefile | 7 +++++- arch/riscv/include/asm/assembler.h | 44 +++++++++++++++++++++++++++++++++++ arch/riscv/kernel/vdso/Makefile | 12 ++++++++++ arch/riscv/kernel/vdso/flush_icache.S | 4 ++++ arch/riscv/kernel/vdso/getcpu.S | 4 ++++ arch/riscv/kernel/vdso/rt_sigreturn.S | 4 ++++ arch/riscv/kernel/vdso/sys_hwprobe.S | 4 ++++ 7 files changed, 78 insertions(+), 1 deletion(-) diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 13fbc0f94238..ea9468af2cb4 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -87,10 +87,15 @@ riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZACAS) := $(riscv-march-y)_zacas # Check if the toolchain supports Zabha riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZABHA) := $(riscv-march-y)_zabha +# Check if the toolchain supports Zihintpause extension +riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE) := $(riscv-march-y)_zihintpause + +KBUILD_BASE_ISA = -march=$(shell echo $(riscv-march-y) | sed -E 's/(rv32ima|rv64ima)fd([^v_]*)v?/\1\2/') +export KBUILD_BASE_ISA # Remove F,D,V from isa string for all. Keep extensions between "fd" and "v" by # matching non-v and non-multi-letter extensions out with the filter ([^v_]*) -KBUILD_CFLAGS += -march=$(shell echo $(riscv-march-y) | sed -E 's/(rv32ima|rv64ima)fd([^v_]*)v?/\1\2/') +KBUILD_CFLAGS += $(KBUILD_BASE_ISA) KBUILD_AFLAGS += -march=$(riscv-march-y) diff --git a/arch/riscv/include/asm/assembler.h b/arch/riscv/include/asm/assembler.h index 44b1457d3e95..a058ea5e9c58 100644 --- a/arch/riscv/include/asm/assembler.h +++ b/arch/riscv/include/asm/assembler.h @@ -80,3 +80,47 @@ .endm #endif /* __ASM_ASSEMBLER_H */ + +#if defined(CONFIG_RISCV_USER_CFI) && (__riscv_xlen == 64) +.macro vdso_lpad +lpad 0 +.endm +#else +.macro vdso_lpad +.endm +#endif + +/* + * This macro emits a program property note section identifying + * architecture features which require special handling, mainly for + * use in assembly files included in the VDSO. + */ +#define NT_GNU_PROPERTY_TYPE_0 5 +#define GNU_PROPERTY_RISCV_FEATURE_1_AND 0xc0000000 + +#define GNU_PROPERTY_RISCV_FEATURE_1_ZICFILP (1U << 0) +#define GNU_PROPERTY_RISCV_FEATURE_1_ZICFISS (1U << 1) + +#if defined(CONFIG_RISCV_USER_CFI) && (__riscv_xlen == 64) +#define GNU_PROPERTY_RISCV_FEATURE_1_DEFAULT \ + (GNU_PROPERTY_RISCV_FEATURE_1_ZICFILP) +#endif + +#ifdef GNU_PROPERTY_RISCV_FEATURE_1_DEFAULT +.macro emit_riscv_feature_1_and, feat = GNU_PROPERTY_RISCV_FEATURE_1_DEFAULT + .pushsection .note.gnu.property, "a" + .p2align 3 + .word 4 + .word 16 + .word NT_GNU_PROPERTY_TYPE_0 + .asciz "GNU" + .word GNU_PROPERTY_RISCV_FEATURE_1_AND + .word 4 + .word \feat + .word 0 + .popsection +.endm +#else +.macro emit_riscv_feature_1_and, feat = 0 +.endm +#endif diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile index 9a1b555e8733..daa10c2b0dd1 100644 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile @@ -13,12 +13,18 @@ vdso-syms += flush_icache vdso-syms += hwprobe vdso-syms += sys_hwprobe +ifdef CONFIG_RISCV_USER_CFI +LPAD_MARCH = _zicfilp +endif + # Files to link into the vdso obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o ccflags-y := -fno-stack-protector ccflags-y += -DDISABLE_BRANCH_PROFILING ccflags-y += -fno-builtin +ccflags-y += $(KBUILD_BASE_ISA)$(LPAD_MARCH) +asflags-y += $(KBUILD_BASE_ISA)$(LPAD_MARCH) ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y) @@ -40,6 +46,12 @@ endif CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) $(CC_FLAGS_SCS) CFLAGS_REMOVE_hwprobe.o = $(CC_FLAGS_FTRACE) $(CC_FLAGS_SCS) +# Disable profiling and instrumentation for VDSO code +GCOV_PROFILE := n +KCOV_INSTRUMENT := n +KASAN_SANITIZE := n +UBSAN_SANITIZE := n + # Force dependency $(obj)/vdso.o: $(obj)/vdso.so diff --git a/arch/riscv/kernel/vdso/flush_icache.S b/arch/riscv/kernel/vdso/flush_icache.S index 8f884227e8bc..e4c56970905e 100644 --- a/arch/riscv/kernel/vdso/flush_icache.S +++ b/arch/riscv/kernel/vdso/flush_icache.S @@ -5,11 +5,13 @@ #include #include +#include .text /* int __vdso_flush_icache(void *start, void *end, unsigned long flags); */ SYM_FUNC_START(__vdso_flush_icache) .cfi_startproc + vdso_lpad #ifdef CONFIG_SMP li a7, __NR_riscv_flush_icache ecall @@ -20,3 +22,5 @@ SYM_FUNC_START(__vdso_flush_icache) ret .cfi_endproc SYM_FUNC_END(__vdso_flush_icache) + +emit_riscv_feature_1_and diff --git a/arch/riscv/kernel/vdso/getcpu.S b/arch/riscv/kernel/vdso/getcpu.S index 9c1bd531907f..5c1ecc4e1465 100644 --- a/arch/riscv/kernel/vdso/getcpu.S +++ b/arch/riscv/kernel/vdso/getcpu.S @@ -5,14 +5,18 @@ #include #include +#include .text /* int __vdso_getcpu(unsigned *cpu, unsigned *node, void *unused); */ SYM_FUNC_START(__vdso_getcpu) .cfi_startproc + vdso_lpad /* For now, just do the syscall. */ li a7, __NR_getcpu ecall ret .cfi_endproc SYM_FUNC_END(__vdso_getcpu) + +emit_riscv_feature_1_and diff --git a/arch/riscv/kernel/vdso/rt_sigreturn.S b/arch/riscv/kernel/vdso/rt_sigreturn.S index 3dc022aa8931..e82987dc3739 100644 --- a/arch/riscv/kernel/vdso/rt_sigreturn.S +++ b/arch/riscv/kernel/vdso/rt_sigreturn.S @@ -5,12 +5,16 @@ #include #include +#include .text SYM_FUNC_START(__vdso_rt_sigreturn) .cfi_startproc .cfi_signal_frame + vdso_lpad li a7, __NR_rt_sigreturn ecall .cfi_endproc SYM_FUNC_END(__vdso_rt_sigreturn) + +emit_riscv_feature_1_and diff --git a/arch/riscv/kernel/vdso/sys_hwprobe.S b/arch/riscv/kernel/vdso/sys_hwprobe.S index 77e57f830521..f1694451a60c 100644 --- a/arch/riscv/kernel/vdso/sys_hwprobe.S +++ b/arch/riscv/kernel/vdso/sys_hwprobe.S @@ -3,13 +3,17 @@ #include #include +#include .text SYM_FUNC_START(riscv_hwprobe) .cfi_startproc + vdso_lpad li a7, __NR_riscv_hwprobe ecall ret .cfi_endproc SYM_FUNC_END(riscv_hwprobe) + +emit_riscv_feature_1_and From patchwork Mon Mar 10 14:52:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010214 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 5C751C282DE for ; Mon, 10 Mar 2025 14:53:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 426DC280020; Mon, 10 Mar 2025 10:53:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D4FC280017; Mon, 10 Mar 2025 10:53:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22615280020; Mon, 10 Mar 2025 10:53:34 -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 02AAD280017 for ; Mon, 10 Mar 2025 10:53:33 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6EEC61210F9 for ; Mon, 10 Mar 2025 14:53:34 +0000 (UTC) X-FDA: 83205935148.26.922AA7A Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf17.hostedemail.com (Postfix) with ESMTP id 70E094000C for ; Mon, 10 Mar 2025 14:53:32 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=IhxRCDOY; spf=pass (imf17.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 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=1741618412; 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=9LN1OOVFFK55bIQe9Bj7KSCICvDpdODqLxcVYOIQy28=; b=51+vUYdbi4wjkiNRx92ZNH8KO2vIFkZPfz1NusG782kWAexDVHnhIYW1ZhsW+4DpfD00Hq kYqLu1AyMAItqVsZOaNXQ8gVaNPqX5rA5ZZ3fNVXLtN1cxSvDJxWjl6t9oGnj4PZUkDcNZ o0Fkfaq0/dfaoMjHApAj7gyWVWyZmj8= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=IhxRCDOY; spf=pass (imf17.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618412; a=rsa-sha256; cv=none; b=lTuMnRogGuxeBj49NFZv506k1Uf0donRSj29nal7u2Ufhh1lWjZG7+9N0QqTtSZfN2rJp1 VXo+iKUoxTSVr3L8Ye13hGzC3L3ZI4oEjEs9BbTtCX4PazPMkvXohwhqAhVMdUvSMsRpzc mLPPmZsbWe1DrFKLlPBu2j3ZtSGWKIg= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2239c066347so74061865ad.2 for ; Mon, 10 Mar 2025 07:53:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618411; x=1742223211; 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=9LN1OOVFFK55bIQe9Bj7KSCICvDpdODqLxcVYOIQy28=; b=IhxRCDOYKiBk4ZqD1j/BdhZPpQ839k/f7CE0WjBZZJpSjo0ookkUuZdXhNP2gWdnCw aWQ2t3B9xhzwbO9irBz/1nNgbp2mbXXXKYzmzOa1wYwfdl7G0bGQCs+8YNC1oQ/ScrR+ 9iqA0Wuj2y3rJv7UXmkZPBjqrWhA47ZiUgNFSd8kRiZehgfo7KLiJ7jdDHxevmpG54IS /xuD2NRNHJAsd5JXv9bAOSNR5gzGbAVe820A1IVvxaeDb9xgyFSvF3X6vQ3LYTdX+kOi fzuqTyRQr9qbxiMt9IE+JNSBndytaf36qpUuYWXO/caTXCbnbnbWSRjSjpvOvSn8kF3c nRlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618411; x=1742223211; 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=9LN1OOVFFK55bIQe9Bj7KSCICvDpdODqLxcVYOIQy28=; b=H+95KNQBoLL9Dyd3Lb4dy4bx9cuBf0CkmOnFs6YaMR4QVXPNB7lquKUU53noRmmhlm h9e9AkO9GOfh5fVABO3B5/ay7RAmGrFt62bzoS5Y6bnhS+c6R30JcoJgODqs9oObnd6j DIDWyAfWroQge3q6bz8QQpEEVLIVAup9tqey9AQFXa0uEQglArh+MBj1q/UTK3Onvcpu mkORlI2tn6iZ92VRwBJlrLQSHX4wPgDVZcmzyc8D3UsPK9JgfO4M+QS0ulaZE5SJpQTL 4x1lJ5CgxO73cRoZajSf5m7Rk/5knTlyW8kT86NXRpwV9aESgfZe+rEsc2k0CI1u11xn W2Gw== X-Forwarded-Encrypted: i=1; AJvYcCUrSntJVycH62VA7AV2UC6OoeH7NKAR44ed3M3DvRW3mlOa9MJM9M7jjPWPJXWgKOXFVemm15JXjw==@kvack.org X-Gm-Message-State: AOJu0Yw4a0I5dHP6EV3FUpEPI9ZCIw2C7r+/oJYj5/mUlxTy6KRjOFC8 73eZC4791qieRnGXREhfLtV2gQC3wltofkeSsh+NVMzYkFAeiTRZ/r2ClXidsx0= X-Gm-Gg: ASbGncszcNMr2WR2GFT3cwfi8HpZqGlvOD3rI+q7Ihgtvce0zQdDk+MQhqL5YMxiCM1 5/4ig5R1sgQVwKXSHcoJg0MZTRqd9oiNbpmy0C5lvg3EpnVvCuNeJunU3AlGCby77Avo89cI3OI R1P4B+1v8CVJ1PskbmeaoHBgU+cIYXTIUJAT0d02gdNGXv1Kyn2sYrleVIDn9Hz5VMNHFcMZact F0cbBggggn19GTnmod6Np8cNcBQnLw44K55/nOAmRW3E0KmOP1c2WbvmaXURrcnY1h8T1+mtjwT B8iyagZi99E19x9wONyV8t0wWrsG3T+J3N6/OITF4EIeHAMwr1Fg4DE= X-Google-Smtp-Source: AGHT+IG9tC1WaMP/xC1ABIbEOt50ns/8+sJ1nYsKd4Gr0OatbIpLJiaEKJdeufsJkmLrEp7EYv+TbQ== X-Received: by 2002:a05:6a00:928b:b0:736:5dc6:a14b with SMTP id d2e1a72fcca58-736aaa1ace3mr21470128b3a.13.1741618411393; Mon, 10 Mar 2025 07:53:31 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:31 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:46 -0700 Subject: [PATCH v11 24/27] riscv: create a config for shadow stack and landing pad instr support MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-24-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Server: rspam07 X-Rspamd-Queue-Id: 70E094000C X-Stat-Signature: ztianddcxwjgw1snmukpybr61was8sig X-Rspam-User: X-HE-Tag: 1741618412-990192 X-HE-Meta: U2FsdGVkX18gvxPMLUByI3sotsPQg9ioNiKMEZ08uAUEEBVeO5rdQLPcPGK7HBHfH8Z7ojtxfDiEtqA+Cn4eXlt8C1EXR2ReQCLaBQgEb2dtsuu6maJxQiK7H42GxAv678o8DQxAUqAKOL/vjMsBA7KYx7iuwCxMi702b5YQC6Gyk6ioCJXFXRlHgnv3Yvi24s+f0Y5qV8DvAo9x7fGm+YzP0klvGIBgdTMCmBo2UKIc9CN6sSDC2+2jkyuOPRRXKcrMLpJNphVz+sXNhjw85Z6bYhRx/wqGDVTc/n3v9bkS/aVOhinojjPHnV6gHke8XWEygblX/J34hlH8aMmWLfdwGY1S2tcxFN4zyw1ZpcNccdGnbKUuzB5kO0FJTnKrEGAmWa0Tyg7weiVHHtwti5ShUhV43+DO/zYsMaUvXJgeCIJvtb3zmMAZbwnYDXjbD0KwuJCS7T7GubEkLxeuSsI9YfvvevR+h2Y+xlJrKgbf7sRjqX+ksOkS/fB8VlMxJZIAA3VgXWDozwSpu4M9pfzkOpPixKBUe3lP5GM3cM7UfOkuh9o2t7BmE1u8ive0FAYBGDdZwVD1JdBKsrHKTKZkk8nXYgzTL+atGBJL5qdhcyq9aFvPe41PS6CF05ShVOg/OrDdqmCfapSlXu0od9ETBaztjyxQ3NCwVP9AreWr9QG+zlZNc/7CNRCB2OhXNkGmSkemnY250gLVDv+cTpg2jo62eHX6Hix2jDMwvBQqMVLYODAhDJxIP+FI3HHoJCgB/xkUfvd/iQDOUxY645e4TEcpC0z4HlLgezu3jLO1FlnQp8P5onJdwp2ObunQt4LN12i2otO3viAeDDDwuogzR2qACJrxxwQXAeYZ6zwBKZlgOpMpYLquDFtA+gV8PJji4KT3SDPEEiNohA9zjUTsmK04TtCbs7r/Pq81elnCr4yiQIXFN+9bGbl5GxzTx5EFjKTT7R3kXEPTvKx 8Kmc8KsR uberMqTTZpuxhU9v81Vh9d38Paxxc2tXLtzh0Z5nlS4Rr96fvMi8UJigz8008gWhDxlEolYjQ2pBeAQPEq1ypNQrsKzxbPeFvjTSZk5jYpn/fSMfCWvMa8UcHgqcZqJWdXxl0xKwWBTY+eJEF5rMO7PfkcxdREovd+pvrWWj4zCsBBDaksHbfy+na4/d45+MpjJGKahILN6MwvGiDcyppykL9MbzW0stZRzNwSuOdaWIoBCQI6xHqtr4Xim9vvPnhB6IvN9y6BVvOJ64P5KMydINCyZlOVKEFAeY5Cs5z4JB3VBSdMl3+b7phavLl+KaOUT6URi8VLFqHRT4TqGqko4g30qapNjIEjRK1p62mprciW4KpxmiqnisM55j7T6MxwUlcCzgiatAIvDmY3RV6+QCUcHXO+xLshpEYkpV4UfHk8FkP4W58EoAagwU1gXPrFiRb5+xmGd+FGpIyHXuCVuPsGvtVbyFU03zYJXEDVllWuUo= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This patch creates a config for shadow stack support and landing pad instr support. Shadow stack support and landing instr support can be enabled by selecting `CONFIG_RISCV_USER_CFI`. Selecting `CONFIG_RISCV_USER_CFI` wires up path to enumerate CPU support and if cpu support exists, kernel will support cpu assisted user mode cfi. If CONFIG_RISCV_USER_CFI is selected, select `ARCH_USES_HIGH_VMA_FLAGS`, `ARCH_HAS_USER_SHADOW_STACK` and DYNAMIC_SIGFRAME for riscv. Signed-off-by: Deepak Gupta --- arch/riscv/Kconfig | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 7612c52e9b1e..0a2e50f056e8 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -250,6 +250,26 @@ config ARCH_HAS_BROKEN_DWARF5 # https://github.com/llvm/llvm-project/commit/7ffabb61a5569444b5ac9322e22e5471cc5e4a77 depends on LD_IS_LLD && LLD_VERSION < 180000 +config RISCV_USER_CFI + def_bool y + bool "riscv userspace control flow integrity" + depends on 64BIT && $(cc-option,-mabi=lp64 -march=rv64ima_zicfiss) + depends on RISCV_ALTERNATIVE + select ARCH_HAS_USER_SHADOW_STACK + select ARCH_USES_HIGH_VMA_FLAGS + select DYNAMIC_SIGFRAME + help + Provides CPU assisted control flow integrity to userspace tasks. + Control flow integrity is provided by implementing shadow stack for + backward edge and indirect branch tracking for forward edge in program. + Shadow stack protection is a hardware feature that detects function + return address corruption. This helps mitigate ROP attacks. + Indirect branch tracking enforces that all indirect branches must land + on a landing pad instruction else CPU will fault. This mitigates against + JOP / COP attacks. Applications must be enabled to use it, and old user- + space does not get protection "for free". + default y + config ARCH_MMAP_RND_BITS_MIN default 18 if 64BIT default 8 From patchwork Mon Mar 10 14:52:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010215 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 8B0CBC282DE for ; Mon, 10 Mar 2025 14:53:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 12915280021; Mon, 10 Mar 2025 10:53:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B81A280017; Mon, 10 Mar 2025 10:53:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF0F9280021; Mon, 10 Mar 2025 10:53:37 -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 BDB95280017 for ; Mon, 10 Mar 2025 10:53:37 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3DA8D8119B for ; Mon, 10 Mar 2025 14:53:38 +0000 (UTC) X-FDA: 83205935316.04.62ADA99 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf20.hostedemail.com (Postfix) with ESMTP id 511581C001A for ; Mon, 10 Mar 2025 14:53:36 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=XHpPAoly; spf=pass (imf20.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 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=1741618416; 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=vh4CUvpz/fzJO7m3g4Lrx30VWLQNLgBESiJnDVTGIvg=; b=vj0fi0P5IEsloiyyxaF5EqLksVtMsyy3/Vta+57XmM2rNl/wfBmjRKI7Obh4LP+pJLWz3n 01kAdY2npA64dqgiS9MYwEznJwYYtySpvnxXdmwjE2PF+3nOOhnkizv4euQvT36mnKKu1z bRrc82V1QS7hk2TIQBuJqHk0fC7ExyI= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=XHpPAoly; spf=pass (imf20.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618416; a=rsa-sha256; cv=none; b=n6CKNgbFUd76pMv3s67hV1+IRrx8xEX4eTWlsJJJRPfwMjm0tcVw8bfON32QLI3sucrYxg 9A16gqCqUUiQGQ/+1HiIm+mWMlRv4Roh26x1SbUtAk9gFF0Z8eLx6HS489fstL1pvVCQK+ GOZFSUdp9rTGd0v/UfaSPPa93RfFmOk= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-22548a28d0cso11750415ad.3 for ; Mon, 10 Mar 2025 07:53:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618415; x=1742223215; 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=vh4CUvpz/fzJO7m3g4Lrx30VWLQNLgBESiJnDVTGIvg=; b=XHpPAolysBMj+b4aefVVntOMMH3TwP1IE9OTqWWe7F9oz3fsL2AB1Y1K9bVBzXEcvC QOGmgntziO/iiluhKSLDX0yRiJZusR/mBnQYqWkm3w/owvhnj9mogaenBooGw8iQ2t3G IcPtoeXFrj8EY4gPDSaXb6yONNVcFsj8Xa6rYTNHrNYYJQba7g5IcQUE1qs7cDIj9f1I yk8yATh0SMSGILP3ZOnWkw14uUYo5PLC7loeGvSzUa4d/pVxhtxiOokNZSUlNM1ZFNg8 T/L8Bn6H6d+VB34QFH+0WTbHETYq62BbXoaBfDP2XVgid4Ak49Uq6fs9Hf5G5gcpbkvO iCPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618415; x=1742223215; 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=vh4CUvpz/fzJO7m3g4Lrx30VWLQNLgBESiJnDVTGIvg=; b=JA22xFYl2z7D/q7SgqMU7yAdtMIMXaaBaSxjJ8uxwLT84AvRjig0dkWliJW2h4ocG6 VHMuBX0SwebpEbeIL5Tu+35rcZy/5Biuwi+RsKyVpeY7L4hsu+qRBp3a9TCS/ARDuvir Ms1CMoglc38U69J3Q7FCEXocF4DDWnTu6KVkY+bmNa6pcZb9DkTIvdzsk5rWoq/gm6PQ 29PlRPpLKsnDPN+qRvo/Gg2kDQepFfYzl13XRqPqk+3BeemO56rzCn/wzgYiPLsB6Ecn d18DYYGvtBzWdqjU4zP9S0Ov/AILVHR+0U4dC8qqLn4BxDpouL5pJoFiH8Gr7PbfiILU KmKg== X-Forwarded-Encrypted: i=1; AJvYcCWro6D3s4PoGhWvLtUZ7m6MZN5c0c352rF17wWM9/5t68oCNThEND0ilLeGSEksDr9rdIjhklDOQg==@kvack.org X-Gm-Message-State: AOJu0YzlWfwNON0fUL+30JZdjAM8jZfMbOTFhcOk1IkocH956KP/zsUq YmBvPZkeOG8VZBdt3XwrVQMou9Mvyd2m/Hzs6l5UW/cj7HK4+rziAF/wrfVqrNk= X-Gm-Gg: ASbGncvAEBSu9BJTxnqKkkFR6mqgg1/ycb+aObJsjdPu09fKBoz5wYw7HUwX+DSq64Y uktuG9Y/4s2IYJs5ID4qTb9JNVxEbvS7YTbKJYzDsRfNddJi7WRVHIN6xNCGPLr3Ir5XC2gSd3d iNIbv3dxG7fBLjnTPnOrVe9Gg9iRtIapfQv7GukGfRIcR2TXtyXI+DMCxhOSksJYKi7n/8IQaEV AEx6tgQwOiptKR+ubtIWc+JIkKxLl0Gi+n87BPzVh7KgdBNlrtf+Bqbg2zJAO7OGQS8xscAS7X5 GHEzGpY1P5mlFDh1f7NoX3JkQUbXCW2nbLLVdxSMq5x5wpIdSZIhEqw= X-Google-Smtp-Source: AGHT+IHk6fUGtyziYf/rEaJOxRl/jM9mUkmR597ae136siDXwL+YfMuIUi90ii9WUsyzBw7fk0+kRg== X-Received: by 2002:a05:6a21:158c:b0:1f5:837b:186a with SMTP id adf61e73a8af0-1f5837b19c4mr4882849637.6.1741618413790; Mon, 10 Mar 2025 07:53:33 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:33 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:47 -0700 Subject: [PATCH v11 25/27] riscv: Documentation for landing pad / indirect branch tracking MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-25-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Server: rspam06 X-Rspamd-Queue-Id: 511581C001A X-Stat-Signature: kcn38s165niqnf3z6zkot6sbpdfag15k X-Rspam-User: X-HE-Tag: 1741618416-367165 X-HE-Meta: U2FsdGVkX19BVL+sdoMOIoVyB01Wy7zGCGfR/MIEjDdyjYq3ycWjRZKfAOf1YwzldZgLd4VApww8/ePB3Sti/hHokN14TI8+2UJ0qdKgxf8JevqPPBg09ZE+FQLYjCBm6dd//W2XrejodPUF2XW6FbaLyJ3vfkJoA0HI5t4u+OdfT2Y1WRNdr4FgVBkkkG2sx+cGWrgd2R2l937G+mIRJYNmuXAZf87uAh3Hq4BFvZFc484XBROuxsQK0F3wl6X1pmb/s2zR0IiNp7t3GUUtFaS5vRpK87ikzTSExdHckcLInS5fsUozIF3pHUsE81DZhsZxOFE4RUrFOAeQpV1lu1ZQFW4uDSsR7TmxPZHA1k6DIpzUYqo19Fw11Uy772oRpHe2xBntfH0WGG/sIdgC+jrawF/MSq8EUBVkbv8z17pKiMlxHlzsmhI156uCdGMWGm6EJEU+Wr951MRL253tfCSF3MT83QkgWvA0uEwa+f2QEV3PoDof+kGnLOAfmaKDOMUBu1atxOYYlOf/8pBWC8AVlwQEWyfQP3GdlRrDLQ0OsuOzch8hfWq3iRc9mnLpXqKlQhypfQ3+pUzWhjtyzRtGaEIm5/SsBVP67KCQFOZPmCS4fq6jJhkrTXCQWobFsyM5hPvZ2Hs4WLkttbMeE4I2yl7Kstuk5KDKRkKLvjNLq0F0lN9ltERG2/mXSpVTA4ZAbsKEHV4P+BiT11dnGkdps2VU/WGG61butJ5ldNRyMgnogtMoUV2aM2gaoyoePg30JQTADZ5q/hkxV4lv0vDQ7d6o9GSVnumIO2qCTB611LCxY2r9PrJ99PyoT7NPKpWoEzMONzPJ8HGOMF3AohwT8s+Y4QC0MiIUszvDEmBefXx0bBrtBHg/n0vOJ5oDOijrw8TF84/28BZaEc+XLQ7VSgMwEFgPd8cbJn2kHA+6tEeD8EXIqDXqt5ajW33A9kWsHLKVTT1dpVioPOB G4kAFyYc 47GfYubD9mbJ9QNpasiPCjB5rDSMMa/WKkxTiB9Vq8kWKK+RN6FTXT5svgtnQfViw31GeCsM9aCBa1uJi8jFi+KeeJRe4f7ty1KR92NszBAijHb7E0KutJxs+REc8vSbQCsfP/c68ZHzXK4ehfLdyfRJmK8Y7T9GOigY1m9OV+6xwHySr9l3TeC7tAfQMgBBAqG7gKxJRikrkFzWVfp5jYSeKJBVvAMRwwPGwGNi3K5rIRAcaJwwzXytSRUZsv/bvOV0PZKSuDYJrKlhCmaSZyMveM/ePVex+rxOsId3Y4rKkwKWO0jBoQwj9kXQeLTqrXXAD9HbtiXx7ELRkjypdYdj0nmS+6WXvnfKPhnWbxxHvhr4Y5z0/lyQGxgK8WshsguNV3f/cXX6lsppvMDslrTqpAjK6RDmNKAjt2z1WuDpyj/iT5uUB6ks4YKfH40uxorj8xfiwN00IVi9B0FGjJFBTYw== 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: Adding documentation on landing pad aka indirect branch tracking on riscv and kernel interfaces exposed so that user tasks can enable it. Signed-off-by: Deepak Gupta --- Documentation/arch/riscv/index.rst | 1 + Documentation/arch/riscv/zicfilp.rst | 115 +++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/Documentation/arch/riscv/index.rst b/Documentation/arch/riscv/index.rst index eecf347ce849..be7237b69682 100644 --- a/Documentation/arch/riscv/index.rst +++ b/Documentation/arch/riscv/index.rst @@ -14,6 +14,7 @@ RISC-V architecture uabi vector cmodx + zicfilp features diff --git a/Documentation/arch/riscv/zicfilp.rst b/Documentation/arch/riscv/zicfilp.rst new file mode 100644 index 000000000000..a188d78fcde6 --- /dev/null +++ b/Documentation/arch/riscv/zicfilp.rst @@ -0,0 +1,115 @@ +.. SPDX-License-Identifier: GPL-2.0 + +:Author: Deepak Gupta +:Date: 12 January 2024 + +==================================================== +Tracking indirect control transfers on RISC-V Linux +==================================================== + +This document briefly describes the interface provided to userspace by Linux +to enable indirect branch tracking for user mode applications on RISV-V + +1. Feature Overview +-------------------- + +Memory corruption issues usually result in to crashes, however when in hands of +an adversary and if used creatively can result into variety security issues. + +One of those security issues can be code re-use attacks on program where adversary +can use corrupt function pointers and chain them together to perform jump oriented +programming (JOP) or call oriented programming (COP) and thus compromising control +flow integrity (CFI) of the program. + +Function pointers live in read-write memory and thus are susceptible to corruption +and allows an adversary to reach any program counter (PC) in address space. On +RISC-V zicfilp extension enforces a restriction on such indirect control +transfers: + +- indirect control transfers must land on a landing pad instruction ``lpad``. + There are two exception to this rule: + + - rs1 = x1 or rs1 = x5, i.e. a return from a function and returns are + protected using shadow stack (see zicfiss.rst) + + - rs1 = x7. On RISC-V compiler usually does below to reach function + which is beyond the offset possible J-type instruction:: + + auipc x7, + jalr (x7) + + Such form of indirect control transfer are still immutable and don't rely + on memory and thus rs1=x7 is exempted from tracking and considered software + guarded jumps. + +``lpad`` instruction is pseudo of ``auipc rd, `` with ``rd=x0`` and +is a HINT nop. ``lpad`` instruction must be aligned on 4 byte boundary and +compares 20 bit immediate withx7. If ``imm_20bit`` == 0, CPU don't perform any +comparision with ``x7``. If ``imm_20bit`` != 0, then ``imm_20bit`` must match +``x7`` else CPU will raise ``software check exception`` (``cause=18``) with +``*tval = 2``. + +Compiler can generate a hash over function signatures and setup them (truncated +to 20bit) in x7 at callsites and function prologues can have ``lpad`` with same +function hash. This further reduces number of program counters a call site can +reach. + +2. ELF and psABI +----------------- + +Toolchain sets up :c:macro:`GNU_PROPERTY_RISCV_FEATURE_1_FCFI` for property +:c:macro:`GNU_PROPERTY_RISCV_FEATURE_1_AND` in notes section of the object file. + +3. Linux enabling +------------------ + +User space programs can have multiple shared objects loaded in its address space +and it's a difficult task to make sure all the dependencies have been compiled +with support of indirect branch. Thus it's left to dynamic loader to enable +indirect branch tracking for the program. + +4. prctl() enabling +-------------------- + +:c:macro:`PR_SET_INDIR_BR_LP_STATUS` / :c:macro:`PR_GET_INDIR_BR_LP_STATUS` / +:c:macro:`PR_LOCK_INDIR_BR_LP_STATUS` are three prctls added to manage indirect +branch tracking. prctls are arch agnostic and returns -EINVAL on other arches. + +* prctl(PR_SET_INDIR_BR_LP_STATUS, unsigned long arg) + +If arg1 is :c:macro:`PR_INDIR_BR_LP_ENABLE` and if CPU supports ``zicfilp`` +then kernel will enabled indirect branch tracking for the task. Dynamic loader +can issue this :c:macro:`prctl` once it has determined that all the objects +loaded in address space support indirect branch tracking. Additionally if there +is a `dlopen` to an object which wasn't compiled with ``zicfilp``, dynamic +loader can issue this prctl with arg1 set to 0 (i.e. +:c:macro:`PR_INDIR_BR_LP_ENABLE` being clear) + +* prctl(PR_GET_INDIR_BR_LP_STATUS, unsigned long arg) + +Returns current status of indirect branch tracking. If enabled it'll return +:c:macro:`PR_INDIR_BR_LP_ENABLE` + +* prctl(PR_LOCK_INDIR_BR_LP_STATUS, unsigned long arg) + +Locks current status of indirect branch tracking on the task. User space may +want to run with strict security posture and wouldn't want loading of objects +without ``zicfilp`` support in it and thus would want to disallow disabling of +indirect branch tracking. In that case user space can use this prctl to lock +current settings. + +5. violations related to indirect branch tracking +-------------------------------------------------- + +Pertaining to indirect branch tracking, CPU raises software check exception in +following conditions: + +- missing ``lpad`` after indirect call / jmp +- ``lpad`` not on 4 byte boundary +- ``imm_20bit`` embedded in ``lpad`` instruction doesn't match with ``x7`` + +In all 3 cases, ``*tval = 2`` is captured and software check exception is +raised (``cause=18``) + +Linux kernel will treat this as :c:macro:`SIGSEV`` with code = +:c:macro:`SEGV_CPERR` and follow normal course of signal delivery. From patchwork Mon Mar 10 14:52:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010216 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 D4AECC282DE for ; Mon, 10 Mar 2025 14:53:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 51120280022; Mon, 10 Mar 2025 10:53:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 49B15280017; Mon, 10 Mar 2025 10:53:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EC81280022; Mon, 10 Mar 2025 10:53:39 -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 07416280017 for ; Mon, 10 Mar 2025 10:53:39 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6F7A51CAF02 for ; Mon, 10 Mar 2025 14:53:39 +0000 (UTC) X-FDA: 83205935358.11.7E10BFC Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf08.hostedemail.com (Postfix) with ESMTP id 71570160002 for ; Mon, 10 Mar 2025 14:53:37 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=EV8TsrVl; dmarc=none; spf=pass (imf08.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.181 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=1741618417; 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=tdDNQkSVTKtNTxsV0uSmAnlAiDQNW7ggaTdWphzDp8I=; b=5hMFLBhyGr1Hi+gbe5NcXZqZAqatw+zTX5mbFnZzEpwNqyF7SU+zzlrnDGY3pUTaX80T31 0PbCuCQ5xNWqw/KhExkwKIQ5gCDaNu5DxU9ohGSZ+X2Gv0ieP0pxxkOmEM2xn+Gu0b/IFg a64q7eI6NJHwEj5YGd7zguxbBvfS+/Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618417; a=rsa-sha256; cv=none; b=Tp6eHl0Qj3uqm/m51hbLVBX0jyIrLv4O9G56mZzVwFbXk77Zq4tCeA5mThTO/d1pxG6TQu FFTWcGJIbsz5436q+9RodXkkdCq+q3OIZr0zQdj/t9N/meYBUCMjkgGBIlb3Q/M+4wNHMR TrwLIIQid1fWgPAtTvOkuznxzjUbYyE= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=EV8TsrVl; dmarc=none; spf=pass (imf08.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2234e4b079cso76891835ad.1 for ; Mon, 10 Mar 2025 07:53:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618416; x=1742223216; 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=tdDNQkSVTKtNTxsV0uSmAnlAiDQNW7ggaTdWphzDp8I=; b=EV8TsrVld1YX+fX8CxpHciwMx2JfFrjZGMcJi08hdcIWfGdAfkrISZsd/62f/f65ZA auq6KT60oiyLUk8rbiOY9HPVAh9doTc6GIIWtM6Y78JlBbD8F92PncGdC9Tye1eonf0s iaTgo/htc1IFJaA+od9j+eEZuIgHR17UeHMKaFcXVfDgn0zFj8bzmgvC4krj1vRN5PIN 7XhxpkH5hHZ0ZEvWKvWzKW/5kaZiJSgsto1Nx9/fsPkPUTdDp7gcIerjndei7j4UY75k qXBf0cMc2XlZ1NL8kFdnxhGE7w8RIegS9R8naz+c1P7uacnH2bI0H3Pu0nU3OaR82PzZ s+gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618416; x=1742223216; 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=tdDNQkSVTKtNTxsV0uSmAnlAiDQNW7ggaTdWphzDp8I=; b=vsKrioEb9fHUjRXhXXwSpFtMrb7Id8hS+M3+FiYEolAnjiGTyfS7vqYkEOK1eo7z3x 2GFoqllXxHDXLyBU1AbCmvHA1c4/F8GN9EYPlLH9FJkoDdVIl0icisXcVQBkVocdW+gg LRJYmsQAd39yjL646sIqvL+7QjBCWD2IA63vyfWdKeFRJ5u7Gztoz5j4sPEIYnZgufRD qMHA9hwniBH4UzLBtBuMVXq+0KT4mbjkI5CzUMr/979/KJWKNqDSfb9UQOIs7ngWn+b5 qgWuzSZOWpYHBMNeUrt85oVSFHWcCtjCkY+y18Gk6P6i8XEJhSqQQ+olXTcfUDfP4IEE 1zTg== X-Forwarded-Encrypted: i=1; AJvYcCWixODvYIMrw60u7d8rol2w9TQnvCWL9pIuYFo9gGvaxbLyjUGPV5mkCPxT/NgrYZd8aZ0Zhcg2Sg==@kvack.org X-Gm-Message-State: AOJu0Yx3QFMsfVdfVIOz2gTbgfNfZ7Qsw3dfttedIfNYrH+vH6CFNNr6 1QTJvGhdIanhJfBbC1a6Zc3Vi7sREjcrNdRzMor5AF+oKFBNYhlTAq5+VQLsDqU= X-Gm-Gg: ASbGncs5TuN+0l132oZA9g21KakX/KNStnUIBk5TDUf53O4TcR8LjfjmHy+9sbQQXB1 nwJNDKjZi1JadBzPBkvfYy3zw4vmpQOOWicGhnDtCNam7qVaYt4XM1ihhTc6Eqhu9sF8xrrVnZ3 KtbD+eCUyKv6GzyEZdkSiAvj1U7n92jSfoeAEv6XbyRYAiRwxIf2/dRVImjwGtL/i/pfChHFD9f CLjXO8AHHsv9vSGp1H1uvkiAeFTsbhnag6t9SMBlEDGaoYtRLx9AjuWZFisXcHfxomiQmLh8dqn EoiukDEY+d5t/MoAuqn1BlB/MuCyZ2OvAeeNajZ4XBl9nwBeNx9wETA= X-Google-Smtp-Source: AGHT+IFaFODVJO35zmAo4CgY/g0ssVNrnGer/dAkzpFZFHLuf8O1kgqUgyNRnEx4GJyvPtN1uJ38Mg== X-Received: by 2002:a05:6a21:4606:b0:1f5:7df9:f147 with SMTP id adf61e73a8af0-1f57df9f49dmr7386102637.40.1741618416216; Mon, 10 Mar 2025 07:53:36 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:35 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:48 -0700 Subject: [PATCH v11 26/27] riscv: Documentation for shadow stack on riscv MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-26-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Stat-Signature: dfcdkdps773b1ubyoofkeh3wk94ua9tm X-Rspam-User: X-Rspamd-Queue-Id: 71570160002 X-Rspamd-Server: rspam04 X-HE-Tag: 1741618417-968720 X-HE-Meta: U2FsdGVkX1/XBXM/EIdaXqQGVoNhVIpCddGBGF+RIzoBugRRlPK7L+zfCvgCWx+KacbpZud5Yt7UNSqWIjSOzU+Nm+/UaAiyz+qnhsbmezlCIeMa45XcYgK+/zoQxPjG2sc3/C4YvzXaQT+ocCvcwjtKEl7LUdmYzs+DBs9Hv43oCLl8htX/wRlm9vfvEj9feccrRzkKq5dz5Enu75nhlrJC1OGD7fRrBIwqC86TqSkT2fjbQEcBBm89vq5BC0KILWcYuzZocbv+oBjIlBF1lB37mHVvPBzp/JjCaX0fJ2OYdjIkmnCDhOlmMl0GtoagDOEvw1Xaw77CN9ltCd17wasOmSN9A69XO1ZyMdAua9emTkCBt8W8XefmO0wG5YTlTqGJ5m4qocDeM31M/ofoqrdyxeUOsK+m1vHMNytjFuznltprDgNTPJ7r3Rw/no6XLbic6/4PJJol7jX5UbqIVPqpr1MXSaX5NiEoFR8aqrSOoQomsizL6Db+5NbphEetgQFvVX1vruuxkuRtSftbPpuO12Ln/uvdTchk2duS9+Gbonx0C9lXOO0kJSkXvVFGbX/RkuAqBrbgyL3H6URQPvnIRtXXR3LDXQlOeFWWEkuzQRohQAZx6TN2+OM5SbKAlDnf/WLUfNCoZ3+NubcQVRR13SmgCJf2nLOmk2oKNcFSYx9IIH4JnFyfUMCcC59FX8YESm/NwwLBzJXorXMjyzcPkqcTLiPeY3LR/INhZUbrGTEfSs4NzSmzAgqIk4eDSs8WAZbLbmgkIJREPz069w1nAdtkvjhx9PBqY8vNGvjIIptHkkiULO6ZMCLFwOStye/IHp033LLEXREAHgZWJH/2TEzt//i6jmImkkPoC51ZElF5HqNhlntathvn7nJ3q2j+YjoTM9f5ME3o+djUpUKL6bSM1CCAKN4t8Qihu/GspPRvOIT1Typf/3P1N1mV0ehYVFz8NG0nkTMDj3Z UVfKWBkZ SDAOCitIXsSlLr0xmu36471JYS3hielkiJ0fE7u4aLqbC5bh8lAoo6GQEGkdM4SQfXLOqOwSUUkuuJlqiorRt6MwJANze0JBCZld/rxOtzvVYgwldTFUCi99/IBCWhrF08umakBdYPadUXfdO+5xDhHZmX3Hfusxe/t6vaoypWN1rqOsKV+Cczgi9a90rJbfhTnzf2hRjLS+KlaKa5mue9E7NAq4zjUeCwqwYwsb5/wluYz4uQW7BWOvnNbv0pNzhL2LcA9HKBBtftSNU8ghA0EefhsADHp6ts02whlFD9OnlNUIncDEIuqrU1saOJfC6L1ii2yzFKO1Fo0ArQAF/NC+Qm+ubAnthIjuxkbKDylVpKZ7y3lag6kz4abexvbrlgSZLeX/f3ZeNxEHOI1FHSSaal6BBe4iQ+yiFnGGDhaevvgQydaUJ9wAT8md4ab1Yalq4sTKU5p2J9H4= 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: Adding documentation on shadow stack for user mode on riscv and kernel interfaces exposed so that user tasks can enable it. Signed-off-by: Deepak Gupta --- Documentation/arch/riscv/index.rst | 1 + Documentation/arch/riscv/zicfiss.rst | 176 +++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) diff --git a/Documentation/arch/riscv/index.rst b/Documentation/arch/riscv/index.rst index be7237b69682..e240eb0ceb70 100644 --- a/Documentation/arch/riscv/index.rst +++ b/Documentation/arch/riscv/index.rst @@ -15,6 +15,7 @@ RISC-V architecture vector cmodx zicfilp + zicfiss features diff --git a/Documentation/arch/riscv/zicfiss.rst b/Documentation/arch/riscv/zicfiss.rst new file mode 100644 index 000000000000..5ba389f15b3f --- /dev/null +++ b/Documentation/arch/riscv/zicfiss.rst @@ -0,0 +1,176 @@ +.. SPDX-License-Identifier: GPL-2.0 + +:Author: Deepak Gupta +:Date: 12 January 2024 + +========================================================= +Shadow stack to protect function returns on RISC-V Linux +========================================================= + +This document briefly describes the interface provided to userspace by Linux +to enable shadow stack for user mode applications on RISV-V + +1. Feature Overview +-------------------- + +Memory corruption issues usually result in to crashes, however when in hands of +an adversary and if used creatively can result into variety security issues. + +One of those security issues can be code re-use attacks on program where +adversary can use corrupt return addresses present on stack and chain them +together to perform return oriented programming (ROP) and thus compromising +control flow integrity (CFI) of the program. + +Return addresses live on stack and thus in read-write memory and thus are +susceptible to corruption and allows an adversary to reach any program counter +(PC) in address space. On RISC-V ``zicfiss`` extension provides an alternate +stack termed as shadow stack on which return addresses can be safely placed in +prolog of the function and retrieved in epilog. ``zicfiss`` extension makes +following changes: + +- PTE encodings for shadow stack virtual memory + An earlier reserved encoding in first stage translation i.e. + PTE.R=0, PTE.W=1, PTE.X=0 becomes PTE encoding for shadow stack pages. + +- ``sspush x1/x5`` instruction pushes (stores) ``x1/x5`` to shadow stack. + +- ``sspopchk x1/x5`` instruction pops (loads) from shadow stack and compares + with ``x1/x5`` and if un-equal, CPU raises ``software check exception`` with + ``*tval = 3`` + +Compiler toolchain makes sure that function prologue have ``sspush x1/x5`` to +save return address on shadow stack in addition to regular stack. Similarly +function epilogs have ``ld x5, offset(x2)`` followed by ``sspopchk x5`` to +ensure that popped value from regular stack matches with popped value from +shadow stack. + +2. Shadow stack protections and linux memory manager +----------------------------------------------------- + +As mentioned earlier, shadow stack get new page table encodings and thus have +some special properties assigned to them and instructions that operate on them +as below: + +- Regular stores to shadow stack memory raises access store faults. This way + shadow stack memory is protected from stray inadvertant writes. + +- Regular loads to shadow stack memory are allowed. This allows stack trace + utilities or backtrace functions to read true callstack (not tampered). + +- Only shadow stack instructions can generate shadow stack load or shadow stack + store. + +- Shadow stack load / shadow stack store on read-only memory raises AMO/store + page fault. Thus both ``sspush x1/x5`` and ``sspopchk x1/x5`` will raise AMO/ + store page fault. This simplies COW handling in kernel During fork, kernel + can convert shadow stack pages into read-only memory (as it does for regular + read-write memory) and as soon as subsequent ``sspush`` or ``sspopchk`` in + userspace is encountered, then kernel can perform COW. + +- Shadow stack load / shadow stack store on read-write, read-write-execute + memory raises an access fault. This is a fatal condition because shadow stack + should never be operating on read-write, read-write-execute memory. + +3. ELF and psABI +----------------- + +Toolchain sets up :c:macro:`GNU_PROPERTY_RISCV_FEATURE_1_BCFI` for property +:c:macro:`GNU_PROPERTY_RISCV_FEATURE_1_AND` in notes section of the object file. + +4. Linux enabling +------------------ + +User space programs can have multiple shared objects loaded in its address space +and it's a difficult task to make sure all the dependencies have been compiled +with support of shadow stack. Thus it's left to dynamic loader to enable +shadow stack for the program. + +5. prctl() enabling +-------------------- + +:c:macro:`PR_SET_SHADOW_STACK_STATUS` / :c:macro:`PR_GET_SHADOW_STACK_STATUS` / +:c:macro:`PR_LOCK_SHADOW_STACK_STATUS` are three prctls added to manage shadow +stack enabling for tasks. prctls are arch agnostic and returns -EINVAL on other +arches. + +* prctl(PR_SET_SHADOW_STACK_STATUS, unsigned long arg) + +If arg1 :c:macro:`PR_SHADOW_STACK_ENABLE` and if CPU supports ``zicfiss`` then +kernel will enable shadow stack for the task. Dynamic loader can issue this +:c:macro:`prctl` once it has determined that all the objects loaded in address +space have support for shadow stack. Additionally if there is a +:c:macro:`dlopen` to an object which wasn't compiled with ``zicfiss``, dynamic +loader can issue this prctl with arg1 set to 0 (i.e. +:c:macro:`PR_SHADOW_STACK_ENABLE` being clear) + +* prctl(PR_GET_SHADOW_STACK_STATUS, unsigned long *arg) + +Returns current status of indirect branch tracking. If enabled it'll return +:c:macro:`PR_SHADOW_STACK_ENABLE`. + +* prctl(PR_LOCK_SHADOW_STACK_STATUS, unsigned long arg) + +Locks current status of shadow stack enabling on the task. User space may want +to run with strict security posture and wouldn't want loading of objects +without ``zicfiss`` support in it and thus would want to disallow disabling of +shadow stack on current task. In that case user space can use this prctl to +lock current settings. + +5. violations related to returns with shadow stack enabled +----------------------------------------------------------- + +Pertaining to shadow stack, CPU raises software check exception in following +condition: + +- On execution of ``sspopchk x1/x5``, ``x1/x5`` didn't match top of shadow + stack. If mismatch happens then cpu does ``*tval = 3`` and raise software + check exception. + +Linux kernel will treat this as :c:macro:`SIGSEV`` with code = +:c:macro:`SEGV_CPERR` and follow normal course of signal delivery. + +6. Shadow stack tokens +----------------------- +Regular stores on shadow stacks are not allowed and thus can't be tampered +with via arbitrary stray writes due to bugs. Method of pivoting / switching to +shadow stack is simply writing to csr ``CSR_SSP`` changes active shadow stack. +This can be problematic because usually value to be written to ``CSR_SSP`` will +be loaded somewhere in writeable memory and thus allows an adversary to +corruption bug in software to pivot to an any address in shadow stack range. +Shadow stack tokens can help mitigate this problem by making sure that: + +- When software is switching away from a shadow stack, shadow stack pointer + should be saved on shadow stack itself and call it ``shadow stack token`` + +- When software is switching to a shadow stack, it should read the + ``shadow stack token`` from shadow stack pointer and verify that + ``shadow stack token`` itself is pointer to shadow stack itself. + +- Once the token verification is done, software can perform the write to + ``CSR_SSP`` to switch shadow stack. + +Here software can be user mode task runtime itself which is managing various +contexts as part of single thread. Software can be kernel as well when kernel +has to deliver a signal to user task and must save shadow stack pointer. Kernel +can perform similar procedure by saving a token on user shadow stack itself. +This way whenever :c:macro:`sigreturn` happens, kernel can read the token and +verify the token and then switch to shadow stack. Using this mechanism, kernel +helps user task so that any corruption issue in user task is not exploited by +adversary by arbitrarily using :c:macro:`sigreturn`. Adversary will have to +make sure that there is a ``shadow stack token`` in addition to invoking +:c:macro:`sigreturn` + +7. Signal shadow stack +----------------------- +Following structure has been added to sigcontext for RISC-V:: + + struct __sc_riscv_cfi_state { + unsigned long ss_ptr; + }; + +As part of signal delivery, shadow stack token is saved on current shadow stack +itself and updated pointer is saved away in :c:macro:`ss_ptr` field in +:c:macro:`__sc_riscv_cfi_state` under :c:macro:`sigcontext`. Existing shadow +stack allocation is used for signal delivery. During :c:macro:`sigreturn`, +kernel will obtain :c:macro:`ss_ptr` from :c:macro:`sigcontext` and verify the +saved token on shadow stack itself and switch shadow stack. From patchwork Mon Mar 10 14:52:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010217 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 23EE0C282EC for ; Mon, 10 Mar 2025 14:54:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B3EE3280023; Mon, 10 Mar 2025 10:53:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AEE20280017; Mon, 10 Mar 2025 10:53:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 91C3A280023; Mon, 10 Mar 2025 10:53:41 -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 6E691280017 for ; Mon, 10 Mar 2025 10:53:41 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id DB376141153 for ; Mon, 10 Mar 2025 14:53:41 +0000 (UTC) X-FDA: 83205935442.11.48BB728 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf14.hostedemail.com (Postfix) with ESMTP id DE17B10000C for ; Mon, 10 Mar 2025 14:53:39 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Fzjoa4WX; spf=pass (imf14.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 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=1741618420; 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=ruj/JnwPHtkrEOpCEVLVNX7RrlNYJUu0NWWeo3U6Fsk=; b=K6gF7G3P5Hq9QBebyyGrshnHlqv31eVoIWzksWJDlNFP4CxBef1ASiPLO/pnOzqkc0q+Tm rNIVsWA87MvYA6DekzfgzwwYmAvdzfbKNb2GWE8LbIne8IZEID8s4Y5VEW37zfBk5z1vnp C/w1bFzRRUJtKZc2WA2wrRccNK8voOU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Fzjoa4WX; spf=pass (imf14.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618420; a=rsa-sha256; cv=none; b=8Pb8Zia6BFbNGQfV1AB25Nj9e4i3VDChr2UW7pt9mGmCgiXk1xvPLJ7nY1s5T9hZjwjK+g fA6u6y2xK4YCLqOX47LzWxjIQYThA4YQvwMjbR1IjyRzCBMiB+tx9WC1+Hk23sdEIlwFKY LoO4eRunf9eeVOV9bCkosa/2vzLoQQU= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2255003f4c6so30455095ad.0 for ; Mon, 10 Mar 2025 07:53:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618419; x=1742223219; 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=ruj/JnwPHtkrEOpCEVLVNX7RrlNYJUu0NWWeo3U6Fsk=; b=Fzjoa4WXPx2lUD08jaiXmkJlpkKA5kWIv8R3RnXGqOaVMDQkkOq9vYfrvmtOOEBarh 86c/TJcer/Y+9qZm7ywBXP5MINT2Xo8Z8ueQSO7VXhW0jBWR+reguZBGRyrMvuNZOLG7 TP4+s/Gx/xy8N+Mm/eRO/Z8zf9rrMNVuqhudr4XCKe8aswynizIQQ6RNbmhNZO1n8LPI JMFSYpgq1EJHi1gF3zjFkWSyKd01ssGo//6gvDUZNMVE6rKW6ppf3K6d0bSWbt/Mkvq/ uZgu6Tx7tUDSLlaAbza5xWNzLulkaKSF0BfB41ukmLWsYGfbL/OnScdfUTd7rgjb232D jxRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618419; x=1742223219; 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=ruj/JnwPHtkrEOpCEVLVNX7RrlNYJUu0NWWeo3U6Fsk=; b=W2TfknSzymWnnu4pCqnxvoAVhQcGWz3bwCQqlfsJD1efJeP1FeSc2cY8SMJ1TfIx85 MoA15KlmNt9dZ+D3EeSgoxEbHt99neCOWVxr7yBXHVSsAap6hR3cC7KkBNXaccnlmHtR vL52ZzmJiG2+0aw3IVIyO4sB6LRr7OBo6qwRhluGqVchmzSv9OCaQuXPRa456zwspEj+ tgqmVlf3lZ7VnBjPEEpiK5Tkck28Dwf8SMK5pvR6HHDqQohQSLGLL0se+Ll19j2Z5zqT zl+DNiFPfrJwqklI1slJaS1rjnuJlbDTFdoSkREL95E1xjfpy/QzNJpHgjDGXqNs+INB gJYg== X-Forwarded-Encrypted: i=1; AJvYcCUQPdrzMp9CDiQktpDg3W1kN8hL2EXIJwzVdKfFYFfm0SJXWOd9guaUcqfMc2Boa+rbSuL+JSKIgQ==@kvack.org X-Gm-Message-State: AOJu0Yz2PecxJAKl/9TfWeQZMybRt05cfC1fuvR1/jJtPgCoydoaoy4/ regN5ydYrfiM2lnY+BR6t1P4Fkyi+sQFuaYJOEfswTiY1jtVCuFdg/APlINAj8Q= X-Gm-Gg: ASbGncui4Eylrg0hmRpfO7hyxrjAu4cCSu4yc+nzpkGl7iRDs119Zc+KQsjMOLH8B99 iNr4sjqA3TytO9QTZ3AW7rUtPvn4OziKsNlMorM98SwWwePqqLm9tHxMztb1zuMWg4XxDrIraqO TMwFKst/rEsyX+7XskIdYjW0Gu4BERMNURUgEADLNA482Kv5ZiEFxn9E5n7O0nDj/VRJOl6Ssw0 dBSvEVLvyOp2M6erEtlFj45dMFoVAbcU/DYNsE8f/yB/1P6VMBUSIpSIBp7Wf8NMzxOjmoypyMb JnzrmA+MXo0vmmcEYIJWnXKX3MNDjWXXJVX8pzDvMb79BCz9Od5oRMs= X-Google-Smtp-Source: AGHT+IGv7tM2PHL9ys+s6t6SEB0A82+OsRTHqO1WWLNqv0N4xUl6sYQq+4x8MhxgrmcY2aWh78Ovvw== X-Received: by 2002:a05:6a00:1ad2:b0:730:4c55:4fdf with SMTP id d2e1a72fcca58-736eb7ca1f6mr271137b3a.7.1741618418779; Mon, 10 Mar 2025 07:53:38 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:38 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:49 -0700 Subject: [PATCH v11 27/27] kselftest/riscv: kselftest for user mode cfi MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-27-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Stat-Signature: imtee34zxuwwyzt1t6w6wzynmfaygqbu X-Rspam-User: X-Rspamd-Queue-Id: DE17B10000C X-Rspamd-Server: rspam01 X-HE-Tag: 1741618419-371867 X-HE-Meta: U2FsdGVkX1+Vuv+JakTiJ6SRxyFclnOc7QsWAvRfIyF8z5B22HqSncx/rX5lYECuaQRd9Z4nbgMC5Ksg7QTuvn3SBfddndzpddKDS2nOOVyo7SPAGf7K+u65iIOdSWfT4b4wn9OW6VGEHciiSLqMGDPCZM+QVLyT+oYb8c7AVNSl46ZrosgE0IhyU7nsOlsEVXxIrwTluLDrlMzaLGkI965gDjpFDKov95QKF/tMmRAQqEg+g6py4fVA97Z5IpayqVF8J1b3jP4ZoK8gL+uWZbxRbSBorESFcRX6nU/ZrNmhIcv5Y4VVgHhLgf653KGgu3tYbeRjTErhTZxaH42t8FttvfqN6KamFq5S2rOXWN1X7bJAB6LI8CCBBwWtvcyfxXSW94/BVKfNCJJIyffa5fXe2dI6fw1ZtlHaLT7gtufeCZEB6YQ+LNfkKMx0X4nvgEnCT1brBggcaYi6djj0/zRRerzOTB/qeLhDh0G3AwAHQYPXUb3KLHTdxtSv9A129FF1POIflKiwJFSJVkP+fhcSZBv0NfIgsvd3ldNKLa9PDQNIN0d/qwdHXzxyg51aI8B9tEZALbA37EWOO3o3I3OaUzFN7igpe02Gj9h99NgnDqq6dfw+MJtiIdgG07K7wwzjF+m0kd/r5OXrhPrzCtOQlCpepZ42QMIxoONZeu+Pcoe9TEmPsHaQKbKJnfEv+KSGo5egPEgnNwdzVIgWkjc1zCpRwQGvINNE81G+ASJO0P3TDQP44Xr2x8uHhqyn8ahBISbHql0XmXkAKyoAsg03VMMgGts4Ao291cf55YZRE+x04vvyPxXyBis7mpWPohg2GVEZisSwhC0jKBMGp4p4qGaYYESWwz6F6GSqZ9pNY0w81zCsUnjZsthgy5gcKZl1WNJD+MDtzgu6s9CAijApzSO7mmGaf2rKhvTSDg1mERmBEUKf9og1zuSNHSIbHNw3Bwu9atjtnlhwMWD 54hsZ7gj GNS7/bcReIvEGi+NdkgdgoxXUu3gYPmSgGfKTmofZfsyqEL09+aU+XtDjAB7KazLLp7hhGs/QLDgL9UVuj0rQqoAkg/jqqGmuKAVkwHfV3InbK6XxUaF8glrTqz6EKxI0lizV9tE9lCsh8upfZ4f8ybPJ9bd3f4uS6HWemLxqKLfQxckMl2H80oO3LnneqLfIPS3IcsC49/Nd7xCiJWM8Oy2Jqy+hi/e9USMlYd+fzrOrrG0F/aL295+XJ6FNr9U9hRB29VmoHL5aC5HUGqMCMOKOIn77T0cJZ5O8XcPTznd6iNZDueBXCL63MjustKSWGtbOSu8To6wZdmZmLjCJLrYvAw0CBYpnGBSAjRZfdav73rNGKfRKk3sUjO+JWGksGY0lyM3vdLEqTWMZ63e00eK3Y1PAWxGxENoyZYhacXpaKtanjqO7XMno8+3KkjcOrpnja+aaj9JGBEU= 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: Adds kselftest for RISC-V control flow integrity implementation for user mode. There is not a lot going on in kernel for enabling landing pad for user mode. cfi selftest are intended to be compiled with zicfilp and zicfiss enabled compiler. Thus kselftest simply checks if landing pad and shadow stack for the binary and process are enabled or not. selftest then register a signal handler for SIGSEGV. Any control flow violation are reported as SIGSEGV with si_code = SEGV_CPERR. Test will fail on receiving any SEGV_CPERR. Shadow stack part has more changes in kernel and thus there are separate tests for that - Exercise `map_shadow_stack` syscall - `fork` test to make sure COW works for shadow stack pages - gup tests Kernel uses FOLL_FORCE when access happens to memory via /proc//mem. Not breaking that for shadow stack. - signal test. Make sure signal delivery results in token creation on shadow stack and consumes (and verifies) token on sigreturn - shadow stack protection test. attempts to write using regular store instruction on shadow stack memory must result in access faults Test outut ========== """ TAP version 13 1..5 This is to ensure shadow stack is indeed enabled and working This is to ensure shadow stack is indeed enabled and working ok 1 shstk fork test ok 2 map shadow stack syscall ok 3 shadow stack gup tests ok 4 shadow stack signal tests ok 5 memory protections of shadow stack memory """ Signed-off-by: Deepak Gupta --- tools/testing/selftests/riscv/Makefile | 2 +- tools/testing/selftests/riscv/cfi/.gitignore | 3 + tools/testing/selftests/riscv/cfi/Makefile | 10 + tools/testing/selftests/riscv/cfi/cfi_rv_test.h | 84 +++++ tools/testing/selftests/riscv/cfi/riscv_cfi_test.c | 78 +++++ tools/testing/selftests/riscv/cfi/shadowstack.c | 375 +++++++++++++++++++++ tools/testing/selftests/riscv/cfi/shadowstack.h | 37 ++ 7 files changed, 588 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/riscv/Makefile b/tools/testing/selftests/riscv/Makefile index 099b8c1f46f8..5671b4405a12 100644 --- a/tools/testing/selftests/riscv/Makefile +++ b/tools/testing/selftests/riscv/Makefile @@ -5,7 +5,7 @@ ARCH ?= $(shell uname -m 2>/dev/null || echo not) ifneq (,$(filter $(ARCH),riscv)) -RISCV_SUBTARGETS ?= abi hwprobe mm sigreturn vector +RISCV_SUBTARGETS ?= abi hwprobe mm sigreturn vector cfi else RISCV_SUBTARGETS := endif diff --git a/tools/testing/selftests/riscv/cfi/.gitignore b/tools/testing/selftests/riscv/cfi/.gitignore new file mode 100644 index 000000000000..82545863bac6 --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/.gitignore @@ -0,0 +1,3 @@ +cfitests +riscv_cfi_test +shadowstack diff --git a/tools/testing/selftests/riscv/cfi/Makefile b/tools/testing/selftests/riscv/cfi/Makefile new file mode 100644 index 000000000000..b65f7ff38a32 --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/Makefile @@ -0,0 +1,10 @@ +CFLAGS += -I$(top_srcdir)/tools/include + +CFLAGS += -march=rv64gc_zicfilp_zicfiss + +TEST_GEN_PROGS := cfitests + +include ../../lib.mk + +$(OUTPUT)/cfitests: riscv_cfi_test.c shadowstack.c + $(CC) -o$@ $(CFLAGS) $(LDFLAGS) $^ diff --git a/tools/testing/selftests/riscv/cfi/cfi_rv_test.h b/tools/testing/selftests/riscv/cfi/cfi_rv_test.h new file mode 100644 index 000000000000..a9d5d6f8e29c --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/cfi_rv_test.h @@ -0,0 +1,84 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef SELFTEST_RISCV_CFI_H +#define SELFTEST_RISCV_CFI_H +#include +#include +#include "shadowstack.h" + +#define RISCV_CFI_SELFTEST_COUNT RISCV_SHADOW_STACK_TESTS + +#define CHILD_EXIT_CODE_SSWRITE 10 +#define CHILD_EXIT_CODE_SIG_TEST 11 + +#define my_syscall5(num, arg1, arg2, arg3, arg4, arg5) \ +({ \ + register long _num __asm__ ("a7") = (num); \ + register long _arg1 __asm__ ("a0") = (long)(arg1); \ + register long _arg2 __asm__ ("a1") = (long)(arg2); \ + register long _arg3 __asm__ ("a2") = (long)(arg3); \ + register long _arg4 __asm__ ("a3") = (long)(arg4); \ + register long _arg5 __asm__ ("a4") = (long)(arg5); \ + \ + __asm__ volatile( \ + "ecall\n" \ + : "+r" \ + (_arg1) \ + : "r"(_arg2), "r"(_arg3), "r"(_arg4), "r"(_arg5), \ + "r"(_num) \ + : "memory", "cc" \ + ); \ + _arg1; \ +}) + +#define my_syscall3(num, arg1, arg2, arg3) \ +({ \ + register long _num __asm__ ("a7") = (num); \ + register long _arg1 __asm__ ("a0") = (long)(arg1); \ + register long _arg2 __asm__ ("a1") = (long)(arg2); \ + register long _arg3 __asm__ ("a2") = (long)(arg3); \ + \ + __asm__ volatile( \ + "ecall\n" \ + : "+r" (_arg1) \ + : "r"(_arg2), "r"(_arg3), \ + "r"(_num) \ + : "memory", "cc" \ + ); \ + _arg1; \ +}) + +#ifndef __NR_prctl +#define __NR_prctl 167 +#endif + +#ifndef __NR_map_shadow_stack +#define __NR_map_shadow_stack 453 +#endif + +#define CSR_SSP 0x011 + +#ifdef __ASSEMBLY__ +#define __ASM_STR(x) x +#else +#define __ASM_STR(x) #x +#endif + +#define csr_read(csr) \ +({ \ + register unsigned long __v; \ + __asm__ __volatile__ ("csrr %0, " __ASM_STR(csr) \ + : "=r" (__v) : \ + : "memory"); \ + __v; \ +}) + +#define csr_write(csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrw " __ASM_STR(csr) ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) + +#endif diff --git a/tools/testing/selftests/riscv/cfi/riscv_cfi_test.c b/tools/testing/selftests/riscv/cfi/riscv_cfi_test.c new file mode 100644 index 000000000000..cf33aa25cc73 --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/riscv_cfi_test.c @@ -0,0 +1,78 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include "../../kselftest.h" +#include +#include +#include +#include "cfi_rv_test.h" + +/* do not optimize cfi related test functions */ +#pragma GCC push_options +#pragma GCC optimize("O0") + +void sigsegv_handler(int signum, siginfo_t *si, void *uc) +{ + struct ucontext *ctx = (struct ucontext *)uc; + + if (si->si_code == SEGV_CPERR) { + ksft_print_msg("Control flow violation happened somewhere\n"); + ksft_print_msg("PC where violation happened %lx\n", ctx->uc_mcontext.gregs[0]); + exit(-1); + } + + /* all other cases are expected to be of shadow stack write case */ + exit(CHILD_EXIT_CODE_SSWRITE); +} + +bool register_signal_handler(void) +{ + struct sigaction sa = {}; + + sa.sa_sigaction = sigsegv_handler; + sa.sa_flags = SA_SIGINFO; + if (sigaction(SIGSEGV, &sa, NULL)) { + ksft_print_msg("Registering signal handler for landing pad violation failed\n"); + return false; + } + + return true; +} + +int main(int argc, char *argv[]) +{ + int ret = 0; + unsigned long lpad_status = 0, ss_status = 0; + + ksft_print_header(); + + ksft_print_msg("Starting risc-v tests\n"); + + /* + * Landing pad test. Not a lot of kernel changes to support landing + * pad for user mode except lighting up a bit in senvcfg via a prctl + * Enable landing pad through out the execution of test binary + */ + ret = my_syscall5(__NR_prctl, PR_GET_INDIR_BR_LP_STATUS, &lpad_status, 0, 0, 0); + if (ret) + ksft_exit_fail_msg("Get landing pad status failed with %d\n", ret); + + if (!(lpad_status & PR_INDIR_BR_LP_ENABLE)) + ksft_exit_fail_msg("Landing pad is not enabled, should be enabled via glibc\n"); + + ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &ss_status, 0, 0, 0); + if (ret) + ksft_exit_fail_msg("Get shadow stack failed with %d\n", ret); + + if (!(ss_status & PR_SHADOW_STACK_ENABLE)) + ksft_exit_fail_msg("Shadow stack is not enabled, should be enabled via glibc\n"); + + if (!register_signal_handler()) + ksft_exit_fail_msg("Registering signal handler for SIGSEGV failed\n"); + + ksft_print_msg("Landing pad and shadow stack are enabled for binary\n"); + execute_shadow_stack_tests(); + + return 0; +} + +#pragma GCC pop_options diff --git a/tools/testing/selftests/riscv/cfi/shadowstack.c b/tools/testing/selftests/riscv/cfi/shadowstack.c new file mode 100644 index 000000000000..a0ef066e98ab --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/shadowstack.c @@ -0,0 +1,375 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include "../../kselftest.h" +#include +#include +#include +#include +#include +#include "shadowstack.h" +#include "cfi_rv_test.h" + +/* do not optimize shadow stack related test functions */ +#pragma GCC push_options +#pragma GCC optimize("O0") + +void zar(void) +{ + unsigned long ssp = 0; + + ssp = csr_read(CSR_SSP); + ksft_print_msg("Spewing out shadow stack ptr: %lx\n" + " This is to ensure shadow stack is indeed enabled and working\n", + ssp); +} + +void bar(void) +{ + zar(); +} + +void foo(void) +{ + bar(); +} + +void zar_child(void) +{ + unsigned long ssp = 0; + + ssp = csr_read(CSR_SSP); + ksft_print_msg("Spewing out shadow stack ptr: %lx\n" + " This is to ensure shadow stack is indeed enabled and working\n", + ssp); +} + +void bar_child(void) +{ + zar_child(); +} + +void foo_child(void) +{ + bar_child(); +} + +typedef void (call_func_ptr)(void); +/* + * call couple of functions to test push pop. + */ +int shadow_stack_call_tests(call_func_ptr fn_ptr, bool parent) +{ + ksft_print_msg("dummy calls for sspush and sspopchk in context of %s\n", + parent ? "parent" : "child"); + + (fn_ptr)(); + + return 0; +} + +/* forks a thread, and ensure shadow stacks fork out */ +bool shadow_stack_fork_test(unsigned long test_num, void *ctx) +{ + int pid = 0, child_status = 0, parent_pid = 0, ret = 0; + unsigned long ss_status = 0; + + ksft_print_msg("Exercising shadow stack fork test\n"); + + ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &ss_status, 0, 0, 0); + if (ret) { + ksft_exit_skip("Shadow stack get status prctl failed with errorcode %d\n", ret); + return false; + } + + if (!(ss_status & PR_SHADOW_STACK_ENABLE)) + ksft_exit_skip("Shadow stack is not enabled, should be enabled via glibc\n"); + + parent_pid = getpid(); + pid = fork(); + + if (pid) { + ksft_print_msg("Parent pid %d and child pid %d\n", parent_pid, pid); + shadow_stack_call_tests(&foo, true); + } else { + shadow_stack_call_tests(&foo_child, false); + } + + if (pid) { + ksft_print_msg("Waiting on child to finish\n"); + wait(&child_status); + } else { + /* exit child gracefully */ + exit(0); + } + + if (pid && WIFSIGNALED(child_status)) { + ksft_print_msg("Child faulted, fork test failed\n"); + return false; + } + + return true; +} + +/* exercise `map_shadow_stack`, pivot to it and call some functions to ensure it works */ +#define SHADOW_STACK_ALLOC_SIZE 4096 +bool shadow_stack_map_test(unsigned long test_num, void *ctx) +{ + unsigned long shdw_addr; + int ret = 0; + + ksft_print_msg("Exercising shadow stack map test\n"); + + shdw_addr = my_syscall3(__NR_map_shadow_stack, NULL, SHADOW_STACK_ALLOC_SIZE, 0); + + if (((long)shdw_addr) <= 0) { + ksft_print_msg("map_shadow_stack failed with error code %d\n", + (int)shdw_addr); + return false; + } + + ret = munmap((void *)shdw_addr, SHADOW_STACK_ALLOC_SIZE); + + if (ret) { + ksft_print_msg("munmap failed with error code %d\n", ret); + return false; + } + + return true; +} + +/* + * shadow stack protection tests. map a shadow stack and + * validate all memory protections work on it + */ +bool shadow_stack_protection_test(unsigned long test_num, void *ctx) +{ + unsigned long shdw_addr; + unsigned long *write_addr = NULL; + int ret = 0, pid = 0, child_status = 0; + + ksft_print_msg("Exercising shadow stack protection test (WPT)\n"); + + shdw_addr = my_syscall3(__NR_map_shadow_stack, NULL, SHADOW_STACK_ALLOC_SIZE, 0); + + if (((long)shdw_addr) <= 0) { + ksft_print_msg("map_shadow_stack failed with error code %d\n", + (int)shdw_addr); + return false; + } + + write_addr = (unsigned long *)shdw_addr; + pid = fork(); + + /* no child was created, return false */ + if (pid == -1) + return false; + + /* + * try to perform a store from child on shadow stack memory + * it should result in SIGSEGV + */ + if (!pid) { + /* below write must lead to SIGSEGV */ + *write_addr = 0xdeadbeef; + } else { + wait(&child_status); + } + + /* test fail, if 0xdeadbeef present on shadow stack address */ + if (*write_addr == 0xdeadbeef) { + ksft_print_msg("Shadow stack WPT failed\n"); + return false; + } + + /* if child reached here, then fail */ + if (!pid) { + ksft_print_msg("Shadow stack WPT failed: child reached unreachable state\n"); + return false; + } + + /* if child exited via signal handler but not for write on ss */ + if (WIFEXITED(child_status) && + WEXITSTATUS(child_status) != CHILD_EXIT_CODE_SSWRITE) { + ksft_print_msg("Shadow stack WPT failed: child wasn't signaled for write\n"); + return false; + } + + ret = munmap(write_addr, SHADOW_STACK_ALLOC_SIZE); + if (ret) { + ksft_print_msg("Shadow stack WPT failed: munmap failed, error code %d\n", + ret); + return false; + } + + return true; +} + +#define SS_MAGIC_WRITE_VAL 0xbeefdead + +int gup_tests(int mem_fd, unsigned long *shdw_addr) +{ + unsigned long val = 0; + + lseek(mem_fd, (unsigned long)shdw_addr, SEEK_SET); + if (read(mem_fd, &val, sizeof(val)) < 0) { + ksft_print_msg("Reading shadow stack mem via gup failed\n"); + return 1; + } + + val = SS_MAGIC_WRITE_VAL; + lseek(mem_fd, (unsigned long)shdw_addr, SEEK_SET); + if (write(mem_fd, &val, sizeof(val)) < 0) { + ksft_print_msg("Writing shadow stack mem via gup failed\n"); + return 1; + } + + if (*shdw_addr != SS_MAGIC_WRITE_VAL) { + ksft_print_msg("GUP write to shadow stack memory failed\n"); + return 1; + } + + return 0; +} + +bool shadow_stack_gup_tests(unsigned long test_num, void *ctx) +{ + unsigned long shdw_addr = 0; + unsigned long *write_addr = NULL; + int fd = 0; + bool ret = false; + + ksft_print_msg("Exercising shadow stack gup tests\n"); + shdw_addr = my_syscall3(__NR_map_shadow_stack, NULL, SHADOW_STACK_ALLOC_SIZE, 0); + + if (((long)shdw_addr) <= 0) { + ksft_print_msg("map_shadow_stack failed with error code %d\n", (int)shdw_addr); + return false; + } + + write_addr = (unsigned long *)shdw_addr; + + fd = open("/proc/self/mem", O_RDWR); + if (fd == -1) + return false; + + if (gup_tests(fd, write_addr)) { + ksft_print_msg("gup tests failed\n"); + goto out; + } + + ret = true; +out: + if (shdw_addr && munmap(write_addr, SHADOW_STACK_ALLOC_SIZE)) { + ksft_print_msg("munmap failed with error code %d\n", ret); + ret = false; + } + + return ret; +} + +volatile bool break_loop; + +void sigusr1_handler(int signo) +{ + break_loop = true; +} + +bool sigusr1_signal_test(void) +{ + struct sigaction sa = {}; + + sa.sa_handler = sigusr1_handler; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + if (sigaction(SIGUSR1, &sa, NULL)) { + ksft_print_msg("Registering signal handler for SIGUSR1 failed\n"); + return false; + } + + return true; +} + +/* + * shadow stack signal test. shadow stack must be enabled. + * register a signal, fork another thread which is waiting + * on signal. Send a signal from parent to child, verify + * that signal was received by child. If not test fails + */ +bool shadow_stack_signal_test(unsigned long test_num, void *ctx) +{ + int pid = 0, child_status = 0, ret = 0; + unsigned long ss_status = 0; + + ksft_print_msg("Exercising shadow stack signal test\n"); + + ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &ss_status, 0, 0, 0); + if (ret) { + ksft_print_msg("Shadow stack get status prctl failed with errorcode %d\n", ret); + return false; + } + + if (!(ss_status & PR_SHADOW_STACK_ENABLE)) + ksft_print_msg("Shadow stack is not enabled, should be enabled via glibc\n"); + + /* this should be caught by signal handler and do an exit */ + if (!sigusr1_signal_test()) { + ksft_print_msg("Registering sigusr1 handler failed\n"); + exit(-1); + } + + pid = fork(); + + if (pid == -1) { + ksft_print_msg("Signal test: fork failed\n"); + goto out; + } + + if (pid == 0) { + while (!break_loop) + sleep(1); + + exit(11); + /* child shouldn't go beyond here */ + } + + /* send SIGUSR1 to child */ + kill(pid, SIGUSR1); + wait(&child_status); + +out: + + return (WIFEXITED(child_status) && + WEXITSTATUS(child_status) == 11); +} + +int execute_shadow_stack_tests(void) +{ + int ret = 0; + unsigned long test_count = 0; + unsigned long shstk_status = 0; + bool test_pass = false; + + ksft_print_msg("Executing RISC-V shadow stack self tests\n"); + ksft_set_plan(RISCV_SHADOW_STACK_TESTS); + + ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &shstk_status, 0, 0, 0); + + if (ret != 0) + ksft_exit_fail_msg("Get shadow stack status failed with %d\n", ret); + + /* + * If we are here that means get shadow stack status succeeded and + * thus shadow stack support is baked in the kernel. + */ + while (test_count < ARRAY_SIZE(shstk_tests)) { + test_pass = (*shstk_tests[test_count].t_func)(test_count, NULL); + ksft_test_result(test_pass, shstk_tests[test_count].name); + test_count++; + } + + ksft_finished(); + + return 0; +} + +#pragma GCC pop_options diff --git a/tools/testing/selftests/riscv/cfi/shadowstack.h b/tools/testing/selftests/riscv/cfi/shadowstack.h new file mode 100644 index 000000000000..b43e74136a26 --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/shadowstack.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef SELFTEST_SHADOWSTACK_TEST_H +#define SELFTEST_SHADOWSTACK_TEST_H +#include +#include + +/* + * a cfi test returns true for success or false for fail + * takes a number for test number to index into array and void pointer. + */ +typedef bool (*shstk_test_func)(unsigned long test_num, void *); + +struct shadow_stack_tests { + char *name; + shstk_test_func t_func; +}; + +bool shadow_stack_fork_test(unsigned long test_num, void *ctx); +bool shadow_stack_map_test(unsigned long test_num, void *ctx); +bool shadow_stack_protection_test(unsigned long test_num, void *ctx); +bool shadow_stack_gup_tests(unsigned long test_num, void *ctx); +bool shadow_stack_signal_test(unsigned long test_num, void *ctx); + +static struct shadow_stack_tests shstk_tests[] = { + { "shstk fork test\n", shadow_stack_fork_test }, + { "map shadow stack syscall\n", shadow_stack_map_test }, + { "shadow stack gup tests\n", shadow_stack_gup_tests }, + { "shadow stack signal tests\n", shadow_stack_signal_test}, + { "memory protections of shadow stack memory\n", shadow_stack_protection_test } +}; + +#define RISCV_SHADOW_STACK_TESTS ARRAY_SIZE(shstk_tests) + +int execute_shadow_stack_tests(void); + +#endif