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 AD1EDC369DC for ; Wed, 30 Apr 2025 00:25:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 12A506B00B2; Tue, 29 Apr 2025 20:25:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DD3D6B00B3; Tue, 29 Apr 2025 20:25:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1F4D6B00B4; Tue, 29 Apr 2025 20:25:05 -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 BAEA56B00B2 for ; Tue, 29 Apr 2025 20:25:05 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4C714121548 for ; Wed, 30 Apr 2025 00:16:54 +0000 (UTC) X-FDA: 83388794748.13.25C1B54 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf29.hostedemail.com (Postfix) with ESMTP id 6536F12000F for ; Wed, 30 Apr 2025 00:16:52 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xCyXJIiA; dmarc=none; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745972212; a=rsa-sha256; cv=none; b=mdvCvLmVI+M29imSDGJs+KtzOrkHQzluFe2OiERh2FkYkAnYbkkz4Uy5PIDnqLTCpgd7Eo JztvdWwQo87nCr1GvS2yyClTXEnYS/grpHK2CcAhZ/c5haFGlGnzrDr7isFXNir1y4FbSV sCUR0aLoMr0X/a7GMzqNZrVSe42L9rs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745972212; 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=whrxSc5YZIoapFVx8zXSBatljtOHtlkqbCfiOEdJ1gav130dhYlBfMeTAU3fKLYuwr8QWF aFvc6o00Ojxf8LlXNuYoZiXNBpvJXbPn9il+GDI4EmRec3FAYs/MKtNFV5Cwaucdt7U7Ci K+D9YfMe61nntCcCzvGAnwCt/MqHmCg= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xCyXJIiA; dmarc=none; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2260c91576aso56491325ad.3 for ; Tue, 29 Apr 2025 17:16:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745972211; x=1746577011; 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=xCyXJIiAMXMOgdXNgdOhqq0zYq2hg6/q6WgPuBz4FJOGBClNa+wfYOMs2OEUfdRBnK KVZsVcOx/Gb5fQNx5dVDfYr0PW6cCoyWVl7yLoWvBNuB5lWiltna1MMvyW7ONan70rFg rC+xujeDiv38JqHPUpNVLcLldOpGWvOmsz9z0Ng61wau4VGxgetvK9n88BUFxLF8NuQ1 MflbQZK685Sg1EqhvZuqfAkAqd43oa1GCM+nUS9BLxHhiHl7d7W1RC/feS015sIjHND4 Bh7DOWUYbJc2BOzCgoQLp1UHKckdERVwlbJgNRmOOp/i5J6QgS64Tjo2a/tUsc0xLcjY NHjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745972211; x=1746577011; 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=TcXmTa4xWuQ+xyzPuWCdQ9Gd8lsijD6HV06zcrBkQxfFwWNB/5HUcg8YVFfaE9Dwba vVdHuR9tUwwVGwh11mNyJa4LXlGu8FW/2pTqY1pMAEdgJxpPOhZW3Snr4vkn3fl0Jx9i jWGQ0oXHIyl32er9vN2Bym2z7Nj7EiK5elj6lw/RrLIDpo/6zj0Khukh6TEy9BPnPAQD DM1nnAItaEs5WoxQ8cNkN7zAaCOMY+jKpPFqrNUReizmoEEHvYWBJ0lfhB4w72IbZGhC NoJwyN6/tJquTJDBRLJzkQYhsdj46OMlIlxZu3VzNgNKW3a/YW3sj3lgi1r3H65dh+t/ pDcw== X-Forwarded-Encrypted: i=1; AJvYcCWOlTAYwKebyUr6QseGS/UBzAj0dWfG6v6RskEmsDAy5Fowtbgj96bO4rvW+ZVJz0x7kfliOAxy2A==@kvack.org X-Gm-Message-State: AOJu0Yy0rslB17reyB9dT1t/pmbAmwXReZ9yqm2NOrERojNcew6zmZSz ylxovBwtdQy1YxUMnHJjdqA+GNZl67q1lAKe/M7+jXqBA6Z0tkW7F7Z7edsA/D+pLnZZW5DNGVW Q X-Gm-Gg: ASbGncsZjJ3FWa7Rv67Uk07kVqzRmAlFUzp/hri2b6Z+8WnZ/RmC1ll9dFgw2QfRNks BBaF3NOagalolGfJrj/EgtGe5uQovgAP54caSrYf688swJB1ZCfTyz62/iQNxklfbMh6rnTaQdE k5Lt2XEoc1/STWfE4gKDaLcTQfHtY4RLDMYFpq1DpvoUO/D852AlqJ7/1/5MZfQMZv3gPCpMaWA rD8TpelU1xV+J9DxHtchpVLdSIXf95HsTNBCMSGGkpV81cz48LWHdVf29g8SzSA/pLPWm9iMJXT /4H+bCHNKug37XetNxPGd1zHkMKwSqeFyuju+Rjv6z3RliwaG4U= X-Google-Smtp-Source: AGHT+IFy7GE6JtLObwZnxUszukpaDqp+5LC/aQlBmZqdBbVLTaJAIv9ljsO1vQI41frLcmnjPyCwjg== X-Received: by 2002:a17:902:ce82:b0:223:5a6e:b2c with SMTP id d9443c01a7336-22df57a6ee4mr7211325ad.17.1745972211261; Tue, 29 Apr 2025 17:16:51 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4d770d6sm109386035ad.17.2025.04.29.17.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 17:16:50 -0700 (PDT) From: Deepak Gupta Date: Tue, 29 Apr 2025 17:16:25 -0700 Subject: [PATCH v14 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: <20250429-v5_user_cfi_series-v14-8-5239410d012a@rivosinc.com> References: <20250429-v5_user_cfi_series-v14-0-5239410d012a@rivosinc.com> In-Reply-To: <20250429-v5_user_cfi_series-v14-0-5239410d012a@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: rspam06 X-Rspamd-Queue-Id: 6536F12000F X-Stat-Signature: 5zuxjc93ponxkfe1q9bhoe1cthnoekcn X-Rspam-User: X-HE-Tag: 1745972212-791437 X-HE-Meta: U2FsdGVkX1+3n2XWacdGTkN0VYE2lvbTnj4A5clfQXxgPyijl97jNpyBlz+7YqkeS1MzkH1/ZGGGOR+akl8Z5YPQUzT9QCV3RqTnSwayghEm2amIvamvj5/byfhn0d47uzYwFQphwn2O4bchT1bYnGwpTQ4kg40OGbIHywFRPdyoM09gL0Txy2MmuFO6Vq8g+sNUjBn5vdrJ9Kq6BMpxQtgbhnUwXUOvU1c8zMM3hEWwpYyJWzaHirTKu0X51rGXvKCeBCnKwKHNCm5KQYVrUw+DPiaj09W6p/Zk3LGDQSr819ctnUX5eqvf5mNn4u+KrciGViMBOzVU+Eky1+kNtvl5o7iDm1kZzweTNh2etWH9h1waHWaxwX32BZsuPZzx5biLYqzq/K/SzyMfPFLkcBV8hqBdQfvLr9Wofh3UbguTRuwB7iIhhzrG2MEkd0Ig7u2UTo3RAJBrGe01YxnJRPcmd8aDD+skuztN12CXJ6PIGPqq8y0wWJKlZE+CiiTxqes1xyaJldzNQhtkkTHnBOjVe+fZqBkP3CCxnI4fQGfXMZ5Fp1eypZ2M179y+tbZiZOJ4jurXxuEgDaRJTC/PjWD4/5At1CCkra1+ZYgQ706ab/Jw6AoUKiLH5Vjjm52YNur2CQQqInp2Au7GsU7HyaKMfqrv4HWKEVI6U49ywvJLyaCqAeQd4KTS2NTMh6D/IKnPY2lxgIXh7Vd9w6ckMr86gj02901tF6OsD4ravKT/TUbd6DsvagO8RkFb6fCS6a2DMFRPM9y3tj9hzukx3blT5Zj8bdoOGLWmGt46cpIiJFsYrnpJ2Fbf3Pyq7NY4eWxzgqrfQ6QvOl/isgEOxI53em2VEBSYupimfj33VL6hqkotg2lpPMtmq6jnnjPw6z7SR73gtKJEdKBKjZWeKdCmOstZ5DGaSu1dSMR+RnMjMHXeLOaKkac3s8shDOg806ex0aVNCKPp2lKF05 EzMr7QfS YS+XXO5cnCKGcM8QUHmjOSTtcqLHMZZDEHKLj5ZaPF1euVbNuKv3+bKusEQJPGnJxjYKRizomn/cK9EW+eLZC5cpcEzhWYtsngZLn1vs7O6T40ezAPzhvS7cw3Koy1GpEizksUz1dFp6A4efwituP7BAFIjDNgXnMBcKlRHBA9xYATAbqtRkov5jqRIWsZLwd77HdEcxqNdEU4AmCcVqJp+m2+U3SNXsj5doz/mr74PHAJzgkddvEWnTPXmeGkkXRN5oX5PJ/kR79hSMt2gvdGv1jbZwzbZKt49kTrM97YoUL1ZIXkcd7q6N7KQNcSqAf1P5O+4er+TiU8dVYJyXS/nHfUDXdWefoM5mC1ryB/M+2OuJ4hhQufLnWixauEnqM8Zf7vG2kJa803q5G4fdgdv/xm1ITVrngK2stl/7brT8xp5p39/qceWc4cBVXmyVSJ0fUP9WbhiJPeU34AcxgzVZV/RWs46GKU77t88Gu10N78hmbBao28bcyWYVMYyuWOA/FKx9xIkPL+LvbfQ23mNfHuUUw2lJDtj4Q/XUI8bGKJr1fH9RBjy44KQ== 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