From patchwork Mon Mar 10 14:52:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010200 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82EDAC282DE for ; Mon, 10 Mar 2025 14:53:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE8AC280010; Mon, 10 Mar 2025 10:53:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CCCCD280001; Mon, 10 Mar 2025 10:53:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B1C7A280010; Mon, 10 Mar 2025 10:53:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 92F99280001 for ; Mon, 10 Mar 2025 10:53:04 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C895314114A for ; Mon, 10 Mar 2025 14:53:04 +0000 (UTC) X-FDA: 83205933888.10.2599DF0 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf29.hostedemail.com (Postfix) with ESMTP id 54265120007 for ; Mon, 10 Mar 2025 14:52:53 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=i3It1f7l; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741618373; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WPde6NcIQ47rHbegQG8dPMP+orPth983zEAPX8ktkAY=; b=COxEOWhMKqd/9YoejdlsiAm3BLnCeSsbHeO/mmXP6HiNQkSC+TEryU5yxTt0J1Wd0g97jI KgrChEeEibzar1zKzYA3t3Zqcq6raXzPLoEwSQ0igopWlSCawHIPS3lsTplwQqSYJT7Xer Dtu1ecsInSRAV8KdeWoznzcTUFm8+0w= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618373; a=rsa-sha256; cv=none; b=8DhJU1+B5wBiAjFV3Cjdq82Npnm5Xwqu2YYVgzQYVucriqZUa1IC7jEq0KHVXv4WwBJBeG z5ISCDlww3s0T8jXZbFpzRoTbBqivuR+kBDlfwS6fLXl5V3PMv024R0qUuR/k0Y9VthOpl R5sNkUdFi/mHb60n4aT6zBziz3XMx1Y= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=i3It1f7l; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-22435603572so41595095ad.1 for ; Mon, 10 Mar 2025 07:52:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618372; x=1742223172; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=WPde6NcIQ47rHbegQG8dPMP+orPth983zEAPX8ktkAY=; b=i3It1f7lIL7q/Uk3aRwqcGBKVjM+BKrYEWMYuN24A54QLxE+TGczBVjZjfpfbMLWMF md+cZKcBLawvvm6bWMYq/5xH1RTG77OnBx1oEHNMedUfrJXJD9Y7t8ozgLwu5wkPRyJB hdGjKx6/LiDqYZhP0NILYJVBLXsljkEMGYopbXwSXt62aoVDoYeCRfW4aF6kjrCRIZT6 8Va0OAlS8ZoIYnpo4z7Qo8jmh3JxBIJnFCgbOuF4rY0RiC7gS9Pn7ZazKNPVEisdj0Nv EsvjpsBtfl4jYu6go7L+63dYZdPkGW5YCOZsoVPbp156PoXMo01TEJ7GwZbQswW/dtBc J5qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618372; x=1742223172; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WPde6NcIQ47rHbegQG8dPMP+orPth983zEAPX8ktkAY=; b=sHw5cZew59Pb5a/CPCQ4pYuQYEIy7kCN+hBV39pYHiS1IeDSMt2wXrm6ouu5Bby2zy mbgu0c+UdfV/TsB6edEU1exL2MVC4BOSkCgOQ1P14PxYRH7ruaRbLk4yk9oIgb7r4xSV HfPLqUMjtVlBwQ4YbSUB8LN9w2ADVKjCmMPAUfa4PeH0hY9AemOqlgYR7DMOYuiTd5MP /FVCJBQ7ybxarAd1Hz3KYC+ZM1bNxBokisfTOAE85w+Y/C3quOp8Hz/88INHdeRGAMvI hNYLInphhH3eCmp5eyReKCYYzwJsCH2FRCm+HfgoNQDZRst3cqmvsCRksp0mNoLr2aN4 9gqQ== X-Forwarded-Encrypted: i=1; AJvYcCU7zH41XFSVpCGRs0aTTNgtcVJGDfJFmjAtP06Emi7OLcrTUJ/hCCEqbD14qry3jPW6EPkHjXF02Q==@kvack.org X-Gm-Message-State: AOJu0YyodwxYVn39NLD8daO7vHAHjk6EcwbCqcPfomQ+KlYou3kXadjy QnRg/OoyZCnVm2XJnfAOAe00aYmV/dTpSJQz5NO14Uyv8v3iDUj6qCTRvEUHF2I= X-Gm-Gg: ASbGnctoiKAnraEGlixmgWJNU6h1w1RU7L/YHd01ji0ILiWQRzkfucN5DTcTthsSiBK qQ07HZSrAAm31NDxthKy2XDE6L7DjwWVnCQbutjo75kWO1xsnY/3luuTFqopGNlKPjqrLeovZ5u t0Zlv1pgIbZlQDLSCXxi/9HT5U6Btrured66ijD10aSZ9VaUfBLnX76Pq+eWwwndPhyAbV+qiC4 yX0btJJb8hkPVv/kl2O/vNt5tjDMu1icDJhUdDiig//9rV/TEFqCdlOhetftasahikSwIZJdkwB 5fBdmxvyWBIA4Vv1w2gxWVNU8TcrSjizTLeE/pI4TyHzj0JAN75QtTU= X-Google-Smtp-Source: AGHT+IFqTxU+p9IhkI8RGdvHdyJEHoK+vlH5JWBOUOv0UhGLOT20CpZOV0dtGMVo/7iEBeBe/MTApw== X-Received: by 2002:a05:6a00:928b:b0:736:4d44:8b77 with SMTP id d2e1a72fcca58-736aaa1cf9fmr27006391b3a.8.1741618372105; Mon, 10 Mar 2025 07:52:52 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:51 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:30 -0700 Subject: [PATCH v11 08/27] riscv mmu: teach pte_mkwrite to manufacture shadow stack PTEs MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-8-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspamd-Server: rspam12 X-Rspam-User: X-Rspamd-Queue-Id: 54265120007 X-Stat-Signature: 1h6ywyqyam1o97asx91rw36r5nz6ekeu X-HE-Tag: 1741618373-356310 X-HE-Meta: U2FsdGVkX1+h6ZdVJUD5ZptdB4amuaStN8oAkpz/ampbCtJuHebkwDkJUZ3Wo24sbRfvCG7cmvEtWi/Iv3h6d1Dpg8Xpj/UogYx0Flta9GzC0DqPLB/Xt6RK/aNv6AtCmszZvhIqO8lndMvwFCZUrNlFg2oG9TsuDhGgtZh+EWop4RxPUwR/HO2IpWp7St7Qtqax5qcPC0MJ8eDwfU5XV6sgxlUdxK3hyWgTjcbBv3a6NdhsCgwhj26OWa90eYJ+x8wkyyVGqSEX+6SS+t4zb8A5e2yNensY/j7/TJ5rrRBOG+dQAI3qlAkeYTRFOSsohvVFugJGMskEEUX541LzKQRQiFfbuiI8vM9iDDVzX3b6U6h+yigrgQUZasVFR4Fr0qb6NnTfeIuZdOjdEbBSSDlWrgs0L/7yS0K11Kjakt07UJ2CQZH8sGzCCSP5hXL4n1iFutKAhh6vAIF12pj1pCaegBPmOEEEAWTTvskUMu7zSJttT/1Z9xGZYn+qDTcwxeoHlUjNco4UJzZ+enHcA5WqOQndudSSYEgQIEdtVsVG0QxXy3x37FdRAQAVH/5yrJrLc9YrtH7+jydhdheNUUfHYRS3MC/IYa084yIxZy6hLbUfQTEUC/AH3XCzsOntcw87PFsqyob2Bco/+NyESR5reU6RvDpwshtsa5TC2l4CZX/mjm5mX3S3wtz9InFOzy/RtBF2PRFhMXqblvJK5zwv9j/7xLsS52eU8WEWPJ8xTGSIRcYTPBdVPmGcF2s/b0bBJYuwnbRiKPyHOh3wR/3V9T9Yas209jweXGOWPm//IXX/Mb74QG86nlGtmf0ThqR2hl+ynKdS7RksvOQn1dOk95vzf/rqnuoUB68Np2RhsTlIn4aHqcIZnybUeEgOpaEdoF55T3SPHpmD6A2kG47cNGgwYy6wZfDDUJjLXd/W5f55Kw6J6svpbfXQOsBH9S9ppuGlocL1MBp8wKB KdsP7LUg kl4D1MMZrOJfGKXNI5hsNrJmMCHRj/uvKitZxT3/pQxlW74Ck8A9SeTdmqHJkV26cSglyzUBylMzVzlpXugOMuD8xy0++Nw0tFwdVOHvv3rhazkR4wR1RoADOmm8F+F5wOVXGxeapOr2MO9sdqdgxmW4HIgWr9qKt2c8GHcwAEJP7NCEH7rhpOgdcmTrqcXePuCqt5tv5kdL/nX7FEC1y9I/1RiWSZUzaYshmzlASN0LUMV2ubgIQM/y/TLZxv7CouMnLbrEgBLIODDaNibFk9dZAjasY9zvW/Jv7VuBiPR/YKcIrSEgT6LeqDtuwFnD7+tjxkcQqO7pfTTTgK5J5QRSAgb3eyxnAgU3eCRodgfGUjaP7wUd2Gu/OIcgbXMLrqAYWcK/KBmAXc7INYiyN5s5eXdcYrS2caT77HtLl3dB+tmQi3qDN9pNFAqzEPdpfEoxm6PsOo5CRIh9PvQg6O2Vc94b709ivWuP/tVbfzRmmiGfiI2dcyDmqcqzHuR194Wb2 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: pte_mkwrite creates PTEs with WRITE encodings for underlying arch. Underlying arch can have two types of writeable mappings. One that can be written using regular store instructions. Another one that can only be written using specialized store instructions (like shadow stack stores). pte_mkwrite can select write PTE encoding based on VMA range (i.e. VM_SHADOW_STACK) Signed-off-by: Deepak Gupta Reviewed-by: Alexandre Ghiti --- arch/riscv/include/asm/pgtable.h | 7 +++++++ arch/riscv/mm/pgtable.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index ede43185ffdf..ccd2fa34afb8 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -416,6 +416,10 @@ static inline pte_t pte_wrprotect(pte_t pte) /* static inline pte_t pte_mkread(pte_t pte) */ +struct vm_area_struct; +pte_t pte_mkwrite(pte_t pte, struct vm_area_struct *vma); +#define pte_mkwrite pte_mkwrite + static inline pte_t pte_mkwrite_novma(pte_t pte) { return __pte(pte_val(pte) | _PAGE_WRITE); @@ -749,6 +753,9 @@ static inline pmd_t pmd_mkyoung(pmd_t pmd) return pte_pmd(pte_mkyoung(pmd_pte(pmd))); } +pmd_t pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma); +#define pmd_mkwrite pmd_mkwrite + static inline pmd_t pmd_mkwrite_novma(pmd_t pmd) { return pte_pmd(pte_mkwrite_novma(pmd_pte(pmd))); diff --git a/arch/riscv/mm/pgtable.c b/arch/riscv/mm/pgtable.c index 4ae67324f992..be5d38546bb3 100644 --- a/arch/riscv/mm/pgtable.c +++ b/arch/riscv/mm/pgtable.c @@ -155,3 +155,20 @@ pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, return pmd; } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ + +pte_t pte_mkwrite(pte_t pte, struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_SHADOW_STACK) + return pte_mkwrite_shstk(pte); + + return pte_mkwrite_novma(pte); +} + +pmd_t pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_SHADOW_STACK) + return pmd_mkwrite_shstk(pmd); + + return pmd_mkwrite_novma(pmd); +} +