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 42AD5C3DA6D for ; Fri, 23 May 2025 05:31:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2C0E6B009C; Fri, 23 May 2025 01:31:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CDCAB6B009D; Fri, 23 May 2025 01:31:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF1CA6B009E; Fri, 23 May 2025 01:31:42 -0400 (EDT) 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 9AF3B6B009C for ; Fri, 23 May 2025 01:31:42 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 496201217AB for ; Fri, 23 May 2025 05:31:42 +0000 (UTC) X-FDA: 83473050444.03.0C0BD7A Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf10.hostedemail.com (Postfix) with ESMTP id 5A6F5C0003 for ; Fri, 23 May 2025 05:31:40 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=rjP+DZ3x; dmarc=none; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747978300; a=rsa-sha256; cv=none; b=r0meZFjJlR5bUHqkMmhraOl7PL6uPrSpfdG+fDQaqmU9ivXkUma3nsrhnM73y2kJf3EXuT qSQ4GMNi5bD/iCXQsLwnv0BnmdUD/k1n/vDC6btFp/cRXYZsKKC2soq8WAejRZJYgLf3D7 1sxN78BMcbdwSTpMxqJ/117MUaaC/6g= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=rjP+DZ3x; dmarc=none; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.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=1747978300; 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=KgV7xvfVUvA1Z2wsD+lGkyd+Mi4VQqUTWlgL+XLiaAbky17zklTp/hUSjo0BRnVBkpuMKZ 25z2CeFKfGfO4R4Kf+H5QBFttybgJC03olq295NqMKn/G+YFakbVPQt5tBjFpLtAKWdItv GVg2Kde3G3/02cQDBMV/eRigA9tZHN8= Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-742af848148so5285557b3a.1 for ; Thu, 22 May 2025 22:31:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1747978299; x=1748583099; 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=rjP+DZ3x6NvtLc76rY0uKtfxdYIu3ONZPqjDYjF99QiT/DdeCpQpvcL6J5HX3+rnBj K33AN/EFrzRQGMkqkTgYbA1hJUV+6iXRfUbKHKQ9NxjxBVYga+mufqXMQEtdi1Ro9f74 kzQAHTC2O2/0VRhL/27kqPMxgVpsWSOb96qiaXrG2D/Qp4KuSR7yKGifT0trO1mVLcKu 73OIJ6P5mX/zj/jXyp5de9XKD4pSmz2/HYgclgyqLKOH1+GDtDViKy7dFD703DEnXLnd rLZP0XU0XNatdqZHAMgs52yI8NfrRu531unGQC1PDW1lty93qVtiEvghfU72sFW9Ei/h LHYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747978299; x=1748583099; 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=eirmF2x5DBb+8EuSnKoE/To4jGm2PmJZ64/CoqzClUyTVPNiONEOwxRvMwFfZEluHs Bb6XeYZk9Sy4j2rn50vlYNcArriitRMUvXjP1NHH/3VAvyqsWhHSbcDTtt+AY1RFR0y/ otdTvzTpKIj9jmDgpL78H5CcAD8m/snsegg5jaLPjnYYuCbAdc2rhjhA/M7g+4+5lZn9 S14ZCQvrCAdRcZ+M6+lTU4s/xms1IocmK+D//VCNfiAD+I9rsLFBWqfgmS82nmkhx0+c RjKylcTw4PnTMU14f1ePDLB1zxHFQJvnbbiH68R2DFOdtLcdW/ZS9QUP9619VbxzdwR3 n4vg== X-Forwarded-Encrypted: i=1; AJvYcCXGfzorhvDhVobxghnH2Dqj0CmUOSSOKbeq/RYxsT3+lz3Isel/iENNMxdS32AEjao6BhD9KS/mRg==@kvack.org X-Gm-Message-State: AOJu0YyhpmtkkCb9ChEwY37HkFjtT8XoSOeNkjVDeTlQdFrLkQZ3h/Ev GWNFjFng0AmjKyDWcsyl9COZGica+3TQGdBQOusH1hlcGqgSCaNrl9n6I3P/SLCOo0E= X-Gm-Gg: ASbGncsg+9KmcHNDARrxFA1e8NXtoTvdlUx+b+x+VBZbpdl891PjA82XvdEaBD8iqeK j2d60dk8GsbLcyS6ZpOmh4NFplBnV6EOXVKIPo2FjxwBTOMGWsRnPv0oT/ODA3I7sO6OhAVIz4A dHH2Crhun0uk8jZR1sxI3Tttclq3RJL5vQsmd4/N4zpvfNgk+xRjnrTYlzipiBX2NPpiGbiOtxN CTtRAsirVN8aHNN1FOXiKa47WNdJFheHApc/Lc1KSF7g0v7suNM2ZSuSnpkA/0uyGxR/lJVVekb TFsEes/nC0oa232uUjamQ4oZuc1k0BV/1l//rwYhxxo6nIQBtcDWAB4DzI/22w== X-Google-Smtp-Source: AGHT+IEqqbbYW6BfuGslnbv1XZjKBqrXHXdbK528Ztzva0n5EWuU2uAXzUGqp84UVkK4Ta38abk2wQ== X-Received: by 2002:aa7:8890:0:b0:73f:ff25:90b3 with SMTP id d2e1a72fcca58-745ed90b72bmr2802658b3a.24.1747978299213; Thu, 22 May 2025 22:31:39 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a982a0a4sm12474336b3a.101.2025.05.22.22.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 22:31:38 -0700 (PDT) From: Deepak Gupta Date: Thu, 22 May 2025 22:31:11 -0700 Subject: [PATCH v16 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: <20250522-v5_user_cfi_series-v16-8-64f61a35eee7@rivosinc.com> References: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@rivosinc.com> In-Reply-To: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@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: rspam08 X-Rspamd-Queue-Id: 5A6F5C0003 X-Stat-Signature: 7sgska3skzgu976iu6bebe8qa66i6n8p X-Rspam-User: X-HE-Tag: 1747978300-888813 X-HE-Meta: U2FsdGVkX1/bE1QZvYigI2MdXE2/Zj73ObFvvXl0VxAzZDVnYQQughMG7Mjv3EhmI8Vvwh4vDSBFXdYCu+F5veXmCFf/g2sm6JSx+AGeipeQtJLWcz2h/qurADkhNPMd9xg3xC3m7zklFQt8lqAlzzEXqBfDKKXdWWWUiCLBEEht9xcIjGifL1Tih15kcrnncMIWHWuPF0uG8O0s83dvQuqAPzh14gP88afRyBPoEfZBMbg3bJk2R8Q422UeLs0PQBaOpMeEJqLz6Jf9JBWBH5qth6k9t9m0TAzbjGqKF5tY1r3FNd2YrPwWDNpOcgGjtU+Cur0S0NThvOETKQAEyQHbv1Mgph1/JQskjFoSOw00pxE4Y9jOJzfEijV5GhYWP91HfMCE28U4jrr2OHx/QYjODGo3B3WleR0cHWnIJwpacz+gjEivnmAtX0KrSEi86jRkyB1QjyH3TGRRKUULGrkctklfWED7EhicZAWjhK0tYrmKeEllxw4Eo4pNJ1lDaHhjujAlggvG1EhvV8kdv/b+orW/tz4KQ/X0dBPxjXpBZ+S0e60NRnTWrh3FS4VabY89lpZ3rSGccOzN6R93q4n/NJW0A7PpvOevDSgDHxxzkzefzmzee0osWQ/WyjmdSqOaV0u5a/6PIAN/wo2LwwIne7hLTHYIsZSVQVX9CtTx95BLm6jskTwVHNulhIB3+6HKCoufaMPRoQEaoX4JuFVKxumQmYSzFKtnQrtWFwnBq5WKDtvVY3hkExy7bfGsxUhEE6QqD91MEoJuEVLBx0aIFysDSF1kHpE2+uXMpUzbIA0z/HmQ+Nr4o2VXWUZo2jeyhidSdqWclW5MvV9GuuWt7kktCXGmFtjpsBZYwcBkwhV1orN1929jUesWFWp/1ZvYobzPNAb7/e4H6Y5kcT3LMCYfjHNFf90z6E1p9ldb5564jSYwHI1Zznbv+KqeDcSuJmXV+27tBGYUtEd weClK8rI Pkay14jfEH7S6ukQz5qczb2TqcD94ZHnFrI8pr9O8aqWzS+GCROW1q6hJEfBCvGpRiHB+67YGmag2ixJYUJsFm/iiQenO6iZMrqsPB4Zjs5nkbXprZsKbgHhpP+9z5yWwQaglAx2m1OoyhwL32maUAz5JLOVkdS05d/ZdTTp+ytf39g3F12ouEoI3NYE0Mj/U0hWtLgVtjjKrDJLiP0lybfRPpt99CbeQjjyrL1I9mkw5lp1si1cyRlu73gLygPchzmCT8mcEvxHpkruunmA41oggdxZrNWCVnObYh0LMISQMpMtQFzZhyzpZQZTjKPwyncQoWCy9GaCF9JtkZu+pT4yODf688UhQRZ7NTZLWeYq3lJe9QCEF9bF7Uc/l85MOv4vUIsOted/ID7paruRskCxsF4JMj9aJ2T5KWiM/1bfajDBNCtrjjT9bJ2U9qYBnzNPvVDFiRnWYhXeIY2sWaDQDlwfuYr75TeWvGsQUPcwP7LArAm95g+H9r2LqN1kU4DknQH74+M0RupD8hll48+eJMO3cUWHqPCyVhhJU2I8xajcdk+7NgmlL+g== 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