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 60504C369AB for ; Thu, 24 Apr 2025 07:20:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0256A6B0028; Thu, 24 Apr 2025 03:20:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EF0376B0029; Thu, 24 Apr 2025 03:20:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D1E9C6B002A; Thu, 24 Apr 2025 03:20:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A7BBB6B0028 for ; Thu, 24 Apr 2025 03:20:51 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 21B9280740 for ; Thu, 24 Apr 2025 07:20:51 +0000 (UTC) X-FDA: 83368090302.15.9A7BEC6 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf16.hostedemail.com (Postfix) with ESMTP id 039DA180005 for ; Thu, 24 Apr 2025 07:20:48 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=TTckgMuc; spf=pass (imf16.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=1745479249; 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=6ylYFmVRjBQGzrdqcn0JjhMraiDjYmLqBMrzaQkDTLs=; b=lk/eXOdUrAXuAK9dIq4Kk4b0EbHUUb8hjGVxwrR1NnIyehyAhAi9lf0Ua+SDDYT/rVPh6f 1qGsDybO3+mrdjLl2a+laR2QnqhTTzwIvidEJ93EycQ3SaPW1A5Gq0RAXoYywqmr4WHwee hrr4QdxuIuvfY6v2osvEPO24J/K/NxE= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=TTckgMuc; spf=pass (imf16.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=1745479249; a=rsa-sha256; cv=none; b=VPAm/gxZJlSKqP6mtYISCjOC9JlZ/SF0Li6PaZj7jNZsoQrsgGnTzsuLxLJxxc8cbuatGE 0uX12cKAXiNlORW4gj28AilUpU+CjLZzKyZR/utDMs0QRYg6NYWMSaRHN4bDO3zNcBIXwa x2umKkhQaO8PENZbufR+7ynAyPYA0F0= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-22401f4d35aso7883995ad.2 for ; Thu, 24 Apr 2025 00:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745479248; x=1746084048; 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=6ylYFmVRjBQGzrdqcn0JjhMraiDjYmLqBMrzaQkDTLs=; b=TTckgMucmeWdzytO/rdLsjpi/iwBD1uPRYWXUOrg0CUwJCeTigiOySeeXVaPQHnz8L t2HJUk+SiVso0Hnsa7bJRug086W0LJynZcUVr4Jst9ejQbof6rjHCuPlB0DMQt7jFK2n kULcPBGLDNQFe+CGM8yJOmJohRuZ268KXAyARaPK5vBvXnkPsjfj2138dveq87dIa7Sb apYYDGW8KhmzSWpDb9mS4g+gCsX08xGqJmDc39cgdjSwxg9IZZlz8F40RMR5/Z5fFtz1 8X8mXvEtufcJsKamIGNnpDkuo0uJulNoFn0+jxAsM9JWKgH73uWZBTQaT9lC+1EAlsv9 IQ7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745479248; x=1746084048; 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=6ylYFmVRjBQGzrdqcn0JjhMraiDjYmLqBMrzaQkDTLs=; b=nH1tHRIXd2ozKP4eq6Bualz9VQGVI/5OvcfwNObeJaxRfCh2rkll/5SCu34iKlSg6v kRxH/QtAcOxQSJlCjV7P9ar4Fc1rhAyuriva8ea7jy8R6rVyVMJIHjDQFeQYCSvpH5Ts NmWgBlzoQ0Bnrl2X91DwiTqmwW+nzHu7G1kW0LjFPyNdNJjVB7b4vUl0ZvXdoHkYxHjz EeIV0iUyvy4s+e1NhCSiEpWhtH6joyD7w2iZjeBPzFjiUjjj2RYsepM/ARoMq4ZG/XlG mgP0EsDOtTWFEvGYSKuibR4Rhyb0WofObVe5sfagizB5sfe6aeT8k7oQM3PQ7IUosNTX CXpg== X-Forwarded-Encrypted: i=1; AJvYcCXTOvLi+uhRqVsLEoWPfMJI420vu9SJCGW8uq465+ZC9XI4MWRmX0YhDhLWifJKFcg1iMfA2/6cGw==@kvack.org X-Gm-Message-State: AOJu0Yyl5y4/ZNR5H/sOdN8QtYm9E4LUUMz7S0sxY1k8kYu1NMWabo0+ 4lt9KajWaRzPq2dTm1PK5zh6/25cBmL2YeHoUYZD6CdC+xzkJghAgoxxUxoUtmo= X-Gm-Gg: ASbGnctfko543jaMm4Ud4dkXuhS7Fqc29zQtbXdwRwPWavkAx95s1eg2sXKoAX1EmiS JOZd9WjB9ouzOEObiBzghOZsaFdTuZmB3Nj8leKZCq/u6CAl/IcsDrvMQosVOBrkTlonu/kvMDb JUaG7601+FCPh4Mpg9FiMhssm7IHbZkjyJnyu9KvduoReCvVIobO10ra/R7Em25UEQvyY5JzAzx INcTvvpMXK1PW090pAzLnSWDc/rCb0MErjbKwv5zNHqptOxSYlBa2cBx/OPWUS8cVwP8vwJXJX0 mGlChwa5C9xuVzi64oSd+K5YneXnOEPHQz0A7VJrdSNgbVhXSkQ5SdiKXb6gWQ== X-Google-Smtp-Source: AGHT+IGjkr4vqGGtTUfWepy4/KRfgzZh10ROLBoP0JZSEZsJlQI5sONvd9/5VHsjRNPTvbU04z+xfg== X-Received: by 2002:a17:902:f608:b0:223:3396:15e8 with SMTP id d9443c01a7336-22db3c0ec76mr25062265ad.22.1745479247872; Thu, 24 Apr 2025 00:20:47 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db52163d6sm6240765ad.214.2025.04.24.00.20.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 00:20:47 -0700 (PDT) From: Deepak Gupta Date: Thu, 24 Apr 2025 00:20:23 -0700 Subject: [PATCH v13 08/28] 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: <20250424-v5_user_cfi_series-v13-8-971437de586a@rivosinc.com> References: <20250424-v5_user_cfi_series-v13-0-971437de586a@rivosinc.com> In-Reply-To: <20250424-v5_user_cfi_series-v13-0-971437de586a@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-Stat-Signature: j5g1mn3honoh9i3ksd9rmjnrkxquciep X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 039DA180005 X-Rspam-User: X-HE-Tag: 1745479248-885207 X-HE-Meta: U2FsdGVkX19dv/Ez7Clio4EaadxlqMd9qnpjNluxF8uRqkwxPTt1hkjfut4C3JENJ3f1Z1zKaqdaAB9u3u3T2TYdJhHkk9KvfyXi06nbbPppcGhdcU6yz3IDW9HHa9BsHdPF9n8tTBwdvwURbfq+inOKCUcfbRfCN601l0Aj2K4hdgzvi6f1rTKL968242zgDtHzAlX5NhTyakigCDucOZCjUR6lu1vo3QsUsRbF9bkrwTKlQtXW207SIngISfSGqbK/vSxkVZP1Pj7XEZjgwzm25DL1x78Ydj4LaB3qtmGDOqvLtP02RFVBSCyzsGICj1tdm9wtwEdkzV45H8HrS6fEPO560pFg2Laj8LEyhS5qgmJM6TdXEjPURNsn62y+i5bXMgHdvtd4CBDk52BQJHniuPiKdnhXhJh0zg1c0Vdji3CqFTUKKnzzXu+waUWhPUdcBNR5Kx5iaw1ucV7RRMknhtll6DdeKCImeNCpxQq+Bg3ONy3mHcQErjPRfHGPEZ3uw2K6qicXfrYADr/kQpo+9qhDQeQD17zHLSFyjLrFRVPZC3mAw78ele0ktaBnDlsPiBehFx+OyI8QPaPsAkjKzMx7wspt0dFf/Z2LmVZoUD6VF3fbEZPhBxiyLOITcbW8uwK56qDDBewfVa1KODYaFYtf8dmRPLg3TTFXl7uzzw4ayUyJpCHWfl9dLDnN1rXogWL60BvfEiuStTFLVTvxphTI+wqxh2cf2duJvI4YwrdXWxU1BIiirqx126EPAYgmIB71oWl69J41vcmmXwjGXtKN/XEhnYam6GuB3ZWJFW4J5XTr+vcE7hjjCx9epcIfbeBHsTEcm0j0TuV2GgJo/X9hFWhiJJ6AbHHN1rQqCBcliHF8ohuL1A/3IXP7RMvvtGQqpt3iKvAvwGwIs6+XSRnQdXwKmhwlks9MxzIWupiHSzAPct/eLsykdgJM9FB0AGtVXBkpM6/VNFu SuBZN/1M lXmNVw3ugW+Re6JmJHyf0V1V2s3HoUdycyzo7/R7wXT/BP/25DGfbZihQmcuap29hiiH57ATlYDBT6q+JEVFEsmqQsf86vyDmxVBSwikjPW3y62ytI5Xx/xLF7KZoeL72Wy8wLbBxZ1dJ1cIA8DG2RJki/1JUthCItIabLMbFBtJ6KDPoPO2Z8XNM5q5flIaxSHoG7DkxI8qRq/NVpX10o7u2qehKckhCD8gN62hnvj+J3xdGk2wg8t2wTHL3Qe8zf4et5opD/gw5vKPXCkVcxD5NmnBlM0qjRFH7L+Zn+Xf1IQn6a7HoA0sI0Sl3c2uyYcTmafOhB5qF0w9hE1KU/VZEZVeNRhlE72fhJdL+GVlX9DkB6QuaDVvEuMOzPJ40wFMkAf0KrJt4mcj06gO56CFmdyi/DF84foUQPjbKSz0SUNbriNtZcs+BV62wsxp/+nfMyv88xtxrz4rSenndxR3H/ZLxap44blKtaHeCEv/+OPUeJSSmzZqmy6ga5neU7z8ACQNff5EUPmd4JuVrWVSGkSklpGaIsPDXOuO5M2+wvQdF6ELBIKYhEg== 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 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); +} + -- 2.43.0