From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37233C3ABAA for ; Fri, 2 May 2025 23:31:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8FDD66B00AB; Fri, 2 May 2025 19:31:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 886CE6B00AC; Fri, 2 May 2025 19:31:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 724566B00AD; Fri, 2 May 2025 19:31:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 444ED6B00AB for ; Fri, 2 May 2025 19:31:07 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2413416099C for ; Fri, 2 May 2025 23:31:08 +0000 (UTC) X-FDA: 83399565816.19.BC1E166 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by imf29.hostedemail.com (Postfix) with ESMTP id 271E112000E for ; Fri, 2 May 2025 23:31:05 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="ONvEj/2t"; dmarc=none; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.172 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746228666; a=rsa-sha256; cv=none; b=N8yWx9iQioZu8n6pt/r7fb6Oos8gegKuNp/QYFfTs6ISGrRUOOO3FSCIbwd90jLYpTHrCH TXOBNr/6d22TUhobSzdj8dljcp2X5CkTd0/qTJS1TaCfW+pC+TCv7KYyc47aG/n5ZO4s8O s6XNIn4FxqFRX2ewN/gw/n65VgShkhE= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="ONvEj/2t"; dmarc=none; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.172 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=1746228666; 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=RIAdpVF04Dq2IgOKnxPyubvKXBbe4mWx866NZtbwafw=; b=y05Uz//Ro6Er9Yhz/q4xGo/XryAoxLhaT7ghyvLqu65aEKI2GCLmMaOtwPVclyZkCx+0mo z2A0nM7bLzHM5ubP2fsZYpM/bGvv5Nz2y67aWSfCiBUKvYsXS4To+aAIg8g6H2QeIzrkmL VCKx6ugCIr/80hRBeGEL7A8OuHNwFhI= Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-b041afe0ee1so2548259a12.1 for ; Fri, 02 May 2025 16:31:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1746228665; x=1746833465; 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=RIAdpVF04Dq2IgOKnxPyubvKXBbe4mWx866NZtbwafw=; b=ONvEj/2t7/SIFePW9pwhN3ppPIp7jGQtYBrLaPOm9YLl16EzwfrKfB3wMn2DUi/dXf jBUuHXiWdU9hbbpknkAi8WIQ3J1Pqyg3HQrjpiFVxgRt2s2OwXOGsSHxOn5pw62kXYem JVgAZ3ZScNKwOYP2ZwtkAWMh7Yjg7qducyUD9BNfEbmS8lsl+CSllF4kR8+GxshS6AGW dpcaCbERrG2D56XW0j5ueHZ3mlcoqvO2xoAFRI4818pPJBPx4qomPO1A69++dm1/S6Aq xRxb7LU4i6CJc8iUOEWSN8qe0gU2E5Eu61/oeCb7l3DS/LtjGyssdgZtgVvtxnLF7Z8f o5qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746228665; x=1746833465; 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=RIAdpVF04Dq2IgOKnxPyubvKXBbe4mWx866NZtbwafw=; b=iTLvgvktSlu5kbx2GdEDY/5ZNTE8MeBOrbOvrSQ9Cu+qmId7AaEq9RPoWG6YXCfCpY ixCfKSGxvVk+eI7/orVYYfIJ7Wa+IMv7Yy+gemZVFcABGj/wXiIALC7JCUZfP2Da7AOy bXYzZ/TLMv9auKAuDugkbzetZiUwlAB5KeOoZf5qrzom4Wsdjc4UHhE54j6vqwEbVmT3 skkfMrN96rYrMtBQgRawhOz9Zm9tQv2E3lv9QGKBujtzYNiT7/DwsTrcz1udrPMFWp33 MPuXqtdKCxt3bWvzkXv4xurLI5EyWt/cBpo8S0DL+fdKmN/tPnPjfI74MRkJe7kLzkAn ybJw== X-Forwarded-Encrypted: i=1; AJvYcCU9qPpAuy5Tvt7kEaRbfoFfc+jTp3UkiPURYxXxy+qoAF+R7opCVn44y/0Reaoeehj/7N/UzK0TVQ==@kvack.org X-Gm-Message-State: AOJu0YwFoIfG0Iv4Ngt9jd4m69fB8r08iZXVsloUvN27vyh3ERhcy/TR pz0n9HJidEzNqwFJH6+Zn6qup2KTxzOQuP+fEiNR33do0fkdnuiI2xVbIoB25bw= X-Gm-Gg: ASbGncvyK7NR1ojsMh3ZCAmJl9V8y3f3rzgCx63Q+04iYLdJtvHQvPr+fhjgG8iuUEX tFuV44Dp6uOJfhAzD1sNayZm3gGlM81Rj2O+UhMrYWR/yRoOr7hA0r5YQklbdZ7P7bsY8wOEEY9 SsqROg/i4fyn2+Vqv54GGGITUkAoR21/seyoH1YI6G7uquGFhSM42axMOq0lbb6kxhuVq/5B5pD jFJv421qrlcr8As0euYY/oYcjBXuYXWTQ3l8YIb4ZtJpNltmhkzNHgVSBLcaNJnif7HkmVQDUwV vQmMGKcGDVroAwJzlE34/+3z6Odd+MfN76KdaZIkDDMoIVejiVo= X-Google-Smtp-Source: AGHT+IGp2tIgqPIeVL1fUnVRzrlkiAjbLccoy07WU8cAzc9KMNqyou0HJrBg+LEQJwmT2E1+TS4a5w== X-Received: by 2002:a17:903:41cf:b0:223:501c:7581 with SMTP id d9443c01a7336-22e18b99d5fmr14703165ad.16.1746228664986; Fri, 02 May 2025 16:31:04 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15228ff2sm13367055ad.180.2025.05.02.16.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 16:31:04 -0700 (PDT) From: Deepak Gupta Date: Fri, 02 May 2025 16:30:39 -0700 Subject: [PATCH v15 08/27] riscv mmu: teach pte_mkwrite to manufacture shadow stack PTEs MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250502-v5_user_cfi_series-v15-8-914966471885@rivosinc.com> References: <20250502-v5_user_cfi_series-v15-0-914966471885@rivosinc.com> In-Reply-To: <20250502-v5_user_cfi_series-v15-0-914966471885@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, rust-for-linux@vger.kernel.org, Zong Li , Deepak Gupta X-Mailer: b4 0.13.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 271E112000E X-Stat-Signature: 5nuk6m4ta9mq4pey9b4y4e8hx1918kam X-Rspam-User: X-HE-Tag: 1746228665-524811 X-HE-Meta: U2FsdGVkX18QbKvYd7JdGI8Mq2bJR9rWYIyX/zh8QJU6x0hFuI3bF2QZDaUl8XIbTL0Sv7LHgV/62PISxeazlUd3aI4mcXO4dHqNIFTs3To3LDsJYNpIaVe3oa6vi1Us2zvX1rMXacU6HXcrgpEkpMhTCpnzw5P3Qa4U6T7nRnAPMMTL5YETl3EVHWCLI7lo5paE405SDFOHp2c+0USZ+BGKxm8RruasZpJFadgZroaSO791Kb4zlc3yaGTMeHxxo9RuA2jt11xJB1+6SR++OlLLbgnj/0D58wqWLtYfD9ZEfjihQZCn9kFDErWreABrdM3GYYhNe9HU3KVH5TMr590ulvxWUm7cPCzz0l0fAzH9VTN3FKkbU/XtO8j3wIgDHwDsxWjR6a+06KbTvUvbQKDjzuU7Yyow2jUg6VZXGkai3WxxZfS+MPQE+Piinb4UrlRWhyw2MmN5XUW7SU5+Zd2SPp3uypacxaTDlAFGHagzi1+3DHGDmoXOq/GY5dgE03NlyTdS6THioNVYAGL8LQiOmTD7mTq/U5y9AoMGjPvmsMNJyKX2emSs1YLzqYoIf1a/X0jMNGznPpk1xQ8YBe9aTRZRZ5hb88haEHHaHJKTiSNgIMDhchn5UJC/S07zKlO1CZYpLqHy4nRYwTXwV+V8pPMb069fT1K75tXDtElGG1g0BqEZ5l+1P1GJCEPUhghS9UpU9tQSS+kOsM8imF+DoswWA33oZbnpGCaRJL8+is6pfKQnGJ3MlUxDSPNqk8pDrGHSr2Tgx+EjrfPHe6b8xwrmVifb9PT1e24LEuVgX+B6ABbctRifgUhB1F1iapSy+aiw/SV4WldQOrX6Ep5izSotNflfPqZYLwKbU9gKOauMZnQMfXlFEqMNWdPNuagFOsf+JL4ATgEFKUPk6UmIXRBwVgRySXRZC21PC9yay3Hkj3bTEt95QMymoiB+9XN1UCIZ58nc5pQicSl JFxupjnG C/UIG8+2j6CfnmMoDa87OJCOT1otkW5fb+gsr3IwP60VScjWv0G7v35Ktlu+bB5zGRZrvl+/fiewvcPpTKBn3+4hjJUYbcFesEfF+L8fKKA+I/nyGofIgnnu9NH8YWLcEI7klLCdsO8uppK2En32C6CLLCr5KeVpukjPE6DvMsX/4cTvo6AItdmNeEIcYMy4hwnTVs3b76PtapgVN5OJVxS0od8f4iqrkX6DdulZCKJdJzqMnV+9w1TLr+QPEhGy7lxCaKcnr7RBbpU71ulnpgGI90nWqpKZe/I986cgVVXQ3hduV0AIiN8S0F9uDlDS+4Yks+oE1ohZlNtc68hNqlBNy/qkWWd7Q743QbWsRfe/nS7zins4UWqAGJ4udHauxyP0wEU8Ekr7A/7aGm1Qswp3NqnX6yroMkPhjY70uJciIeqcCteYSazrUBDMd2xPyXMdp9O4V624QQxCm5PVzL0IGsv+ZQnByTIEogheBD0O/vxktU8JTpRuVRk/xlAAAEwO8amD6bhAgQLcNzjK0kMWXYwfmzYEjc48MN1wmHYYNNPLNebL100J3iA== 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) Reviewed-by: Alexandre Ghiti Reviewed-by: Zong Li Signed-off-by: Deepak Gupta --- 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 f21c888f59eb..60d4821627d2 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -428,6 +428,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); @@ -778,6 +782,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); +} + -- 2.43.0