From patchwork Wed Feb 5 01:21:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960369 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 382AEC02193 for ; Wed, 5 Feb 2025 01:22:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 029F7280013; Tue, 4 Feb 2025 20:22:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EF963280001; Tue, 4 Feb 2025 20:22:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF93D280013; Tue, 4 Feb 2025 20:22:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id AFA45280001 for ; Tue, 4 Feb 2025 20:22:12 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 692A147AEB for ; Wed, 5 Feb 2025 01:22:12 +0000 (UTC) X-FDA: 83084140104.24.73C6F96 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by imf16.hostedemail.com (Postfix) with ESMTP id 78D7018000F for ; Wed, 5 Feb 2025 01:22:10 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=hHrhxc2m; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.46 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=1738718530; 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=yK9dyzlB2saA59zgEqOtaJPOlgqKu4A9g+p9as2h+DrrdAYhdk8spJwG4p1s/WSb17UTKE wX4vCWdM/JhTvT/gntdi2u5S1WTIQO97v+wSxVCOUACZFkx+6sQn71jY/jGgotICOAgpnd 3yqhz6ulK6DANw58OddN64O9uV4jz5w= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718530; a=rsa-sha256; cv=none; b=DuBHoZQcpjdEVn7mmsRtpME2FNjQkUY4P59J5wOiOPn5rpuZ+dO+Hk2QdCXk8VifjP4aAe 0TJwX2b7DGuKrCHTNIw9ujgxl3cpFTqL+o3WDZow1wNGOKFK3Mt69Wsq92htDBAVkds0N8 Wo1ukGAA4j3QRw4Fqu6KfJYF00+blHE= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=hHrhxc2m; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.46 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2f9d9f14a74so1154086a91.0 for ; Tue, 04 Feb 2025 17:22:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718529; x=1739323329; 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=hHrhxc2m+9vp42IFgugJaprnb8yEyRgQtJj834+t/sLUBSaS5rRvl9zMZ9uw5MPaKw mLaWqK49pFAaT/ykws7zpWqZo1So7myl+jD4bCW+PIKEVXiRJ86a2d3mCoDulvGLW8kV HWSxVxrMr6lKAbd2DCLdYcm054b3LyA3d18ST5IpYEh1C7WKZO3yYf7fbpMBKrEzpv9Y 2HiwCFrqgRfBm6nCRMKK42LHeJpl9Czu6n8YNSkQ/88j8DcMUcF5chmPLabUNmwaxtna 4IRXNTi5Ih+t4uyog93zQ2HC9uTkx5OTNZNqxLSosBQHaiA2TspFivFabFkZj3yLtW2N CaZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718529; x=1739323329; 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=XecvGQ6LUm1IuqmcRwwK24oNKLlwJhLdHihBu5LxQTOTh7jwNerSXDbNmtXfFqUGT9 kNFUuOEexQZAxuxJNd1QIk9nItNbkGwGIVsnkW8UAxETcefvv2rVx+q2SH2kUn5L4vT/ iWM6YYSUWLiSVbYDKxIk585WCdBmUhA6Pz5XQsd+bx70Does8y0dsTOcv4s6VmbcSyq+ 8EK0hzf0LXRzhtwqKemlLdvvR6VriHNVurB0/hXDhPFWq2Dt8WNtz6/uLSu5fhWgW6sX JV+dw0d+xWYz0CRtYdqVl1kFWU2Fjnk64jRQ9d1JpdUgf2vOLJZGGh1sToOwK4nEpnDu bhUw== X-Forwarded-Encrypted: i=1; AJvYcCVR6HYVj5ntGX2mgaMnhaAtiuOX5rErDfkbNwFtY18V3OUe1xq/Cy7m1beyweVj882mD0X0zvjApg==@kvack.org X-Gm-Message-State: AOJu0YzIK8RB7cn88zgH3pu4rBLRs2jGxuNOKyqYeiRyEUNzzFWsZGN4 aQL78y1zFwYrWZU4Q6WlmeKgp2SQpZ4XpGUPVvS2TprSxfy18KjNgQ1mLR7LLPs= X-Gm-Gg: ASbGnculmFPgGIoagZECjzrKUH4J37hAtUjkmzL1+pEARdBPDxAx3SSn2QGhlbY8++K dDUuA3mCNvggVGPrOuxh5vseUjZbHGy6mmN7fMqsVnPmGY8ifMVQRu0GilSBXLhIyFF6neQsp0J 3A2zTiqPvGGV2AWG0FgI9b2qARp7dxEgd7We31XRIHJhoZiyjrIlj2+gm3OXOB8WpmHIXS5MSjG +bj0NkrKquwb3P3WX2xQfs2rEZEQ+nM4LCFPbwfi1n5X84ZbGMWRG/JKan/rEQM7+6RE2Fiu3rG hx0k/ywQscX4VIVPV0gOUaTv8A== X-Google-Smtp-Source: AGHT+IEPr/jAZdU1BeAv0MTLO4+mRSsOemI+fwwJ0UmsHYAhZKBwL5jRXw2/FSsvJQ9vrjQzGW+zkw== X-Received: by 2002:a05:6a00:35cb:b0:72d:8fa2:9999 with SMTP id d2e1a72fcca58-73035140b35mr1685541b3a.11.1738718529305; Tue, 04 Feb 2025 17:22:09 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69cec0fsm11457202b3a.137.2025.02.04.17.22.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:08 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:55 -0800 Subject: [PATCH v9 08/26] riscv mmu: teach pte_mkwrite to manufacture shadow stack PTEs MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-8-b37a49c5205c@rivosinc.com> References: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@rivosinc.com> In-Reply-To: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@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-Stat-Signature: yg4rroo4x69ymtz44ucfx6my4podkhu4 X-Rspam-User: X-Rspamd-Queue-Id: 78D7018000F X-Rspamd-Server: rspam03 X-HE-Tag: 1738718530-851430 X-HE-Meta: U2FsdGVkX187mamZVupt4+reBEiqz7SAwFGKm8qnjyUf5bSucqK3UVekUJuVB4mysuRbR57d5RpFD4DzZE/ggmpLacBmZmjxuUBiv2tjwQN6+4OlCguK9ea+B6kg1QoIlG7YMhDZTnBd5+i3VxyRMB1eZ+U+SqbNMM+DPimUf63CuvvfdHAsU5NH1eKVHSkeP+P5X3vk7UuiutQ0BI3RUzvy5HHMNkoP0FzRm8QqDiYgLEbM0fKxsm1luZ8CEkHdNvQGk8udbqAbohlDwa2af34O0F3daRjZm90LfXsKUnmNhxMRjL05UcfTeKc7+WlCz+VLs5972kbpCRfOqLd3pIXbooXgsMjsOAUuJ4NCg+JimKtNjoOghsVFgz6RTEXEmVZBDb92EbPPuqh7/m92X5ZJYZKpT/HSDcqL85yCe6c2tLPdCHWBklF0raTlDZJcUpq0LpjXnEsH3RrgzWGcHMXz1TDrQymwEvL0xo4On5qPZ14aX0PV8t3QxCZGx+QXbL5QajAoGoqYPtcBiLhPKLxNX+7i64bwbFQw7xikQ45qyOc8i+aQYm9t/wNAxs7/xkTlpTnKXOvJ7n72nv6GR0QspbFfloWTCC53gfXhJiY9+kBQueF0hJsY8qshHHDvjbMcMAcABB7zrp623AdN8pgWD2Gsoob4reootb7Gfsnfj/mxBkMa5AZkklzXQLRoIwaPvHQ/JDqkYFKEWMrNTCAg+gFuOxmabL0xNqwOupQFuBhJv53tiriq44RmPHJqZFeuqDybSTTT6/6cywcxlT/KLQsE7IoaPEgpWb+kqVCO3AQW5Pr4hG9ARQ31DQ91oX8g+TyVNTbER2C0Wwgdu2gaj5CjUZw/BLgfu0JqI6g43yGR/z8+hwjpvThekDJaVhvRyuimJG1A0Dqbk562WhHkJD6s/nvJmCTM2ANpiL/SpTivJM3ChkZSx2nnAuq77ISJakFu+/j+y0OrXb6 wij6kI8E Ak4hb3UOfAyPWKETDyhjq+i3O508rZD/NJWxBXYoNCuvooIvuk7QOW9vX17MFMswxuKULKOltsvSlkDGkYqSxe4VTUE9rSNyblojSbBNQicShjoV1SIelvTOxKLqwAYAK0gVIqgxYsuL4ZagPcDIhMe/ekzT2YjR7IpmvX27mfgRJe9p1uzSWUXIdj4AgofezIGoiRRezOjo3lUCzaay2tZ0PMbj5iZIqW4vEHlTfmmGsFBzNQuQ1tFpk3IVbBWiN2XSHTmHuG4OOO3V6AFD/aSC3EzFITdXKN8YC921rBeBfp4oy2BvMrSt0sIh2q3lXeXz87sUlphrrU6IjYWwbGU2DFYAZSfSdFV7iMqJwWwrd80PCFtIa9mEfxnP/cBt5OMrcA5ez42Umnzy9YBO80qXLgX9Mqye9Do0KHtS+nySGv0EWPpITZyZC4TDWQQdyebzzrAKnivYgadNbLBfBHKoHSy3LVdtVmDH6WYaAFyJkSw51t2TlmDDPXnRAko7pbwvK 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); +} +