From patchwork Mon Feb 10 20:26: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: 13968599 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 6CC6BC02198 for ; Mon, 10 Feb 2025 20:26:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D87AF280013; Mon, 10 Feb 2025 15:26:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D2B3E28000B; Mon, 10 Feb 2025 15:26:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BCC09280013; Mon, 10 Feb 2025 15:26:47 -0500 (EST) 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 9E6E528000B for ; Mon, 10 Feb 2025 15:26:47 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4EEA41405C0 for ; Mon, 10 Feb 2025 20:26:47 +0000 (UTC) X-FDA: 83105168454.22.13E8875 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf27.hostedemail.com (Postfix) with ESMTP id 55BDA4000C for ; Mon, 10 Feb 2025 20:26:45 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="vV//RCDb"; spf=pass (imf27.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.171 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=1739219205; 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=ZQdkftJiSrZjLZFLAhFoV76ICDkSP9sKrZZoJ9PqutMOC6YMOCOixa6YnhmTyKNZdS6njq ZrwhE1wzmuRJQQ+ljxS1tSdkfzPg/2VtOVGu2Il9k1kaKAnKXG7wh5wfWwM/g1BJ7cUDfX Aypc/jwTnHVqyncNgoTup8HCM5tihWQ= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="vV//RCDb"; spf=pass (imf27.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219205; a=rsa-sha256; cv=none; b=gHJQ4lK/dIJE+MkK4ek+lTNOTgFH5uN4J3B1blTk80p0S6yFp6CgJtw3+iXSchrb3A00JH 9LdUIKycpeaQjyDIEyVxvsuV2ijY4MysyVj7+OkGM9O95tG/Tv1RRFkcMOvdHRP3nSUNxd fn2nn0hXObdWcwchzPLdY0jMrTfjpFE= Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-21f4500a5c3so93749045ad.3 for ; Mon, 10 Feb 2025 12:26:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219204; x=1739824004; 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=vV//RCDbFVrWw77zVLvOSnwmDIqJDJME/Vy5iCfKf/UVRPGDohB/xB8TlKN4j6nW4O W7Sc1Bp7eipP9ppFzFcluosLPeFQyfi5O120OrZaMRSkbtAzzmgbBKR4+j0BsnymyZVH Oz5Rg1y7rpZdj5/EbWN+P/GJc//voCp1z0CHJgQyCcGEpYwaGT3Jq1SuqDOC48Eeqx3g m5RVP4PuPrdemOnM7kLV3snt4xAY+cIeGHTjHqzW3Jtv0Xw2ykyumRPTUZKyNQXqw9YB mnT23VFM17/0r+C71Ix6tfNkuLV8ZtCbhK7UeQm2brFJmBJlh+aqgKydTMmU9ujlWTPy cRgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219204; x=1739824004; 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=FtfHrcJPA76SVoAVpLoDmRQzqXm7O2e+aTxyAEFWPtRbL5cd6jQlDRJ1Ev38P0B+mN jhI7WnOjSNP6RgMQEfU+6RiNbXZnAFCJmNDbolWCWFQU6nERMwlf0lE/iyyb0v9AZIM7 hvP95nfKGQZADNF/gAB87rZDIADju/vwi19ObUnfd7eeQjgcjIBfYXuA9T6EjC2NA8Ge qeSxtbAzoXnhJzUqHibVAsdVn0iAh0A6xLlVDfDNThoWPUk8/X/8IrtsHWXGvQU14wTL pNSZWs4G7u/sRIad7qhjZr1h5snJRQe5S6QtFzQAaLqYYBT+Ew9mgjJ6+h9eQw3tGGFR yY1A== X-Forwarded-Encrypted: i=1; AJvYcCWJ0OK9NX4R/XxVHb57bb93jYZNnjM7x9zBYTTTlWqSju8evQOoTrrInFaUZ2lWGg1N4V6zglOx4g==@kvack.org X-Gm-Message-State: AOJu0YwR+M+2jgCVcxYO2Hwo8HIPZKanGKjwAsglK7ev1+QYgLbguczf jua3uL+Gka3cF7FFLxwECSTfGwK/F3Vtajt5YR7DQTC5A23M82DuiyCEeoSLieY= X-Gm-Gg: ASbGncu8G3AL6b2s/Hw/htCsqNmvh63p55sOK8R3eWUQSKA4d4RR4bM9ZXlicZnz6H5 1TgKMY+ob+765ZZJNfLyEllB++Z+qXaN9RxzF5hUdoMLdQqZSRNbtxKxwjUGki8uH+bPK51rmlL H6WkDoDq5yZEjwNukArsVYdM7saJ+sLDIA8LhBIAmTMpZan18YCMUmPCCGo+PYTdMp1Qr1dtQBQ gtCPMNB059kLkJdwCVUKH0qHe+gV1dn+P8Wy7Hbr9teorPvY2RWbsd24iaOWeGtw6JqnpEVDSB5 x4rle31epoZQ39SzNH7frlr0Qw== X-Google-Smtp-Source: AGHT+IFznxG4IUsH1vtGUm0FvXVBvTHvmf0eQhdxQZjLsHpvXLSfCmOiU5USFlGIslppLz4th5AW+A== X-Received: by 2002:a17:902:f114:b0:21f:75c:f7d3 with SMTP id d9443c01a7336-21f4e798104mr179051845ad.38.1739219204274; Mon, 10 Feb 2025 12:26:44 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:26:43 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:34 -0800 Subject: [PATCH v10 01/27] mm: VM_SHADOW_STACK definition for riscv MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-1-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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-Stat-Signature: t43ytsfr7emi5ktwkbnoag4ts1dqjxhb X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 55BDA4000C X-HE-Tag: 1739219205-578171 X-HE-Meta: U2FsdGVkX1/k/xoB30YpJ693aSD/M88QhBt2ghFXaG0zdXaBynQUIOAHS2SYRF95A0CpxCW9ndGpLSYhCmgytEx9/FYXZY00tlmXFTGCAc+9L5Tym08x/V7D9xymvY+LLL4sTc2kRZyr+5LXLP+uLSMblhkoVWJFcqBFH1Onv4J2pxd1Fz14hMBjEHBHLlI3dVGtkm56cNH8rvrBmBAZpkdgP675kG5GotjOIdgXqgKcXjVLaf1Snzv10qBfzGIzj1R/O/87sbelu21huKBeLjBbWd2OjOey/6CQiQ7QvmCCBuM17y2D8dlVlhwm7yakXgMerjC0vhlq1FiGukeU49eFzbKfiYTK8tmwftHhI7nPakQ2wlPlBcqHpUv7OgM/gPxx3vpi235vjEm7R1g5+TyRTtfIzZ+dZRY8hnfB43FbyyYlNRd9o6vfitIBQsJwcBxg3WQKWt/VyjaAwixX1IIkHo7DVtigziCj0YT8UA1ZMDrrA4ndLQyjMFmVBRYbJQoWXscxaaVlK92go+VPAvJ9IQh/uvLt13Pv7y7qsPFUfy3v5IQ2LD90JVBgzm7w81dYns24gMb7Km4PPvMzifVQ9g6bb8Ev9pLaxWmtR0YHa2Dl2GgvXKpAYD1XIid6mwUN/kGJvyNGbZdohzK8pIZcjqNXW46QmzYk5qdHcmjJL5IjpkVzen3kwiDKSqJnyY/AfsmPznGraANwOl7RnX32aeQ6S5CWILMRzQw6G0NPl0y3CE/JkeQhhn/1bibfoxBtWwZpAXJzwmsoBxmQdNscjrJDg9X4B7DeefNaAfMO5Upd2feJQ2qPlWqpQ0GCUgwB39m+ZORWApfrvuAB1yjh3VF88k24tD1WJwgb5v4ksEzZtZRH1vGSb+ga7qww3Ys1/nb720YCxiZVQFDK0CfWIQdykQJTfl+GgQy780dWAfQhaQ1n1cIMSdqSTWe1mXPOluRk2cRqIxWUMNb 8E0Zl8rP fYg5M1CSN0BdsUmbixLuk349uY5dVuStMr0u6CVc5ATJ/UCLdFH7EkbXpwiuxzWo8n2MLoG+iVuRlCWI3qNKYZGFL0qLjvynmknU7KwMNDnKHcu1qKahjP3cGKBLLm0JQKf7HcWdKieGUfABvZxMCO6RZibeNgSdVJXC6zxNiPV9IZOOSnH+zfO5roFzxRJVTb9PBK+BLv9V0zwPZQBz0an5KS0auusLZcuJPDxsmLgDpuu/XvY62YKgER3QChJnuGWATiCfCOGxV+4UgZtb3GlBbvnaDeRw+tQvASuhrb/L4g8ffd9Ymz+YMWd2iNaN07mC9rmgtrujAvcDyvevzCIHaoOdsmIp3BpGIgWsUnLcILM24oNs9+ntcmzHELXXWCddKMUGDGRbJzL4jvY17oZi+33AFgdqvsw2I9+rxXUXaGZcFRpXChq+deCWiuV9S0+kjDpTCV0etnCsKPSXNU+R75Lil59L/iTFo2vR9CM90z+upeG5UOZda83MycrH0F4u3 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 Feb 10 20:26: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: 13968603 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 E7957C0219E for ; Mon, 10 Feb 2025 20:27:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 31F48280018; Mon, 10 Feb 2025 15:26:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A564280016; Mon, 10 Feb 2025 15:26:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A92D280018; Mon, 10 Feb 2025 15:26:58 -0500 (EST) 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 DA813280016 for ; Mon, 10 Feb 2025 15:26:58 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 013AAC0659 for ; Mon, 10 Feb 2025 20:26:49 +0000 (UTC) X-FDA: 83105168580.28.DC684F4 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf08.hostedemail.com (Postfix) with ESMTP id 01108160004 for ; Mon, 10 Feb 2025 20:26:47 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=zznJ6bPb; spf=pass (imf08.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=1739219208; 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=5QXF4YZuff6h7i9h02qWlJ5yS6iBeiaf0Y/X0aZEO4WhxZN24UShtU8PnaAXn0H1I2pw/k O/qnzUMYU76UZwCg52JHFtRjY9FoKp6QAwULb4flI67LpK6khwkdm/QSkvjBnR83pmN+81 ppKPSIgcXD5tieep/1bTJBwCGduEwq0= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=zznJ6bPb; spf=pass (imf08.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=1739219208; a=rsa-sha256; cv=none; b=lHx7QnBTW4F35IRgHDoY550G2VDrZ5q7MskJrAJuALoX7bpnIxzSGttNir0pnrpHJijfog YQIxNsaXY3rZJgGWYdbx4k6bElX7ixk8xyv5MFJ4Wj60VVSEgBZb+yKGQwSC9YDv4JhUkn ksvTxi/Yi14/CQJlH67SzQNZTy3P+8A= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21f710c17baso38749855ad.1 for ; Mon, 10 Feb 2025 12:26:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219207; x=1739824007; 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=zznJ6bPbCPGKL6fG+k+6xdNhLqBklmtHz4NANOgpjlXcq+z8EpMUjvg+eWwhMLunKI DE/rm6lOW0+qKyTWlQ2gd+25EozNepiw2guS87ZDxA/P77j+S9CUpGtbu1Mk6HGfr60h VewViNjPim3GpuLZRnPfjoLUrtERwQ7a9UbRcU4oSz7sSCXZTfD8EMbZDuDlsTYIDYXj mEjdD2zcI7JKYsPcH44/1BliXOulLHxW5VSjfjNzixTqSLqrQRRJftIBx3X5TovF/H5m zvDyOaKdD2v67JI2jIi59Zkv83MZXQbXvve4C00xMMl7uIL6bxpWrzLmJyK1VoP4eo8b vaZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219207; x=1739824007; 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=MSPoF6HEGOgZo1UFHuGAr+zHqkmzkMU8gzj/qyeYNlj19TWaK5+WMOp8t9qCBlp4Kh b3PSNOIjoCzP4KIhPydhShElC2OzY6NqGS5amv0OdKrPMFH29/VYCF/n9yqm8P9gEnHl M5vZxfEHtCjOhiUb3nqCEjZJUqe4DDVEDzOXIMlRf4mXNWeRCEHFkO0sZ5E15EjIdBiW nXTOTaLs03kg9VLuXX/20gkjDhkIIeAvkNuHTknohHmk2GfLbJFx8UespuwAgN/DT1ZG lgeF3x6R1ekh5uqOA4BK/4PLFG1mqCY4Snld7+4kUjKTGDcdSp3KuthNCj0bEwQGqDRU K5iA== X-Forwarded-Encrypted: i=1; AJvYcCUflwHNVT/wuj45NF4Y39UmaBF5VsUsoK9wx4d6ETwftY+rzSxzITv9R9/9ndrulG5fOw+/ulII4g==@kvack.org X-Gm-Message-State: AOJu0Ywk/f25T8opLTzSkvm/2grTDQgNXkMnKXCrbaISkwB9vn9okGBG 7pllDXju+61Ea0jLbrTGbYFkL3tSz2v5Bl4o19YJ6yrs4j+VGsFn8MbMaDPxgdo= X-Gm-Gg: ASbGncsubiF65hXI0MUt17WUM/xmaYJcMM9oOMGJihnF03pB34MMVJK6dPB7gicztG4 R3jo1uW1O5/C0ChNEkFv7wjP6TNWVxHMCdrSMOcSFGGdhFBQnFfIgVps/9dsdfjkJexJKjGRQvM D69B6bcPB24YA3sWMkorhojZ8k8tk0ldsynXeHynuvBgSyUiOwIgRbaLGKG5i82HJ99fcNJx5rJ SgozDymjLVmiFbeFRrMAvl6wFu0f7n4tIAgKE8Crv0K3251fI4o0azm8w5+O5BCdAaoxQG/v0Ax lbtsWXPI/PTgwic1Y7QxNX6RsA== X-Google-Smtp-Source: AGHT+IGXqRpNguUrMSnJHDFrz3qQhRvvMy95jaGz8XHpdEECN7AcOh1dWxqC1mHx3x1SCoyBHua2rw== X-Received: by 2002:a17:902:db0b:b0:21f:169d:9f39 with SMTP id d9443c01a7336-21f4e779cc3mr280440675ad.46.1739219206908; Mon, 10 Feb 2025 12:26:46 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:26:46 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:35 -0800 Subject: [PATCH v10 02/27] dt-bindings: riscv: zicfilp and zicfiss in dt-bindings (extensions.yaml) MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-2-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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-Server: rspam08 X-Rspamd-Queue-Id: 01108160004 X-Stat-Signature: apmuuph94s8c7oj9n75gpy41xqf96rrb X-HE-Tag: 1739219207-497577 X-HE-Meta: U2FsdGVkX19d6WW7NbKJ3GDGh0uBuOTJ37TdEZfhlJCud2RkGdxMuxIendy40odV7L6T5q/g+J1hd425SFeOGXhC9Rkt5xxw4qn5ARCQ6XVBCV1zATfVs8myF4Kqs/Whq3YptpV5MTRLygDgnirskAqvDIMlJpCznPY6nhtzCNof2XXtOWfqsKNGbzYcHN6NLIRxvbNwpvqhGtpOcpwUjQKMvUlxlNg6gJ4IhddYOkOEEgXMHcnfSFpKVlQGZOug4+cQns8V+sRzfmHMPmq6vQwZiYp8G/io0rlGLSNnPyiw2zPR3AxGUpESAAYnootvBGQNQkVyewL/QOPJ0Hw1UFjc/gLVCa9yGw9qU8Ay2YN4u4XdpWT3MCgQO4VjwNGnZ0mF/GoL8+4rkTF6H76DC7dPUSMIXN1vYw2eskaFj4PM8VadxXoG6NbNP9+K6Ewlhm7OHq1d6yySzEtMsqa0ZsivAjZ36Zejm9GPNOgdLiyOlExANvcSPLZPU+CwPlHJ5zFwqnZGIadXOuht2Tc2s62dAPOscb5qKnCA+d6aTs/RSq63WS1T/6d7Eaf4kk3bGljHDNYywa4mZlcvFztuaLcCG5rokERzu/qoz1n5/RNN2fOlziKJbhwmKObKWrMXJ7WUiCcGoLhRFX+KBJUOu1RXRkD9KXlMeL0Cc03Yl+1fhCErYNBDWMZHW+wIWoTw+rsKxnNJqdayIwnz0EPEt3lt7vTLPncxXsIGUDbTvhnrhO5rpBI3NI3WIddPAoiiJBY001PVQmWcnn/FeIFmNI907/CyUg1BISnY4FNbuoJqEl3eylNcsLlaZhLjX7s7s6K+w/L6HfOYSFazbFe8jJR3ZmI707makRfKWwDboe0gLMR0hJKeU83C4ReX0/ugrsPnw1zvc80ejMk72edAyI5VoQO291EowPBlKtaT3EPdxtDuANgWORDOmUh/iRxHQ942bWLv6EceQfD9N2Z Ftmj1ew9 o7/D3gWxnZIMFTf4/8IuVyJzpuf828WkdcYy7Teq2rYrb1704IhA0l0s0hu++d5zQAU0WmXAupGK0HbHn1jvOppjwSTwAo02BtVdcdND9iEEzWUDJZUz2n4CVPg8XUoib5bBl1BXBlrB9Q/BxzhWuwLoypCWftopK9RtWr5ZEsrC49JwSub51/1pmabb/gI4Rc11ype4xDDP4DIoFrAA1+VGdjA/lVv+5qx4N1aMHVdbLCIupC6cSYmdC49xoiguk0621bvml0MdF840OF2L7/gjOK4USLZGPv0dAnzdidcC03/AZUhJjYDXG2YpXzzyEzkkBjfYR/W5AJM+EYPs9Aqqxk/4c/V8xS518zeY9unwYuuBAN3NEAhkUlvrC8QjyUcCh7x8PCfkS/MSAIfIoi+qTTBqgQYlgVob323EeNoIFK5tf+t0AkAVHOMfLJdhkXjQfA41B80Db+Lfm22od4pMV0Am/JigOQQkvkpmTVhKmf5E= 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 Feb 10 20:26: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: 13968601 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 B8AB4C021A2 for ; Mon, 10 Feb 2025 20:26:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 45387280014; Mon, 10 Feb 2025 15:26:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3DCAF28000B; Mon, 10 Feb 2025 15:26:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 25804280014; Mon, 10 Feb 2025 15:26:53 -0500 (EST) 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 026E628000B for ; Mon, 10 Feb 2025 15:26:52 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 825B81C765E for ; Mon, 10 Feb 2025 20:26:52 +0000 (UTC) X-FDA: 83105168664.07.FD86AB8 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf22.hostedemail.com (Postfix) with ESMTP id 96842C000A for ; Mon, 10 Feb 2025 20:26:50 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="Xf0V/y3g"; dmarc=none; spf=pass (imf22.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219210; a=rsa-sha256; cv=none; b=uQIAP0+99p5QuedycZd/r/jFUOylo/Mam5puQRUukVwMkUfSz2XsQ2/LJZq2wrs4y2rhRQ nt/v6XbSQgRElPjaVorFH74+EjbNPgkbFUo0i1zZiyRVrBBRLBYZFC2OamzdkXseD/xoZY 0WjY9XF3Zo/5iNTio1PmMTnxc7LVrWA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="Xf0V/y3g"; dmarc=none; spf=pass (imf22.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=1739219210; 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=I3yTvjZfksKwKiaaKqFkXliiCbZdysKRnPJzdDEIvbRsizHkq4uMCWtWwNk4EecSjp7aY4 6Ec7Ub6H23APBnLwPJdqvQq8Ju0HDedrYlQe3b7rg2wGDt3gxO4DuVgsmmH1pqbm9SkS9d FYpWdPyGe5+4ZQbEA8mYzuBijKO0KYY= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-21f6d2642faso58703165ad.1 for ; Mon, 10 Feb 2025 12:26:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219209; x=1739824009; 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=Xf0V/y3gRp2Jp14n4vG2v6eKhyPCNWEQbCxnhSK0NY1GHFAUXyLAvez12LZpG+Rvfr XEflpebK8+Ctx/fMF/GyxgEW6YvwFHd9Cvqa93pdXCx7VMQeZdc6Reo5ixnt7j46uBKz od4zPEp7vQtWnjM9xOO2tCouTGnAc9nJcSj0fJpVBRpVXc5k+ATjohMJszGdiHp8saAO nRxhRARzR80YoILC+/HsM2mpDXBfJEOeuqdPqFJ7tE0M7sqFw1SfrdHwLsoPjKM/BHi8 05182DF0SY/7pxwNCiq4+LFVWoZ91W0Smmj853YMh7lypkUATqHVFWbthCFa6cQBKExa 7H7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219209; x=1739824009; 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=L1Yrw0lQaJrwkL0PEFQDg8LpwfQwPjEKWV6h61/uqTv84HOW8Jbi0ijoVM5I4JI0Xb vlO6FBSE4Nk+Jkubk20/NJVffWq3dcqcAdeRUed046znyb2So9wITUBTuorx0XPltSCn Id6gaVNWxfakQKnEf9cB31tIoiYeZTJdvD8Fz2teORWIJRehibjv1bbacNMmLQ7YjqkN RNc1sexau1/SfpWy/lKeT6LQTfFZdtGnyy/FHgn9sP+2KTQJ05NegxnPFRX4c6npn58p FSrINm2sAm9y6B46cKMvi7ewG7F9qU9iYJczl7sLDM8m5Ozn0W6yCxVcfejR5eFWc9FT irbg== X-Forwarded-Encrypted: i=1; AJvYcCVQXN7F6+J/JIMd5d18VH959bidOkl5UKVQEk6y40P/yVjELYLGggZcOaKE7relOiDVbRcSsEYvWA==@kvack.org X-Gm-Message-State: AOJu0YyU5lKqQEF/xn/H/wLmUnL/8gCWnlwh8iZXBkewyA2YKN6W3VDP w2l482TRN2V21mhBCpFLZpZ/p4Ylz10n5YUVEky9BNrZP+6Ua6mSvd1gCJ+IjanjeONMOZtN7dp R X-Gm-Gg: ASbGncuRzqTqUQn005MX3d6AELDy4WwQ+S3OMGVVszeKCeJF7myPXxVTTnXt0bIY7zD wgd8Agq4onEZgSBa4mPr3+dTqWC9G7Lv2x8uptP9cFLuEg8MdvJqNlfpICoKECE9KwwCVAs1dVW cV/mUxsCzAyWfOJBTepeEYE89CBqTrVg4NJJRsIZacOhxIOHbeR6sE8qVtjtWEllrigcUjFHMEn 5KRdfH6Uje7MyaYus/5y345G0LxeULXptJ5F3QrUFxKkSrWDnwPJaD6HjhnUg4TuV/QaT+e2j85 SEhRQb75XeR9dg56jm0M70KGEA== X-Google-Smtp-Source: AGHT+IEhZ3TYH/tcMpvG04g1Gw5nBcJh1Es1LXU8QZEq1VPJSIGDwObL506BPg7EHhAIxgdRzRFlCQ== X-Received: by 2002:a17:902:c40e:b0:21f:1549:a55f with SMTP id d9443c01a7336-21f4e6c0f49mr269385645ad.19.1739219209495; Mon, 10 Feb 2025 12:26:49 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.26.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:26:49 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:36 -0800 Subject: [PATCH v10 03/27] riscv: zicfiss / zicfilp enumeration MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-3-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: 96842C000A X-Rspamd-Server: rspam12 X-Stat-Signature: ny7zuozyzbp4ai1i1sw5e1jd7gzdmues X-HE-Tag: 1739219210-368533 X-HE-Meta: U2FsdGVkX19+k4axP5tewE79r5qVutGzAbTGcF0qy6VACbQNc/++A1b7n9CKcv4JcpCNBCbmP3h+2yz7DDCUIWcGBrUYHMOVQWwCheaBk8TJdfNKQLi6TYBLAVF5RYsPRpeTOsVnJhYb57wiJphv5cNKZjIHUlrMAUGUUapH2YVdYwRF2hPt5dEVelZAXsdmh5iSzhCPFfDASi/KUdMOTrmLoN3RyW5xmy1LBuWzrWWPk88V6F/d9JQZ3QY4E5DZx3cFWOCgALbxZ4l1EAbuWICx+FI96xGQ/Z/tKv1V3oy+Aql3CvdQ8PqXU7vnSGkyCCdVbBWQ2zAkyNeGSOaRG7YZnMdZ/TXxVymPvaBckwui4qXC9Qxstjg4Gak6xYITxO/rzXCn18kkyKA2xo51V6ZXKxBVIZBxZLeded8aCKHbAlZrhE3VrolhAGWZKiw59IS3deQ61Seuc4kL5Z7hjMfkp3mFED8sPwiU5cZ0L1qYguLykP+5xUQicZSK3G9I5yWcMi4czdWZ3MPLd0msSMyJkSzCGYIep0YZRGAXB/MsZHHFeJY9pwoZd1uCoOfp3LZ/Li/IpaN9vZF7kc8YOi5AuP/y2XNuDWzW9YW9OyJ6bQlFf1qYuHXied5GqER4CfPaiJThyKQrNOpjghPQBizKD6bgaN81LzqwOv38+gNDXb75owVo8KvsaTQkGdLlYysteW6/Sj1dEYV7BTEZFNWMsjPsVNeJrwDPt5iymu/ATZtry7oC/944HQ1hZu8SoT3rL1lE1llHdCknxU7eL6vlJcCEeBGltdFH4DZ5At7w0lSoCl2s5JnODEhdit9wwAYIgMIp88TQoqcGoiVADhA8m6fhd7dKM+ThZCwUjIdGYX6HVlEqEbLA92y+l8Uj9KAn45XfRDm9FbIhwkYurp3muGv1+P12JyqrSBhk2VObodr7nxh66dPYxpt+uYVOCXFkjoNuh1ZjpwgFvo3 c/vGM9qZ 2pzmoUppWsIBko31CcSFQdiCxFiInVlP6kkXr/NNaJJfB2+Uxx4c2uyFFSw2QS4la4nvT0svU4b95WPURK6zNelrmRSO819/1j4nOF2udpsyKGtCv7Vp+ovlFIC6hksoM22uqvedRiydYqJ0dyM6SqoFf8yE4qGgqggOkPRzj8tAY2PHL+YRrZFYVwEP9oIypJgtqJo7Z528vkyCf3pPMaNgMAqVtfhmjb3mi8i+asmnxx/Zj/eqCmlTc7sqgQS3Y3sCHbKEDwUpRrY2HEOJB175i+Nqz8ItfwviYie+Y1pIr5+osrpTHlG5t+aInzhikYwggIgO5P4H96p2yzjP9V76FaZhtL7qewip2SsAUr4ajAqqEKPn8hzXH/fQ5tBZJQQVuvt8M1jORuoDJvCnpehFSg/cCVS9I7Ep5sWOQR8NJMSq8uyieZBXNnt0rkG7OQ0n3csc9Dl5uDifjmiZGQw1uo5/axVEQA5gaoO1Lwv+Bo19mofU9Kca/yA== 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 Feb 10 20:26: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: 13968600 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 F2B10C021A3 for ; Mon, 10 Feb 2025 20:26:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87416280015; Mon, 10 Feb 2025 15:26:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FCB728000B; Mon, 10 Feb 2025 15:26:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 67785280015; Mon, 10 Feb 2025 15:26:55 -0500 (EST) 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 3FF9F28000B for ; Mon, 10 Feb 2025 15:26:55 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E38D1805BC for ; Mon, 10 Feb 2025 20:26:54 +0000 (UTC) X-FDA: 83105168748.27.40C0E03 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf29.hostedemail.com (Postfix) with ESMTP id 02B2D120019 for ; Mon, 10 Feb 2025 20:26:52 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=TvHx3Qso; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739219213; 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=KvnZECdNx29rPHHWBfoqubAAYJn4vomYkrIiuKdiWogVp6Xg9UzugQgt+xMxpDwQlTnWVU /pArx23RfT7DcPtFgty9LXzCkYNdnMwleWJcoEKBQumQqHQcLTsg+qfEqlfxGh8yLcpe7R z5bmX5c6b45HgiLXrPpLEJp05tJl0no= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=TvHx3Qso; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219213; a=rsa-sha256; cv=none; b=hhuXLfqtjHsvE071dWd77Ukh4xW157mHmke751C+JEWReLpbX30xFXms/mAIIPg5GO0Hi5 RYSe0pNyf0TArkR+wVftcCSqm+XsF54nWy9ZboE3Wz27n/iNAoVVPRjgmbvL+5636VRcMy GPBWD0VLs4f6oTvpxGvKYB9M+2szC8s= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21f55fbb72bso56897035ad.2 for ; Mon, 10 Feb 2025 12:26:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219212; x=1739824012; 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=TvHx3QsorScwsQTs5XCY4vfsf1qGFXDgSins/QAOTmDUpL4pNNb0ueATUZVhzotwLY 9ymZE7DftqWZthHEtQxhEdV1fOwNKz9nz9/9zNcr1Ty+Rgg/LJHRHIwx+BPw0rQuJfC7 Ffc+6XkeFxWHfrF0+L3rcFyyBjB3wUlyiHRr/0bILv+5leEkb4eTX9ryWZY6t1glImnJ izLpTrCUi9VzU0fGlgyKA6VZYZKsBeXKiQGCsl7nEQA0yYTHcEGO0p5vE+3fBnY3mKqV 8Ix0Zegeveep1GG985wSpHfZz+73x/8YoBBqcbCl61y3DT1KGIUjypgXTI9OTFzmvW2o IR2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219212; x=1739824012; 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=dbEaS+5UGmshfyx4qhWc/s8ODQCHPEqGO7/5vEsS29aoXNmBlgPARpET8n9Xw6ONGS LrvFB/I1gjkZz4FdCrauz6UZ9+b4zFDtYjnPHIoRkUbcdcl1be9wvbipHaNqHFMRDMTx MPNB/HGtImokMZ7rCiYlRFO1CQCC/Yb0f27eZ+9TqOer2g2+InIOkgDJ86z4GziLwQUg bOMPXg8v+3K3UB36j0DQpKfLwokadZNt9El1RPflIEfbtmsmrKEmhWXIa6h4GmpOkcoP iPEGHVjr2anYVnaru+btDAc8ZOtZjhBWMVRDTpmtlq0mnnGcc0xEMiL5QdBqfDGOS3m2 fr2w== X-Forwarded-Encrypted: i=1; AJvYcCWVMeQ92EsB9QYXeHpcBAQJeO26sB2bP96rAGjMo/ieiKrbdeAEJUcwSDRizccKHqq99UDI3UFgfQ==@kvack.org X-Gm-Message-State: AOJu0YwqD4/ZiYCW7cGC1PBl3+RT11rvh+/llHrtJzmxDy/0/X3yHfXF rNJDrJ3ME3GUjOh/phmpvjo31Sqhu8zosNocfcyh9XoX6nRk4zSTCEDqQ0UPVPA= X-Gm-Gg: ASbGnctxva+Paialt38IWOqUFPfNa4w6yHOczztqL7nkHQqkq68Qzh3xMLF++5GNZLe DzdTnGtDDztRic92p09VVyXfSEcSPtkMHTtDiRDGXuns0koBZ3och0FM7JAuZz9JF8Z3uVNIPWu uB8nN+iP7YpXVRtgP44fhxAsE28JDNtLZtjymzJPWrf1Vklyu47lddZsdGknNB0aAeoCaoTcMCZ x4ReTJqeSxn0KX6FMX5jihjduyQ/y8IF3J6hej0TR79vle7cBTGUCXq5LRjrdK7z9MZLlIgDf8q phtA08FkMrhUgoMctjfUvaUGIg== X-Google-Smtp-Source: AGHT+IGtT2BfpGC+pxbWvm2Qtn55Phvbe3Ks/NAXxmbZaEXtXhWUE3SuxobC1K+zZICcAG0d87INng== X-Received: by 2002:a17:903:32cb:b0:21f:dd1:8359 with SMTP id d9443c01a7336-21f4e6d2642mr247925115ad.29.1739219211966; Mon, 10 Feb 2025 12:26:51 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:26:51 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:37 -0800 Subject: [PATCH v10 04/27] riscv: zicfiss / zicfilp extension csr and bit definitions MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-4-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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-Server: rspam08 X-Rspamd-Queue-Id: 02B2D120019 X-Stat-Signature: sztd6cd53c5839ai5p3sdp95z5wuxkp6 X-HE-Tag: 1739219212-357800 X-HE-Meta: U2FsdGVkX1/yrMtVUbvomcOet4ZgU4vyp1JuMDUpehZ0gupNm+4mmgZbcpdgPMR8DSmHizvZLoWzAnJr2ZZDgx36uv1JACa68MS5a2iFPdTr0cBST4sV1bJyqeS1OK6kdQ8s36a2KlGyqg90TeDLKsJxSnXbMX1mklQbxAA0E9gbt6BUZteZhx+torpkXDvRAG5x9ljXtaWZx2d6d8b9E/QoNFbxva/6ACEy01PMAS8q4nt1j9I2LyVYWNn0zkK03HiI2OAH1EX6nQ8Oj7iAe4E9ddoGcD+O/W//wMIO8E8wttQpo6EI+sXDbAe0yWEwriedEqaexM+DqTQtv1W7jsjWoQc1O6aIv9a7LGwaglaynef1zyyBO4u86O9kMx+9Jj/qI/4617Rs8zMG+gKR4sY6InO196Ym4GFp4bl8pRQP5DmV1+FEjZkdLpsFTnO0yl+Jme09GUjOxDA0tFTALV0rv1WrHX7llPk9SWRt/Z9CohbxNc9Nro52FU3kGkLP2maLb90qApKkp8thXJ5i/kjOLZHXzx1xNF671kVleWBnsH5Ex6+2MTgR+ykdeSqKlfusJH+JtV+zkn7SdYZY1y34L1STriM616CSypwKBQ8arZQAjfOPuD/yYhx4Zs/m/fRaFuTtM4lR+IqyRo/kr9aDR5GjETzULO8PKsT+rPIuksghQkwqTtnuB7xyBLymVtIeWQZ6Ru8l9TqF4bZ6fqKYDz5iuOpGG/x7Ujkx94ZEqK1CXNmMMreBFc2VBbREXRme+Fxi4JrZL0Y/dRpVnL/KobvY+uo0QYxQb3JkhLo1ViD4/l/oFD7FZ9HiSsWJWe1c0u9tCiFMK/BBG+drfJXutAZ8CH78nX5d7MNmoPOHYGoiSYTjNdxfyMrqBjjyT7tIXk6ENOdMHOAepNpLIxDNUORZdWtURDCANUhhZYZnG3O3v1yRF6qOm9t3z/kUBIC0YPxsqMWEErGGDIy fB02tl1D YjA+3zDvaJHbB0ciGvMUbQ2J9Un7KDzFTt5JEJWTI4kx8E0BaXtyvJJf0gBd/eLyWLUxAezixvrrOTUt8ytnr0fn3zW1K4SGWLkyixPQ6PQUkRb8HEaWcU1FL9Pw11kuJSAib8yiGjMqhrhnCkiOna4RQfRSY8aOtF+Vqd+4aAeT7efsRMTHuJ7Z+CuluM2I4Qxv1qwTE3BSF6YgA8aF02OcxU6a5o+S2BcURhHRnIb9/VvLDao4WOUWCsV+BeWWzGplZkWP+8NCMTYwcwu1VYk0KIxovQRgNfdlffyQvvtFoLcH8xsx0sVrcZz3ZtDU1gw+eKKHrQNPgrcbGKnzi7H8LwZFg8nBZa7hxM+ePkOagt+qauweuuboiZoUj8edeLc6e3N/VJmrwFkui2kl11EFrcc31Jl00VqmMhNIJa/8i147SSatKRLYl6ZehJuNtj2piKva6vKipWv0gvlgmepDl1g== 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 Feb 10 20:26: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: 13968614 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 C2283C021A1 for ; Mon, 10 Feb 2025 20:27:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F1DC280025; Mon, 10 Feb 2025 15:27:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4547F28001E; Mon, 10 Feb 2025 15:27:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 27E0F280025; Mon, 10 Feb 2025 15:27:39 -0500 (EST) 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 0978828001E for ; Mon, 10 Feb 2025 15:27:39 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 720F1805C7 for ; Mon, 10 Feb 2025 20:26:57 +0000 (UTC) X-FDA: 83105168874.22.4A3A90A Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf08.hostedemail.com (Postfix) with ESMTP id 7B99916000E for ; Mon, 10 Feb 2025 20:26:55 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=pXS5csb6; spf=pass (imf08.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=1739219215; 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=kvj5ng7rB38otW8CESo/aLKedGBxbVFTdrF6Ar5FrJdRbL2HwGZhMvH8TAQEpr/2HZI8Xj 7avo0f+j/vjQgD6fu7686bee1DVJ+BmuBJUTPvSIFfOrpeVCwIgfziLotedtwdeo4WtiJT 2GcSH940Jp1HB1AZ//hBoTXBSCJQUVU= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=pXS5csb6; spf=pass (imf08.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=1739219215; a=rsa-sha256; cv=none; b=XTGGUfav51lxjRCtaSEMKV2DbfQPjdXRYBfqd3glKhKx1wsr+xgk9kAXz0jBF9IB6p2zhK 5eRVliL+GD/cSZ1fmBceXAuha11w0xAjW4JPKOMuGAI/1uwjqdFSgPwjUf7Yflbxn9QD9y 3H7nn8PyT/TkEofF9haiTsKyRKIDgac= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-21f62cc4088so49823265ad.3 for ; Mon, 10 Feb 2025 12:26:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219214; x=1739824014; 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=pXS5csb6VGx6wmbtbO5X45WFNjdsqgv5ajcArXyckeAQHWfADhLoBYuH1+Rzybd8rW 7Jy0hLBSUTp0vT56RTbo4eYRwcxkguHsWnx0E7kMH3bhR3ntWKAv7X15ZmFS8MhvCZqH s7dvIRXG42NLrVw8iYNDjiN4n2yP1Mn8GzTtW6JclbOFqhl8UMhBWez56oFCQul641lk /GRajehEUZwYjHp+xGk3COR2x0s0M+49Ae5bC37wirGjRVCpO83giJZvnbebmdynrj16 7221M/Q0+XMumdtjlPIhYqaM1eHGiqKL7m/2q/g0h/wJGwOXwNEx+yBz+ltcZFPqgsxA gqfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219214; x=1739824014; 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=bwBK6YPKn1FUd0VNk2rSK3mHO/Ga3LFyeYgTx8+ATmWo+p+cFkDhm41eQbCTnc0Caw uGEjcJFrD/hyHqrSOJ9XIXmU/on/QDsrn4nmkhCiBzfqe5KyxowQJJbixQ0xhKPJ0a7k h1QefTTvgYLxGkeuACDzIQcgJzX/XGIbHXYOTH7JFE9gK3RrOquKCuZJi5qMIdS5DtfN 8Q/3p4HtV049ePr7jcd/a2t4N9asOzP7G48r+qVUzPdUdSxOT94POVYw5Dvcm9/cX11Z 1uCwOmhgxOYk+G8+ReLlNohW7hOGhQSuSAGvDLO889wJurrnkTRU9ftiW2GpRgkpb8Kj 2ldA== X-Forwarded-Encrypted: i=1; AJvYcCUMwHB4r/tqAu+1mOJyJ4tGiqtTV5icIPqOgCUiHQzaGToUD/meBcvp0bBlBf/mVXRwocFOUoYsng==@kvack.org X-Gm-Message-State: AOJu0YyfOH8Es+pTF2jmeKjapjHF37cC0BtCFaNbMKBmz8YTBg8nvwLe YMbntlhDSsc3zZgz9AbjATBwO68J5o35Ia6C4DWdf3PmHvH+Ji0BJyfk4ZOZnCA= X-Gm-Gg: ASbGncv00+5ow3Q1MqIae3QQ1yMaMFfXLYkUUZYAChjw31vvhoqBdwOVf8efrrYngWs wivcr2j70B26wXjMStfwE8uLsOQmREPPBU8IjC2dT8VXWhERyfCvNm3hKApiQT3nkN6h4YXTSnE H7mca/Pnta8qjAyBJ7crkQMVCyX/e7EmzUMSWe52rsf46kzTOndmB6FTFOP9xQQASAykNnooirH 67TOrzywXboxXLDMM3bo02KYE74B10vcmF6jO+OSuoMSiLBSnVtjXYUCxn/I5crTyYmNQ6cAIa7 XqgfqqAkEH/AyINHym0x3hbKvg== X-Google-Smtp-Source: AGHT+IEPSlWV/roU0SyRsD9mZQNHSbQmDLwPbxxPcGI6KoZ78tihK1b8Yp4dYVskjWY846JzmqLryA== X-Received: by 2002:a17:902:d543:b0:21f:f02:4176 with SMTP id d9443c01a7336-21f4e73bcc3mr228449315ad.33.1739219214484; Mon, 10 Feb 2025 12:26:54 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.26.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:26:54 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:38 -0800 Subject: [PATCH v10 05/27] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-5-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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-Server: rspam11 X-Rspamd-Queue-Id: 7B99916000E X-Stat-Signature: grmnng4omn94dggywy9f78efkanybqec X-HE-Tag: 1739219215-379455 X-HE-Meta: U2FsdGVkX18dbltULBi41MSBd72yR7ClSWvQU6NKtZ7gTk5ortbtFrXrO/Z8mLuYv7Tc8/mugQjz0KtpVFCU6b8OeLpAViNGtbpweGg6Z0Ls1bGr9EFWj8dM6lICJkEd/xviafxaSpKpQuteQT9NSyaZP8ODwc4h0gdRPrP53IW5C5M+ubWrycT99Cm7l0jCrrL9B1d3/T5NC/FQkAq/PIYXgxpVEcxq08NOoqC7BN5hEYTUqC3kqPcktd5siqmu92X8MEayN4HqzEjOHG4YLCUKQB0QeraGOKJdYZFybjiCa5Yzx+XkIMnUBSfuNpQQBvztCoG4kpf/VEo6l32gGzdxC5PnK+uJ9NLjqRhq8Mu9qJO35+6fgw23qj+PyLjF3Yv7uNRWieEtL9OpTHIzD4r++TFpn9o+Tk0+vT6yxVWNFhQUWzWpHoEn/t4oFruJuPz28aBY9jBmo+sJ3lUcLubRsgzWVd9EzZFTScYpYGWu9V0VTujle8xNJj8fVBeohpHKYGXEiWzxcQB6HiEOudHEf7Wu5gXzySouniQelWX2z7k5MNy6A1GUo4ZHc5qE71sdxy4otfKIPy8KB+tMLPqdOm8VSb4Gve4uOeblrmPEkRs+PIZhwU4OxqsvLT64EGYdYlLUiHyDKi+VpqC6rEvYVadFQjMmCD+Gfkbfk4S19FHNR5A/JTYZ/yByQElcnwCqeit3FYybxi8oEKsuIa47gF914RmsnGKZt9VDi2zyw5huIkJ2imEx6w8JbgogElfpDW/owv7Oi9OrfrsA2J7HqYY/EcW/FA9AdtdcDTor5dAMB6IVZOoTCO4Lilw/BPsAmCo+TDTeXSUc81eaSZmF+rbBbMACJ533bCFdHOwPM9/eZGZb3SEUz13GVxMHs99ugVdjg96sadNqiACP8cu/pjUYslklNhgy+10knXL/tbOSztvpM/s5sHHRkVNn1I+71DIiPXFHOtt2jMu 2YA4AFvR gITgkyBGyAAhniMCh9HyczeAnQQR9eIvUGrcKY/OCRaTrJsgHIPN0EWkk7+7lmq4Jlk9rQleNoa2WZzuR4lhYCguVIaTqxD2IsL22kfkJ9DLF6yAXk3XgV25+s5Gg7fIZGC/IGBD7uf7h6WJbrSxjz86M8GpxpUj8IBRdt1p1H7Kjv3tf+KCIPALoplvhfcLZstQZkHX+zZtgfzsxY3jEBUHD9RQLH69E0/E/TGorZ42O+3CGW0ODkq5QqcU3gfbPnD9PaFUDrCbSbfw81m6xnXDKWvllqEtvyRpzOaQDOdZtUd4rSBhPZveHg2Kpw0ukvyY+bm5TX0jH6s+Ks8aVgqTmvkjrzyhbZ3XjUdUCf7DmV4WYPcCZArKHFfpaGY2Qv9hvOeFZuP/ZjomAb9MiHvfMwGp/L4Bz801WJxKN1F4fyeqq7r+oEuOww2ChduemC7QqVdoYpjtMVXvPwAmrR1CcUJ/Vswy7rWSMf18oe9gz3IslyEd0GATKeaFXSjouVBQpYxQDqBq7E1y6mBEzUJnE3dF+x7kQgFcJ 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 Feb 10 20:26: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: 13968606 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 2CD28C021A4 for ; Mon, 10 Feb 2025 20:27:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42E3428001B; Mon, 10 Feb 2025 15:27:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B5AE280016; Mon, 10 Feb 2025 15:27:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2312428001B; Mon, 10 Feb 2025 15:27:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DFBC4280016 for ; Mon, 10 Feb 2025 15:27:11 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id EDB2A120611 for ; Mon, 10 Feb 2025 20:26:59 +0000 (UTC) X-FDA: 83105168958.24.B2CA6F9 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf19.hostedemail.com (Postfix) with ESMTP id 0AAEC1A0006 for ; Mon, 10 Feb 2025 20:26:57 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=wD0DrXYV; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219218; a=rsa-sha256; cv=none; b=POIAqQuPx9222frCQOeX5VVM1N4+np9eoMmNrgyrZYN/YnXHjEbqEs93S9Vci7crLDEnNM EMo+1Jo+eg6yZoDXn9Gvb60p/kysFOGAuC+/bsKLKbCXI9BaSV9AyXHzE97s+lGrRAcKED Lpyyi+RqD5gTXY7hGPwq0kGClTbxAxw= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=wD0DrXYV; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 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=1739219218; 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=bdUJKQKLIVfTCwG6RtKyzfaIXzfHFp6oKXvWkdI7q9QnjicIaGz2emnIiDGc88eaIv1rtY MsPtp/oVfJyg/ks6KF8faMSVZWgMGXfdaRxbq4ze5dDV9ph+XhzJc0VwOdJuQMOmABmSFC ni3A1iaKh7XZemd//L840Om8aaO6ZLM= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-21f573ff39bso66562185ad.1 for ; Mon, 10 Feb 2025 12:26:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219217; x=1739824017; 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=wD0DrXYVdxvr1+kmovLcjnNgaodcYZQNaeUt5Gw8SZxXFVMHc2nlVbWijaZikmNKBb op8UoUMu7vFvcTLLoGGl05vGq8E2ZVrXec/S0OuEZqQjonrDb4HSiI+AzPi7F5+Yn8Qr 45gil4GTpEQQOtkeipjLbKgZFTWjhyovBd0QWq1rrgjBqMnLBjaeLdJZuCEcyuvXAXnt QK9Qz3uakl+ai4frOmVY/34RscA+IV2sU+AF6Acw5m/Kfe/9qV2/mmUgBAJN+U/ykAbJ HCDMJgBdyS4QgKUeF8sHmQzwWCVXgCUff3AiUOHaQuFpaiouSHRLf6QHo4sUrMN1OcsT fM0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219217; x=1739824017; 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=Aq8MRwfYovijQnxxmw/VYwtvxHNMkNVn3WFSuIOUWlU5sT9cTHcitj/e5gcIGaA1gz nuTpkQzjZqTVXsMCVUEyYd9DzKbNdE2/wlAdCOD9JU9/9nMOMpDRRYQ45IPivgSWusD1 kDIPYrDRt4c/Qzg4xWL4RMLLwN5dY43jctI02dCpMkod85uulvklGTY6l6fdeDJbV/AV aaNLlWDwXtut5l1vmAYBAUt+ZPqVh+A5vMBIfZCksGRCJVwFT05sBv2sRtU5sBbylEcA ddnPJUE2j7BgnhYMJDoEVRlpsGYtNeosE2546YhxOFjVnoaFqM+5fA6JEiAUBRKWiyt6 gIgQ== X-Forwarded-Encrypted: i=1; AJvYcCV7EfbNiANGqunqxW+PwkYFVeNrBugnfFwGmfpXouXbHsSJj0vjrl/bKw4EgFeHyktKSXK5AoJpvw==@kvack.org X-Gm-Message-State: AOJu0YwdWv38se7jgXzbsBSwh46VBnIzSoAZZ4pqN2RmQuzl1KP3tv4q kjfM9SpJwiOMMkWUDAQbpng93LPspYtwbAVTbJS+4hLG4YLHp/6EhvrOl3LIoCZ+LhXBQjMdvR2 j X-Gm-Gg: ASbGnctVJliYSRRk9Dr8YGLd0h48Oqli8M6APLAk0cc/yGN3WZg0mOpJosuRfbGkdsd E8/VOwtFzU2iIuiRgUZMydMPN+c1HbgZ49M7LabqJ7OP1SPVG/qKtX4DQTdpTtXkf5uIWFBo4bk RdVnmV8Q7NzsmUXH6HHIH0vxLqGCqfWM2wyXL+fK75wKteisZino7UHIPSD2+MUW8wsde5BSVF/ MqM6VF+L5wNxHEgY8OFiCbLCxGKy9jcnAE6f9rAmkoNCsHavKC/MKCdLRFKsvyVDYQXBwLweDZ4 WHglFBcrdavC96fKHiNQTap/dg== X-Google-Smtp-Source: AGHT+IF0tY5SNTXDToYW1J21Hspvgjxz/6jk5/bs6ru5UkSgBD9Y81K/9+zJgqpvYHP1/U94A96iNA== X-Received: by 2002:a17:903:234e:b0:21f:1549:a55a with SMTP id d9443c01a7336-21f4e1c8b5dmr268029605ad.1.1739219216953; Mon, 10 Feb 2025 12:26:56 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:26:56 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:39 -0800 Subject: [PATCH v10 06/27] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-6-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: icq3g6f58nunpc7wxshj9jppwpwfy116 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 0AAEC1A0006 X-Rspam-User: X-HE-Tag: 1739219217-439438 X-HE-Meta: U2FsdGVkX18wlaq3Tj8LhMly9wZfMRCoERuy6/VjBBa9oPFq5I/FwRa4UXp/KKdvimb06bMMkRViXTgMLKbRSZe47hd+15yItZSnFMWv0i0htbo8M9Og/Bjpy8R935RnaDK7u3+p+jbU4ds7EIMhF0dOKDGeav+XBUoMy5N5tlYNuc7DNinzNvgL9tIOd1cH0Jv5L+YZDgN5C9eLYtYwnWFXIt8FODqMgbSSyUYYkfowbGeFSd1tyKrHEKm1wUL4U2HP37SFnabJ3YEbrS86aiGsUMyL82jq+Y40ygzKjNkb/87lyQnN5knJo4nSsIt8Jd4jtQhAauTzY0FsXad/ZXMz+bLhhvOD8VS0fdXxqgim029oVukwD+fw2HIDxgF2Iu5v2iNKI9wJaqPwIszJVj2wFjyTRHQyLwHqKqnNxzM3xjBtvgsuMBqxWXS/W2gGHPa+MNsdGb/v3IYSFNPw1NaEm+Id9hvPiR+eaE/lrXFtQW2f8JOqRuf+Bx8PvsNGSufA12wfy8r8fbsXTiYeVHPFUApYoY7XCsD2Sdkr4vvaAkSlrY02AIW0LHdnj+2IiAvB2glFjN16OtHJGDRK3q2t5lawEVQ6YP8j027nH88TqmYk9nuNkVBLYIhdvfoZZcaDwDiorHYhguHToP5WXdJpSDogtNVIr1/gna4HOg94Y8s9onNmoPMg+hdRB5XypS5LJ3NNB5GTEbQnd0iapPWiWU6ZiTcRpOQJ7kU9DNTMMRcOmVFuwEzEPt6xhS1DDSD1pw6/1LbZIXweHybbFRLUByK0zy6a50pS2e2a/p1LLd7hUFH01keFc4DCd5ztWbEKpJCGDHKjuQsST5LKIpz73ut7rX1k0i/f8laH14ZPtdsqaHg6YSMuxI4RIDH9r5lg8vueECIijsFfB3YtPi5d2AwbFzAmrXLkSgH3oFuKujrA9ieM3K2JEGKiaGe+YM28me7Kx/2O7QIaNKw NLj/fT/3 DSSwQHUM9HGErBCTacSojVlL1/SPdyMHo55nFEGBGUJSWpDnDbJGWzYg0oVnXECOKotqMbtJUtS/VqDWmlBKMrwtx9bg79sBe/jMEyKUNFvVyXQV8/4MfbBGT6+brXq0W98dxMrKayEOpLWt5jPnzOzZIZl/IbqgZTqsYSWq3C9R6h/ucjr8tO50kc6FYXWtg0BPsu5PpMA3PdkpHdxEr+dsJtck0m4mN4wn+Y0HHO1eDnfFowIN8+nIDADF+ds/Q2v2d819oM1DurVQgbik2uonT980rjbyeRNvnnxNY5rWXBl9Czxw0yCfygnCtsF3fFyGMq3ogQDtC9bQHMpadrXweVE8aF0wZYGzKZ/IIdeLDgRhz81TmXjhggKQvFDCiCqnjwsGp/d6DP1AoYKERtIuFWV1uUEN6Auup7x51rAwxDK5IDMhdkXKsA5KFxDPGb7zTnvICoe+Y+XqH/DkdyMl/NfVLGbJ2p2OU2EmxrERRSUP46odh5jde3KImeWR4muCJal+GXLidKGFo8oVSfliYIEszfBVJamBw 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 Feb 10 20:26: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: 13968604 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 CBA88C021A4 for ; Mon, 10 Feb 2025 20:27:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1995A280019; Mon, 10 Feb 2025 15:27:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 11FEB280016; Mon, 10 Feb 2025 15:27:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC8F2280019; Mon, 10 Feb 2025 15:27:02 -0500 (EST) 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 BCCB6280016 for ; Mon, 10 Feb 2025 15:27:02 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6725214062D for ; Mon, 10 Feb 2025 20:27:02 +0000 (UTC) X-FDA: 83105169084.27.DCE887A Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf10.hostedemail.com (Postfix) with ESMTP id 7FC87C0014 for ; Mon, 10 Feb 2025 20:27:00 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ZEI8++B0; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 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=1739219220; 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=JVTlUwlNXAwWWNlB3QqufoXUPp0SydxWhFLZ4aBm1szVmeoEyQfjh/HkJ8aE8CzVXbhdMq TKIDKLH94SESO+sfgzlTXcV3J1MoyUNGQTk0YtJFBwyhPWwxP+pRWr0HrEwZspf4UOUcEu K/T/aQtddfs8Venye7n8dBYk3qkAv+k= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ZEI8++B0; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219220; a=rsa-sha256; cv=none; b=jdCgN/LgpYGVr3itzWu7l4yg9GEW4j/eL5aVNtobkR9ZePf0I2RheJJ/Ot6gQ5kDG/FVAb Um9twJrbSCX6X9ifJRksTTH15PIquyhEa6z9VTQChr7pAbHLR74vrdyyqrs7holcm5k0Ua ybGiYaPlDJHB/HJanse4QrmuKzYBedU= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-21f3c119fe6so107239895ad.0 for ; Mon, 10 Feb 2025 12:27:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219219; x=1739824019; 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=ZEI8++B0YDnj2JUzt+NqfYiQd0IzE7KLcRD/mCFqvrWFN3zIE1yqoy2/SOZTzur0bA S9HsXARnSYDkSUKxHntolIPv/W7aIqDz1ftVXyP8U9YYfLmUCtZu6lbMsmWMRyiimVZK UfxBxbjPckThcB08DhYu6sibzXHHphHqkIu5hcZgLuK3zkwWxgJ+zW3xjh8vfJEI+yVb dIM0ZSn0JgtCw/qe7y+N2QFLOuPzc2N7U/WFaLNaSYJDSx8JFIf/uv0bydoBedBAaOjm ZSn5+CgaD3++iXTmLLotwVnEZqLHrdLj2K2omNSRENtqfy5+ghSfbnZR7AYG821opdKi CtWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219219; x=1739824019; 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=LbePzt78Hwt5RxINEzGYcc5q3J3rh3PQwQqYL0YYv1Br+qMrob4+5hTuEJs4BiQPt5 TftofLoL2RqnVqtE7Ka419djw/L5C4tcnSw+BPfSgDpaIsM31tCAod+MdOIUf3fNua1K QeBlM/MGaEZUpk4tPacYa55du5kaEjHxEdU3eoeJj7Oo5H76LQ3a/ZrJnr4q2l6y9sYh XKgxZ30RKkw7dK6pzwQfctS5sqLmDF0Lu4UPHcf1bkPWffL8diNxrYGe5vKolAFcsiTh MkstK1U0tqZSeN/1nI9wRK93/ldPM2Llci592a+50St5KXFILfVKKpJnwHkztS7HtUaH QawA== X-Forwarded-Encrypted: i=1; AJvYcCWl7cpwxlEGsH7ujHZzCePn+dmE0N6gH+55oeXTdHvKLP9kyMaSKd7BBeYP62X//Qxypk2v6/GLIQ==@kvack.org X-Gm-Message-State: AOJu0Yxt2HUM1w906I2XFRvzR9pSsWOK9v2dItLAiy9suswRIoId2f+T M82MEmzObSThVR8soSuwmdONO6iqyssl/Heo1FtsBOCO8OpUPvR0nd/C7T88MiQ= X-Gm-Gg: ASbGncsyZLPtScD9lj2X0uiB5it+hWIRkw1sSNJQoJ0uV1nFoN5iynBlM3xmbX0Ovh+ MuFuloGxGys6+kdOB6fEqWOjVpLvlRc8uwLz52iji7SDNIK2/EWTDCsrPBCK9QWqlJVehQJrYqr h83t5S1pVzVazRKmJGvRFtXu3N3UhYs/0l/PIhjcbbAx9ftv/c8MoCscUwzso5WoCJAaoeWKfo9 uzSJAq/yZ3205DD4T2dvHHL4ji9sHCZY6uRqPFcZeFsU8SZV16fhOTR7wbY+KUlUoa5uJMf3KZt rdILOkDgEGVzbb1z3CtV/IiJ2A== X-Google-Smtp-Source: AGHT+IED7zcqCk6xnlgZyjRhcEK3K99n9HG3VnjktIjXL97/vl92I1hppw2VD80KTsXjIvmfBlGjpA== X-Received: by 2002:a17:903:284:b0:216:7ee9:21ff with SMTP id d9443c01a7336-21f4e763a67mr241716765ad.49.1739219219434; Mon, 10 Feb 2025 12:26:59 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.26.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:26:59 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:40 -0800 Subject: [PATCH v10 07/27] riscv mm: manufacture shadow stack pte MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-7-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: rspam04 X-Rspamd-Queue-Id: 7FC87C0014 X-Stat-Signature: dzhmq9st4adabxaz4t1dqq9p7p7gde9m X-Rspam-User: X-HE-Tag: 1739219220-587094 X-HE-Meta: U2FsdGVkX1+wxen47CWBwG5tYGxwZgAlKn6zIkfQ7blIX8M/2lEowF+TTcGbZsFLXJpF5PJNxmp58r7U/7Cz7dD1bqD9eDM3Q16PfCfe43WA+pAzNbaIsuGHbl65NcjRUWnTuUGYLh2ZFyCDYUdmOXZYQROMkPhNPQaqY7jBPNlrhYapuSkF7tZvYZbalFMzlsxJrclG21AMD2cwEFPv+SrXWpiZ2AeXKs7izxdp+jGrQ05e3x50PR8MeaXtj5CzNkVVE+mq0otdK6v4Re0MrsDNU9ZPrLoFIYww5a4ZbymjieAPZVehESGHridYwuHj51GQso71E7Q6j22Vn1xtU6JFMtTdUcASwi1nlYMnKhntUE+kl8Gc5OzRix/VfhrYxTIu/4mEuEkjXSlRod3e87Rj20t24U39EKn5HAkMxL3NZSXFRounRSI8pzbZ/oHIEpBcO99SLtZI4d3kEHg1hyJ5byvlIG/78rlCbZmfZuewmrWzC8atlj3jkByoRQX+R96kPYF8OJcyEeGtidA28iQ3Isyn/80vcRhvCUMbW3qNBu/762BO+fcSuNCYK0IVB5KKNPWb25RFKM/IDew0Y/wGFO2NnK0xWRftwfk0gcnlFM1IMn2WRgvQq+B4oWaeoOq+N3QFZh86cz3phO/dZcmgjrkrxxv/YaOfUjqnriIlrx2SJYuSnjmWAmuzMJehGoI2Y19w1Wh/+Mb0EiwdWP/PTkQHVq49xOS7k0ox9M39KBSONM2HyCwVAemJx4GJP1F1Vp4ZZ2YX4vijVYDp1VGq2CQIgWjLt8hOrFnuXyN7QsRxzRI3XirsI4x1ZlCzk24GywC8A3R1oG19cZM+k3LRpw0C3Y3cfI10Q2nZWY6D/RZU11CReMONTyls6HZesp0sZLqdE6b4fjqqVgiZzHqBkEpGhSQE2+r16xZPa3B+AqSslTTTvJrCNT7KiYFbIg8VmGQbD+s0xJD3+yu 8wEg5Jrk FXnlL+adA6NLEjjKguB43j6xCIP4Fx7/lD6BARsHhcLs6aTo80IMT9mM57tRBISL4G7pVEHzvPdaMLPD7+RhNigZjLxp963I4aICsAQ0xF0adlZ/vH3ROEX28Q1GGr8MKOCR7h8vsPx4Z0PAhAea6lI9yzMq4hFGTSILDzFFHaxi6dTkpDs22AV0QEgyuX1Hrkm6F/u7iRIgu0Sga+IPMGLS2q1mmm1LCXduWOn3Lz/bbOq7G2lDJ3fGk9IC7DOcuErRzzjhaIl0WjvykaqkdUkIAnujNrZAs8pDi9vHiKqLln/SyVfqdyC9Tsh6oqcje0M9yOxzO3OF6vuxeRNwA9U4jN6W2c+TyjsXKL8f7vPqBYKoZls94fn8VpZ++P/2GG3icVwiadtokWnlf+voKAfB9P9/kyhA1UcMkSjT/OK+WuEFgPNhZ1hYentMtBT6fs5LZyAPbRcmp2dI= 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 Feb 10 20:26: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: 13968626 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 DB099C0219E for ; Mon, 10 Feb 2025 20:28:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E696B280030; Mon, 10 Feb 2025 15:28:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DF0B728002C; Mon, 10 Feb 2025 15:28:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF592280030; Mon, 10 Feb 2025 15:28:11 -0500 (EST) 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 914A828002C for ; Mon, 10 Feb 2025 15:28:11 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E4D961A05E1 for ; Mon, 10 Feb 2025 20:27:04 +0000 (UTC) X-FDA: 83105169210.15.71D08C2 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf05.hostedemail.com (Postfix) with ESMTP id 057E0100018 for ; Mon, 10 Feb 2025 20:27:02 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="0iyf2/5b"; dmarc=none; spf=pass (imf05.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219223; a=rsa-sha256; cv=none; b=evamSBwqQHXpFIskS8iIvoym5a0eclJW8WlxU5rT7kh1+vHXawKuZNnyyLM3ta/LOunOul KM8s1oBXODviQJjbMfGZGoB+NkWUwvOsFWXjhCqalAwhOcNvenHaWHzqEHGDP2yAsHy3Po YBFRJRfXvr6LZbnun4QyKUYCGsImFQs= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="0iyf2/5b"; dmarc=none; spf=pass (imf05.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=1739219223; 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=DeO0low8YkA80T5YPc50l5FgrodMqR2ovHqJwD5zawG6yc/mjUZSplzmXEFvwUuKTcKMCU jB6bUyowef3mAqRFTDIKRGdr7D8Qb9BMCw62GQrO393DRDeGFAKJNc/OlagRBMxCHuzQ2w xkIGRjOaAhsYXeSURQutJ2A29VgNkxY= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21f5a224544so37852405ad.0 for ; Mon, 10 Feb 2025 12:27:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219222; x=1739824022; 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=0iyf2/5bXKfdcqZ4tP8SBhKTybCfuxMKRp4q9UygBEdzvLIibKICVgeQgaKWXkbv7b Q2Px19qZSzCDKyfIMWCArAYS6k04dNFzm0WTYseHXLuZO2kyWrxFvwLnYMs8Jcoey6p4 Pv2xECPuJ3yEY040Usk69LJjk7HKLxwQUQDemSxPtV2svnMaXnM8juGM2MJ4v3RbOw6Z tUS2DMxZQluNB8FPeS7X+YQ0TbxUMMde4eJWE43g3p2If+9p79ir/lCsLSaFUTu0lsB0 xEaVP+HLCVarLvyAmgUJeB44XjKMNivRYZB2/cZsCwW03BwGSrMHpTnPnXpPRPWPhIt1 X6Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219222; x=1739824022; 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=I/U/Y8eYq62D33PBEJWFFl7x/3LaOHk6CqVG0AzYN1W1gYdVzBWvpP10kjqP+at19D V4elUYizqFCw6rMwXsqh/vGnUbiDuoTZO+WymsGb9lTMxRYPLn/qxo6MI1kNZYjoEgKK sHuolyefBJwgPrKTpjupp1PfbbFhz4+mKHmYs/dDAGUdvJdMBVy4LgN4XmjAcGSyI8oX DIjjfY5MxT+xV1iBW8iLWd5H/krzkfgG5C1iMNbq9rGoprXBB8d4LEqE1bTgHqToUq5d EcBEdSdQgcsDIyC+OaF1mSb8bj+4i2distSs9LPbxItm2kHpSPPCr+vlxVgM11ZJ9wEF 5I6A== X-Forwarded-Encrypted: i=1; AJvYcCU92ocSuO3HhZ1+sM25lBiL7Hj4rF49Y6pK2422Z381wG6ySYE29gh/D87yRMvtIhLlwgmSmWGToA==@kvack.org X-Gm-Message-State: AOJu0YwdmcF/ulEqUpeOwTw+ip38g1l6lVs2T9MIqw/eZhBiyrsEZhGV A8S+d9yehgu+4hpKRj7IpMFggqOfjLJTFRspion+ixxC9asAiz3wLZg4ihQpmZU= X-Gm-Gg: ASbGncsB2qJu98R284ZNSXtYu4Z1bqEgabm0ZtORyBBuk5UiwQ2qok6610j6Pp8ZQpw 3z7D7UtKOAF1w+w7tOWpXvWFaz0HHgwF8gl0unkThrIweSGUQ5bAAT6vbCaBuzbXNtN9GlH6O0P f9BTX5FTn4D3tC8EU2KjEFcn+mOqJTgeZ2XZ58FMoEFGR0Eq3WNls2VVyNOF3m98PAoiT82oXML i0XI1yqwcMzAf7oZo2+PR4Poqg0/K/hwBoiRMmM++p4MaaGFmumjO2ZRvZOr3QQsenymAHj+U2u i/Pap1cRvQMdGyKSk2kzqb+9gw== X-Google-Smtp-Source: AGHT+IGkck8QMdE2zF0rHgCttuOewb5gUafKkLZkDOmgM8iUcqpClnt2HEbL9+VvYLlypifzjE6CDA== X-Received: by 2002:a17:902:f687:b0:21f:4479:a34d with SMTP id d9443c01a7336-21f4e6bf3f3mr236952035ad.12.1739219221922; Mon, 10 Feb 2025 12:27:01 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:01 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:41 -0800 Subject: [PATCH v10 08/27] riscv mmu: teach pte_mkwrite to manufacture shadow stack PTEs MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-8-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: 057E0100018 X-Rspamd-Server: rspam12 X-Stat-Signature: j1rn36kzmmuuq919efikezwrs91ghaaf X-HE-Tag: 1739219222-538399 X-HE-Meta: U2FsdGVkX19gySw7t2FHbHh1XUe9FZGRzlhu9wMMONtbSEuWXDY42aY+kpAZJUjB/4S1PB/RXXOZi5/5trzJqLcMTieGOuNkQJsCC2+jCSSPeMhqd13rEu2BczfX8Q/F1LzEIC4lUMiQlVwQG/PuL77iA5hVnyHFH/s60YcIN1ne72ZM7+t81/uAImrWaRKzuUMO3DYiz92xj67cvBa/CYAZGKfsjHMkRaVM18ESYDAbmFKkPglK1MFQFyrS+QVm5I7LRdRReWhoFFION6sixlpFncVUOrI8IjNVQPKPkMRMno+hR6PEGKIKCBAxG3lOJa38YWXD7HiGHOaMNroH7qh7V+23KVVrAa+BNBUdqI9jokb82EHhZNFwfaOxZbR4TjT1oU3js64nVbWGEtCTqY/5qGhKbfT4L/Bp4YGnqxdXUjRsUz1wayTGRDOqKK31Zf7nUmpQgHAManqyiuSdYZ59ljJlM5mPTmmNB0cytJ6URG/duO7VS6FaMnH4dsAc4XE820UghkedJnD8rw0c7weie26byz4FXyYRUoWBzLRSNdmBIpbJRhZqpCwmxmWd4x9bAPI9YwlV10xL9ukvmPU68iWoPzVCCjfp1HSYH+QBVquz4D7AgGM6wBFS5457ivU+2eG9Z/FtLjlS2Q7AEsX1+AIfYN6VMhkzf0+oDLw269Qs+HODLsgaWKEogH8O2JbiiE/bs3tn5gsXvWB8DS0tPDOpWmsHR9Cn9WBeYTtfP1sntcnvdKPnJdjb46GnTn44nwYdL7csW5wZrizw6lmpZ+Q285ZngT2zR//5qE756zfidC96rss5+uum8Eeg6XMeDJvepw42KFZD+rPyVWBalpUGaVg/Im5g0Vx+nPKMDAPr52DwgZZw45enG56ewAP0A+mLfPOF8QvPTpqfBi4mGFPsgtZcCoj1kxcCDxgBgB4NMZOKXvgedl2/GeGDSqRfKBOQJFj1z3i/U23 zfAG/P/Y I3HbhInKcFxy80MMUUbGhYgLgQ/E6kUYHJMEPbvB4b1Yix4mwkIAlT/3KLA28+0iv66K9KUbIjV5lFTv/owz0umI0qlL5uU9ANOhBYjqQtx0URXY/23TTZiYTo/iesPCLTMC8fOj0PYmIXhcFHYKl29c00rlwS3A8xtCClMQUj1fBEWCTp+JTTDSW3gFoe3hNDadv0cRy6hYuN1kQrsmHnMG3Xv3iVnAxHpFIvj/ujp6JRAh7Q9xGC7lTXfJ0uvIcMWGOfdUcATgW0igrRnTrA+SdiqglzvTcH8Zvky/knQymEZnuZZVgIGB19i+SsDFiuAqAcGzABIgF3e9oUhcgwx5evRuAOBVPlxDpE0vqUdCBag9D5tnIT0ItKkb+s4b1HY4KkrcDlYsOdfmWD9MMAtuoeIjuV6Yubpwnmuuvjxnh5QODLCJT5FYK2G3LCNYzZWUoBOne+uytu96Knk0Csy9Ql9i3doCxyVm+vjEDJrbx0TVUW2sUbpODbVXQvVf/zp7k 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 Feb 10 20:26:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968607 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 E5BC3C0219E for ; Mon, 10 Feb 2025 20:27:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CE32F28001C; Mon, 10 Feb 2025 15:27:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C6A88280016; Mon, 10 Feb 2025 15:27:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A948B28001C; Mon, 10 Feb 2025 15:27:14 -0500 (EST) 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 80EF3280016 for ; Mon, 10 Feb 2025 15:27:14 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A2575B0B08 for ; Mon, 10 Feb 2025 20:27:07 +0000 (UTC) X-FDA: 83105169336.28.0ED8324 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf15.hostedemail.com (Postfix) with ESMTP id 73915A000C for ; Mon, 10 Feb 2025 20:27:05 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=tDJK0F9T; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.180 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=1739219225; 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=K1m9PhrSsqH5an6RMphux3Rd35WVsuY116g0ElYrGC0fI0TYAqGFnpvDEgYsC3ONcb+VQB cau/sCTTzZKdZ43g9AUxuecdMa1Ba7FphRf8Imubfc0lZrgqDw2R07L/FPoB2iIJsjzdZm OcTF3sT5Vpb+ktxBMFE9LNHQI0u/N5k= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=tDJK0F9T; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219225; a=rsa-sha256; cv=none; b=jYqBB/jUXHO5YEkxhlfzAlVr0y3Rl0NlWMLA1GwEIxBNWnT08LY3hn2qKLGXWwDhe6X1DQ LZ6WwurXC2cr4THpZTA1Dp59uWUd+h30PcpuqCk272Ma6jnN0L4OCEb7DjfZLqT89BjRmT bHJsTFL74y9E8dOgXGoafeNnIqw2xhE= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21f2f386cbeso88901985ad.0 for ; Mon, 10 Feb 2025 12:27:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219224; x=1739824024; 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=tDJK0F9T10pBBDEimOd6FXokkItzLp5PuhE199zDJJvqxlZjkNARVKl9eMW22Iua1D rWQZcKZ8H/PbP7+x7utgt3Ti7wTcb+YidfbgZRCg0yb29eO5bWz0R2Nv80dfgxpLL781 vLQBbqpF5nDZT5EpxDYUGIAvRjnvSkB50httgJRRieddazKHg/znabSgm5u+3i2JcfZZ nc64XDX/Z/izUd+3+B/7bjp0AKHf1b5VosDWoaMcpU15ytTe4piXoomX5GUTJn2+O05i LBpd5sJaY00aTUf+icVG3VIuMaoAVB3Q8aFAr0ktC/XHWEavHlD/6GYBcwu4gFovQCbD Of2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219224; x=1739824024; 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=JuCk50WtTWqnaQj/dr/oywE3tAGYs37vtqLe3cFgvGxJ8oM2s1if5A4Y2IBma//Lt/ RRlselWEMGFmJNdyRok5Jt5eoQ+aHjv5dloo/06JsadxgR/6Boqku7WOq5wif4H0mqom +O+GmCF8u91tQQiydfmVzHvlgCLeSC2Q7ailjclRUfMJRkxS00oWGH/TqJ7DSwH2Okho eeQKY6Lyfqlh6XAr4+wydLmD/T7Xtf+3dwc1AgS9KKcvDJ1WLTRz1qe6w5YVObYceU5O 6yjsbRW7TAsZFF4/hPYnFIgp9AbemnelGEofS/ujJd+9oAFswR1pYJsIqwvrcww/7peW f/rQ== X-Forwarded-Encrypted: i=1; AJvYcCWBOP3iM8kt+1oTYVXWBOHjS/d2RUt+fnS2IHySAqnBfn33RlpPQBCn0OYV5+dGN4wmg3lT8j0ndQ==@kvack.org X-Gm-Message-State: AOJu0YwLc5cifQ9k3kQoaGuszTbF4A2+qKBfUNKX/86DuXVI5wah4k2h O1AZYW70hfehBB+oK4tjP/cyiRZ7RzmOAaNGYdnot8NOtnOKP09cXli7DnDHd2c= X-Gm-Gg: ASbGncsfHz/29OUZH7ZKm6czn2+HZov4ekvqNF1EmOEZWjnyzoa244dMUDsOVW6ms/9 8BV5fOAS47QWR0sEGPVIe9qsMGn3D0v0BFuhtLXP0VvKLY+NTu0sB6TtXRfAnc6kbxrbp+3N4EO tV9BIs/zhStNrm6AsELACfM8qYT66rwWa+hSNXGeOryM1vueSSE3QbLRGcMo0iY2JPgbAzRmW9n da5TZRAWXroMQ9/JO7zAfaYLBjwZHKe034E/3R0WF7PBLE5Hiz3oGtHm2+k0dvW8n6NkllJgRvQ SnePM76OXCTIdZX5R/vGXHgpvA== X-Google-Smtp-Source: AGHT+IH51GCkumMcFJPAZ0u0Kjg1gihjqDbfZuYLpqygtJdnaOIjAF7ExdTAshwwxxeYa5aWxibyKg== X-Received: by 2002:a17:903:2282:b0:216:48f4:4f20 with SMTP id d9443c01a7336-21f4e6bf3e8mr230190345ad.16.1739219224426; Mon, 10 Feb 2025 12:27:04 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:04 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:42 -0800 Subject: [PATCH v10 09/27] riscv mmu: write protect and shadow stack MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-9-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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-Server: rspam08 X-Rspamd-Queue-Id: 73915A000C X-Stat-Signature: k115aea5ruhtp3t84hy4j49ksuuekmas X-HE-Tag: 1739219225-611361 X-HE-Meta: U2FsdGVkX1/gy+RK+DAo9Y8lS9k5iXQfe4ndcjJA1Iv8Kp7vV5DlOkliwWdNzZjNccACFyq3uSLRcVKRdX/gVl/aGu17N/fb53+KAUNNv54CZQamefr3BAgrTaFEDdxe55Qy/lCquKljWFXSfVVZHnM2EIL/S7kYp6IMX27p4/y8XlNQMAloGnPYxVhej9/s5AQvtDc3+2B3IPY3EyRCUUaqeh2lF1uY+tIt4osQaTYyN0DfkbXISiGadf0vMVrJMqsVN26gKQUppgAdu7fzsQt9XDzWFItGrDEcNdyWJY2LX4uaDki7MCqegm0Gf3n9ALpZASPxK6nudvjFnkSYj5dSzmnfvi8lfNL75FRWw/vdpAy3E9M/go2U/VEttg2se7vYYbngVBWgtPGTbwiH/tqAcqU9gAJuf2DNkREvzdkTl/1QbBUcZB72stwotsVgcFCfArT1KVcQFNB9wvz0hvAXnE1YuMyBbJtQRzkPeDRf8fdFuE/NutrFglwvnwYUQTy/aoXj8hVCKldGFWtYwoVnqxUfe0pQyssBT6pOdQpvj0yLojZ3EmiwryIGKizq5qEf9rTRdxnDs6LzibofHTEbNZ4jWHa4CoMFzkiJFGQ8dEp2IP/RBJ+RggXdzgch3GDYJhc+rHzBavQknBdPqq410PRGcHcd4hfgwewF8DE1kxmKJIzCWstb+Q8CzEAPiiT4cC3M50pnxthJyDR24hk3apkk75kfHLNsF4q85gOoAJ19E40O6GrvSrS/kVrb1EFYbHdn4hq3V+SOa33aQvGFuqg72lAjiIhdVhJUQbGKm4yyr87483IqDSUG2tRy0s1lEHMByTax4cu5sdxL0XCUh51s3RKCxQjtHrnjd5gooGpGL6F5f9ZL2sVL7HqMd39ZjDTeb7d6JxdE1LG155nYWWsjUGuPzASZpBogupm2dK0+eEJgTmON49HSDwJ+cT++oQFoytr9vledAEK qXcLV002 1QGkSfugoC6hlxN4H8480+UHCcno+oXS36arxYpZ4mzV/sGD2hNo54yDBSP75Rn0Goig+qHZOWtU1O6TLKMPztyORE9rPhKxThaOvgTmXrLwINpifV1qc5Ke1oOw57ClthLLv8N6X3RhLrly9ra/NsCg1COUdMNPA74Q8uszRSob8BOD73gOhvYGX6C9kWDkOqfg8wI/sUJ71gSjHFWCdPBZSkKPV/7l+q6jlmdj2+k1njcYpKLcbrV6XUBV6USLXRZOyOpdR8LYShQ2nmFki5KlkXcv8JWH1aHt7GC4gwzSwjqWXAKnO8kU2gLTTDuSlgZNa3aEjmZXKlK7/I8Ff2z5QCrVNwr5l8BLz0LNz51grJNrKjx8ZrQmBjHMwPMvCJfHd98c5cQnEnyJPWuxJMa9dF7WQuaFezaFUo6qlSZEqRfUjvyvB0uRkvBC0UdiJmCMJfsr9pnRO+crHp+LgQCtNUw== 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 Feb 10 20:26: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: 13968605 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 621ECC02198 for ; Mon, 10 Feb 2025 20:27:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB74028001A; Mon, 10 Feb 2025 15:27:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E6FDA28001B; Mon, 10 Feb 2025 15:27:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDE5F28001A; Mon, 10 Feb 2025 15:27:11 -0500 (EST) 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 ABD84280016 for ; Mon, 10 Feb 2025 15:27:11 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EE072B054B for ; Mon, 10 Feb 2025 20:27:09 +0000 (UTC) X-FDA: 83105169378.10.B8B7D27 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf15.hostedemail.com (Postfix) with ESMTP id 06D23A0003 for ; Mon, 10 Feb 2025 20:27:07 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=3Z7NxoWY; spf=pass (imf15.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=1739219228; a=rsa-sha256; cv=none; b=6u8v9CRYOxbkS7RpR79OsmL7vpp8gh15U8nq0S7bX3IS5klGo//d20aQTuzAaS6updSZ6C KKpdRcyjVBJcKCf/JpvQT+MpgSuo5UxBUJCjg42YqoVzBauKqjEGr7zazT0iYPlUpFBqrQ lNA4LU+65MhYgodDxTJeuzo07vKXKyk= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=3Z7NxoWY; spf=pass (imf15.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=1739219228; 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=JRBf04F1CUY7LtDAg0yCt7/cCixL1Ju/LXf5NSa9DtKYnfOLILOw/CbC6/+DYBD/xP5Icp XNEWA2SniDpkmIiQfJ1bHX03JpaGIHjJXR/L+9sMV7vccinQI9W9Ctnpk99ccQPNR8njty rtc3g5Wjo+e1YponyQwIIxgjROjZs1o= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21f0444b478so68622235ad.0 for ; Mon, 10 Feb 2025 12:27:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219227; x=1739824027; 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=3Z7NxoWYLPmCbOJXUXBpCwOwEv+99H/p2kr75p0Z2C6LcanH+0g2zk+dmbKsOr70fO 6ZDIdeF106g7xCg1hey4xhJLBOqLf5KlmRKaHv4fSVqM4WUW1SXKG5C7zLbNWM3E4YET cN2Ep7NlMo053uLuO+GvGuiozBd8r8losGzCxB6pE7ORuJmOMJ81zyjCY2oKio8h5ho+ VfstrM4vnzhN2e247MzTVr+5lVW6eje4sKuzaY4j0BIyC3Hb12EvOQ8a09OJHxuOY3rZ rN7OACQp36d9/s0Isx8cTeMNkwefYROUcZnRNpOM5GnUCeewQMgx26undcsSHq9gYPjU QaGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219227; x=1739824027; 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=YhmsoNgaLHDGlYX4YiLy6LROXOWqBb7D/Xd6fSe/rSprKIC3o9QTuitwOrit+zFaTk tpZwiy81v+U1sDLpTkKAZKXI3aj/6z9cvCezJGdhs39eIAx5CKIJERQwsKZ2Mamx+unU QBd1iyrqQ+ocE5iCPDQgreYRmrlp7iyjLvykYRecs3aTst//1YZyV2rvU5lnnqIdiaJs C9cCINmN/JQnwvSzc6U3vU0bQCc3E2xgZXmUF2TqX0pTDlQDoIM80kFFtk4GpT3lERNo nmFgmr3jlGuLo4V1vl5OKH5LNkJ+pyodvHdU2lCXaSdB1LbSDVwPj/jTk9LZ+Zhdbi1b TqLQ== X-Forwarded-Encrypted: i=1; AJvYcCXcOiXyp1/cVR5ZQJR/+Y0wmgVlSPZx0SjB4k1XljM7QdXmKYd7QUy9swLqG7Cwuni6JQ1l5K1DOQ==@kvack.org X-Gm-Message-State: AOJu0YxrcwEo+xQEukuWxXFuGkFDfeipnllvMOkO5GGqfU9BO5epPk1R ikrWFyafdAZYAyFejSTyawHyCoGJP/iZngwbxFH1b56mvtU+1/tBbOUypw+W2L8= X-Gm-Gg: ASbGncvJU5FxBS0AnwCd3DnmCl9pC3AbZ+RV1PF5Ch+68XygkmB3LhUEjhr1gMHYaCh 5q5lsjF/OWZh5ge5I42svcX/DjgYuLmhCYrq6UeFWYaVCyB9yS67wcJZ4VPZKnsQF+GaNjZcp/I Gq5dLR5drwzGuDO06xw31wC4eOPShI/elen6vig7V7EVs7uGN3fc+81yFkCw9s6mxybgJ0+mtXL h7xuBto/XRfPXkg1WS1EmzNJIIhhCNmIKGrDHjEStyD1paT26l9z36dL6kFgSxHDXyV0QAIA4zZ 3tf4LCD506ltMbk8Uxa1xooiQg== X-Google-Smtp-Source: AGHT+IFiFOkgExdj3mQCqaaai4pDSiQ+Hqrea6eAygrZlJssTNgeNQJJiOpmwE+Z7PNIOmAr6Vu5+A== X-Received: by 2002:a17:902:ebc3:b0:216:2f9d:32c with SMTP id d9443c01a7336-21f4e7a1ffbmr262362135ad.53.1739219226925; Mon, 10 Feb 2025 12:27:06 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:06 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:43 -0800 Subject: [PATCH v10 10/27] riscv/mm: Implement map_shadow_stack() syscall MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-10-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: 3i3y5a9w416hqcqh6ydzpaub7ukx513a X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 06D23A0003 X-Rspam-User: X-HE-Tag: 1739219227-234248 X-HE-Meta: U2FsdGVkX1+oRRpPzd/h2Qlz95rNa7KdQt8YcGVgwYPEbo1x3pcMgKzB8x7zQUxAeyIW1sIHs1gIAuzG7G2Fieya/ksjQa5g+66kFyUc8GbAMyQy3lWid6lBe3uNYW5qKblwI4G1SZ9r6hsD+jhg4lQVb4zZtLSfP1ijDrR05HBrgY+wksV+A40aSqVjA0b/AGHm9Yx2Wd1HygKeNcvCOB/Sn/Hw1utZSp+dU9GrBRy0z8Sq9F4eVCyDT+YjNeIqC7sdsekX9YpTtPglwxOgxoCug5MazABu/NUnnHtE+iSqMrVraoH1lNs3yuwnKK0qKBOT075DVLY4o/X9LuOy3PXkv10zfKBvR0IaRncKGGqpKCTWi+jRspSuSMx50bqRFCu16r0jsNjWdsfzyYFjkInVKD0k7vw9FXm3IYzzwTuiJMyHb1FZUmwEzDUVO+AeT3LYlV3w3J7JmkDPye9vMeaaYiG8OivuZhzOfrkzxd+9xLFnozJsX6ef8bJUx72uKgyAY49PIbePYfFxBKIXD3Y+HAn5JdqL2Dkv2s5ATUmfEfeNFpeMcOT1q58EYYByWJnuXGSoEOFWEz0as3LTXLwspceRSjNC73WCpjO4xNSmiBqkLcLdhrz6/tiTigoxoKdjNk2xi2I1aLd6zUIAXororbVVmRrkN55Jj4vFX74NRBmJD3jAeyzdoMRxtkAc+H+4MwGQYxgB3oki4+Ne/WkzIneSWfrV0SmPB8ZOW+J95uiTQR+TbaPIYhx0Kw+Jg0YVthvihhsROeHoqiwoOqj/qIhGvyxKElHGfQh4e6Sp1ymhQr/SYGmhxLL3c5bX2OXOpmF8HhPYD1qLL7uf2L1RVOfteCI4mACXty0RW07ytSuGLvuJaWgQtFqfK4cQTh1zCDh9l2VbZb22dt+iBVnnmMeSMkuPFmmijwuLQ9c+ro9Nek19TaPxJZwbLs+x0uafconPdhVWIIed+Ax BUfN/4c2 PKtBIwERbY+7GN0Kleqxy9zn/2pqjhWxLoqEn+noMU4zGSaARw5qw5BEdAPUBQQcKzIqYG/TLgViQWa/fRri0AhPJyiKZIkcYSDqQZponhMAICk6Q0oPwWKdp4gJGl3d3SAO1ianPBUTHMN+5XP67ydAYUi4WxknjS8ZAAP+lZwPTdlG9jRGXm0yhfQJYyjx2ufX7Y+/z94E7688JTu9LRCBw1BOf5V9vU9RmUMhALhSrrEM6745EBCMh2atxDburXf2CKKoOeoSp3lNjFWwLRZbxStQvwtSKTvbc1AMRhtxQwS0yXThKrimPrz+8qQFOmtA9qYVqzTPahZaMCGX2nyoWy6OGrMLUJbdOdSx97jYqQwaBuqBl8JIU1BWlZ3KaUfwWuPKRfKMPUbMz5uC6vQsNFjryU1RRHaF5oQig+o/DEIMdeVpLDcqbS9WjAPH1TvRahSLy78yFq1jIOa2dlshU9Qn8YM5VbK29zVeOnVn+RombrMhxcvSTEBUnTtydwEqD 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 Feb 10 20:26: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: 13968621 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 F2B62C021A1 for ; Mon, 10 Feb 2025 20:27:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47F0328001E; Mon, 10 Feb 2025 15:27:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3DDD3280001; Mon, 10 Feb 2025 15:27:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20E4B28001E; Mon, 10 Feb 2025 15:27:55 -0500 (EST) 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 F2646280001 for ; Mon, 10 Feb 2025 15:27:54 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 94CBD120619 for ; Mon, 10 Feb 2025 20:27:12 +0000 (UTC) X-FDA: 83105169504.03.811829E Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf17.hostedemail.com (Postfix) with ESMTP id A22974000A for ; Mon, 10 Feb 2025 20:27:10 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=HJAF8HrD; spf=pass (imf17.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 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=1739219230; 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=Bn0GvdIU9sgvGsRpAbAueBTaYReDrqyFL+yeIrjAMo3ibzZcDBNzmxEaizUaOBPjpPKZ5C ARxo2ueyccuyt623JqsbG9UNuSTvuHkyb2gMJrWjhZ/am9XSBbz882AUKf12tXiA2uQY66 m0ltvplT1W/OF9miuZk65MRwkCjxNZY= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=HJAF8HrD; spf=pass (imf17.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219230; a=rsa-sha256; cv=none; b=6jHfrEfCbGvWYwxA5aSAT09i3AE8g7aTMFtgA9q4yezcAO+psGo0K3gCTql/JriT2PSNwj d9DUqTwIJnlIAiEpTKKnIw03iR0DV/Q2yNT5L0/hnOZOlK7sVPlIuHZpXh1HfqoIC2yxHr TY5Uj8QAdKsxRaOBcl2WpeM7SpTEd7w= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-21f5a224544so37853815ad.0 for ; Mon, 10 Feb 2025 12:27:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219229; x=1739824029; 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=HJAF8HrDxY4wXqvUy5YmsV7zcMStOqoyyRIiZfI8Vj2SAr6FVw3mI5PfL+EeBOIiA9 pASbzOwLE3/ohthj+9j8qKeKieW3mtTbfuAZsNGNbIvnhLrE2RhWd9NzS4SApHeE0Ch4 jK5R/ISwXdBEw67/LwisviKg1xGgMHkC1tGg2fAgd/lVAbe6j61OItvviQpNaw1drAtu YdftJPJl8elE86awz22xvvKKmCaE+v6QnSJhyHEOpAmciLf9RH7ktEkyPIeRqhOrhQ32 tWRzW4ex3pu/mHiPOHDFTJg4KPz00useftx1rKwhCeFKn4uSOX0jLYLyXsUTd5oDSW4d 5Vbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219229; x=1739824029; 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=pf7TKSxd7rKvLkAwIiQ+3cgtpQFFzLPyPOdzVivPbo58R7dbbOZsqkGnIvtvFZSEiu OX1KrbtcoYUhknunCRtc2rcoCI7xulXDxKpzA+mCrx3F9EBAcdfiwsVIshqrqzLvdhq8 Ir2YU6xKUHhUXPLkfnmMnxZfoDwIcn8bQYb7pH2X1UYtuW5WHRdvLYRKlL648aNNW/rb UcA3IcxtFfDkW/Opp/vKt8Hqh0KLE3OpudnRNHJQWGHlCREz1wAG1wQC15qg1VxCucYu q6NifbRLJL/CDcgAPKlQ4RDnTnYjEHUAI7koP2TUJkvFvjJbXB3+/aYq/1LjzaJyU3Wv Yr/A== X-Forwarded-Encrypted: i=1; AJvYcCXR71lOSedxO0rkXn7mcgTL4LoBjmAnVeL5J2BbMRwKQAuruwXwYQkhwRbXSBtpKslS/HoEPXJh0A==@kvack.org X-Gm-Message-State: AOJu0Yz/KZUedO8zmv5k8PZ4qeXlfQ09Jk2vQ2YS1hxNWgkP2RO+thG0 93TGArRq7RcQGTrjiNvFzFBc7f0XRjctZXtSfdpD+mLVFBrbutf1BQe1XCHMVH0= X-Gm-Gg: ASbGnctXYuu8m9EZ5pmPgwRz+WFavPGXVy4fwJmVbve15g8ZrzhmZFyOea7wNkms8IJ bpAHrpso9TgJsqBsPNyIrCsvpBRmCLjwd4Qx/gxMIgf13+Bj79PCkdrsCuG4D4bNEbjGEcvrhkS gjjCe/k1od6DCtoXp/RTx8S0sozGgKo0kuvChq/bFr62xf8gnmHxUbkfXgmk3960BmQdYb1D1mF ITKc1tGDrMpUgZIGi16TCT3jg8KSHDRWO7Jjamn3u13WGprt3aCnSmaucMigQDVW2qplXOThVJD g7G066q6PFWzddA7kwMhXLP3IA== X-Google-Smtp-Source: AGHT+IGZnFyPKV59isrengTEGABOlCfahgTa9XjYAn6G0Fd83Q6lRI2on59iQCcOaOdLCTNcJNym3g== X-Received: by 2002:a17:902:f60d:b0:21a:8dec:e59f with SMTP id d9443c01a7336-21f4e7637d1mr213149445ad.39.1739219229424; Mon, 10 Feb 2025 12:27:09 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:09 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:44 -0800 Subject: [PATCH v10 11/27] riscv/shstk: If needed allocate a new shadow stack on clone MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-11-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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-Server: rspam11 X-Rspamd-Queue-Id: A22974000A X-Stat-Signature: hsm6aqzeic7dkgo9wtx74f3stakwjcn8 X-HE-Tag: 1739219230-336048 X-HE-Meta: U2FsdGVkX1/QPS/LfuEaCHHwi6zWhUYg5HeZRElu0cGCcjTH4jPTJ5YJIRGWz5/Yb4LjSUVBG8xJZw0S/xV7CRf2vLxnmaJd/0meL7pml+4RScpJpv5fxh3gd4OPZKJ495markJiYyu/+7FGbjqpXFjZfbPxOWsS0ar2/WPnFCNSt+fk+19gEwd0OE0w9kyNGBigjnoPvVIMYLpb79tyvO/0N9OM2b6OoYpfJe48bAYBTSzSXSwlVC4EQkM/VVYh2Gz6RFwiYY+I83RbfGx1/yqBudjiHznQF0PXIeflMkQuY7E+JazjBigmKN2JyxGaOxLjM+p/b7Qj8Lf0KogiiknzUfDnEZsbbLO431DjMwTARN8d/XbiB3hK4KuMiHFjQZoRQXUV0oPIqNpp8TIK050WHThCesF2V1fH0m0VdEEkbvsotJH0pWpHqkuS2sWeLPghHYugFCGi3V77vdG2m3Sgelxkx34dVw/6hlpfmBb8P/jrWOUj1ct1Gk3J7HU9WphdER4g/GdLTNj6vxDOR3E8PXeERQVPocc9ATTiyP5V+4WxABO0eWxnOoqEk50Mo23Z0hQbZZrQ1vGDylcASmdGt5cTnrZmUBv8/JHGTRf+uGwcRBImQmawug2D17sJL51ZyuXEs3TwJ9rgmcmdO4k08iSQOh5gMVP51mmgsZpvHQljKpzHBCopbfH4p8u18K1unfvhJyaD5sDUnLhGbnd3CA1j1ZB0agXxrkzU4pLEeTq8fsCvlKAAvzQTFXDIvNejj2lkpspzEr/Bl0qNjd9VFLv4e7sVxJveLecGnIKt74Lc4ryRo+m6ZMjLYDB/r31fgQbVael5/q9D8CXR54il2qMtR1mfhQqVmj6QinUkXNn/a9+4VIdKYvPZrl8Mo9/WNrK9zHvV+p8Hms0QzXJ1sBGbYMLzoMu59S9v4iJVf2MPStNloAtHi30KuNrHsV3zRNC6PtNwbDfiRnY 8xJyWVX1 Ygj5SqwSvuU0HF/R4YdQ6P7Zmntow7pZd2beXf7Gy/TlW8TnC1bRwnVaqCTiwy0DskkDURq9a7zMtQpBld47mSj0oh6alLFKXwnH/8/tGsVw0FF+0Q1q/WDfAT34mEmBJaf7jwaQovZOHKyocYRWnGr0ZQvEa19uWNo4oz2twQgKzYJSPl/PTOvv+6GKKUDAZJcFJUXwwRg7LlJW9VVX8lkoEFAkYWhVZaYc8jDKyIo5lhCe327Z3M7qUR+Q9JGeqLIjyO1YL9Zy6vyDOWm8srl+OBGbkx3+2KhN9tSXI5yClUfaZ34mz4pRHZxQSel/q+/V0ohse/1vftz1FqVyt2NhEkcMQ2RovQiP39MnKi92z5+VO6Zkne6YW4tJ2HOCLOf4CXBV5kOR6idhSmKXfF91ooYs0frKnD6jq+6PBUweNDYQaJoXARMBtd3WwbcpEiTG2GcdoSVHZq/8= 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 Feb 10 20:26: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: 13968608 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 C5773C021A2 for ; Mon, 10 Feb 2025 20:27:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B0C3728001D; Mon, 10 Feb 2025 15:27:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A95C7280016; Mon, 10 Feb 2025 15:27:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E79028001D; Mon, 10 Feb 2025 15:27:15 -0500 (EST) 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 6C5E6280016 for ; Mon, 10 Feb 2025 15:27:15 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 2CE961C7622 for ; Mon, 10 Feb 2025 20:27:15 +0000 (UTC) X-FDA: 83105169630.16.7D36951 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf22.hostedemail.com (Postfix) with ESMTP id 3FFB7C0012 for ; Mon, 10 Feb 2025 20:27:13 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Rh0I7nv7; spf=pass (imf22.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 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=1739219233; 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=wPGCQRUIGIe3c/AW2ptWMmpAEKlkHe7ZVTzpZ1Ka5Ok+1KMo3YFTEnGa1eH7yJBxkoZefG SYrv2IOX7bpjY9FIWhNicj42GF5gIw4Hvqi2Ji+a/dDiKFyx9eBelcqFvDr0K5hPeUiDap xW3hQknyRp51jxyowP7Gx+QGgUQR29M= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Rh0I7nv7; spf=pass (imf22.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219233; a=rsa-sha256; cv=none; b=SPyWPmcvhf38UCTJ374fsHzrQL7BuRcdzreg7Bx7L3z/Ie4CKESP7Gt4/iBRISQa6IsiPM Q9bQ5wAuXoF1BuqEUXeeE5Y9Ko/aY4GmApwImMO9sDdN8YaZ07QQEiYf0v7qdHFmPJL1qd tWxp8z8SYBBnNZjoX2NjfGa2eOir+s0= Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2f441791e40so6639072a91.3 for ; Mon, 10 Feb 2025 12:27:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219232; x=1739824032; 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=Rh0I7nv7uecUE0MhEfKNOXboXdLUN0okzoTYC/TMCHEUgNe29Nrhz78Mt+OlAoiuF8 VUOFRBtghDCPK7fkwE/xGgY3z53iK0y5LSc2k45eD8+/xFbr03REiJ+Ba1zsSoXGhpSt 0d9/5kVvtnK7977osYBMMnYPocnaVCTa7X8JTszGyqvI5l0vyH/nZsfMErlxINmvtmDc XdvN5vQ2/BrD9s3b5yx/62k47IHw6xAH2eqkAd7XoyE1j/9KwVGmMQeTwTHvDomRw4Aw ppIC3hVN9R97MeucXJrurvdCd+g2RDnGqYgurvqdHxpqobYRYFKrOXnQF4FJbPMKPc0M GDQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219232; x=1739824032; 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=sB1GNMfwG6f/WFaZm0c1ujANlp5UGrVxXkLGlJChdnxZX0XQ1JaYXryK8uaNMoX8qN mZEx46cAfGnZrynMLMaOOcm7otuRJO7k0W+shNk+WY9D3T8Of4v5fRNLrOtdNG3yq3kL d/bs4OrVZyi7KUB9/h8AqY0Szrlq21Sd/koo79khD5nJohS9TJiLJU7tVYhukZQfe4il qIouinw5F5IV4WFG+LSQfSMHFs9pFxf1OUIWedmCgLHp9+cvV9Pp6blSpb85feMPaRJu ITD/kYJggGGMeO7U+7PFDQyGc/oiXdjQCwBvwImtGwRHaIP1iC96xFLF20oy8V/w9V3u wz8w== X-Forwarded-Encrypted: i=1; AJvYcCXVZ91owzxIWIudzbxlFwf+eJhQjS36bfNgY9AH1axVMLdxGMoKzzXsH7+OmIf+2sjur1fNRfVrFQ==@kvack.org X-Gm-Message-State: AOJu0Yx0NkmHxhiJZaNqhBUbz33tc0YBOLQum84wime9caHXSmSwUBNR OMQdfEyeQD1We8cqXY14svXQ/HTzuROslUsZ+iE8DCogGTXAWbyaQNdyUdUDdgs= X-Gm-Gg: ASbGnctPmVUq4Cn6SDJGL0aQHCy/iC8/NfDEF2tBP6N2HPzJZeqrIiTIhyg4pEpJVTw 6ebictHKEOZqVedHJi9Qgj2vhWkS4hYyxoToV1dnWPG1ScbpeXTmtbb0HqkB0LCVc5LDaU1D2NI POm+mxrEkuOnqG9yFAXFVXYjoDbAOJgUozl2YAzIpMZ1e82aHMzrj/522CxxrP162w7OQdiRy3r 7WPiB4AD7iAYdhnmM7LQeCM/6UVAdq1FHB1WzjridHfxp8D9I49rEkyF59SXi/op/+AyCDYboWc cFCaZYKnCJv0CeuKmPmRizIjcA== X-Google-Smtp-Source: AGHT+IE5Dg5nkfBxu0gDkqjTzqTfKYquc9Psb1XN5Wmp92oZsUVGzrjZXZcy3FDrBIXQzaUWIDbAIg== X-Received: by 2002:a17:90b:3f4d:b0:2ee:c9d8:d01a with SMTP id 98e67ed59e1d1-2fa24064713mr22932653a91.11.1739219231942; Mon, 10 Feb 2025 12:27:11 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:11 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:45 -0800 Subject: [PATCH v10 12/27] riscv: Implements arch agnostic shadow stack prctls MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-12-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: rspam04 X-Rspamd-Queue-Id: 3FFB7C0012 X-Stat-Signature: 5bfdjp4wsdyq4hzrow6ct3rnj8nqgx6w X-Rspam-User: X-HE-Tag: 1739219233-127759 X-HE-Meta: U2FsdGVkX1+6E08ervx8FusP+CLZ8ICzs4cMINBpmo8CAp1AENqfnbyzeMM5MAbWvv6j1hBBzDGXd7yNwgDDRwXbgdiMt9oDmycPPmgwicJpkeIvPNwokZUHLAHNtk6tw+9ho0xXeiscPOzLmB82kRl47U7+QMtZwI9/WSznFzj+neyCY13ujwWoz/mVWLyuBu5eURXIwD9tfYrhy5DlVHy/LMu8pPUDfoAWwS3AtAfmMbAfhQntrxpLJAtqDYkp+/3LVIlIYepniYaHzx+zE8aQJB1Wj4pnpTsV7GrEauhocx5dGvRsDURQjp9yidWJRIfDZFTQNAQD+8ztdVVnUHIfS6k2zQHF8a0S2wtjdmEokMzP4Nw6iMKfo1ChkJ86pYNQY5p1hlAlQGl0C+tZo/QCAnPl8nA4ijWmftrwjg0IDUvtZKMpdF3GuJA1n/wwuYjzwrDQTLygU6dQ5TmX//hcSB67B7AAQmsHNCK5Upa0DTVf+9dNvbsAZx9Dz1DmQBz/mQmeJ8d2/PGyoKhWNhlj4z/OZFeEFdHXUIPoXlwS2B66Lom2viU/KGrhTecG9e+IbSL2qid60J69hvL55LwWh+AHPCsGRfcbbQNR0jOoMVuHOx4ftqiJqMTRuz3SBbc413iI3mBUA4yOPVzOyBfcFW2pUz+yS/7vGvxet+zouEYDQyg6FZk6d3QRAD0MA4QgNbV3pl+n3ib1yw372dBkcLfeYSlvs2TyttpyIfzwVlJmu5XIj/1fBUdDfwbP1etNjSJcjGwOHtbYKU3l1+G5EG1AYqtXjyQq0U4zv6s5eHLbTSHwK4gqpttCplXQmJ3pXptZki2REIZKINcTj6uauT/z//pC8HDQ7nLuMpKIHA2XKFDYaNo7n7VPGGvRShIxJ5U3GvhDbDF5WwG8NqLZvr+vIIuya9eP/HYb9eqZ+1h3QA4E1+uSQOwTPpzTbFpVFIuLnqlwPIaW9qE OBFHuECl JduRgyUovITC3FE7Vd/cPFyqvTErfvMZqP9o3aeoS3z0JzVLuFgTphSnMyG6RPcM/6c28tkPifcQs52ppelhS5sOMVzTMjBUCE7Jse1kb5jBjBzxujW6TfroSKZu3ChoQh/sJnGCP+NhsZG4n8eVElvz0qM5Htr+yvgHqfiQPllYSRNZzwO/gfBO+mpj1VLBVk9Jws+MLm/mQZotSkkLao/XH5PCXXTaKX0UvSyobIgt4FKD3lNQwcTf0c2tPXGk54aVL0qY3HY2q0lPjC1hQaw6qJ1ijF975UVmhdweD5AJbOWFoJTQBs3Ay/F4ZzxFvbSXiTwqUpeGSX8XLc7u5m2HgNV6T+5QZ/rHSivgCHSoFmlEVs8Y+1HNaZQhvL++jUwkvigld2Co7xHz2RJfMUfY4T7t7UVmw2PDcjvLu6ivfeJUruJPpPnKjkVZEFMz7JoTUJvUup3JxoLS4MQDb+Nn0LQ== 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 Feb 10 20:26: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: 13968609 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 90F78C021A1 for ; Mon, 10 Feb 2025 20:27:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14AD0280020; Mon, 10 Feb 2025 15:27:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E3DC28001E; Mon, 10 Feb 2025 15:27:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1851280020; Mon, 10 Feb 2025 15:27:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B90D728001E for ; Mon, 10 Feb 2025 15:27:17 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8264F1605CF for ; Mon, 10 Feb 2025 20:27:17 +0000 (UTC) X-FDA: 83105169714.09.3B2CA83 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf22.hostedemail.com (Postfix) with ESMTP id 8B906C000E for ; Mon, 10 Feb 2025 20:27:15 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=z5Q5O8Dv; spf=pass (imf22.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=1739219235; 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=MG8ezcZAlnGXaJxiwmUt5Cys/V5qAT7qBNqAf82yZWTLDm1vvvOGm0HKAew3sTWFnZugJb /7FGWje80N6eSol2JLDpq6PjpvKjGhW9LX0cUJwCwhRaTfqWzfw/qKrrklC4me1hxcIfGB 8S+jTZ7tssAry1nMaze/k5Q/pBTXmTE= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=z5Q5O8Dv; spf=pass (imf22.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=1739219235; a=rsa-sha256; cv=none; b=5G8ATBqBbHOEbcqABcDR1oH0AZr4T0NRcmE2gqoOYmMZ2v90g5k5EcltUngZcbM4K4+e1C xOOH0Se1UyJS0OfyezBmXWwgXNDLGMOQ2cG9Howrv4ksnwOwyDiu62dt9U0v69v6m+h9Eu kxjYa+jzBqf6dC2Rov0nB4ACicEk3gw= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21f3e2b4eceso90257875ad.2 for ; Mon, 10 Feb 2025 12:27:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219234; x=1739824034; 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=z5Q5O8DvxzIc/h/Lyi8FW/FwLDb4Pel3tBtIJ7g9BvjpUgjJyJB61Mv41V24hrxaFG Xzp2cnH5lC8/RctgWzc/f/1KawV2G+AkpNkOG5eIvIZgQst32nBEm6qxAMVyrE6ivNEw NEvB5+ql86Ist+8gTOXeVbiB2zspfOfAl5Am2yTPO/W4oL32R0ffmKftSes0ZjBeT1QY QL+D9T2mAEK4WPdzRiBSQBU/BEVue60Dztk1xDR8HpjRWLkhoB4+IrZwzehUsFOu6KmX Q2eMqZ+vWScdDQ37aecxpc8k8R6WtZvQHRTsR8Tjl+J69Q0UiHXQVDLYBbXe9pV9TmxF DRYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219234; x=1739824034; 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=QEVIbQ4cV82eIogCpIsyCiOmTgAgPenatewqflL579O5w/gITNeujRVfagJxSfI6Ba mwt0E0Qwi5fVkqS/4ldsuKNlZM/1zSGEeoU6+qjl+cAs2m4yBpvmtHB7ncXG1tLtQZlO COz2TGm99wJxX/t5Urk1fosLB6v6wrA66kQakvk4kITxUPaA0xnwmpmf/QNw/LDqsQt7 EhMrA4AeckA4RS5OsxItfvP37a+D0leCoaILUGpDUq3gQdLg0v4P3hEoehLEAJAaiPfN MaEy/1879IuG9Dssc2KtQLuk/D4QuD/Zuf+5qIht86/gv/LX54XMCoU655duOC5S/eJd z/FQ== X-Forwarded-Encrypted: i=1; AJvYcCXShZ61593aLSNh63s1FF8q1eSulBCZlqpVtELzA9WaZus6gwTEFxs0aa/9Zo8rNVvzR+2Oo8fUhA==@kvack.org X-Gm-Message-State: AOJu0Yx+sS27Z6T3Xh49rFlKjpKig9nwHQWY4D/HRYKXpumtZOn4ChVo JDfIxhHOCYWyiRLp0EzL+N6Byq9zWlPQ96tNhBWaNYdBtiwHt6x5AMgb1bwiH10= X-Gm-Gg: ASbGnctKxfoA/yiPHhaHL9ZRSjdMtjTaDDRESEf4L+xUA5eZnfEh4UKzktx1xBPXM3H cwLQDQRJajWNGnILmFb/b1X8W8gjJUbLFN7iza846C0+RSwsMnzd/dCgQi/+te1A6C3bXZvFKS5 lCISPM8fB7Jwi0lFnuIv5Vv7cikRaVsXCyRANKM/5N1gU3zh3T71WXfpg+EW6aYjCMZH7RNtRt/ OfJX0HJkNP+kr7LhnW3DXprcLXP5AovzxC7AjyhnszJXXuPtY/pBRRCXbBavj4NsMC215E6wLZU 3iMuCWzh95D+Rat7jg9K3jwDpQ== X-Google-Smtp-Source: AGHT+IF/ji7Q2jsk3glAmrvkgQ8qeyspiS6WaI2wICDLM2NlYpH7cnCIzarKdjCUYb/eofkHRWzaPA== X-Received: by 2002:a17:902:e946:b0:216:69ca:770b with SMTP id d9443c01a7336-21f4e6bc5c3mr267481085ad.12.1739219234469; Mon, 10 Feb 2025 12:27:14 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:14 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:46 -0800 Subject: [PATCH v10 13/27] prctl: arch-agnostic prctl for indirect branch tracking MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-13-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: 8B906C000E X-Stat-Signature: f7s3q37z8jmr3xiaqs46nw6g4sfu64s9 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1739219235-46657 X-HE-Meta: U2FsdGVkX190p7yjn0cm/k1WMykjXh8sQrcWkUsjGLqw+E70BzHYw/18o3ZxhzMfl0fyE8cYL2aF/rb/nnx9wufhFIQivkK87nKyO98aRwCoV67XUJ3Q2+wLGUZZbZebL2kI8Nc84wozMxnPGp8sNZX30mDPDlB7WKbE7HhRwnZZ91CHBTlNcKd9m6Fa9fh7GxPA7iEFSq9JgFrFWNmF9Y8dNRqra60AlkpvZ45xdQpUoUFcWYHo0d6yi2VDhX6E4dclNIKs10F0HW1AM+K3XEdVUrIWHK9Tey03VK4nuoV8b0SbcOMlORECL1SEMfpt2YcxVGHE5RlgFMjLHnV4VGPU/F79dkeUlitDkrt3eiKB0gXpYs7ZAfHGIx4FvtP/QN7q88uTRpwDaIg30alJpTJjO3ntici8oo+5q3Dm+BTW9ULA2RZhjZmX3RdOpKydb2Sn4q4/P/LCZj81mhrP5AvoW1PcK41DwTy0iTNbVVd0Vfb9GIaulWS1TMs9Y+XW+f4mja24mEMRkaTk9wq1/nH2mtfoWSwgg2T77ISLSLQBNISQcYgfM3C/htJBzEPM741ycZ61R19DwkkS1Au33uVZnjiUxYxJz1NLNod5uXMTZwmUPA1nyVMJZZuXe5VETmKRp3zqgnRyjmLwSCl7CvqDzBM259YGqx3e+vzOlHL/yD73Uc0c2LWOfMvCoCOL/2QrwlBqJmP1DKpDJUPS5cFMtWfetOPjy2HcFcYp10Hs9qq2BthhH4NMI9/qBH2wrG/YAW/GG8Lbom3gqN6pluDxnSE5B3AEWNNNF02OOeHq+4MODngluSNiYQNjaei2KUgDBt/rTCSMDYwGpZne79JSXS5fwEqMo333HywYVjNZd920ijM0RmT1hoC9jWDaPdGZzzlxBV6/M0dXEsercc7NTQsTdUb0BBkv7bdWQ5mBv3eIJ3W4lfgggkbt54dI5/WgeznPZnjYt7E/8IF ou4Q1gmM XfC8cd4d3MG8aylT5qdPSrGXroQsCrjOt24CJzhcKrdOg0uEcOpqe/aUe6/50GpWB4bOKikFQKUbwQ8wWTnTBEb4SY0Jy9hP2XCzWhSO5CF/MlLuFj2MQwKYt2BY/RotIHQgYZ5YOfhu5R5fSJ8bGicv8r/A7UAPo8/IxttRaOzrzcufVhd11DAywXSn7KfKVr9r5MJnfIisRJaIDUulCK3apSwlAtYWI4vDgyh9xvs65WvbFWhhmQYTSr0zR51umvo5RBKk+q8Bxd+3kzH3cE38ECP1wxBK0fmCsRTldDkkft9U76Bsgo37gm+k5PyMBHUgj42OgfpC78yURgkVWmi15W6zdGd8747lItUEIUs2FF+Xzf5fWrllQ9u5rtARcNROMZuYcyb5qU+H21m7IRWicPAkmnpqlV1crbylSaPM88tqI8OFzYFCJXiNHdbcIw/ovBck8r5e6ISg/NKH2ddtOKa+nGIx3RR3R6t8cPoFHFxI= 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 Feb 10 20:26: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: 13968610 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 A9DCCC02198 for ; Mon, 10 Feb 2025 20:27:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9AF26280021; Mon, 10 Feb 2025 15:27:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E78C28001E; Mon, 10 Feb 2025 15:27:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 739F7280021; Mon, 10 Feb 2025 15:27:20 -0500 (EST) 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 52D5E28001E for ; Mon, 10 Feb 2025 15:27:20 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 14E5B466EA for ; Mon, 10 Feb 2025 20:27:20 +0000 (UTC) X-FDA: 83105169840.17.1B98C94 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf04.hostedemail.com (Postfix) with ESMTP id 2541640002 for ; Mon, 10 Feb 2025 20:27:17 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Gd3UGzFw; spf=pass (imf04.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739219238; 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=5+lRHCIBpCs3WN6hdHKJrnl9KMJMs7AwXQ79AhszCD+lNaWLplaM0tk53apunQ3LJ11s7K PD72EkNEkvkbVJLqc4RJCAvf449BXcRXQMluKDsD+xc5mIZwPumE5QRzMBocTwsXiKE6CE 0kAgHRbXvPi974q2MtOJb4Z2uYlsEgw= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Gd3UGzFw; spf=pass (imf04.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219238; a=rsa-sha256; cv=none; b=vN+qveubuqLhWKy/dPHg+7pna3VAkGBeK9sxcus9rHYAo934gAyynK1gJLmp/hBx5Z3yb6 LsNHIgV5BdXHbdinbEWJqAVtcTzlXSsBmzdpGhf56UaBIoTmgSjP61y9VP6Oq9jsM2U6nF ii3wyxUp2OyyVro8OwT/9xxyXPqhKbA= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21fa56e1583so18606965ad.3 for ; Mon, 10 Feb 2025 12:27:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219237; x=1739824037; 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=Gd3UGzFwUukUag3nnMpcKY0cYPh6v18gQlqbRwNyXtC/ReDxTIbE3+FFmw7tPUS+CR RetUPKHT4F5KJEiexPPPznd8beq9HmhiIY4FEkrBMWS/bqfBnovXhJZyPI1zMk00NiUw FZfCaldxkYVsS7S8Mmn7MPwlkO3fNsgWEnfkIA2k+gsb3C5vJR6RR2+du7A6aUyZcIQN TEhpElsijuzRoeu1my8CAQkoTw77ZrQp1c7eOTalmN2yQVs0/71BPsB3SFxLZxIbaV32 mrbkkcdwpkpPNIubFdYrSDp5GEQhswd+RQZYc6ePKZ17nhWuad0bx71bE36taRXM5dej 7+bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219237; x=1739824037; 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=ZJ2/pih1F1lx83/U8xdoTPuJZMI9PR3fHstnddRuZGdutNFNM6wCLP69nx92Yvpg7w Jp4T0zrdjHlPoE6+TXH/hW27XePNmOEVrqZPCDAMbWQ428NOR1up5fpUpRZ7u29V8tSx pY4rch5X5AcFn5hP7LJnjuyv8me/mBMBhdfwLxVuLNnGeOaIbfYnwPi9Y0T8OUGlpv7c jz8AzlG7dBazucMbA32pxDTQctbeeCtN0Ock3ldHxVq3P4VEMiPSVSIBXTjnykAom+fU P+ne11cOIrIZGOhgFLo6qOrrcSkAAJTdjpYH6K+iIJcRDjo1GIYXcgYkVdfqYnMTKG9T LKOw== X-Forwarded-Encrypted: i=1; AJvYcCWCjMwf5sU1wludRElutJaKc7x6LGsvsumiefnq4btjAvPbXBoKigl9z+iTcDY4i9sBgBSvTDaG5g==@kvack.org X-Gm-Message-State: AOJu0YwO/gw45Lb+hBNIgQImjPW8I37zbYFtojQUg6myL5IkBQCFHk6l T11hPPsfGw8bd0sImRSEZZ0D7fOyk5iHDiXAaiqO5THFleLHUoyHwL8YjYQLBN0= X-Gm-Gg: ASbGncv6W4XXK6jKTIH4HPHJ2rdWVpdRiBBImOTyiF4eD76sRYmJ0hN8VDB9Y1SO4Cz sgh4uI4uy3yDoKPuI9/SCiDKb845muRjiSOwIZkCII5umsKd7Ge/oLRgxyDMIYKvF1XraNJz6NT XMyHyJZym9MmTKh8a/VoFbsrB1wj7AgUBvOxxomi1BUhE921hDkd5gidO7Pt7oQwSwvWN4zD5s2 CGNIlGzqIwOnJiYCeOhUVu4S91oGrTRz9I8Lx96A1alJelGxMdWKkq4MnBRL/P8mzLDtWOaLjXZ qVbGcpYECEJOpIIQBn2UNDEAPw== X-Google-Smtp-Source: AGHT+IHdHEBMhep7yU/mVgZUfZFs7fvP4+JZwXsHPWxQJF2WCxVaTQUYKv93Rn4bqO7ShpSAaGLGsg== X-Received: by 2002:a17:903:46c6:b0:216:393b:23d4 with SMTP id d9443c01a7336-21f4e1cb92fmr222614515ad.11.1739219237018; Mon, 10 Feb 2025 12:27:17 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:16 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:47 -0800 Subject: [PATCH v10 14/27] riscv/traps: Introduce software check exception MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-14-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: 2541640002 X-Stat-Signature: 86ktt6kbjx3wgyb7sj7u58wupshuarhe X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1739219237-516379 X-HE-Meta: U2FsdGVkX18ustUm196oLw5HMeAzG8dBOlZU192M5Xr7MnITXuZuuhJjTaBz81mH6wlcQaDCEQXv0ZVC4Jz74EEYHHFON+DfBozF4BqJjLeO9EUOTzLFfiotAQ963sBFKa/d0eJp5OoZ4GqGsGKba1CMbiPHKVg+BMuhxeCLoeFZDUo1SZ4KKdx5POXEQdrZKgDaeVT41rC97M+954hxbfZ1bcFA857emApWaTMWl0N4J55dRev9BMKgw+hi+upvbinDsrnRTcQuTthyw+RCVELziRj+6gZn8meIaH/1Z04BLu/oZnxmJZoklOj7UqA6TEndZvxSpV4hsuvTrqIp3ksC60xUEQbJkzkGqzxjKLJIfEJBObmiLpC79pOs9GT/UyopcUXsLiUX8IrPBJnSV1vmPRKKllVtz4z7R0ZtkIY0oZyPOLDLMAx0NkHVR47sIjME2ClHNm3/01Qu/4D4Pr9x662qsXjb5ICsTZf5NSF4TobC1PdSPLcGbhBQRs0/EMSD5Vw680lz5oMCxflCLT/4qfEubSpXZs/xZPHllV5LtSnXSlfeE/rr27p65ke2UVFgzKLdGjbduvYdhOExmuBUvMooXt3ewCSDk2X2SGRAJgGwA8IVdhY14ZqWCSkN6Vxalu4/ij8bD6r+uRvl/ilmH+KJzz16sMQMfZqSG0CCu0hPxuiBRNpfQokq2L0c/xlzryC52/i47UMcLethXwV/KDgRkrS/2MDGNMjMDLqaLof1C83RMFHswtWC9+K094BWOb9w23umKW7Xqm05fCKcu3mmp084jg+oP6rW1KshwRMQ+9j5uljfRz/evG4TH/pH4dZOAOP9gGDDZuEpHy2c5OG4U8Hf9wXAHU/Nk6xhrFTMO+r8oMV7yZQgaY/yzbUuchpspSW94rTYzmqd6ijbyb66neJ9OINokBOGEy2WbjatPJfPqwNi/7tKFWpb+Q7QEW8QRXk0FiJekha UNiSsne5 9kZTvk6wfaMr+pQYNb4BNRhPpZHP1DjE9UMMZGIJWVKx9tOw5hWMKTir2KVd67Rtd9vpmKZY3ezeSvFzeWprrvt3j6S90/eupYEqEfh4S+y6LUwqYCz3gt937LJZtkqZLZve2SQosr7Bs6ET1uDf769nbx7AHFSE7SJ53gosYG6JAsAWL428iD/GPBIaIjN4bd2LYWYTloez1txyV80CkxzuKVxp2iTCAOEib1XTN1VivSLXdS9AT5G3PcF0hD+oyExJiMPLS3qAKy6MphjUV3A916uoKXWn0PnhSCk28UcXccaEOHek0YuzASvelsa4mqZmV/Iixk32eLhfIENaqgOjxhhLgkDjEQU9JP13XUjx0LlI7tevM1P6NFh8CTkBdbZjP17F0wf2TewPeakH3TKLMO1wkBjsaK488i0/O/zd4TKoADL4EzpzDrmYKbl9cjhlJF0X5GVZ2fxg= 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 Feb 10 20:26: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: 13968624 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 1B10FC021A1 for ; Mon, 10 Feb 2025 20:28:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FDF028002E; Mon, 10 Feb 2025 15:28:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 984FE28002F; Mon, 10 Feb 2025 15:28:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 761CF28002E; Mon, 10 Feb 2025 15:28:08 -0500 (EST) 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 4DEDD28002C for ; Mon, 10 Feb 2025 15:28:08 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A6B981A06E7 for ; Mon, 10 Feb 2025 20:27:22 +0000 (UTC) X-FDA: 83105169966.18.9FFA08B Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf28.hostedemail.com (Postfix) with ESMTP id A11A7C000A for ; Mon, 10 Feb 2025 20:27:20 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=zO12bHNb; spf=pass (imf28.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=1739219240; 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=mzk3WtYbkFbZVwv7zgDBHHFFAu2TfHJ/Tbu9ff7fSesufVyZ87VAkO2+BTLQqx+ExJ/hqL QImfbL0onr90QtBShzUFJjCx1pPcXbapRZOC4XdAeq1ZhlgxfR5RLkQxsmZ5pDMaD6ygLQ OolSx5zsPpyTBskBXI5f5rQoly7dny4= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=zO12bHNb; spf=pass (imf28.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=1739219240; a=rsa-sha256; cv=none; b=Cy6CBGZ6aKIH1THRwB4SZ21b2h5PsiKTdct1uR0F6MGylYURKXB4phC8gwnB9Tv6g3Zv71 RNOqifR/VEcYwmpRthqm3TqV7a5lEL0LMZhl8+V0vRYG0+OIWGgbDSK4Teiwk+nXbB7pRS 5HEpM6rAZhCMSs1UnszYihmMQw+6/o0= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21f49bd087cso63024085ad.0 for ; Mon, 10 Feb 2025 12:27:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219239; x=1739824039; 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=zO12bHNbjPgq5xDpe4fnJSLBdxQQANrkjScLWfdhkMOJfJ+ZLEWk6ZqTyaf7ZZfbMe RzKWMAG2wF4S39b+HNrRUqxzZPiivLGC7TQUP//ExN9oPhifIoZGWB3uFEE0M3atTMr7 dsjVJ3XpNDlvm7/SAHblMTLZN8yhqBvMaaeHNUamCgWb1Ofbah4hybEnBwUmWheMefNO l7MdhP4tPxvzrXxhTI/vPN7OUVky2x1tsy0wfKojQNodBbh1KXHaJ/FLU2pIly8XvfkU Bn4HM0ow2FywB4YQFywcPp7AUC6BRU/8HpQtFyFZNG4PNkT3xHfeCC9jbWu1I+lVnZ/C g+kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219239; x=1739824039; 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=IDnZ1OgfMolsxsOQwsJXa79BxZJ5VfNyDFNjcP+35gxor2ujGIo1chnqtUaTvnoKEG WpeyfyBNnFTORIyvsAkHdSXyE4kXoU5hgQFdDsuhlzop1ihuUseMqV07JM8aIVNYp5nz Ejff2WftT2Nm0ZDYqQflv4r70CSrFVeaPlSAgjK0psAAMRkHxger3iqq90MGSlx8uLRF 4bQpNeBfxFUjv4yD+PJnFVbMclLOLUahepm8dqlthvu5ykA7ceAR3tg9N99QLbcvND39 7IGhBWJv7MoGulWV141PszfY5dUiWfVM3Y7X7/Y7WLGMIth84D8Q5qN+a2P9daImEH8b 2w0Q== X-Forwarded-Encrypted: i=1; AJvYcCUXG5gyq3ptZ0/UqzG5uNd4mDo8lEE+pcSLnE8UWXHKCHjAHW62FjoTROLwvwzgZczmqln5payrJQ==@kvack.org X-Gm-Message-State: AOJu0Yy8bZT4KwP8H0QCiscXVSEj7RvAhKNq7hklCS+uZJ+lWvWt5RAY mGn3AwJNThJknk57f0RGDc3k9Pcfm6pjcyArt2hJMlUamEeE2YwO5yhnXiUI6yI= X-Gm-Gg: ASbGncsn6sV5Jzk1JfzlWJNdn74xOltFD+/B+R9ErY7J1JlKJsV/vrZQRnZf05HDbjW Ga0Z6Y84a6NV/E1+EvY7qd6qPGKZW4fuHTcNQeJoEzgQ03H1ilZOpDgWQwYQKJfb3KcmygBPQ/1 7PHv7+JKFB8U2V+G1lHO4rHxdXGSvc7UkhYH6CIxC1vaoGp53vp4fYkFw0lRl75sHgbac5yzeLE 4evprB2fJZn1lUAY9LIHD1Us94pMvfnn+//VzFv4QkykUbXBNtwgpZPb1NHNrySTLFi+hltCXIN 1ofpyOUqln+Tmyp16MqbkK8hrg== X-Google-Smtp-Source: AGHT+IEqr2w6ar9z8igWE37AnqdTZQAskGxOfpDyMik3dNCSypk77ZCJWfXC9IN3REVr6mH1hjulIA== X-Received: by 2002:a17:902:c942:b0:215:8809:b3b7 with SMTP id d9443c01a7336-21f4e1cf107mr224484445ad.7.1739219239596; Mon, 10 Feb 2025 12:27:19 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:19 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:48 -0800 Subject: [PATCH v10 15/27] riscv: signal: abstract header saving for setup_sigcontext MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-15-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: A11A7C000A X-Stat-Signature: d6ijrf8mcumzxqk6m4inwes8qw7urzdr X-Rspamd-Server: rspam03 X-HE-Tag: 1739219240-765843 X-HE-Meta: U2FsdGVkX1+eaWuEi+bGYdjINRDmKIOk+iTxtg53DGiqbSBlOVhTG3VptMgqWaC1DnBMfk38AquOBU5cpuulE8zrQMRYhMNmuBXQTRbxXbPuuhBbOq1c0Moqr/cBA/Z1bnXDX9lZKQTPrzHHTvRa2qYJOQlMWpOH8/pEKrINjjMbDpFgxJrGY+FhPuVwzMX4SPJRO+GB/714S89VCkNUZPhystawXSxwmb22se4GTxejAzeYW2qIb8dkntLxydycCN5/t0nnf0uMVKJJL6UEHfPnTa2IaNXZRrS23cj8gG7Zh/GScdTJd/XSZEbaDJMTIu9R+Vx6fCPfnrfsQwdiKEC2XOLBJsX88GnguzONret4hkM+6CHsA4RkRvKJFVpesgfLQ0Lf7uw3VgaV4BSEp2Q0typ4NUYY8eXARBQbl+Z5twXU/3l8WmfpQ1M6N2K4jy6599fR4u+LYMiWjBsz3igjcslKgcPEegBn8QuC7b1mZaq1pE2w5nSPm5k/zLAyUH53ISKcixfb0QnJn8LIZMVewS6llIEdH3CCfRZ6aCDSZ/udQqpMYHSeuksSGgnvAyt/L8j+G3LF4bsDORWrNTpLAd4M0P5jv+7PpOba2z1JMY4d8xX3Pzcz3ELaCxkv5qLFE7aeVxweh7HRri9nRVO84QeshpZy0oIHvm8Y64oz+PUczCJw+JhUNohTAIZnVayOp696RwExYtfwbCoot6rRpE3lqFRo+McQbT7pboG1VGK6XOiV9uT8acwgbiD3zwydhOJglV9fdiNFV+ZmweSTdsNh18Tog4kGi1dXbkIzKR96fazYyXH/RYx/ZctfRQYj9cstBzCohCb6YmYI9Hjg1S0geQjhY07XPwNmjdm5lWP4VGh4KppDYbl8b6OZ313t8uU83AGM+Az88oV98wTfEzl6ufFPHpXsrP/TWwjjO8gt9DNqj8jjMUg0Ild8gBLlIQ04isBGNrfdA+/ qAiz9eqA J2j6qXWQt9ufFC3BJKLZQnqF6tJcAbRctGVrWzM8Bp/qdCIK+qBHnihseck92ClChzvpXkWyUiCBG3KC/5LAY7/X4t/XxGtiw/SLyvjqLI46cDISiZjIsvpmmU7S5KKDiU1Ghnn9uwzxmJk71LWLPvD12XshFObnn7Slct+pzUXsu6uJZUkaivIBmu61xi3G4c6dWSsOUuPdk6B8v0oQNUxveHxh00LfzPztQw1hvq6BA/yvxgQdK/sNUTvgajDwm7r2qum2/LKg7Ipr4fLhV5Pn0j5eov15sFvVHKjVisuZ2NxOb2QRF+OhIoWuHyAOiRIijBTmSb9Iza/xhsgT3iPuMwgHUKNy3RDBDOQRbBtAxwme6xrMgU7l3Ji5nCfWxjz8LYlfVcGZwgcFntatkorfQ+5cQEROW0rEZ3UGFzGTJOpAE+SW9AfFxpKd9/Ia/WQW6y7u10PWNzVler6UtXAZKAVS669Jhsl85 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 Feb 10 20:26: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: 13968611 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 57B77C0219E for ; Mon, 10 Feb 2025 20:27:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4530280022; Mon, 10 Feb 2025 15:27:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BCC8828001E; Mon, 10 Feb 2025 15:27:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A21DA280022; Mon, 10 Feb 2025 15:27:25 -0500 (EST) 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 7CFD528001E for ; Mon, 10 Feb 2025 15:27:25 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4173846A64 for ; Mon, 10 Feb 2025 20:27:25 +0000 (UTC) X-FDA: 83105170050.16.AD87D95 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by imf19.hostedemail.com (Postfix) with ESMTP id 48B351A0006 for ; Mon, 10 Feb 2025 20:27:23 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="NFypK/Ep"; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.54 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=1739219243; 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=spQP2abKNsdlwKMC8tVdOv/d1w3XawI2+ycXyw1XDvR6VubEfhs5DduIhJmhxaf9nr59GP z4Czm0YRWwuj3iVcaM9TOoepuPeZds/0WgTGNjcPLdEVIbnR2FREgGqdLlZTRL8IfM5VvR mfOZm+FtoN/gzcy0UTpSUyAkpm7UIkI= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="NFypK/Ep"; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219243; a=rsa-sha256; cv=none; b=y7vS46lnl+FPG84dZbMwMSx6uvWF9QrwNM4cuFHx5IDbfRLoZ7vrfJgd/fuPAz4cnnlczn CW1KxOvFdI7utUzVUkzMK6GPgzS5PTjPPXRHWT9IUFPL985y3u0IWjcer+JvFGdqtOtuIY 9e8LYeKs7wWSM62C4LvMxSz9bXv8Ou0= Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2fa2c1ab145so6078432a91.3 for ; Mon, 10 Feb 2025 12:27:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219242; x=1739824042; 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=NFypK/EpdqTmKzEYk28KlxwDGG5jmroRyHXWj9SDJIS0XcmlhhHNXC1/VZMtiCsJ0I K+MnWpqsX531XD5FwZlb8+emgpP362ZYlePYvhd5kNYFp5OTEmkaDAKzlc66SIuyCmq+ 5ia1if59pr7GY80br1tcO21ylJtkjwRG1ATp2VBC0s5ebE75JLA2bv+NCB3731dN6BjE 9YngBvxRe77n5d5VlvEExCOkcvjwL/Ebcr+p1Vb923adxOJQ2dfSlCNQziNf365uve6O 2j3QkZeubdWhhiYt4/Mq3+YCnoR3cBmFC/y9i88lw6VhYqPSpwY/HevINnnJdtefFfMq A3DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219242; x=1739824042; 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=lGe80mTzH6GQ3v7ePLz1XNypeFFRvxVC7uNDgdxzuo/BuJV6gxmGKjcpib6zBhOkVP oIPLRHQ8qYZLZL/tr7ONeLfuIhmoTWiOtxlmN4EDO92zfHQpXXeUxe6Leo28zimOuOo2 OW3az9SyxQ6u2dYA9NVviq/y9iimLLsU47vhw1DFce0xUF1WK+qQs6nFjdNHI6K6cWUP mbHH50l/afq4b+/2Xsi440svbQLN50+SESvK83Hny4nITxVMCEX8vKASkneuNKf7i6dF 85JLeYOlxhvg2XxWXBZcHunTTy+xGS1VURJAnBTuUBlKcVtsUOtNHNdPoF0XeB9UsTIH a0hw== X-Forwarded-Encrypted: i=1; AJvYcCX1XpfUu9Iyzlt0tH0xBEeuHMhvy0Q3wcNW2ghDDFqUV/wmxoZflms/hVlmjrF608O6jFVgIT3uMg==@kvack.org X-Gm-Message-State: AOJu0Ywk3+lozRfz9KGw2O01mZH2oCOCiKzIbVw9qq/h6Qsu9EYZXOTX qXmyBBQrtmhpF4S7QXT+rvRI08L+HGItEbrGO4jNRVbIjFXD5NGMtdnHcSUjL4Y= X-Gm-Gg: ASbGnctzvynL+NphdirhngpYZVhshoofJDd214ckfBsbB9vY2EbT8+DRIClqzC+admS afdGyuNeZfCK0d+nICF+dMzOQQYwALKeyElORRNAdF8ESsrQFqSEI4+BKei4qkplZsUasDlpU2J d/W6DKQHJvjCAJCCWZg7I37s9Vz8ilvw5iGKjlARQMd7PN+WCdD4J08/h/SlFvIS7TF1BMzvtSU 8QtwRmXc8Rs7cSIftkVQdkyuo7ctbrDHqyIdXZLxf4algKwHwDLmyp9KIGg1LuYNV+Ipi9ZtTtj yVI0LRuFrqmiegLwAyMHf7/gkw== X-Google-Smtp-Source: AGHT+IFy5C7Irt5WbWHK+S0kb4JRRtbqEM9TFgu6vGtozVHpZLivrLwQvX+c9KIa+SaKH1vXsI4t/Q== X-Received: by 2002:a17:90b:184d:b0:2ea:7cd5:4ad6 with SMTP id 98e67ed59e1d1-2fa245085a3mr21172352a91.32.1739219242068; Mon, 10 Feb 2025 12:27:22 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:21 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:49 -0800 Subject: [PATCH v10 16/27] riscv/signal: save and restore of shadow stack for signal MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-16-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 48B351A0006 X-Stat-Signature: i8gjxoiiaktghjw31j5mjr7373pyrin1 X-HE-Tag: 1739219243-499772 X-HE-Meta: U2FsdGVkX1/EIwEH/xBcnl885kKRXifw8mrT2/V9lRQFRmf+Y4DNEI3LgMTBhF5vJQxtCWdY8zUABnBNiYXGedQsXYbqn9OphROe/EQ27Z2VSxqayUY5YNTYUns7kCjACUQ+OEHege6Q+QfP2qJ7iDJlcNUtnL+viJ1tAOaXmiyBK+K+534yGcu6ucnJg0xcW4aI26mN//VfTZPyBHfzgEfYyBmkYSoZTEYoc45A8XH/dYBE7z9FVR8OmRVPovdRXHGLE/50pe7TWC3wlOJ2z+3UWSpcfMZ0BuP2k7jXmJBs6VptpEw9zwFQhgVDmtszOx6YYhJ+jVJTo+xkCOJP4m+es47M0jJDJ7ursEYgBw6SQ/ST96Y9TSVntaEFqH7DNPys9HnQTqpKGINVhYuNl645gD14AyHTxVHqTQLu+Y+EVgiBnHHsyqWDKKRAG+NHikERM9D8B6vM2CA6R018qmSdFA2MzHfDtRtEkFm2fY8HFPDeIms3VF9pKiMxVCBt4v83Ttch8M5tYBo2k0Y9fLKMf1awbZeVLv1cxPywtOyFxZO/Ag76+VwmRLILdJ8FnRrJjnkhAj3OHWZhfX3lSWbwNfvepM5KiCqzjIPsWN9mfO/1VFZxoFXDVW9ItgQBU4vsvZ9CAXZ7UGqHupvel+bjmFViiqHY8vCCKJTBWrhM3F08WPoUMBBSMqwi1UEuvsAUC+1YFcQVVUClEHRH/OdcKDlGmqIsgkU7xu4a5AXmU/aY3Un+HdNqwBXOAaCr4EMyesIv0hdzu88zIsRUL8cYMKTj/TRmq1pxzVYEutIvx4INXcRYaHRLdJ1V2gdgUDKvCjWn9DxjQ2UmBwJEnWYZ7FI0EjlciEvCT/M1RlNQh9DZAeonXcAAPPsmtjlZqD0zl7F1eVTKNXTOickvKphFPW9yFJEqtS6+1leguDw4KSgQWVZCpjI+/Q4WsjA/AAy9xYsh8qPp5bTuSk/ L3jSHDeR tW0dqL9BnNa9ed77dES4kFqk/n1z9uIPMXnTTLBqoySvYsG8b0h/GIPTIwP4mXgTHjbc8UDjLaGwMeG4cswhekU9Z0r9Iwq2Jcc4yrNikTPCbLgIpi3Tz1BCTi6bo1myyiHFzrmVDGyXjs7T71a5X3EmoVu4uBaGFhIpPMNYFaF5t4nE6xqZenX2e43oYaqFE9zwlxoGsVoCWSanASLHuofAxGor9K9VSl+jJCGqDbiROWgtnnioV10yQOSIGTDHkh+ljTPt6LOxtkCVj9c0Q9X/3DKupWn8qCjhgSayU87ToifR4gPiK5UXjIEr00bPEMmVhanrChoE4fp54mj/vJ+vOlW3pmdUGc1APN/MoYaMpaI7ytVfb+bIKTA2rHGhv4kASAdhaEF8b8CWd79P+sBMZOK4duZSuiMcbQNQp4cDFdRL8SUQV6pS2AGi1Iiyca2Gb/Z5oQtu29A9QofCl/LdtC3e/pCMm6zn+i8e0iLtFtVXhBiPqESlaRXR+ChjcT2/X+BjVmCZmTxg= 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 Feb 10 20:26:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968625 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 25A82C02198 for ; Mon, 10 Feb 2025 20:28:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F2E6A28002F; Mon, 10 Feb 2025 15:28:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EB5B528002C; Mon, 10 Feb 2025 15:28:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D070728002F; Mon, 10 Feb 2025 15:28:08 -0500 (EST) 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 9226928002C for ; Mon, 10 Feb 2025 15:28:08 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A555F1A0701 for ; Mon, 10 Feb 2025 20:27:27 +0000 (UTC) X-FDA: 83105170176.12.153BE07 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by imf13.hostedemail.com (Postfix) with ESMTP id B1E6B20004 for ; Mon, 10 Feb 2025 20:27:25 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Sf8Kbr5t; spf=pass (imf13.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.49 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=1739219245; 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=Fpq9KegH+6L9ARFRCCanAyab8Pahw+fW8CB0FKxRC/TkG5N6iQQogNZcpltQOAf3MuF3Zp 6rjNxfntNw6DwARtRoirztgIJrO1JLwFwXAuHUmbZ8/Z+Bblg3h5iw60v2ZPVAFNPAktRp wKnWsDIWrGjKVqXmWk7tOuFr5FQCYts= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Sf8Kbr5t; spf=pass (imf13.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.49 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219245; a=rsa-sha256; cv=none; b=cQwTSLRanwDk4Vbcjix8vVyn7uEqURKR6+LYlE0FIpidbl04nmq1iMMi/Hf1UYvd6KxZDE /Hr1TfmyoqerTYu6HzXyZexwkGcKXpur/VQPQa3nu5kHYyXtnrWJAtD9pEA9TN40QyrKVD YjDe9PIUn+oIhrubLN0k3DtaZSmVwho= Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2fa286ea7e8so5076374a91.2 for ; Mon, 10 Feb 2025 12:27:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219244; x=1739824044; 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=Sf8Kbr5txeIWuGx3nYVYFJ6zphg+wF4Zl/E8tDh9JPH6YheYZ6P1XBh+eLRYMrLwm9 lXCwrIn/SzFnSypyS6iMyDvFTm5Jco8w5am90NWYB5Jso6LFI71Ql/D6yz2nHmX0OcxK h+3Q4e61AaAeQH/Cc8sk9QVXEK5sKiOBrJi1b6SjHiQ6fdbRLyu6C5Nq6pyHx+CvhS1o 1p7Mev3vI8aTRQWAmWZSh7i2wGEUcAcsBtwMpbiWhuI9Q2nSd3GL8kUGLy1KunEahH6Y UQog+7uKDf30SE10dXll+3WszD8UxHZiR1EdeGjSG3pCro0uuB9sTOyG/g8e7zXt7+sf WYBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219244; x=1739824044; 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=u63Ieo+PpBTvKkBqnbqossmLB8nEy0BsHVmb1/j6hN0XNthF1qJCnmjSHtj5U7SBiB DsYH5R0IJ0rHi3mwmWTD+Fa8la7ZsiGeI2hQlhOKEwPiQOtlT0KeqbI7bWscuvPkI2Jj NLkcSMs4NIdXEBCkZVq3M8JL7ZB6EvoPsiMB7bVPO0fZxJdbENuQuQswr3ofY22KJPJa L+/Qw7AC8Ov+DwRIrHGuaw588WsGXLx+ie8kMAX+KGki6OtI6jDyW5FtY1UmcmfWzfL6 xejgaTtBxwADqgeu6ltCegNUFq4kMpu03WFjbiRR40/xQIYOXp0iRcvu6PDmfx/jH2zb oz1g== X-Forwarded-Encrypted: i=1; AJvYcCWJGIMapU1RhK5NUE3QCLJoZ+n56fQ3MslUExgqkbugCz9rZ5GpyjjXt7GjqTmyZF/ZcyICUzttPg==@kvack.org X-Gm-Message-State: AOJu0YxpEf38iqpbfE1ATaNAiw1ajlH1NC2Pfz2/LOafUUCcdr4SYlpG O22/dO4RNpXvtHMXeOiKa1SiiQTBqygxeVr+8q108Cfx94fXNT+ET2gyRDTcK+4= X-Gm-Gg: ASbGncu1LBg2ICIEBIL6uQbIxOIRK1xFVCLe39hJAO+zrfghc35wRje93MLrUTEi0Fu SjwJQMX6i4E7H2u4sAYJp14BJ/Ns1lDa8yOFnQVIKnax+Jhfxg7aO+pim+sxv+J+c+OpbeJaYfG z1jQ5walGKSVlrinv9S1ALcpnAIHN7ZM1pfC0jCZYtQ1vfc2hv+BxOdwdoEZsAoyjP9QxFUIqbL 91wmzgQz1uoU3owXU3DXQxQXR64Ud65QRgMH9b2jjbTpv5LYXerMh6a8+cBQN0fAe3P2QOgpzzP Fcwu1JWFAxwInRdg9LemWVW6YQ== X-Google-Smtp-Source: AGHT+IEWx6Qroyd+owNLnhKMgXzpvCrfsJ5gLeMKvyo/Cha3hnXDj8amjvFC6tZrBWudZswu2pIc0A== X-Received: by 2002:a17:90b:2317:b0:2ee:94d1:7a9d with SMTP id 98e67ed59e1d1-2fa243eb4e7mr19748747a91.32.1739219244559; Mon, 10 Feb 2025 12:27:24 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:24 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:50 -0800 Subject: [PATCH v10 17/27] riscv/kernel: update __show_regs to print shadow stack register MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-17-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: rspam04 X-Rspamd-Queue-Id: B1E6B20004 X-Stat-Signature: 9s1rbiutgfmyhnxds41d6ak9jsdc8sus X-Rspam-User: X-HE-Tag: 1739219245-25362 X-HE-Meta: U2FsdGVkX18n9eElVMgdATCKX34XPpJYIsF+E0yh8V8xYCKJK5z/xiREqwpuNCXS4YfsDEC8cHFRUsfBkHGh4ppdP/6GFqTaAyN8PM0PH4ZbDWBJMnoRPAKcrJxd0lv5h8T+pGnIsHf/idoOnLEKrc4qAA9T550eo5QJ5tySVvDVJrKXvBN46/ugS8cyzkHb3u6W+hT8+SteVPA9w8/sQaPjBYiMxuXFnGZmaZ9rAJG/ngQUe20YowViO9v28FwQ9bEz23l9lTq0WhBJ9j6Fhs5KD4fxeQp7tPzsDSDXyTzXK32geehSa/ceO/9lRbd6MoG2crfKoykfgOwfzfRdcRfhA4bp8QHSEzckyRE5o5LDrBk9W4uF56d2Qajv4Bo/uWoBLwQGtr6Ef3Fpz6aimq/EUDfRSugBW2wo2fCIWutUqxgeJGheXAvo7QvQQlsZm0gWhJ+VIOmdjh/+ZpqehpMhlVBJRzyapgvgrJBHNIABeB+u0YmfpzAZpv2s598h82NHm/gt5xsDWYta41EP5AInlspY8Lz6vlOcIEKV91tqc6DuzCDBVZPQjRS5vyD6A/97Y4rb19qJ8YcTC1MWYt5Kypwv02yJoy+Y26gsSf71j2xP0wGeaPjxh/xJkC20kYkW1AhElhilkLVur8Ve97iVl2KpzT/elqSzKI4ZazMAJybZDGjGjX2ywgYMszOBs61kSCXgz0d1hCMrnUIhF2jkac0UMrnRq+Yscbn1S3o8bUN4AsUcaRmwtP4yBBcM1A9rpzZ3PGQGzsRh8EVFXvSAwZgoWfU/4dHgGoYwy7usk4cuoxXZbfAoamjFSTnB5CUMplShLgepDkUaR5Xwu2mlL6NAy/tjeLC2rCdsXr0SmWJZXdhFd54RklP0/9s44lg5oViXMDivv3xhA6jQ9irrQy+sFTflVVuEAGgn/pDUHbOyTXNZNmIAICKKPliTEiiS/Pq5xsMALkAEJ74 Ln+xNCtk woYoYoaiu5vfvxkAX8UvmEeQuiEyN5qGgnXw/8BusT1lbhaoryzSIgS78oxvvyUUi8EjfdSXPGAj9w0EAQGVKIRl6ZNDOmMA1Qz/0QkN6mXZaekU9kELgWaj+WIzF0t+JiNwPJyh+Lj+oCSXE4TzcLyEe175q1eEttmhticFRwpXkbiOIuoC8zuJdQtPuZHjIFUZ72FYFRVkPLdN2KK/x9azZefEZf8amiYeXT5HW7Qj1mOeQC3j60IYBFtDGUOX9VDfoGpav/HYH6ofThjVt0+FImLcucJJv+lo/B0JRcUmIcbg2QKhdksT9t0ZoQTdiC8zx2AJ7zZ2mvCaN/TyaddbccBRTNfVnJlKyOKuS3LhVF4ZvND2SzrhcMbAmWNtlFbkFLGAPFlzPWKo+hH1nETTEGT+ASm5P67d7b12/oQlLEqjl8UyDjxO6ggf7dNXO+R8c7IEpZtkysK9R9QVGQi/kq5/VYxsT4hSCw/lnW5/rT0McYMNdZwe4lUlPsL0jhpZZ 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 Feb 10 20:26:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968612 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 48E5BC021A1 for ; Mon, 10 Feb 2025 20:27:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B81B3280023; Mon, 10 Feb 2025 15:27:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B30C528001E; Mon, 10 Feb 2025 15:27:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 98518280023; Mon, 10 Feb 2025 15:27:30 -0500 (EST) 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 75D8F28001E for ; Mon, 10 Feb 2025 15:27:30 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3B3921C7634 for ; Mon, 10 Feb 2025 20:27:30 +0000 (UTC) X-FDA: 83105170260.11.1731C61 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf15.hostedemail.com (Postfix) with ESMTP id 47B15A000C for ; Mon, 10 Feb 2025 20:27:28 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=IF6qE1bt; spf=pass (imf15.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=1739219248; 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=qJNGbqzkxrOTPErkuPihJ60IltDf/kjkm8aYbagDCkmxG/h4xihGObMFG1gNbBOz9b4D6v ZmmC/4vHr829ErJpjU5iKxF7ITioF2I7+W6OS8V+Udh3FewoSHnXakWw0e/FrPZdBcAUXC BQd1FtcUxBPEl5oXtF0JnNc4IdZSKVQ= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=IF6qE1bt; spf=pass (imf15.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=1739219248; a=rsa-sha256; cv=none; b=lcYvK7hHqw7ba3uoLxEMolvCkjikHLmoKqai5Yn4Pp22qgviuuEYTC6Eo4EMMDz1uCbMA0 exEOptV+MtFFgjBpHuQVo2n6T+5J519S+7C5nHvV+whUkj2wNV3PuZLpas0Y3R698MOkKJ emKGBQns7SgWCfBODKA6X8RKNWZNm54= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21f55fbb72bso56905945ad.2 for ; Mon, 10 Feb 2025 12:27:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219247; x=1739824047; 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=IF6qE1bt9zAZTjlLXZMwaM9isexhY4uic+pYiH5OzBDG8hlYljE8SeimDHhnAIqLTV lL5hVKYf/KF1S6cB/UKylhrGCe+QbYsxqUdpNB/XaSLxVaBPDHW5M2hnQGfh0AgHu6zk IKwwD9c7mOQfkBA6RWcbKA+P0+wOYjw4FDQisU3bCui7as72/AFdaACd+eUo95ZZi1aw LvKhuPwZMn0enMvzxVZ3cqgz2gKYcPrg0QOqNG85UBcgcLKxMomGlgcImyg6eXy2BBgd 8WSGhaKowQjDNqBRoDn6nxwHsKoiRlm9Yj1vOATR+TZPny91ozOH8nvvT9kZ3FkJ8qES 7rnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219247; x=1739824047; 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=f8k7tuGi52+mitg7ehin7nNUfJXA/7enkEkF0+VVxCccA0ybrJgORZXaCvni+fij8z MqUV2QfRFfmgn54e+a8L8AXFhaRCeSyPbxgWH9y6Pq3L+l1tbfiGfWRHybWCm7UOgYoX JYZngA10fxefsC0U0rsvkMjXXy991yXWCG6lByroJhM55MyaaW42ywGmrVRK108nlOys EjuNBqsU6ogjMi7J7X1OH+cS7fY2lU2LYr6hCHnphn6zuH1wQzqqtkQKlxeV3bnAzpCF SPXjT3vAugWyIRJMRKlPXike+AqfBl5Cd9WEB7hZ6Xtw23gfYXGx/3rW2biUKvUqz9Gk AVhA== X-Forwarded-Encrypted: i=1; AJvYcCUqzDjSkY0dPVuSMsNhrCOxC+Wq6afFlFtYbmMmjhIfzLlh2PTeF9YXBOhJSBKmAr7wS9obZ+9Z2g==@kvack.org X-Gm-Message-State: AOJu0YzNektx/qqvMI3kvOiy7553EbVyDhrpRlSUxHuKNcrMSRWmsS8w 7KqTOjfZUgUhvfcvOjmTktn3lI5sNzPayHOMqEZzryNjKLX0Fe3Etl+6GPBSOAk= X-Gm-Gg: ASbGncuzOju2YzJGtuB3Ni++NuqLk+sPFQpLL7EiWciqAlJiYK+AsgjPVvWGBEKIeTk qponx5qvL8zn2castXjSp6d0Z/IKcProVrSky6x4y7rGhHLtF3MQ612k5I5Ko4rrSU2tS27Ndxd 1AKM47SfHYgLJJs+BsfX8RU/2RfRDyoFII08Jd/sARgVeWxh29o6FLJKYWfRZOT2bNOUWYgLLii yf68BvGJOO440YEWspUWkzHpezJ/H9thrpbA+GU1VSUvgUHOvzvD8Xlm3tlEpC6u3CWHUmgMGRU JOk+zs6KIRoLygnlSXiuXlDhXQ== X-Google-Smtp-Source: AGHT+IF7EXANdfW+rLsLNvBS7WrISTRoOO6x3oQIFnuoI1GdkKkKLf31wWdGn3loj99yEU6jyJj2UA== X-Received: by 2002:a17:902:e802:b0:21f:4c8b:c514 with SMTP id d9443c01a7336-21f4e76391amr226903755ad.45.1739219247115; Mon, 10 Feb 2025 12:27:27 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:26 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:51 -0800 Subject: [PATCH v10 18/27] riscv/ptrace: riscv cfi status and state via ptrace and in core files MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-18-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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-Server: rspam11 X-Rspamd-Queue-Id: 47B15A000C X-Stat-Signature: 4y1um1pghagsqxuzztpuur9rxe9m3ank X-HE-Tag: 1739219248-389410 X-HE-Meta: U2FsdGVkX1/dLu6yETxLwi/s5b3rXC8KFMy5is+2jSerRiOfNmJt1ydA8LsSUB/w36J8KSl5TNvODeXai9/30LGvYae1YpeUIOx2UNXZhVboT65jy/MCMuTgvazbfHf/ZKWJOfcS8tdUMtUtNRYqxGcP6Gpoot0q5x8UYFZdMBi/PHkFenSgU22oEGz2c8R20+oRYX6scbcjSeGV9ddKQIBaglYHXJRGtN+3o2ZD4XrWWMLRb++W6yYQNZgDVOSx2bIp7rlBXVU7ioderSss4ynoDpqGkxcC0jbnx7UARTOCMMDODPn8kEYoi1k/uxCBpws/Qf+4FUZl33z3BexqqKx9ZTT01Jvt7cwubnNt7FwXyKUPd+f+2F7HADe/opfHolGpdGWVPLJXnsHFFOxr75VKlB0LCbJMEgFTFHMBybQpRJ4zG92iibjeWFG0sv21GQ0ViXqahGmkvR/dLo5bv9GixdjA3iAGNh7WBcsBk/F0ViMvgjeigehMAvqXBkNMSpHe2zy+0Rg/EFWHR0kfWnV3xppBvNREUHPuEIqI3pIoItfLXqWavj+1Wo2SDxbmI++AKMGO9bE5dqM50M7CyKKEOT2oZuaZ/1JA6XQODcdTcDN4rQhrlhVyhDISDthJJcJNgldk7Zjdcd6MPgMIaZIpBzslVte/DXhHURUNCsU4LaWW9Ir13y8bo92HLwr2noQN9jYwK4mNt3LSLJpLU/7E+7KbcL4vs27z23Lru9fwzqsq30cEFuFr5xHq5GLQ3BvI2mzVixYP3Eu8XmZWcwFYAnsQGWPZGK7THL0rKw/7pnuEELQEKPhHZBpZXDWBdudbCqq5PuUQcTxbmAmunYDyUL8kbn/W6piVTDH087E9aO1vYmYPmcY8ikNmBvxS1kkogc09xzIdQ6LQqRf7VvxF+vG1i51FAKzvhH7MMl8zrzU3rL/A1HVlw6FLYKSAPRQW2IM0ZOrwOypdvjg OXI9fhnr 2CSZUYE+Mul9ZVuaoYzQIVbRwE0/fgfxY+NS7so9nSd3zT9uB4LToDdYf2K4WYMDUWuaC7BEyLaMZdRghwryn4XyBkU36RwqSz7cXB/uWVI+XVBuksGBA+8ACm1X5thFG2nbFxAc+7EeHUE2oVQhOle2s7W4umtetGalW5+/fOwQhyYOG+WNAMZu5SYy4pO8CVVI8riLnBV9wgq4asavKICBbJSzB859U6IVvOY4phUOxjpMqYK9fTetI2QhHsy85YHNwLDqeLCjDoKdLNErYkGBKby48F11ZvobpDzXvYOQeoGvEdSuXITPQdj33/EI8Fgtx9ng2oOBLs925dlfEJx37ScVNQlT/ZMFQeX6kZoTpKDeGI9HhzFUON+Y99QF56egWffDpsC3xTekaYP+VIg1r2bNd8QWaI5PLO2S0/hZ+2v8tKybtKX2ZSFq3XPrPJ9IHxwrQdDN/gf0= 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 Feb 10 20:26:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968622 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 C2675C02198 for ; Mon, 10 Feb 2025 20:28:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F31128002B; Mon, 10 Feb 2025 15:28:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 47A74280001; Mon, 10 Feb 2025 15:28:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2808028002B; Mon, 10 Feb 2025 15:28:02 -0500 (EST) 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 06133280001 for ; Mon, 10 Feb 2025 15:28:02 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7FD23120612 for ; Mon, 10 Feb 2025 20:27:32 +0000 (UTC) X-FDA: 83105170344.10.4F3739E Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf28.hostedemail.com (Postfix) with ESMTP id 90272C0004 for ; Mon, 10 Feb 2025 20:27:30 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=NoiI97IA; spf=pass (imf28.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739219250; 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=I3gnb28tgJgyOEt+gKzwENGVby6Vcp5zztb10qz5L1Nt2u3LkXsTsBNbFrdNBT1UqTyR8K Y7x0QPtFQibk+a01caT+OhrlJfU1xGjyovqvC8rY/GUvbSXc2gw+kPMqUP1dbJuyGb/WBJ NbqOVEEHrKG0FRypW2czM76N0jXHJX0= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=NoiI97IA; spf=pass (imf28.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219250; a=rsa-sha256; cv=none; b=3Poo8tOYdTV517rKLk5LJWjcMFj8+U4dUrLl//SRRWP63fFmoZfyy/aCaOmvpkDqKZ8uow 5b61e9VERjFw5LNpfMgcaZVQdLtyCR2PkNn3pbIcEE1GbY29uH4TJTWQYnsbZycPlXjsMj OeXpQ4TiWMPteM17687JljLxe4wwqXM= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21f92258aa6so39407685ad.3 for ; Mon, 10 Feb 2025 12:27:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219249; x=1739824049; 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=NoiI97IAWLJsqpk3axf0Xyl9jL9OwcEE6MaPBQ/PRtthRSSCJjEKsFcH7OJskbUEcS Bf9XKFkvBh8OO10OqQ0lFbOwS6ed2kX9XmJ58eb1zi/IifkJuLllD3kM6z9IQvA+0/tr l9zp3Ykg+3vtqJ5TY+AYj1+DWL9qi93JQE5GerxalY5MTCaD7peJC40g4T1VZMjFb0ch /DGBeu69NUW3pLjJIMy75f2Qht8JLf69v+iZkFLEM4ZaeTbsWTtf1O0sw1Tes2RbCIEH gKMR+HAvAA4AZXhd4XvNGs45hbAdNdVC+4tGF80qsWCmVhWS8VhDrOlBuQYOZDiRT7w8 Tahw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219249; x=1739824049; 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=q9VJ7NWvF0VvIAhAJVuXd4CqD8xU905ga4VYYX9GsZj1D7Nm1F1C49KWM8WvANxNBy vKqmIS4WH+mUjG4/7p44sIDP+2fIVIueUn9QAc9hSrPaJP7j9LrMigZCVpRwpQCs49bb gyN/PlMqY7vzJLrR+kNGlUJWmWlAsETTcChvUbzljPmKj4XrmYWfRG7bh84KMI9g3b2k XAzG/YxL1UIgRMaiZc1OzB+b72kZWemcdeIq7JPaAIHEou1BbcCUtDgOME3yVlmQZar6 hbFBH1CiOPt/HmegTO1AvS6evPLUl9uHY4ktxdgjSw0ifC0uVFO7ahQWzrowR2OjRh2c ZCTQ== X-Forwarded-Encrypted: i=1; AJvYcCUgahjxMo1sOlaTVX+v2+La2WcKBwDiJk49QbzupUwaXcPNbv+x9591cgFW3s+zNuHtK4JSp5qPLw==@kvack.org X-Gm-Message-State: AOJu0Yyp2gRfIVxXb/T0Wmc7bExbqsxkHvj0bF7t1l3r0ezMKucsfQmX CAR2YrsZmneCkGyorPp7liIi15JK8dcdcL/1X5AdnRbRzWZnxJH1vR5ivsZF1YOwqTNV9x/WRRE D X-Gm-Gg: ASbGncsD4oVUqIKTliy5tFVmRok/Qz+HhC1YV8OeYpagCtSt+wurw+XneQfKuOn2ADF S1XlIlzNlvVYacdzN4Jinj/Qzu7t9g6gK2UtgA1mP0VnQDjJbj3o11lFlU2VJXgoUWfG4bGneU8 MjhDswhhAj2m9cZ0MQRdv9gyGNgBNdHljmlL/kbEvt2TxJ6RqMBl4JLLL7A6Gw6bjZD8nIOqPsy +/U8mmRuFHGMAnFPsPMIPK2ByzamP+0nqYlvq3wu2OqwuQnxGQ+jgrHbYbQiwnQfCjQ5k0oP8uO gSAd5arMGuILh45n8TXVAMKLZA== X-Google-Smtp-Source: AGHT+IEt5F3RjsoBA/4cHXJN1Ltv5WX03R8vCEuQgHxCW+5M2vSetK20AA29/O7CLlddL+JvfC+2OA== X-Received: by 2002:a17:902:d484:b0:21f:617a:f1b4 with SMTP id d9443c01a7336-21f617b009dmr211020025ad.45.1739219249583; Mon, 10 Feb 2025 12:27:29 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:29 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:52 -0800 Subject: [PATCH v10 19/27] riscv/hwprobe: zicfilp / zicfiss enumeration in hwprobe MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-19-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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-Server: rspam08 X-Rspamd-Queue-Id: 90272C0004 X-Stat-Signature: icqujwydu46dsu76o3q9gcu5ngghnu9t X-HE-Tag: 1739219250-318265 X-HE-Meta: U2FsdGVkX1+t41KD54lzZu1GSpXxXkobADRHEeZlnslr8k5RO6Tl4tNbg1Ccb73ClbszJnts4LUCsHa2nuqOs6diE2GfJG+cKqN3Glxrtu+8B23KMfYzCyBdU79MimCcVFymasWzz1YizgRSr78iTJt8IUABU7+WzqDJVagbZ3NY4YnJrjslBZAi03KY7N6K9acvc7OTJ+0lUJug6FNznU37u7SepnNmKXW3H13a0PHQybv/6/cDXRngcVv1YX61qodYkdoS48bLw767harOy6mupwdpiztWB8v8LC5w3LjdsCYpjHtQSBfPqjEb9kHaqSg/dlnfmZtqDP1Dgwxo0GcsGzmRZ6Y92e9/j2RnhNx2bs/GwExBp0hqveSC0/NwYQ+0vhohBjufJQRgTYUL/taBlo9qTaop0533Ne9uSeUbmmN9Gyvv+jCK87EIkFtpZE3tHXL31HlEjyzXtCiIkQ/AAgJzXvA3FZebuUTFhYQN68IjYXak+iZnW9TaGD545tWw+ISZyOkcyz8BEp8426cK7YjsF2NsD/JCGkIktsRWK6DUM+zgUdlpEL70jIB0tJM6s9idFfmzVRYtoulx0/BD6cjHp1wkkyjElQTwS7AgLinfCD8I+vEqbD7HL4VG4lf5MU13l23FFmB6QdjedS0WUCwOy75DS1sIrc8Ass2ReGiabCwJ+vl6oEG2zqnC/v5QCu8ePmuCUaEl5IcucOY4umQfPBKhiFTVI1Z/4kTBhxLTZvqCxIRB/9mGuz5Bqi27Llyw4U8BGQ0VbgE0jtTUm+dGpRTb2tDYVeI5UpsTPySTml6l+VuZ4tiG5n13BqKJ8o25IXq6saDh0T8pay0XjGPtoL1V3QYQr8atAM02vHasyfguAgxev2YgoqwpRhc/VpJz4FSqVVAojtsXipZcb6BxpqL8MPuPPj9/msvyl7S9Fog42gCdZTMwKZbB2FqN+eRfFmvLQtPaBfa +W5jEnFY VukKpfnu2mFvqQZczbE4AR7ftkPrNPpLHUJGGd1aIo8YPxaaPWmV5zFZi92kj5b/6HbjXkjpXUrXsFna4KT0kY+eB8J27gbIxVqI0rVo5KoAa08DTiZCijn7roULWCC6UBpniwtlHFfNK7opfh3Ie40JVD9jf75iI7I8tWor7p6eOx+Emb+voLi7BznKXE/+RX37a6TLXDS6+8T/umz48AT7992wqypuVh9t6IqVd3AeBMW5KjsKCvajL9z5ydKwURLNSHlH3Enc2MYBheQxGmAmRFAtTyNGvvcymbCut4kY/JQ8qM8mYinTc5fiQmQBB4qdQjIKoyzIbL6/7A2dVKsyCOPp016gmCZDt0JgEqQk9Lkv81hLyH6b7dxIKnz7Tly0rQmfvCILsCoOrLMbIUZ8tZGLcOQCMSo+VhKp3Dpr4OahlI2Kvn4qEI5LCJdsH5c/mef1rqyx/RG2V0GJgub4JJQ== 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 Feb 10 20:26:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968613 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 EFD26C021A3 for ; Mon, 10 Feb 2025 20:27:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7D92B280024; Mon, 10 Feb 2025 15:27:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7876528001E; Mon, 10 Feb 2025 15:27:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B302280024; Mon, 10 Feb 2025 15:27:35 -0500 (EST) 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 3B08128001E for ; Mon, 10 Feb 2025 15:27:35 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id F03741605D8 for ; Mon, 10 Feb 2025 20:27:34 +0000 (UTC) X-FDA: 83105170428.12.4F7DA27 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf03.hostedemail.com (Postfix) with ESMTP id 1A61D20003 for ; Mon, 10 Feb 2025 20:27:32 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=2gpRYOSP; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.180 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=1739219253; 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=4/ubjPMEDeuXRhyjO5MTAoUHEsj3II2l+u/px3sh8rPvwc+xLsaqJe/TPgo3zrnGSK+gAn yjmQJKPwiktxlVhp0Cco3LT3FTlCtq+aEEh4aDFkVBcis//QNv1Rs/aw6MJxLwnLaQpONi 8MN9gn4xjFn2Z9DepVLu2zpYR3moIlY= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=2gpRYOSP; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219253; a=rsa-sha256; cv=none; b=A8NOrQuYci/OpD+qgtEK0RdAd5SghHdu7JDPsA3CYT4CiI+0PnSxGAyPBx3iP9Ln9YKGRq 68Opg2tAWLIFbRxsKIvXkhxZniNA0Y3sgN14Yu4MgE09WPsmxG51bqcZGQYF8tRA3vF/3j vx7tvzNjJRO1sxSgs7dpUXtrGN1wwPc= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-219f8263ae0so86743325ad.0 for ; Mon, 10 Feb 2025 12:27:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219252; x=1739824052; 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=2gpRYOSPPRbN19Dt+bkmxx8VpHxwbroAtRIuKzYniw/DzYe+U7f/ljHf42DJ58nmw1 vtoCZX0A2IzcntZMG92uFB0MlePxo3cTpW4epqYteMMeAV2JkiQGvzzNJnDH5n63YpJY 4QhJL/Q9CTZ8HWYSAOvmwpZoSPsJCgHog+hXIlyN77FhIq12iODZGgdcKsfAdbvAzbnK Cces2t1Y+LS3Jsu9aCvCBbfp0HFAM1Am0UcAzlNoGkIFdH5YW0yNTTWclwFw0PJPhzMB x9UV4EHqPgWw+EMB7TLKxj3pE8GE2sms65JN2MBLkJ0182GvRHD+rSIyRScdD305biD6 wmiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219252; x=1739824052; 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=GpJK3WBwTi+QzN80Ge1NcOgLUUM9oZ6le+iESHHIQ+irNrGDvGZj9Hr/pNUFpSmrxI j6uYl3VBqzAi/KFWq7Myjseg3ioJ6AmQgg3IT0EyfYI6LAdVQpzI8+kf8j+5zGkSWE15 UzCtRJAuZyQ1eSLVcmQ7cm47SpEtOxZQI6oeYkqSTtRfDjvgYRVyL8HRJfUwIrCrgW74 Kju0YUfEH0NRl18eOF8XspbbBOwFVNlfIcquc4OVuR0n9vbO8uQHgp3leNnPueAcMog7 BhnrdTJ/o1bnEn9BYos68cmKh72A1KVX4TARoTV/4zxomTeEkolJJm1KAKXEZZcvUONL DySw== X-Forwarded-Encrypted: i=1; AJvYcCVNRZZ6RyEdfl1f4rvSzI9eW65uclhPgjDxadf+82wOo4LIj+LmE7nH7th/B+Ilv/VoVTFBL2yEFw==@kvack.org X-Gm-Message-State: AOJu0YxOMZ5nl3PSRV4mxaBiyKKUzpy+BpZAURL8xNMREVHuLUh4wcPh 78NKssZ9zCs8D81VYxd9PhOu1QQ8ClVzL9JlDFUJWo80Tr4Bmq05HVee85xwAT4= X-Gm-Gg: ASbGncugBbdtTeNjba+Ums4MOOhULe8gLCcx9qFwhUp/rMn5bNgF/7GFH+PzoR7g/UD 0OGMY+UUgCcBNyB2trM2zUXSmUAJW0d4ywiiRTUvJKmSH7dBtJOCCNlKmqMhTJfKzeL85ELMFCb T+c2iWG5Xp/+YKPjS95MoadHLb21ZealeVIVIIuV54iAHoADpkwr2nHpx3V5hZPZafuaMWRgVkS l2GAqRv3pGpMWjfX8Qa3fa45hXUBKefSIzHfIzGWVXKdL84Lh9N4l6ijY7f1jtDYceW5VJ71C/L lAEXYFK0waekrIx9UL+THQ29jw== X-Google-Smtp-Source: AGHT+IGRSFFgWaceOiIiNm5tv+e7IogqAyyOZF4Jzr3uh0XSSHp0Pwy9ipwzTE00hP4VjDiSKq3vug== X-Received: by 2002:a17:903:32c7:b0:216:39fa:5cb4 with SMTP id d9443c01a7336-21f4e6ce13bmr265561195ad.25.1739219251992; Mon, 10 Feb 2025 12:27:31 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:31 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:53 -0800 Subject: [PATCH v10 20/27] riscv: Add Firmware Feature SBI extensions definitions MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-20-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: 1A61D20003 X-Stat-Signature: 4nsdib93hmo41qnmb7n4zk8ehtuf6179 X-Rspamd-Server: rspam03 X-HE-Tag: 1739219252-736455 X-HE-Meta: U2FsdGVkX181LdI33K0OmvDfrYwDCfoQ1UNC+Igrmpdrl35tCJH5zKjmT8pcWBo8ic7NRlfbEXia6m8kR5jr3nl0ci8c3AaKVlc/P4rrJSz7/VOfeLEXhFXX9odZ9KhbN9Sg1oukKeYeCdURSJqJ7P6rVv+Q0yW3/FAtr0qDOWK54JNELUHYZWKzdoP6jAHB3pZbj+xznkA1mshGYxoFRVK1kaDtCZnb6Xbig92E+X8/EHvQuddHjHxyjtfhKeK5SRl0u9WHLlECqy5eMeNsN7KjJFm9wRtQwE4ATx7/fLgxAGQBBq+Au/ZzcFlv5HHSR4+ffeOmYR5rDGl14kk+J5d5FvHMF0a0gf9tW8+HPPKBQ9nBvJ0ch2p6ic/QsOywWciCFmebZaMsZoyGAjxlcmkzj2rYfy+3cjQjkrhYavj7754a/M1JoPTo1WFNQ+JDA7K4KyY00Js8VU36Z5lChso/N6haxZYt9EuGPSQwq9eWmFC0hnahwgZ8v/NDpTV56arjeaVI0ZlmBCOA/DVGVVAupWc1odfEzx8LGv7Gwahz8WSOTxlhjFdVzMOKuEhXEaA12LDPXYf302SCf5pBnmQM6C2y2sOvgZKdFOG0an+2yqPr6rNSKTyW8Nt5DAwGCaRZ375zy7xO6aJ0Nr/tWntUcB/ap+ofZnHahhj1eI5kpcrBXLxZF/fKoZ5qDn6tbRQap5SjGNb4nqyqj+t6a2NZ8FH89EVFt/4bUYvicfZoeZjxRgBtfBRyNDE08K6O1qTGchkJHasPEd5MLUz1Tv6XfgJMCajfv5SM2A7EPlps3jDC6ZXr7zUtjm9XwiAx3Zh7wgqkjZmicJqCymjkuORV3FN/sPaKU07Om5n8HkRJoZT5PSxsRTV5fUpUb49SEbH2zaUbeIpwvHJJJuaNi0HkUpod8zUZNIPOCAMZV8DuqP+r1UQt56qvUUDHr3GsM76KE3towP7ZdNxaWdt TW4EiYMd utjT64jg/x4YHlECpASF8Zuh8wTl9l+cqiW26rIa6N7RLo4sMrRlEWTOBIq4fW6KGiXIxY6E+YlPMmymANISaIL1nZALZYKuvAKzmWbjaxeWEtZNXMkSZsQ6/2vWZ97E/YnY6+p+rmYPRVKiWArWuf92tTW7OyWZKro9SHwl1gXhNsJ8caYmXCQNa1hxyHY3i9GPk0SWYM3Mdl9nT2vfrInUhr4q+2EQz4khkfArP0HxKvT0iJmk/MPFzp9+Z7/GXPLMjZgrkrM5Yx8hUGlMj72MMbXKvHUocyU/k3+1Z11GvEfqK1908zhHA5wohVYh3yezC4JjLIieem2dBtmBGjdFwk26iSgQDdl8qxbxfBy8YijGhh35HFlOJRso3pRDi2HfIbMDrHT6LGATUheLae7nVGWBSLi8HZTC59M44CPdvRxQb0K0WMROvwio33rls/VydeXJXBYiDt546+5Tw5vfmu1m0bUAMADSkG2is0zIq82E= 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 Feb 10 20:26:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968623 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 96AC2C0219E for ; Mon, 10 Feb 2025 20:28:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 25B8228002D; Mon, 10 Feb 2025 15:28:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 20B6D28002C; Mon, 10 Feb 2025 15:28:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 06A4C28002D; Mon, 10 Feb 2025 15:28:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D3A6928002C for ; Mon, 10 Feb 2025 15:28:05 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 757C91A0724 for ; Mon, 10 Feb 2025 20:27:37 +0000 (UTC) X-FDA: 83105170596.03.221FF27 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf06.hostedemail.com (Postfix) with ESMTP id 852BC180012 for ; Mon, 10 Feb 2025 20:27:35 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=MA8ZIewg; spf=pass (imf06.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=1739219255; 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=ebZibOKjQYdoLFN2xE+1C7mUZh3rXl0smlUtD+PGMxu8Hy7l/oL1QOXEK/Qi8tY9fwdyD/ 9K5Cq5mT1tGq74j2VYjZg4aWpYNgHZT5WK7rxVicepZFm56rvTBhDFchsDpqQKFVG0G9IU IIDHt0Ugi+MG1XKPMC/GjElbtJniqec= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=MA8ZIewg; spf=pass (imf06.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=1739219255; a=rsa-sha256; cv=none; b=Ef4GYsJRE3V8R9PTT8y/qd/eFwbS1ZZsLhS1nSfsetaNeqVGX8hAgMDopcx+7mgmS6m2NU utuK+1nX+E5OhIC86fRovn7RjC4ZGhuh+NkIxkq3PgpG9BgUcOveMUbbG677LniiMrW3aZ KzpY5527mT/L+diBn5Rba3xNrv5dwjs= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21f48ab13d5so77669065ad.0 for ; Mon, 10 Feb 2025 12:27:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219254; x=1739824054; 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=MA8ZIewgDTej+3WBA2JFLbN7qlY4tlAyTAFZ8Khm2lXvGSeOU62nLVcyAW4x5nLqd/ P3jw2kbo9KA3qSlpYJU7kACw7ewdNDJlwPmoWJAtBdYtAZDGSiSJ6uxl/1HJKYYHI9Ta xcx1g+jW/AwCcIf8HT+W1Y0Hr1djfMPQtKKhe8UsC1g7tcWF/Um/n4iiuMLe2jambuo3 WAVp0GYaO6isyCzt+ApRYrHM5IL1m2eBi7ZGMxVMkjjHahouo6cUO+j4uju29nR0kXx/ a1Yht3XZlIEIXBC54Jz1FarFt5ixIimMciLkVzKTOsAm+rFBBEFj9rcd4JNbAj25FwR6 Aw0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219254; x=1739824054; 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=ibqBSlJtxXODs7l2KBNJ7M7x5v+/1cZrj6D79CF0u8wF9/kLLda+LGNVM+1CKEIBiJ k5SNxNED8T20FVkX+nq7NoGreK4eA9OC7QQiKiohOSMCLUWw9rZFO7TPOGbgoHI5rSl/ bJE2ZNOPFVCeQFXFaNyDQ48WURevo62sLDPgRRBu0kpXZP4Ipq62lvVWgBRlm39ZF9W/ Jl1eYTd5OQDUlpCHOYy0xI4z6zc0k4oFHCaHKSq12rbmLAqAGXgi2yr9HbrFW9z8OUXg 81CR5eOwAbpzXv2x0/1mfGEQN/eLN2k2H9ru61wj9gQjo90y/+NmkW+/JWhfkN2AT5jt 89Yg== X-Forwarded-Encrypted: i=1; AJvYcCW5DbYemRiN5Bm70eT5rKkWO9WuitBZCWhLV8axZnfDQKFUcxjgFgbiaLtXelkElcfpc69HcJwvrA==@kvack.org X-Gm-Message-State: AOJu0YyLmkqR8w6jEjHw6QYWc54PtyfxrQ39XKKfFGgiM8mESs/aqqQ2 FQl2qKPuFjJ2bMOke1iZ08vehGHsUd2bJBe3+ZcGqOxHhq5K5Fvmql6zFMcuM8k= X-Gm-Gg: ASbGncu0lQCQvBYVoFHGSx5jYgtlExXFujQ0lKwfOBianq+nqaUkIx91hC/uABFRpiu hNCRwuJf1dR2Svv9Y9Z/kPMGs2f76dwUsErcuBkj1Vrummy4jqtWs3zs/tmfFry9i6YQEMXz6Mr 9kZbryW9Kg1NRUlcV/HEhUVtc+Gaua2+r38/FR9ePqs1trABAXJHd/ovMyEk+eivYn+qxXwjwJA miMYsLh+4ABg7LZLkgVxNIJVIckYQoGOTug8V0qyJHFKSc5LWxEN+F00FPc1zj+nGR2OVCJHSQO LB+7YylNnYZ2tPdsvLjIpeFHFQ== X-Google-Smtp-Source: AGHT+IFdaxFBkgdagf7y3zqU2s2u/Xx2zJIy3i8Z2j6IzHAvWKa52jNah2tWLGP7hmgNkKb4ANZukA== X-Received: by 2002:a17:903:230e:b0:21f:7671:a45f with SMTP id d9443c01a7336-21f7671a6c6mr168719375ad.28.1739219254463; Mon, 10 Feb 2025 12:27:34 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:34 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:54 -0800 Subject: [PATCH v10 21/27] riscv: enable kernel access to shadow stack memory via FWFT sbi call MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-21-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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-Server: rspam08 X-Rspamd-Queue-Id: 852BC180012 X-Stat-Signature: ror79fcsx8814bwonsrded15doo4qybn X-HE-Tag: 1739219255-541916 X-HE-Meta: U2FsdGVkX19UH9ZIdBhYqpflybpoR7DkpoGq/n7f2oK0ALqDfKN3JefxMrgLEjaSbG2JOBtjhVA+1i88oDb/4hGeG9KyAKAUBpO0fLsb3I5aADMdkqYXSkgK5WO06NLKzEkDZYAbNXA4YBwYsuSLHI+mg9tdQpYWadImQ8+vrNZqUR23suL2dhzh4GQ6GxZsoN/utMSNn1kREk13RHNxWv5NQHBBXt4nJOAkleOSvcy8fSsK0dsH2saa9l5pQTTrxy5Yli/j3JGKOXZ2Sc3eFIND2zVmQwRwca7a+hU+9LPnH9bjhUxPPSG2JsKLDIXwgSTCpoZ/ULIXndCfOuuV+NXjW3/6wQSlMShnaXL1qCmWbVYKOFwq7XdNRaj/QR4e4s+UTqghNVqPrPgUbCMf7kS8ilS9Y3rpseHMQR5wn14Zqg2CSEM1u9CI/vTmynuwqMC3Wpg1VY4xmllgR0EbyAXxbFlSpElKDr+J2ibWBop5ElBm63aKpGeseS4tH0VWRerXiNPIi7ZBn52H/rYJFzzqSIe5OxGpEtZL/OhIObk/v8NfcIUTcqHqW5hdXvkNfusXNBm6r1rvmNsD0wPdyB+LmfPhmRqBXRwUwAP5h+T9X+jxhyFjniAWhtCrLnwvw792U5786qp/Hlk0BwfsgprnEy7D0qp7IjGCiAsEAe/XGF9WootYFyW+aFmyBnqWve0U4qTO9m9d4BJt21cVIDdstNTVuKOQO9pr5xkjDby5ZAUumwt1rAdBVrFfKuD/KTPag95ocnn1xCT4U/C/bwVmaFf9vse+eq98gTfYw/PSBP9drBIA5qhOdtfSs6ivpaMH9tV4qnW+8UU5/FaFaWokjZ+eWfDpdLqhro/bL4XW5ufb1j+BeJOtDhzrAj5QYF41st91LDBi+gpw72FDFG2786MpIbwwQ+5SURyazg864cNVMdFzW6gWZKLUq8OeOZXt8IYe8dlF5a7NOzf MRT4Fgjx 76hDMhAP2oI9AiwGNygdC47Akc/A/zYB9dj+5xT08raJoJthNNp/voA5jRvALfupZgeOu8ekNI13Sb0c7yeUIS7SJV7bXgIElNRtDUUpnQWOeak/5jgT0CASqcw7/wYfz5AVl1rEWMbiO9dycmToOmxvcPZa2KuANCsJ8pCsubcZyZdnA5v9qKotxx4ZG09nWx2NP6eyeRSEFuXPw/iXwNiyRaRwbApiNpBJAbG8cqYudUhyhkzT64A+X1z1rBMr7p6rKlKDDCncnUayFJWXNiVm94Qacfg8tAxd3cxuicsM204UH8vJzTPZiToTqc8hfvpm7gpF2KxD1tuq6VZNQgw5UGMLwUFOgYweYXxNYYgTsJAVpgZ9TXnLH7MZnjRZxSTFYzmqBq41Ze8GHieBg5JoMULdVX2uq6LO4OkROKfHatw3S6wlKCTFAC6OVdu3Yd0vjFvlo2C4nmm96tzap0i+O6w== 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 Feb 10 20:26:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968615 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 91EEEC021A2 for ; Mon, 10 Feb 2025 20:27:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 78C07280026; Mon, 10 Feb 2025 15:27:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7135628001E; Mon, 10 Feb 2025 15:27:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 53D90280026; Mon, 10 Feb 2025 15:27:40 -0500 (EST) 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 31C2A28001E for ; Mon, 10 Feb 2025 15:27:40 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E4DB5AF542 for ; Mon, 10 Feb 2025 20:27:39 +0000 (UTC) X-FDA: 83105170638.17.E7DFEC0 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf19.hostedemail.com (Postfix) with ESMTP id 0A70A1A0006 for ; Mon, 10 Feb 2025 20:27:37 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ojSLe9To; spf=pass (imf19.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=1739219258; 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=HpYztCg0+04NvgB0aTgK3u4aGp3yqsLj2G/iREVTnNfrs1/W/Re2LhdcPMqplOj/P6Tn/7 P0tBKp6xi/Gj3Or0P6A5WQsuAEO7U+7y3Lkdm7Rqp7UEsd5qr5/oLCatizwaN4X1bYanDt im6hXYyaDunxlVBKQW315f2g1OJaxoM= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ojSLe9To; spf=pass (imf19.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=1739219258; a=rsa-sha256; cv=none; b=S9YKg0LCRcwfFd+0zslzQSSYYFoDa62zTP6+n+HU2Ve32OpMewZaGygzxaDUjGvkUXKWbQ jl8UOrjHxcsW/ca8qWDT5kfxeD+g3kpcVUYkAVbPr7v+qkTNcP+L2A59vEKGaMO54/ePJE Ef9tRboUZLakRI8nLbetLc1gO1n23as= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21f7f03d7c0so39216685ad.3 for ; Mon, 10 Feb 2025 12:27:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219257; x=1739824057; 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=ojSLe9ToygQA5v6GUZvHWEPUru3uJ1lgVSEv9Cm4tXPA/ZosEHZJN61rykY0myNc/Z kaJUSdPU6bqteJ1Y6yONeTWDoHII43nzc3fX8PIEO6pyJdIL3evCo3cmMtcItYWG830e nPNy6Eq+OgVLZVfTXy96C8S24Yq5h11sASo41Jd8F194kLJyQwLmEqLSaS9Z1cQKdEYu Xvu5+uT4s7SKKoXUcDZJ01xHVvXm1vopSseTHtYphp1/BEjBHd72cG/QIJh4+yqHh7qu NRwfohJ7/NOUUJOarxkIQHab5kvhuxRNJ0Pme4/TqSsxYNsn9bITHQDsY5csuOP8xtHC KfyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219257; x=1739824057; 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=eJHM91RJsYtCQbpr6Mcwo4OQaaco6zAKxg5eu640l4SCBlh9sljYBxwiwcirjP7nNh DuCBcMRWuBwFJIJuNuUGxgfdLbffG0/uS1z753T7KmN5rMkmBv3RnRiOZIjb1XhRX4X7 JzDDYclkwVRly08KT9LfKSqYDvdnMh5FtpVPaYLtUVEliNbpIPV1SXmrSk8nIYTJjKYP Umadnu0Qw+nUbVWnSlxzvy5evRmj9ZwTIPM4FdZfZvBsfTRV/DIW6GyT8Ot3pHOl6u5y JjT4uKKOHPLVliuC8vsdvkuC9xNrZA7Ouu8fiszMYGN+RBTBLOr3fg3ImM5tUW39KygZ LxcQ== X-Forwarded-Encrypted: i=1; AJvYcCU25VscbkTaV9lgGSTMmubnoYAFHxIIgVsUv1auci8rnxvMoPWUlb9q0um3JM/8bqV9QxMyiFQ0wA==@kvack.org X-Gm-Message-State: AOJu0YzgJ1yClr+vdH+0579iK2XGoISevSDA31M6ejkiDqC+Dzq/VxfE +rdYEQBsQbSpeTcAc8XrhQZlVSyE2RKDWhdER2nh87mPS1vWwB+s0N1qdmyO4PY= X-Gm-Gg: ASbGncujaq7+I/E2Bl9rchdPn21Evd8udtBgSQTHuSUrCy3hzvBqug2Dk+BteYLWTFP NEwcbuj0OStMmlXYyEHZuGZz4mO5KYEoTSiBo1KrKPmJI9ZvsGlHrst7IKcXRkKju4OW9Cj9Aey j4FElapJ7M8AkwUAhTunhMGr9WgKAlUVpdeEiN1SfBwRgCcfi4FQDDN66vvazW9HlJUG37V5ZVO 7u7Y8U4II2U5fIaQHW2jaRbsTjxH1r4nUQFp0pzX0t36DQTNb0eWPiJctylBbcJ5BLZSrYuOIRE SQg8qU3uWIntuHmtIZEoPfu3/g== X-Google-Smtp-Source: AGHT+IF/dAuKVSsF4xfi2H6sG4wlPlN+BXXOHG9nKEFkchqxVssSaBrEBlASEgV9299c+TKy14VoKQ== X-Received: by 2002:a17:902:c94c:b0:216:1543:195e with SMTP id d9443c01a7336-21f4e1c8978mr260581855ad.5.1739219256955; Mon, 10 Feb 2025 12:27:36 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:36 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:55 -0800 Subject: [PATCH v10 22/27] riscv: kernel command line option to opt out of user cfi MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-22-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: 0A70A1A0006 X-Stat-Signature: f7qjwzodhf3sreb7kd7dtf34kf6jf3yf X-Rspamd-Server: rspam03 X-HE-Tag: 1739219257-114533 X-HE-Meta: U2FsdGVkX19vfcf8uxndDGA+Edow5KlNraJtzZf0Kn/VO58DlUFfMKhsLshkuuKMu5DoNmctnzsQaNLz+WCWy7CU32r1jk2/y267UYK+zWXcS63QyYsYAFCUmUnQLlo5YyGlZjbRf6hUPXvdBheJYfnmYZN2RaPx0CMDGRotZZB4nFOicbUBzI3Omw3roIcLlks1bekpzofVfgO7zoUqqjGnDtaTaw2p+TH8FGJXsVLmdU8TjXgsoQ8s+FU03U/IYxxynyfUmdGR5fR9Wj5lo19GWmKRv84P09WiiIXX5LKx9GlsSswp2yBfME+2+wb1kt0DNicSDvxtaQegYFSvW1dG2RnHvL1rYHGyOxerhK2m+zQUX3qFl3bGAZa1fAgRfCd3FaXi9Nf9EcnMQxvNT8QSIViJNAR8teNAU2ift5K77Ah6ClzM9BURYdjz9vt7b43TJAc3RuWRFro4QDFcSMwTv9O352uB6viJSTQz4S6cBMNRVN1dmxdfUNxnghafy76Ec7POIKelt2lLpMQYFrFACSprgU1BK3LtjZVgnyUXNDNYhAA49BjpN8gqgQWlwCbhF3I4l7jsOAELPEEUBsvOI2AXl+fd8sBYOwUaddo8RgPg/JsjT7QVgUinNI/mkrjTYbR+7Irxj7A+RqBlfWfgtRjXrBcuWGaF2yhHRHYhBY2iL/KA/DJfszF8tN1Y56zKuigkGRxS4pU1RVatOaELLXAWyZAaIFqrLWUAlYmtZtTyHkkbY7CfH+P9ujDeS60SlAFAc+XIXCOYXFDYQiuL50k6mRcnlDmax6TGOscUc3fkXLyTuSq+hjoGTwNy+xlDLJc1PRSltp5+BLv+CZAFUtqLlXBbHhWVj7OZI2AymPqNSL1uaJvPKnj4ABekUbDhYP1kTgPk2T5gkIeZBL1+WyzV1p+6y12RCQJvffumC3cWZr9bLBdGcYwMTEIvBoom3k6l0ghZWwzGD7D TAi5YH// y/K9vPJqX6OD9jOcLDWUzetBybyMeGi+SyE5ry4c2iK+3mXwCEYBohshiTxUho+OtsoBBvGs+uGSUkmGoyeXyRiW3No+m6NJLDfwcvSggqVGz6UrQ5x9f2EiLIbal0lItf3DQfrBj9MGKUDL8Bo+aZZ1im95BXw+5xXnGaGDTbpTiGI3XQBwqzy+0467BLwAhgWqsV+/yatKV+lZ8lzbq1LFK+hzQONiuq2aJqjKAyh/UakCqpst+SUTVatPCnTDEiMKPu7RUCWFZkbQ68A3l6fxzJQjWq52rdAEKl9jiRq1ei+Cxlbs8JCtKqfIjhJ+7TsSfJxTCn1UDAXe2/qwhtLxeDPc6GbgYpEJozT89CsDiGbSTBpeMudHmsym8fYmERtQF0JfCP4xgwOg3o5xsv3bLW75I5+Q54DyMpm4n5pgLB6IkjPs1mw6ZIPteeAxBghS/e5gko/iVJAI= 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 Feb 10 20:26:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968616 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 3DA6FC0219E for ; Mon, 10 Feb 2025 20:27:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17339280027; Mon, 10 Feb 2025 15:27:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F8CA28001E; Mon, 10 Feb 2025 15:27:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6580280027; Mon, 10 Feb 2025 15:27:42 -0500 (EST) 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 C90E928001E for ; Mon, 10 Feb 2025 15:27:42 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8212B1605AB for ; Mon, 10 Feb 2025 20:27:42 +0000 (UTC) X-FDA: 83105170764.15.028C01D Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf23.hostedemail.com (Postfix) with ESMTP id 7CD90140006 for ; Mon, 10 Feb 2025 20:27:40 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=amTC22oi; spf=pass (imf23.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=1739219260; a=rsa-sha256; cv=none; b=Mju0pYkej6yrd47TvSQ6bKvTXqYYVF7dE9B/kRdcHjcUxvaxPgpaxP67PrAVhr6Cf9HD5+ qT1Ej2B8AF+jx9PTaT5tMweXz9e/kvlhBpYv7uz0gD2MY7ar4tSFZSV4ap/keOn37omHRE pZZlDB8nAp6SDApolSvaibsmW6Q5F2c= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=amTC22oi; spf=pass (imf23.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=1739219260; 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=r7taaI3D184cw5jK643mXVB9VjzO+GYqeON7OFr07g0=; b=OV6o3PoS4MzImuQPqCzSpymt5sI6sR55935jCAR+4Y2JEZM6ctMkOYKHqmrK/ev5+Zn6N0 TGnHLhVoWd6uZKPTWIoxU//1QPp7uFEYobtRk7OM7bnOegLoRLjpShEv1wSPWW9hfKUrgn vATy6VMVAV3oIVRtoaqXuH4ZVemPkhw= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-21f6d2642faso58721275ad.1 for ; Mon, 10 Feb 2025 12:27:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219259; x=1739824059; 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=r7taaI3D184cw5jK643mXVB9VjzO+GYqeON7OFr07g0=; b=amTC22oiewf8WbseGnzhsKpzlSEAuJq1lxK8w8CYpD7t/essRYKwtAPiunC8AQK1G9 xuPsREpxSzxNxU97f7eqvvY5EBMYfhoV0jdE80iJ1ZxF2X8qDA5+r5L9zq0qKHEgLik/ kfqyBKgCkSXlJD+qdCe2ZS3Tynb8XzZv6kFORwA2BtdV7K9P2wv2R9ngvcehGE14D0LX KaJwNHGaz4VVJ3tzIL0zqO/wcvWHN6qJpcnfoSW8E7557joA9qWF2U8i5Owl4n0sJg6F JB2P72PIBYZHlMux96ev6CrwVU4ST4YsHhClaUPv0hLTd/UaFvU1FqN9djSutW3VBbMX DRRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219259; x=1739824059; 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=r7taaI3D184cw5jK643mXVB9VjzO+GYqeON7OFr07g0=; b=pUWewbue7fRJd6aNo+N1BBaYHreyeS+15UkGVFvyFo1jfowYxGbf+DmJ6SIHt320bU f0/+Zl8wq/I3l2oGg4vpICmlL0TVmbwPg8X+pV26qgHMGujWQepmbE/zguRMfmrqE7oF JbiJ3GdTXHtO13MJCR+Bs/3cRWT7F76Ttta9ci4Kp538YKdFniQqgRxKjtlPeT08F8Bf eLXJDsMpHI2HQcj1IkN7dQ7bwaeZp8nJ0wFzTeHrCMXSoxW9xrnkDFdhyoFIIeRojBi6 xSN/HB4K3aFFcPsR1gePgdglm83V/eYcxSXyJkUmBE8Btu9/GHFa7+n5eTBaE4Mseemx z74w== X-Forwarded-Encrypted: i=1; AJvYcCXuDJ+xns4NOMuYWUp5mFodEaDT2+YOt3MdvrocEzZMiO8s4t9GLPvw2RkBI2yCYuFCSBM/opvBoA==@kvack.org X-Gm-Message-State: AOJu0YyNJ7qkZ9Ua1j80KK7SaKpV6HaCvFojlkOVLj3RQNtVtiDhadyA s164qVJcZ+FL10g0ypXjMw+OED0FgG1Pa3uJfrkMTl/ZvOZTU7WTHCytlHMyvro= X-Gm-Gg: ASbGnctWvqkTTaWWhavzOZrNYKqzNdtgaVUQUgGtFEB1Wz60caYM2hR7ojD3lNxGs8s aRFb6kDsHI8Rcgvy3GaHVX7xmg07L8d/DS/gLVS+FeKvIx4qp2DgpX2LuhSQmdVw5uW42CZ/RNH htuHNqdlQ+ZO3APLe/16vRCIW4CrE4b6mzjx87pea/LYHMgD+U01COGkOO4XK1kVCmElacDh+5U zHxsrhXTk7fRc6B0t/OD/6BcHWCYrJGSfghgEcvOhUJsz1mV+g7Cb7H6DejHS4y3T3N2domsnKP Qdyznb4aw6Oe6Hn8ysgY1ATp1w== X-Google-Smtp-Source: AGHT+IG7kVqNapt/vUbJRwHXJK1nO6NkoyLZ2LO+pf9PsrB4j+p9Vq3YwvD6dU3hxfVAOMr3upzlgA== X-Received: by 2002:a17:902:e548:b0:21f:5df6:b259 with SMTP id d9443c01a7336-21f5df6b45bmr209610785ad.21.1739219259424; Mon, 10 Feb 2025 12:27:39 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:39 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:56 -0800 Subject: [PATCH v10 23/27] arch/riscv: compile vdso with landing pad MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-23-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: 7CD90140006 X-Stat-Signature: tcjcdat5jdiierzyg4qfj3xxi8qub59o X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739219260-36432 X-HE-Meta: U2FsdGVkX1+6EqB51MkR5XC93kA3CBL0AAf1CnPjd4LNidCwcxJ6F/4OMPfk/Fyse4/8J9FHqpm3+8PKjFD3x4qU5g+d6XHpwuDvXnoEU56dwa9B4iUPZEYqxNGyddkzocMez3cFFbF+3XPH35UiwZYkOJh5QLWiUm9fHjIup92CJGOD63SJ89fRB3b7w/l2CGYPVhxFdTmY1HD94UqCxYlFHgXG4IBqzbBL2+AXnWuVUMQ9O3skgDKDQAkPmU5etIMY86wKCxM7RUSQhKLdILgM8ipkvjsInbeixzEDwB2vX+ksP0kHCD8TnD6sDbDo1GFw/L0Au5OcNFc6pY15RSzYWkQGGeB7eMLjhA9EOzRK7K/nbOwKUUch8Jc4H3VB1ROwgvXse6TcGcoaHO7kR4VE/NM4rujJmJLeTgxwJu5g1n4UJ9A8ZwFq6rCbr/FNj4QtLa8NrPNMMTQSuVj1b6lJ2EJjYV+h00qoIzL7HTBqUs3CL9MIIsy3Afeu6J5Zt2QhaS4gpXDluziZXaNAfKnb6zW7m0FF2xQKZjzMiz9PHC079qDJjTkwBJ5OOBBAirSMl5sZLnr9FXVuj3x7P1xojEBiotrSh0PZf3LG/+SvttkVtz/AEqYFdu/lZn+mIt6tPm0bDmmXfDM4juHnECWNR7hsuHLkUmOCZPkGOtVu5jKoDKE/4w5Ut93VUDDGShLn72dgx0HVtNoLcD4s6necYAvmKJJMz3QJtZydhvTKhYk/kJIC7yp1sjetPnQNQp1cUxVFM0k26pg1sDFzYX+LIvGWYjdE1Cuqdirsp5/kZeBnYcmqE8ioIvGbAnpMAs4N0hH8szkTTtgc5gXe2ReoubnxHF95PH5X0cu81K+elW7oj5vzA3aHqlJeGToDNScUxWKXo73e1BfJ7vduN+iaWJzlmcTISPp9ivw70pADeE4AMsd+keypAVPvZ16klpC0e8wO435K3LW6g9a CFU72ANg qYBBF8TNMlJ69lCDSGfu+rDwIvwaMCRPgHeEO8O5phIrSXgU5vLAmbgNp+51hEzh6JzwlHB9aWT7Dchv6H7kiyRJwrMHBplFXOVqg42rQF9KtXl6efiCIjIpzb4/Xkhzz6+HNAwBXqHhuPeuWsSGIcc8/FBWVFL424Nv0L5+Hlk8r89tX33UkbcOZMrfNTVzuavQAETqhO5o/JxoB1K3P0olVxOa14XSTXjD0GQlnEMjX+UnxsoPCDOEQL1Cn76r9DjFiclh9APdCIVsdXPi0FodAAVaymYbgJ4YTSv3hvjTNzR0AmI1Ws7WbkDGMjnWRKd2RZrrlmEdDn4YGzs1jEC5zcBvzV2M4JUV8Bu7AVeaktPtB+QFsEVF+1haaT75O/Cal3GBHzTCOVjwSCtNPvx3njLIeZDlwrMpIwwEAcYqDwUfOqgak8gUq7xomYM7wovPjyrCSYhTcgDkj7/sfsqnscQd0G6PIkmST1pfEi+H3OODY9MjQotgdbu72iqwr+QC8TDpa7E2JuZ0= 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 | 8 +++++++ 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, 74 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..edbe86d0b4f7 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 1 +.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..93c134f0afb1 100644 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile @@ -19,6 +19,8 @@ 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)_zicfilp +asflags-y += $(KBUILD_BASE_ISA)_zicfilp ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y) @@ -40,6 +42,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 Feb 10 20:26:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968618 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 00C87C02198 for ; Mon, 10 Feb 2025 20:27:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9D476280029; Mon, 10 Feb 2025 15:27:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9610428001E; Mon, 10 Feb 2025 15:27:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B05E280029; Mon, 10 Feb 2025 15:27:48 -0500 (EST) 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 3DB4228001E for ; Mon, 10 Feb 2025 15:27:48 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id F14051A06AA for ; Mon, 10 Feb 2025 20:27:44 +0000 (UTC) X-FDA: 83105170848.29.A02F6A6 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf26.hostedemail.com (Postfix) with ESMTP id EEEB2140005 for ; Mon, 10 Feb 2025 20:27:42 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ioWwkzb5; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 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=1739219263; 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=XqN27wEtUUlDPmiaTRJ2smOQDBCkppKTV4UseahD/q+5Fzgrd2gs6/U0FkBTFKEJz3AWGp 2LZ277DAjCK6wgNR10yi9kfRC0IDwC5tu7wOaP/CNC80ijRLKGdU9fF9ZrSRBc2cChe7We NRIochbxU77xlfBFtxJpqssEURqqGG4= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ioWwkzb5; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219263; a=rsa-sha256; cv=none; b=jDhQmDojVbZQ9jN2cImgjBOKhk4fw1Jj/45vaK9WCPZHRK1KGTUV4QvPjEW0IVkS8Vnoag AVcWXx37oJUrTCdphM2nHTty5Yjk9vvkh4oz+GdU0VZqNpG0lOaBsJvJ7NTFHx2zIHSTxU VHB47jBMkzk+ImNpnxaQmQ+70nNjiWA= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-21c2f1b610dso117771375ad.0 for ; Mon, 10 Feb 2025 12:27:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219262; x=1739824062; 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=ioWwkzb59K5UodxOFArTRasD2MU76eUjorhL3YKWqjgUTORnLigHran9JDpxUdB/wd Ztf92R8s3MqT3CU18pvk5pXQc66Sghcht98SwmosVUEGCqzoEm582R+zpk3Y+FnU3rKU UtMmbixq9bznId+fgGhlE2Enzmmv2C1dLI42gx9JwwiSDjYD+i4dpl0m9nH7iGjq4HrN pyGqYzS0ETZJFRjX13kvIMv0Hx28vQ2zg5XAMw2KkljvQc7Ra0Ty+rdUAQSWlq3mUAG/ DFxdnTbOXd0Mle9OXI04SCHGJgzqBUVYaLy5hw2nKIV7C3CSY9HnNzMIPiNx8Q9Fq1h5 33/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219262; x=1739824062; 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=Ijz1UCcV30UP0O+7FBUA2WnOzzVhAGrGB7tdR4bSQeXE2IuMJ9JobopHTsKvDCrZoW gcNeJ8U/XU765J5cyI5sGx+Z3i3NyDYyqd/M4XUOMDLOk9NXjQCmG7FIZ/cD8umNePR8 OKWUKtvFWS6EagGjnG245A3NXoG2JVTCJX82XmwJ8MTNmXrNLMZEGng2xIdbKh5Bfzeq BzAdOwE7Gqbm3JnahmUJRW6vyhOmOuAO5L1aU/FyOx2d9yWUA75GShc6RQArhOV+txcy UhBoVbtpOkLJq7OIhgUFk3W7tA6uocW5/g4HFPkSsmQ4NazVYHpt+d2bYYgDJqzJFo74 PJ7g== X-Forwarded-Encrypted: i=1; AJvYcCVlKNv38d6I5h/qnKzvd56mTi8MoeAyNjYHDuIuanLUZWJU9TPE8PnxqU2fcL9q+K44NDVVqkQWmA==@kvack.org X-Gm-Message-State: AOJu0YwnR1LMZvODL7DsDHUbB7FZAOr0dTuSBs2VB+93FzerzT2kpCpz pfaGcxG1yEtH0LNiSDEqViQfDO8phWbb2icatHBXanX8n98K53a9KNCfupvM37Y= X-Gm-Gg: ASbGncuRdscG+76hFwE4Yehvzmlfz8FitE5g1B/8G/uH2A5m7JcFzcNj1LC7F0Z6PQO IiwjJq5cxtyVlxlKeYJwJWz+HuwBLyTucwhQYPdrC0J9849MntG/q06gDuKuj5ybtXhvBpkKYUb djfScbwf8GLWasXCst9Lvarn5O8qsFw5QnSBEI87ZcqYQPtEPqVhkafrsFk2akZp5moPcFBTnkJ mkJYPlau3gOw9Mk8YwEwGTKFa1xRwd6EMYAhbBX3JNS9HKRnYoPLqhrgAth+rELenNpRJHJH7jO Np5I+gkZmC07r139eNxXI6VXDQ== X-Google-Smtp-Source: AGHT+IGvJHthtMMIotmYr/CK0oOoURKWcK3k+qdOAPpSTfBW1H5FZ/zO8d2C9jHOqU/wdcn1U6s6JQ== X-Received: by 2002:a17:903:2311:b0:21f:3e2d:7d36 with SMTP id d9443c01a7336-21f4e6ceb59mr270827895ad.1.1739219261893; Mon, 10 Feb 2025 12:27:41 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:41 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:57 -0800 Subject: [PATCH v10 24/27] riscv: create a config for shadow stack and landing pad instr support MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-24-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: EEEB2140005 X-Stat-Signature: bib3gf7imc5fahzz8mrh7agyatayb83n X-Rspamd-Server: rspam03 X-HE-Tag: 1739219262-105436 X-HE-Meta: U2FsdGVkX1+1zjSXNbmUdYmxsLo9Nf0n6tZt1OWa1EIJh8XTXJcnPvqZ656AhgYC2GxNb8oSMcgWceX18kOO3dBJYGbAkrNouGoR6hk687wAWZeoZREYj2mgQi2t0HgBZebEALhdL6q8PNDgXPLZ3nDl3zIe5I+xQEIpiJs7IqpSwJHILWKJfZ7fUxjtOGXsAybMkUjA73jXnTzItqrDAgQDXfEZvqbO2DVbMvZs9qj9YEOzaLnzTPxTBdKi6C4YVUOIELiM5SiSNGIMKO8RSN6vc6P0WWfYsRItN2rit/ycUniV06v9kIvHl2ZMuvxeSIVmW2Gc7VFUx8yRGSDiglAgAE7lTRWYxQeqO6ox5bqTjMFW67eoKATPAucme/mpkOx9tsnLQDACPtl3WqjIQuvGyPy29f9cLUaqkJj+u5Bj09Tlab1ojj7TYPB1XADqiX4bBVkRwKZHR2dT3Z6YJLo7mRMiaokgPACPtNdYH+bgmTdW49WhF1GKiGXTnD2AnCAVUfjvfcIbUDrjG3f/hVKoJ2m7VTLmXxSjOLvdgjMEngu7dD+SfRnqY2/puN9BogkJqCbfiSbKs1t9WhV1Gm8sUmYKnK8HGm6zeepdzuRIx8bhI8hjyaK+s9FJ465SsYWdp0Bd5Zvz22VwwEygOQxduT0aLcxyKR7SiAwce7TJU5ae1KPg3rWWMR62AaVKis1QLPrpxTbfTUovpWRFr2Zmhevh5z7rDIRUWtcT8pJUdxfe98wNpW4okdOAPA84xQyq2bD2DXql1jB8qmQU70MLwU1v28HO3rE6uClAnM35/+EpAMMK26jIghRxavwkMBZxNiX8N0DLDxsI/b3VJnmaKdycQVT3PCPqTjwSJHolij9z5pBYuSVLfiDTlUM02tmqvw5JoxFf0Hq5YZNa2xqtpGKGcnzQjij5Tl7DgiVghrHAB9VCv26W2LGo+K0jypBQzfHKzVg9FSOXzWb +NQGio1O k5osHSHaWT7ubp2M1kYLF3VQ8tf2PdNznt8DdIMqQ+4gjTOlThwSPrll9jVf0hkbqwlgXLn06lAKmjDw0zlb0IIUaJs1BVX/y2LChR4d9DeK9OWv/0h539IbKzYsW0mIBirtLRsi5OOQKJpZ1Qod9KWeA8y6lBCFk/o4YMFY8YWxFxbbhaDfEQ9/QAmd5JnvKGvLT23tbMSmqTugon04xaufXzk2LAp9rNpbryjz53lVEIVLMy72U5kYMm/kbnP5nAp8gPeR2DPlOObj0zYUW0A0SOwWmPDNHfSmOT8YCNQLcpM5bPs6+L5gDjn/ngO1O4hgPK3bKyNGbOfGQ1NmWfbMEagP5bZY4Lc0bwPl6GmBbNmc9LL51itfBiJE8fPWI0XTnamUibdW3lrEi9hWkW2ukbBgXKGn1/mKZ1KcrGV+pW20Q2ga6jKqrR+2NcmDyBBwnEqiJAO8vHsUJ/ajriam75X4WlJdvgWvS9idH9loIH3Q= 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 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 Feb 10 20:26:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968617 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 B9084C021A2 for ; Mon, 10 Feb 2025 20:27:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4CCF0280028; Mon, 10 Feb 2025 15:27:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 453B9280029; Mon, 10 Feb 2025 15:27:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 27FDD280028; Mon, 10 Feb 2025 15:27:48 -0500 (EST) 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 0201528001E for ; Mon, 10 Feb 2025 15:27:47 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 963AE80588 for ; Mon, 10 Feb 2025 20:27:47 +0000 (UTC) X-FDA: 83105170974.22.B148EF5 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf21.hostedemail.com (Postfix) with ESMTP id 973431C0009 for ; Mon, 10 Feb 2025 20:27:45 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=a8bn8vtU; spf=pass (imf21.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219265; a=rsa-sha256; cv=none; b=d6WktZ8bnlRYNLP92HJrEVgCr0jjZaN/s88SqqiEhV1q/1cE5KKjWegHU1i7CzHE9D8ZgW htNmKlVj3weoFIkgxFWt3Rl2CyRmlrpc9HPMflDnF5xygFQ23HcCBySa/3LM9YfOlmsb3l S0WYHeTsA4n1bVS8uWQwNFtTl8SHKy4= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=a8bn8vtU; spf=pass (imf21.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 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=1739219265; 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=HrwTB5P9UvEKKDWd3tkdOo6rpbElll3fYPShvh7Cdz3EDYKS0XQqu3zO5e6ZENl44Afyls rstxBa2SdRgJZJYibVixrhGnAZd9zDRHvzW0Vb1Ont5JSvY3WntI7VemLz3WvcMOQLE6I5 HY8FYrk2Qt/h0So1ooO6GfpHHl6gNdo= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-21f55fbb72bso56910505ad.2 for ; Mon, 10 Feb 2025 12:27:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219264; x=1739824064; 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=a8bn8vtUBzYAJ/7fUHxiBzPN5Opebsjpx3IWH7vbaCiSVmy8AvyOgHuHft+LVnwPTE jOYWCuCsAa79lEpIxCY2f+SM3x5oTWvIrHRh6DhibIQmXe2AmdZJRKtEMNILMUCaam9r AS9kEmE3OXOmyz9qGUg2L6dsMuMPWcSTw2jzFobdKJJwNP40U8WV8cZrjUauZqiBY3IE /jTGf2RdXXBe785Yu96SB2URjokx0NX69ZI6kH1UCMybJ/iL/zc8ReK2ntJ2fGclLpQA YmziSdKUu213jMTe8U3wNKhcc+L5DkCB8uQ78uBpnEzZKGdXLzyLBBLHMf/+vc0fr8zU 77sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219264; x=1739824064; 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=gUaSmFZPdRHmbYcwUBHzc+NTf6SQU+datUTWRSfw8nK3J+mJYozKdUXwYWpeYCWKIF dJudKN4gpCAeSvaxvfu9OEfA9a8I2jAo2MHkUUaqjvBWDvWHOW9m9Q86wK6Irotqgla7 WmlMR1wGoXXdfbUn0yMf/phxkBPm+CbPFzHiHWh7VvU2G2FL30i+9B0eyZKI3AvNte3n Yf91jUoVttjDBvk6do/L4BnJNTHBb+lavYWWenrJC8EvS/BwQ1Jckiknk6DHzo8onM+/ PsDtaDvNd6vzJBE00fzbBzTKmvb12mZTf/c/XV6XEB2rjQt0Arj9r6LYlx/q2Yn8FFuw C7Sg== X-Forwarded-Encrypted: i=1; AJvYcCXgQ1/jy2mpkB6Q4NrwTuffEkVlGKwxSw82ncHk3csTDePRRbdiacCGwj6QzT76uIMxozECMNAP1w==@kvack.org X-Gm-Message-State: AOJu0YypXd7SrMAjmMGgkSWLUcJEpc7/y1mdYFswcRIR0/TSZmhtbCR3 RZJnTlLtf525K5MDGQKESqylb9Pj2gPrB9WeXYf+gQLiZGAh3gCN4zCnEvI+JU0= X-Gm-Gg: ASbGncv8qlwT4JyT+F5BN9Uud6hKHpqqwoZRJv6e7ElYezJTLfTRCISACeGjl8to0yy 12daIR1uGdqj0joSrExC2oxnGEcPoQC2kM0EjiDHEYRMMUJCOQ/9LYK6neR2zxagGYqjwW8piMw 30L4H62I1Jy6rL0EYF2GoGOivWlslHXN0P0BYwh3XNnLdXffakJEOOzlLKKv8dwyLC5WRvZ/JK6 TTN2AP8mxSUF4+01wOT0IJy6nwEDTnEwSZxPL72eZByju7soHCKLl33XvTOpUyYpP5qvwRHKUPo DBpOcp+f/lZoZHHEv/wfKZcltQ== X-Google-Smtp-Source: AGHT+IHONYQapq26xKI/Nlqt2sawgQ5ST7q18FCOtyS0Axv9TidoEnrL+FFU0G/ytCjykvg19tyLYQ== X-Received: by 2002:a17:902:d4cc:b0:21f:6a36:7bf3 with SMTP id d9443c01a7336-21f6a369009mr211502955ad.12.1739219264447; Mon, 10 Feb 2025 12:27:44 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:44 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:58 -0800 Subject: [PATCH v10 25/27] riscv: Documentation for landing pad / indirect branch tracking MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-25-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: 1r6iuyzyyanym8izfafr6icu9ssuecab X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 973431C0009 X-Rspam-User: X-HE-Tag: 1739219265-392791 X-HE-Meta: U2FsdGVkX19VEeydKlwQBMUbXIq6m4nUK2dKXDXWqwEjgoxhBWFErgBlJJfkNfNbO9FfEzhN8IY/rROOotkMqu0pSQYNHFvWOvMS2J0sxMJ2nkMaLkYefHZsU6d1QxjbXJ/QHvfkpqT09RAYVrHfUm/p0H0CFSukGtoBKDJeokuwYSCX2fwLRQ8LyG/iWBKWLr6RJzpaUMNyFomWHKp5IHz8qfJ4atIPRhIu84XxvOeXf0jjyKCb0gYnK/0t1z5ziPvIAs6E2VZSHdLCnV29nLj2kICHyqqNYP+RYmlTobq6eAWoQoekOToLG8h8jQQm1rl9f3/BTui1OPCCXhwwJzh+5ZsoLkne58UVLlti6a/NVHn4Sa5kRzsjoaR4PG1S+82AHOkZRpYPNsGXsT+Y2+Z9vO6L7TZOkql5qCwhLTp2fANrK9v6ZGbmJmEy1+y41zcN6NSkFTlnDqVzcewE4EPd5HwO9af+vyvIGgL7Xp58mccDxFvrOHHWdilEq+tq8LIXCaMzP3f4e8v399tR2x4D7r9draxDnPI2ia81bDqdtxw9ezdmHEl+226mKwhEvl0Cxzvv82hxqWdzh2tIQfk3JnQ1bjZe8uaSijYEVMmEB0wHR1An9I7sHxKd5lhoOR1Y+JO+KVXbCZLx7nRUdKZ0TvkXo7W8ZhaHeiFRP8eVl5/BHZ5whikdVOADQglY3npm+RAXORQ9e17TccxQSVF8vOp043ZLB/qI7edHNQsnJAPOWJHh/io5l9lChDZaPAOWhf98gOYBWkGfB99yHUCwe1Oi9W26bDBAnUCTy6fxBf181JIN02qv8IDXRmPe2yUO9j6Maux7/eyWJ6RWNeFxW7i7iLs2PEVBidANOd5ntRB3lfl/yMKYi3H8KV9ckbCfWKeYF3VN+pGUMjEpryKXLZ66O54p3nFUHu/COpG9EmEGMs8lNs3cc+GgAjNATPekdaZWMpTMGkDGxrH h1TbvzD2 lVS3V37q+JkyPt10vcixqlO0myIP1VyHbrgk0GRwbL5eniCw/Ah9p5fNgUrLHwwz8mUt3zDq5WDmQVm/yeDeS9wVQgn1H5En6QUXab2kuC9IuGUbdUlirWSVMYzJfaC80cQ60uVPuZaV3XHWfgBwwwxzB855U7GKJ4YsAhhm+oZTCM73it3tkElsuCoqj/FyX5t8NC1Cn6GR95UNl8GMoC+eC83gbFMYNHTNkD5jfNgY5WisIE9WxfTebbsbe8jK04h8NScmxQakCUU4fx+ZbDZ0CQk1fs19kzD8bFMdqRvFOKSewYRBEeAL8iWkjDiME6MQE/c6KeoyaXOOxh7VQti00Ll3MmBt1REXhitRDA1XNrrn9tMsHw6auUFO7h2BzxH4KALKY5AYXSv0q+uCm9zx3BKQTzQX3zzrmVd6ZDBZu824LfdZWaPKxNL6cdodVRdeAYpffVPeWL+o= 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 Feb 10 20:26:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968619 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 D4981C0219E for ; Mon, 10 Feb 2025 20:27:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B402628002A; Mon, 10 Feb 2025 15:27:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A955828001E; Mon, 10 Feb 2025 15:27:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 873C228002A; Mon, 10 Feb 2025 15:27:50 -0500 (EST) 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 61B2B28001E for ; Mon, 10 Feb 2025 15:27:50 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 21FFDAE56D for ; Mon, 10 Feb 2025 20:27:50 +0000 (UTC) X-FDA: 83105171100.23.4657F74 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf22.hostedemail.com (Postfix) with ESMTP id 38BC6C000A for ; Mon, 10 Feb 2025 20:27:48 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=N4dtuJcv; spf=pass (imf22.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=1739219268; 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=66kKBrY7eYsl/+lMoAMWEh+YzKFwhy3lADnyAUIcgR+3H1a6yrEQamA8waqCk24a8iV2Ay GL+aAev5jZ8S0UQK6IFE1Kdkn49YWQl/JvJhe1D0MqRmma5svtNN4bT+aQDiRTTpiWmd1S mQhcabci9D80A3P8LAux6+lHZ6rYIts= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=N4dtuJcv; spf=pass (imf22.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=1739219268; a=rsa-sha256; cv=none; b=OY5CXbOhiRj7jztPNJ1/arhQV1FMcJ9oqi5nUX6f0iWAz3OMdWsNTBicDGqjB9sx2Xe27I 1DPJCttGFl1qYZKX50AwdDo0LMdkh7Y+dVm6RXFDBs5klCZUtBu8X/gBKbkviI5dg+PRHp zU+/XM264H0mwBegoHgEPbO3Pzm56/U= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21fa56e1583so18613945ad.3 for ; Mon, 10 Feb 2025 12:27:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219267; x=1739824067; 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=N4dtuJcvu1UaUBhv3UtzKqY187LK7lrmBZ9NmngxarRFSwp3sWvmK4JYhr7z88vJeD cDJ6yHD8WXWM/9LylgKMiya8S5FnnGwsavbnEUYx1qtZDhJDrNDUhvbk0zeUOz7wcw8z d26pGCb1Qtk3W+IVf+Jnvb4oXKDxUWs+to5oxmX58Vg5RbiIbtxj3x1A1G1/bcN56Kyo BZu/p1a0PEiUmMblH6CVsOQRgEte2DS6NcZFPlMdZw7S+tJ2AgdOh+Aq/dO3+CNGu0NN tmdVr9CLqYWVAMqAb4daxRohsvjf8O/tMryR2nI4H2itr8f1vpk9uo2J3W+jzF1aPj9p gFWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219267; x=1739824067; 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=UigyAck7qcOCu4d/Mvc82k4JwZk0GI0j2wBSJ06w5aSKfQ+ll0JTorf3Yz2gBQq5Tq DPlfeBmckQnHYjq4OYIqJAbyJpaXA4YyO8dUqQ84z4+IJm2RV4o1J/SCIrgc7/l7Ra/k CrqMHlZzG8YdIOtyXF+tq9HYqNZlsLARGrJdt2eSgvX2iTGzX2GUH8t5dIhmqj4cbxEL afbwSVoHqxm6r+Usq+wKyRCM+ZR/oYZcNZIfzWZLPn3D7xlykDJrIk3CBKk0eOZardLH tZGxcsK+csMMFLtfWitzPKbqGVHNJQQkXX2fe3DSNfCFfDngLz91AjJwoDMJEPo0OV+D wdRw== X-Forwarded-Encrypted: i=1; AJvYcCXuyDMY0kCZZZfTPl4IiygzB7om33VadKDda73pGCQV3uCkZdSS5fvEIYOfigrgTGWLsrcLH/jJMQ==@kvack.org X-Gm-Message-State: AOJu0YwssTxi10cZW9ekDwYik8y4rrx53V2CAuVIGKYKPHf4AvIasXi3 cl+9lunL/glnY2eK1CBtpaAZ3FG9EsqMoWQZuWCQWEP8tXQIXOiMSZq0PpwXdGs= X-Gm-Gg: ASbGncvRKuM4GGrpf7fB4fHv/9B06s4sMTKBOdhhIAl81knJHrQT4+U0g3I1KKVrSbZ 9cLGCzZJtmRI0jvneN5Qb2DKReiBXgr2exTgZTsqRRlepgNf2ABK8t52s8kD2RFTwbcqEzF89Uu rpswhFLDuPqk343wDsDrygu+EYS+e6XZ/cGWJDNCHKt1k717eVFg2f9Mn7qrG1M/YqQbsZCWNjB Mif8BZF2p2xPROYfVc8KSNqwdRcvBRDJcWihUw8HALr/Yoerg/gN+VT+a9I4bJJ9uggxmkkO7ZU rWX2h35lggu9pQ0H0QmGBN+j0g== X-Google-Smtp-Source: AGHT+IF77b/hZZKX9o5D9F6SK8FsPyTMmzVDWUBYEE5LDFgE+CZCLSSTSUYC2ZjQiunkNaspDHPycA== X-Received: by 2002:a17:902:f646:b0:21f:522b:690f with SMTP id d9443c01a7336-21f522b6f5dmr266497335ad.46.1739219266961; Mon, 10 Feb 2025 12:27:46 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:46 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:59 -0800 Subject: [PATCH v10 26/27] riscv: Documentation for shadow stack on riscv MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-26-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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-Server: rspam08 X-Rspamd-Queue-Id: 38BC6C000A X-Stat-Signature: py7jmgberoqgtf3sgbjcphbohjmfygqw X-HE-Tag: 1739219268-82760 X-HE-Meta: U2FsdGVkX18oOsaet8t6WGbkKmf3M2EBRX9pAeA1yK5mnX8+zkQDLYjZnVtKCcwd2bKt2FWdVVyR+socJlbkTlc6w0RExBJCPFv0LfSfWqbTm7G8juEGLQsn41yMv3A35MVQVKZVbeuhk2BIeRcmnad4JlWoDUkgQ/Q1bDh3QN02MvuZ5rVl9pkEM3i1AmDKYr2GZyrXmKAclPxEhC5sYzJErG5AFqN/yXWVXGTK/RtzunbRT1AxvfCxpttIf4Q3G7Pgi0MgIpQ9HhSR2d7foGxVhIUgAXqJFbvRSmWYXzVDTPInk3i1p05A9A/94LBF3grJzpNboCmyB/LLkPZbF0TODJvMe6T9OAnoORbMUu2wqQY6KS6wKPdKpqYWofZRoSd+REb4Zic8d6E/AKlGc4gAgSGBPDy7tkMqkPC3cIot59WNlsEjvEvpl/g6iu7pEkxBj+rO0RYppDiMBQ/EICXKd0A6FM+FJYYXhD+9FQJ/KL4x3UqxYg1ATozfM1Y9JiuTrM30Oe3Qih4IO4dqAjuvZxF7OgGffcVyzutX/XHigPqyO86MKCzFu74Q+FCmdh8fkrqInF8Qlw2dOAcEeMoMhPAd2YLw95Uc/UXXkhzdW0E74QNUhdZs4hf9B+p+Nq41XBwP98cbstOLEafkLY/SwOM+ljufOd2hi6oK8+RgEQQrs2U34XLtZFAIsfuS9sG1DgHTEN6Rts33w9zJaWqgWWfyNgMxLJoDJzuhasOhURf4C5bPJ8yG7sTQ7dk8jY/BVXoDbLHy05KHR4d1p1fz/O4ZW+a5erJoVhOLpw1ZlP0YWptLxrTLzur2V7qQulDzqeMGVHVjsTIjgqzUcAuajHv2SC9Hn4iJL0uejhcv0Ev1BQz+Mj0PUE60b3bCidBMLPnmcYajWrjPWQjewQhAexy98ormV3o9uCpfcdbjHWY5LvvTMHmIJL2U7bDu0gIeDfkk0Rv9FuqGTBq d/xYsWvH z5fsTrWjieK3IU1rBqa72aHfd1X+X+GG4N9Gz27aBu/JWFRNUXD43EsJ3kLwRnOUj5oftbNHe2mif29MiYl88oD2OCpaJ4OyRvhPU3k77t3476qEQEvsCwogPDNxtKEbt6BG/0M2ZxbRY72qo9+3LdG0xPqxADo9XHYlu+oKIJ0nuGD8W1mrE+l3+e0qWQMOukqWmd/jw1KH7X4Z8LGI7Q0AD3rIu3GcqWP+d6+P1JEqBkq1g64zV9NqO48fzTyRCapn4ZXYOCOf0G13FsXvCGq7RHHV8PHVZNX6jdunfg5h3TOE2LRvQL1NQyjesJ7C4ZT6qEeHgs3EeFFXE5z+8vNQffmyVSSST7zeJJJpuT71oRD1RQFfBBmy5EpwZupDaYNPkQePl0VEG1QNKKG+YzwZHnu3YbsttO6V9wzoU/C5p9eV2y6mJ/fak/wBttLuV4UR3tlseFSAc+p6bokuhmDYWag== 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 Feb 10 20:27:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968620 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 1BF88C021A2 for ; Mon, 10 Feb 2025 20:27:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8EA89280009; Mon, 10 Feb 2025 15:27:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8A51E280001; Mon, 10 Feb 2025 15:27:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C9ED280009; Mon, 10 Feb 2025 15:27:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2975A280001 for ; Mon, 10 Feb 2025 15:27:54 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9E948A030A for ; Mon, 10 Feb 2025 20:27:53 +0000 (UTC) X-FDA: 83105171226.17.3A2385C Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf06.hostedemail.com (Postfix) with ESMTP id 945B118000D for ; Mon, 10 Feb 2025 20:27:50 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=mSHdCHQp; spf=pass (imf06.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=1739219270; 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=ZV5J7J1otrcGnKhE+zTI9rpPTLucIP6FuCUDd2PSja728Dl3anLGWhi8EYpXu3ZeAqYktU +XwH9Kz5yt7AYGpJuoOL5ceF51httUmhfn5OSNt+mtPHVKbabKwpyQFhpohk+BLUt+75WE CZ0gvEE9AMj6w7C4U+5fHz+tR+MCmUM= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=mSHdCHQp; spf=pass (imf06.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=1739219270; a=rsa-sha256; cv=none; b=PgGWTGdTM+p3VfEW4xSMMAuEvSpK84PAORRAv5eR71dvM14nCJNSnt9xtHIaOmWAz1YBzI MeD8TPx3ooOJTg9RRYJXKLNRueDivOChxTTrKXJLAZR7IGTQHrh9PuLZPXBCasmWS2/5MV hwEMQ94xDISB9kPYg/qNLeZCLZeIeTA= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-21f4af4f9ddso54453245ad.1 for ; Mon, 10 Feb 2025 12:27:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219269; x=1739824069; 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=mSHdCHQpnzV22eD4MTrD5xKyBB1gtF8G1FlxoOJCdnksh0w/8RvENgSGkvzpKctQ3l F1UZ3K293yafAuoyNiJyYukFgpnEdmYbIlXircGCE5/m2poTNC6YsrC+vPJb3mDg+Zwj tE5LVd6t7rLwi5g5IEQ01F2nLkUzd1nvi6ThcacjYnYIzqixr4uqLrJ/C9awwIoFq8+o E5N2QygBaab+2BAhgpWPwCYvFmS+lxCf9F+DZC8lcomgq7T9xcivfPdZfXS5wNjytWVb Eu8b8w/MKUeog5wn8LjDFMIaagN21l3GqSr6kmLhB9IxQ/dEMZ2TCZDlLwhZzX2fas3d SjFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219269; x=1739824069; 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=iCThtpFfxYVz1FJojUz1dV6YEyZBQlOjtRJfITuE+GD6Uwu06mVIsODGM2qoyx0SJN AZnRgADZ6QQT4q25m7z74w7tfk2vFvjUAg6THENUeaV6tqLzespTwRYrRDiVB/It9EMW UsNL1a3pHxBjaLNvxBgi0XeHspvB9HMHhKMV9p5xRiA81G1WTORYblhhfFHMsGGPeI5I JvEVkfYicD41PM2o4x/N+/zhaq5RHuPPIKL9s/bvWRn9DqLwXZNdU6gqpRzmppHOtUPg 5s+EAg61qJiR2LAs5tXyhQozLSbrH33EhFeTnJxmJ76IBJZhZDDrc5eQ4LotVI9YAkre Q4Tw== X-Forwarded-Encrypted: i=1; AJvYcCU5hJlYSYqwY3/cbKDAgqkMAl61ZJzkzEqfDwPY18BqcHRRnoYrGyud9QxMkXr1GvDQyJH9qx9KXg==@kvack.org X-Gm-Message-State: AOJu0YzS9T+ZREZF5Ykfffa9yIdYLIN2Z/vUET/iiEachvs9I3Zysdsy SnRCu8xJIcCrW91i9O1+mcl9ShKhEXDCZ1mf63uqG6oninE+MIu0MiVhQTPlUIY= X-Gm-Gg: ASbGncsm6rMYDf1FZLy5hlDXf/aonyS3lzzZsppjMt3A1s+7CUUdhTAUiMON1Uux15a 2bu/x52CCjvLHqX6kVAUhCF/aLybq9mJo6f76HsI6TiDE5dOL6xns/smYZ+U3NDRMO1OU5f9agS s2Wg/lxx1l5vZ4I3tkbe3wj51/PlGMy1VG1OTyDGoYsjL0gFyTLG4qVM+s2lqVaEKwIHQTollFP OucY2LJ7Ruxiw9zN+IN50T8aF89NXPUnKBeo5vfQx3XrqsCA6RfI42XeTi7O6j9nIJzAJdz9qb6 7rUbpUbLqzf0vsR9BJfJF7QzQw== X-Google-Smtp-Source: AGHT+IE2Uj1sWUdpEj0gHWEptcQGW9ooD5IicrlNY1DO+ltEd2VAtju32umUOH5xb6B4TzgsWO/D8A== X-Received: by 2002:a17:902:e88e:b0:21f:55e:ed71 with SMTP id d9443c01a7336-21f4e6a0100mr226698995ad.5.1739219269485; Mon, 10 Feb 2025 12:27:49 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:49 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:27:00 -0800 Subject: [PATCH v10 27/27] kselftest/riscv: kselftest for user mode cfi MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-27-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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: 945B118000D X-Stat-Signature: znoiut7hpya6wm7aytuwswak1dpwqpep X-Rspamd-Server: rspam03 X-HE-Tag: 1739219270-735618 X-HE-Meta: U2FsdGVkX1+rP57O1XZezOpxn+4D+alzBDg8TuYrrpZajonB9bpZC7QtV3WOgY+YbPVdeuWQ0xfYIiROmIdVU8iuG5Pjy0RLZZBKwu1EEmGDquud8j9SYWmD0eFTMTfjZfn0TR03zAIEDCCW8PbfMhcSodbFpPaaxpRLPWi2C/L8i3rQyF/4lGdZMQmqvHqdfL8O3W9gg/tvwWrWkT2b0axIBPNoEsp1qciHLLQXAixGQnsVeHkcWRL+r3K0d12bwrmJ6kLPoyCVFnPz5ivbTXGcn5Qkqxi+Rr6aBLMbBT7YCgFhEV0SnRMF6RDO/gvMWV7UHPZVqjNWtmXSSYkGuEd+2jaBhbDSIb3rHGuQOdh67vAxibLMrvWv3kMNE3nda1mkjA/OrAliHmFcHgL3a2PSPbpxSIahs7nlFTP9CBYomwMM+Nms5q5zhUrGScF0q7v8iBGEE+77oNUlkNekdMiwUhawcO61FJSyGDRN36ZnC/vhY8CRq13EQrdgPK3MOENApXhbw+FspI1G+O8/w4dXCNAylJiNZS9AOhgZeAMWpk2ah/iHhKVpx5IOdA1DV3oPMOsVv4iwwmuKz/4uhWgyvN62oZPWM+PTk1HDqZhAEzsCHujsIJRv6VthGkBcsldWPn8Hv7WZowcZEn0P7AREzaSAOhkE6OANgNFrJEwtjvJBI8azttDSnyHPSepJNWDbQp6HgUVw1GVfwsW4JMxEW6vg/TK/owTKDSVXl+tw5g6LsB3jvlVHy0Byq/FcZk6HID/ampiGiqPxfjG+yhnbqXiL9dmdxQMeN/Csl7HU8w6Ns88nh516X3TfAiFbebgWUyJoa6503MbeZ1powJK3krV/41SwNVMx7Ec/z4V9fFXLpJkFHuMM4qYgQ52HDyHuI7XSW0R0p7hJXXDjKXfCOR5URsgGJXFVTrwx3nr0CYelGWxFeXmkyAgFCoKk2VSt5HZPbqWXdVnjemH VIuZFWGm qEUYcFab59SwwmvjCu3dT8AruWAEBbTp/B+a1+gmEZnRKBs9lbCV5FIsWn/n5TOs0OX+sf82MKgZ0/O8ScBCqAj1tsWv4Ysksa8lhXVe7Sjlrww1l64T4dtQAfZ82Gxrc7klEKCGLlU8gHbW5h19hHN1jeXXVK3mp6yR4UjUD6ONVdAE7UFVJcXTPpYkk77kH9J4oPi2vh0iyyq64EjhD6vSdYW/RXGuoe/qq0tMXoC6VC8jk6UFTdJBDSIjrF0om6SrAW0h8nATBem24E0KtZE7svCUCUm/NlkiyNhIsEXNF1Z1kund2QTLXHoRcJQx3VrdXMA/vkC1e42fVT7/yVt2Ys8NbCmrvBh+kEesuQcvkGs670MmDij+h1Zq8+J6S43QJydm9y0Wg6lslIsMcAr2zwiT16DlbP7ODZsUqZ8tt8Dh5g4UKwsfuanlxP18Wvx5eddiHWEnfsq8= 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