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 D3202C3ABA5 for ; Wed, 30 Apr 2025 00:25:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F03C86B00BE; Tue, 29 Apr 2025 20:25:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E86E36B00BF; Tue, 29 Apr 2025 20:25:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB3356B00C0; Tue, 29 Apr 2025 20:25:20 -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 A724F6B00BE for ; Tue, 29 Apr 2025 20:25:20 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id EEF2B1614F6 for ; Wed, 30 Apr 2025 00:16:47 +0000 (UTC) X-FDA: 83388794454.12.E13D261 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf13.hostedemail.com (Postfix) with ESMTP id 126202000B for ; Wed, 30 Apr 2025 00:16:45 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=kuaZHrOY; dmarc=none; spf=pass (imf13.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745972206; a=rsa-sha256; cv=none; b=37sDMviz8+qKjZJXuh30ORaa5sYK2m5e5nYIzp8lxn+Q5009GkC7mHgHcneTltyKl2jWGI gpQbts8fmIxQxGhnanxypb0mn62KmaYYbhkbp8ZHvEpDZJV7fHzPJ0cz/aZLWg8Y56rb04 twXtxof6/qTfBubI2eH9TsivFwJqhuA= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=kuaZHrOY; dmarc=none; spf=pass (imf13.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 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=1745972206; 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=bllvdjgPqMLGFPevmb9vKr9B2wGZQF3J7YB/p9RdhJg=; b=MZmLGj1pKTofSKDsK2o3MsE0XcMnOghdTKPE5t7qhI0h2C88DML2IzWTzMGuw86NsJ+97u LmLGsDnvSr9UsF43DdjAnX1tAj5MTCXKwbtFVIIcXJO3y4rAhDLo8k5AaY8DYf7H2BYDw8 Q9K9Vn0QFT6ApWg0yuqnWQXZRTdX6j8= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22c33ac23edso61520245ad.0 for ; Tue, 29 Apr 2025 17:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745972205; x=1746577005; 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=bllvdjgPqMLGFPevmb9vKr9B2wGZQF3J7YB/p9RdhJg=; b=kuaZHrOY9+tu9NiI/IDvbkigQ7540y35wEV32K7kKaoyHw/Djig41afQC+FWu98Lj2 44F3iW9oaMZVtXaSl8X5NyE5r4nVDFoDWoflCtOrtkl4N+poihqpvEah3YwDoqlcrWMP B2H5qvHwyPULDOCyTmwlokk8ZndcspxAgz8GkdPy8oz3bUjcpgTZcrj1r9+fGwqyQFJq rXivko8q95sTEJ+yRChjgQfZPg+QTK+lnY+4grqw/tuYCS9eIFQyizn9wC9EY94LIF0n z/zlJpjx14H0hHPwuJBKxsD868ONNjSDWpZ7Jg0F8YkkxUAsKXdADTRwRnc2Q+VwKvE7 +cpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745972205; x=1746577005; 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=bllvdjgPqMLGFPevmb9vKr9B2wGZQF3J7YB/p9RdhJg=; b=Ch+yZrPIv/wTYyCKwPxQEVtO5IFICC5w7T8qGwb2OBv4ce4XkHmy3qgQc850Mgi3t4 CkjwW6F4q8LQFvM8GHbOlZ1/HPAKO4vjZVvYlYYi8OdpzzkpX2cJAovpd2O6BM9ZEiqa r3BDtSRQbwBeEXUzrrE3/LfESZS5c4i5EWLYcy6ur1F7ObrFX3HIQwVuyjYmSr5v4/X4 2aNQAW52kqFthgBr6BK+IiTqgb+q8LUx25ilutmlyNE2RXebXM3bv58k4Rb14LJOC8dP QEG0bC9WQGCzXfKh38jAFTelB4rb01fL3C1OwuOxiZjLzBUYJU8Hbd0RCy9xccZ/xnji TC3A== X-Forwarded-Encrypted: i=1; AJvYcCV73gE5jDJ6xshN/gno/2/KUApZqaAYKnqTchs0FbB95ZPSRmQH0Pa5k/GqPvEkh9V3RTUrg9LstA==@kvack.org X-Gm-Message-State: AOJu0YxEOwpdBeqy6dcZoJhKYp3ekhNUbUp4xvPs/8y0kfgqypj7z2re ZolkvYEKSZazMWaFim15AAmRla6z3YkAImxmgg0ftvSL8r1Ct9q/qUYNj72V3Mg= X-Gm-Gg: ASbGnctn4rIqSy5fYAt0mernaMabOLqJBKEN4pg+ercAKJ9gHz04/2wwg4VJM5Xdc6l VWPXv6KmzJDkJjXWOUf1A25HiwehTEL0+R0t4cWzWgtnWVkHYw6kdpKY2RZl7KY1J0KjqwYrmRZ +fm9f8wMDxIatL+zDpyJmdViOIyLJE+Tzntui1uAnlbk5WI2z73PonU9ZVGGT1t2QapJ6S+OoBI /GYlodeMs1KRS2UGwc19wpZT2yZtvGqSJ5rmp2nPlFaq0f5WtHGLfCRcRSAROJk/3ATOBBy1rlY llf0lPjCjQm2vbNndbxYAh3MrhQVKevffTLWRlVuqkyd0gqH7RU= X-Google-Smtp-Source: AGHT+IGX6X1OgZofU2ZlJvPnk66vj+cVgPxJf6DI4qEF6hu7Dh1aTRpCC1f+gbT1r+ijJlpWLtiuCg== X-Received: by 2002:a17:902:e886:b0:226:30f6:1639 with SMTP id d9443c01a7336-22df3587194mr16990645ad.51.1745972204843; Tue, 29 Apr 2025 17:16:44 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 17:16:44 -0700 (PDT) From: Deepak Gupta Date: Tue, 29 Apr 2025 17:16:23 -0700 Subject: [PATCH v14 06/27] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250429-v5_user_cfi_series-v14-6-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-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 126202000B X-Stat-Signature: yznu3pdat17hg5o6xxmismx7kh77fjfq X-HE-Tag: 1745972205-265508 X-HE-Meta: U2FsdGVkX19DaR/8ptSe3LcL7mChIC+yj52Gpgypu5e6UxR4Fpufd3GTI2hnltjX4cGXJ8/owj6rofOA3LfJXUjED1SL/jjcDoiW2D/n9vZJqPHnyr8/oW9xQdrHp1OoeS37JUWutR8ylliWb9ig/4G/3FHLfSR1ZzZMdfqkdQbjHlDfXUpt8OF3JrfckRRnO1/lS/y1M1ZtogJh/sfbdutwwl9aqMXDWaABMq+c1/xzzkmP1cuZLckw7vjs1bT0Berw7p7XjXh6xaDlIQiE1XHbYUQknG8H+ylJKCegDqTW4BLX7mTqtc22TQeNaL61GmaHmKtw12E9Czi2jWMb6MNK2gdDjYyylRBjRpYLNGLCnJtXtT3fG4oRNQfLCsyWN8tDUdHhRJcr05URZbxijaoMmDlSEswqi63k5ILifdO9SnXr596Ym06M8mQP/wGatsQEF7pQTOMW1S+wL2fugU03v8vQ5cPqNpD0qFLjtnelgNvSPzuclUCbczeI6hJxlR6FLkH6mtrxDz0MJtTUvajskOBjBmdE7O8yegyUSE0vI4gvm+0x7SA/QoF/GW9/VV0hb46drOcnNflFxwEpQhYBwCIGEx0k9XiqONW+pN1lQLm/1DTpoHfwPgAbLlhmYgjEYsEEb07cMOAtVuTlvOvAUQ6kN88iCiIIAZUlB3q6a6+TtogK8y5FfEKwiOcPHSEh94CA1HNTP/RWiv+3Qmy1TNxQYa0vtyYVsG+tOUyBk59WUcky2APXJMAWk4QuIo9q3SQYqawkbwHFEXDXWY3MMTuak3hVnRJUMm6Y9WB/hDsqh+pX09tQXGtaYC3sGOUVSofLP+rqXrC/Rm8c0+oVjUKyxA+C0eAg9R/CcqX3mFTIxIu/jpwXPJrLNSUVKbTRvA2o1JqOdOp7FnyS57PwRvtrJ58eTeUII4gZmzjlDBfi7QQb6jnAZ/eLzAjLWKaw8SEKXIvOibH0Pao 4LTPjEmy VLo+kMah26ECs5i768mJncUZey876zJsNMf4GTRkuepTLzofl6WHBSzbaX4FhO0azBeoZu8zDtcVOaDobclU1seGzLDb35KCCuBEwdr/KdddbwvLqlhC5vzMZQVypRtHJeeZCs/txAfLjQSqM6CThE1k6w0rVHbsWKIRMutvOWeqNiHiIuDxnfGZ2lonWGTZgMgYq46wF2BnuAWcW5kNExCWOTm/8ytWxTey8eiTydyxAiot7lggRHgNbhjBYAcimMVZnPwSPz6yLaO/l7i/zQ7Ep69t4gXz5yw6gNamrhyn9n8WL/NZ5TWF3O+4WZ2odc/PfOeIM5RT1fPu722vaj7szJeSkypQF+3kOsvH5HAp3Dv+KJjNp8bMb8P32YEG0U9qcb99qKjPiBTNr8sF/PtiiVr6f+vqJ6KyTgckoSZ4RVPjxEgxCMY8Hya5Bq4Qwcd7oRAB6qB3vBEgjArbUkEhacE49AanP/GgBtkrllkibDpEUjn1qtTG69LaV4wZ42O5JWXGDZV/1Jj7CjfuZf/mGk91AgAAnkXqzwNEwd6lAyI2+GJSicBvIRQ== 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: `arch_calc_vm_prot_bits` is implemented on risc-v to return VM_READ | VM_WRITE if PROT_WRITE is specified. Similarly `riscv_sys_mmap` is updated to convert all incoming PROT_WRITE to (PROT_WRITE | PROT_READ). This is to make sure that any existing apps using PROT_WRITE still work. Earlier `protection_map[VM_WRITE]` used to pick read-write PTE encodings. Now `protection_map[VM_WRITE]` will always pick PAGE_SHADOWSTACK PTE encodings for shadow stack. Above changes ensure that existing apps continue to work because underneath kernel will be picking `protection_map[VM_WRITE|VM_READ]` PTE encodings. Reviewed-by: Zong Li Reviewed-by: Alexandre Ghiti Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/mman.h | 25 +++++++++++++++++++++++++ arch/riscv/include/asm/pgtable.h | 1 + arch/riscv/kernel/sys_riscv.c | 10 ++++++++++ arch/riscv/mm/init.c | 2 +- 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/mman.h b/arch/riscv/include/asm/mman.h new file mode 100644 index 000000000000..392c9c2d2e78 --- /dev/null +++ b/arch/riscv/include/asm/mman.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_MMAN_H__ +#define __ASM_MMAN_H__ + +#include +#include +#include + +static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, + unsigned long pkey __always_unused) +{ + unsigned long ret = 0; + + /* + * If PROT_WRITE was specified, force it to VM_READ | VM_WRITE. + * Only VM_WRITE means shadow stack. + */ + if (prot & PROT_WRITE) + ret = (VM_READ | VM_WRITE); + return ret; +} + +#define arch_calc_vm_prot_bits(prot, pkey) arch_calc_vm_prot_bits(prot, pkey) + +#endif /* ! __ASM_MMAN_H__ */ diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 428e48e5f57d..dba257cc4e2d 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -182,6 +182,7 @@ extern struct pt_alloc_ops pt_ops __meminitdata; #define PAGE_READ_EXEC __pgprot(_PAGE_BASE | _PAGE_READ | _PAGE_EXEC) #define PAGE_WRITE_EXEC __pgprot(_PAGE_BASE | _PAGE_READ | \ _PAGE_EXEC | _PAGE_WRITE) +#define PAGE_SHADOWSTACK __pgprot(_PAGE_BASE | _PAGE_WRITE) #define PAGE_COPY PAGE_READ #define PAGE_COPY_EXEC PAGE_READ_EXEC diff --git a/arch/riscv/kernel/sys_riscv.c b/arch/riscv/kernel/sys_riscv.c index d77afe05578f..43a448bf254b 100644 --- a/arch/riscv/kernel/sys_riscv.c +++ b/arch/riscv/kernel/sys_riscv.c @@ -7,6 +7,7 @@ #include #include +#include static long riscv_sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, @@ -16,6 +17,15 @@ static long riscv_sys_mmap(unsigned long addr, unsigned long len, if (unlikely(offset & (~PAGE_MASK >> page_shift_offset))) return -EINVAL; + /* + * If PROT_WRITE is specified then extend that to PROT_READ + * protection_map[VM_WRITE] is now going to select shadow stack encodings. + * So specifying PROT_WRITE actually should select protection_map [VM_WRITE | VM_READ] + * If user wants to create shadow stack then they should use `map_shadow_stack` syscall. + */ + if (unlikely((prot & PROT_WRITE) && !(prot & PROT_READ))) + prot |= PROT_READ; + return ksys_mmap_pgoff(addr, len, prot, flags, fd, offset >> (PAGE_SHIFT - page_shift_offset)); } diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index ab475ec6ca42..78b27164bf83 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -375,7 +375,7 @@ pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); static const pgprot_t protection_map[16] = { [VM_NONE] = PAGE_NONE, [VM_READ] = PAGE_READ, - [VM_WRITE] = PAGE_COPY, + [VM_WRITE] = PAGE_SHADOWSTACK, [VM_WRITE | VM_READ] = PAGE_COPY, [VM_EXEC] = PAGE_EXEC, [VM_EXEC | VM_READ] = PAGE_READ_EXEC, -- 2.43.0