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 A68FFC61CE7 for ; Wed, 4 Jun 2025 17:16:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB1F28D0037; Wed, 4 Jun 2025 13:16:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DEBD88D0007; Wed, 4 Jun 2025 13:16:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D01C38D0037; Wed, 4 Jun 2025 13:16:46 -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 AE5648D0007 for ; Wed, 4 Jun 2025 13:16:46 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6BC2F12026C for ; Wed, 4 Jun 2025 17:16:46 +0000 (UTC) X-FDA: 83518372812.20.64D9417 Received: from mail-yb1-f181.google.com (mail-yb1-f181.google.com [209.85.219.181]) by imf17.hostedemail.com (Postfix) with ESMTP id 74FF14000E for ; Wed, 4 Jun 2025 17:16:44 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=qG3GO2HO; spf=pass (imf17.hostedemail.com: domain of debug@rivosinc.com designates 209.85.219.181 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=1749057404; 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=OtKPI2Naweua6KOKoYxAPpZu6IW/4+X8POy/Zey8NJ8=; b=PRMHPqxNshjX6lKHNXQbbkQH1vHpATBK5kO4pv3VrQr/fkfR7+yIyMbQFFMV9baHgLiSFw MZNMF4mQxv+m+0zfC+JVt6OI2OR45xmLNWLUA4YmJpUIMHl8+VT33h+ySpTo/g+/PtoOK9 HdpzEsTj5c+mSYCW5RXrKvMrOJ6BOVE= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=qG3GO2HO; spf=pass (imf17.hostedemail.com: domain of debug@rivosinc.com designates 209.85.219.181 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749057404; a=rsa-sha256; cv=none; b=f5lf3jLBhY9Y40v5GjiOawwRwqr8WGLIy+ta/XurRL70CQPkzUodY2kV/CgjHOa4xQGoX+ 9vUkctYtNjpHpu1ns8k6l8oZFN7omdbpUsuMRM/cIXUpB6cWfJkhOt+4Is451dI1J43eEr s57qIv849NmlcsZFWNYM31hl+C7Gl+Q= Received: by mail-yb1-f181.google.com with SMTP id 3f1490d57ef6-e7db5c13088so127574276.1 for ; Wed, 04 Jun 2025 10:16:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1749057403; x=1749662203; 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=OtKPI2Naweua6KOKoYxAPpZu6IW/4+X8POy/Zey8NJ8=; b=qG3GO2HOOXH5tGFMWojHZ+BA5rHL5YsQ1EIvCchJl8GMXUSmasYOgTM0FcURwXhuwD PkSNMY5ezok6EXfKC9zKQ9vCMkPaaSV5ipyaxKQBFFfIt1SvJX9CmyMyAig9VefhFKc8 IsBdMeaRZf2HptUXPZ9SHHQ8N2f+E0U2xI8ob7E2XNdAh7UAPcqbv3qUSiD0Y8US/RU7 Iz3tqtg5nUbrU7KfV3Gx2wz94byKqlq9a325TNTEkiHKCrfE4WDYw4awoqQtJv7iHoH6 h7dsXigu0it7nM3wtHqktKJoKoaVVfxaspBtozgV9F90N00vfnSL3uckQccv7FxGnMxu 9i5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749057403; x=1749662203; 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=OtKPI2Naweua6KOKoYxAPpZu6IW/4+X8POy/Zey8NJ8=; b=XRZdYn/oSl2RY7dhQuKWFKINQxAeKQS+wo0Xr5XFqAkxiAGDm25g/V7PoDGcp147+U LckHKSD9WEvAz7Fq/r3IB0fRBonAp3gwdiYespt99e4Cv/tadI0Efn6XMDtfFizI8JBk aYyoNPlt4UFy7/xViuyO5eC9ycdFodb1zgCrjum1uOGLRxlaTDYpD5EgXO4p8DeZbztC jxnGXixpg/h5y6dzMgQHeURLv+4qLVGS2uLFXtZV1SLtfCIEG+MEfpQlZmEjY2kMiumN oqD+kypO2b3diNeMRcAk7DIrZEirIrYMWqwAVPafvDrHH8k3zQcoMFVPYbZ+Z/axVDDL URyQ== X-Forwarded-Encrypted: i=1; AJvYcCXNtHbpnQq7v/3+tEFlpYNZJr4Xe/bt+guwSh5vuygeP/OcDBQcKrmVlvgACHTPfZEc7MsCPC3WTw==@kvack.org X-Gm-Message-State: AOJu0YyNWxK6a8UyEZ3iI2BlUDJaZOiJG6IkEdRXN35poX5fFiqC01ZF 9IEC9b7E9UZyXcmHqIvw7Xo8spOwTkTKqvgbPfDIUEzzwaoCUtatJ1U7CV40OnZ0h5pTS+/xDwj JnnCY X-Gm-Gg: ASbGnctnV1wULaa3RjvQHuhi4s0bL30OJaVgNML5NCypPRRK8RHdSHPGONsxf/KUkHE ufgD1tONQzX2jHVX9A3OBm5qeRRY6mPmYVVCbEC450kBITIhECqM2cEAJEP9c+VkNjP5Id45LOy LYrIXXdSmWWl6TnwTtO3Mi5dxajRh8WQ7syXO3veAJuKYA9zPYYuoVRqcvHng6apUR6ctoHt8+z UxaIQrmIkLL37/gKxj3eNiujJZKcEfdoIcUEJm15fTyTEK6ufKGfmLoBT9bt/cgJ778LvAAb/d0 fcoILlQ/c6RITPwm7p6GjU7FWyAc+enOZl+juRB2h0gJ1nmVwWk0g7Z2FfHl/Q== X-Google-Smtp-Source: AGHT+IHE2S1H2Kp8xKCw0ZpGRZuaXR3xr247uSwdF5+LhUIbu38f5b5b/U4ShdbPQxItyXeG4sG0mQ== X-Received: by 2002:a17:90b:38c9:b0:311:b5ac:6f7d with SMTP id 98e67ed59e1d1-31328f8b1admr363794a91.6.1749057391469; Wed, 04 Jun 2025 10:16:31 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3124e2e9c9fsm9178972a91.30.2025.06.04.10.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jun 2025 10:16:31 -0700 (PDT) From: Deepak Gupta Date: Wed, 04 Jun 2025 10:15:30 -0700 Subject: [PATCH v17 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: <20250604-v5_user_cfi_series-v17-6-4565c2cf869f@rivosinc.com> References: <20250604-v5_user_cfi_series-v17-0-4565c2cf869f@rivosinc.com> In-Reply-To: <20250604-v5_user_cfi_series-v17-0-4565c2cf869f@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-Queue-Id: 74FF14000E X-Rspamd-Server: rspam09 X-Stat-Signature: qzprajckoiqwdebige6gfkinq3bdajyu X-HE-Tag: 1749057404-800097 X-HE-Meta: U2FsdGVkX19ttD1UzofC71lmOm5ePxhoH44zMD+7FiIe57ekJogYJn+cIRWHtuHAHHdlHr/1WmnoGrL/wJcMC7FGSji3ur3+2Sdy3Xx5/cYsgQAQ7I8gY6acakxeHXENPBb6lWl2x8UTRuxefrypTkrCUyhruPfKWFwfVa4xZXPto15gSyI62alrcYpHspUZlY5WAlFl1a9p5DacrBvLArPzp+jueZLnWwtdVf+BmLHrvNZF+LF8+CM/7p0GBEXNPWoZA7djw6Gg/UhID+iEYCuWucFVG/VND3U/3tcUO4gPvDShytDY2ryuxXIjzL4Tqk0s4pZxZxJmB28VqMtdrRA338UJzjXZZdzuAKtLwJQUXGHaDs1pCxOfrnmq08DJ8vrDhhuMuswfWLChsREoQ6t7AHkqwuuaOjB9aLbUTN3JWGzbe3YusengCYRlhNCV6kkulMKpTGQxTddnaXZN/j3VoI6FiO93AnICYLgdG5DO0eyHRkn6yj0pgGJhhQVMH5yTcN59dAV6dt8gyu15N2M+S1TpRAV2sZJ4gl16QsxvEcY8Xo+Rf7jjbtlXkAXjiaba9hWSZQDJSairc4IFqClUvH135Hv9npKY5Cx18VSfVkGHpyh6lVwWAkbzWcI1JU860Xk5H0zc2yMq88DbiTpiBqcRYDjxHgPv291NX6JZfK1vV+LRvYMJCF3vK2rT3koRfnaDTKG+6Q/+lMQxt2kapppWrVLSK+ezrDwJjPlV9j3VyNu8Vlu9pLUWIFDtXGkqr+hayEQVqnEYPhMve6iKAxflfH+2Zgh7hJYxdrxyHfrBFuFlrsYM/Wy7NNwiNoocp8aQ3RYrLj8PvvUVe3o35Y6hP8N3Tppkfsr3iQz4p+TiX1eM8+n8jrJLK3V9vXoLBXi4FT98H7dMgqtL4r5Tzp/vvLcusVlpz7bRCNiO+nzaihv8UKqrGxZwZbiSK85KsMElsWeF9Jk6dPf 9UZiZJQW FfeJ3cvijnJcDfc+S44IoRP5N6W1j9RYrKljDhseb4A8NwnQVYWfxqlKSuCyGqhfHie5tBulCoQd74U/rbDnRQkM2zvRWC7OGUKdY3/4ny6H7+zG33KMXTmpBj8o0JVK642c9N3UeqZf4ZCzbUCNwVrKROJ32jeU2iuXEaSa7h4h2HcOrTppnOUUUKPanVTBTZTbaEI1zxP3qY80J8SOf9nl9ad/jzfP2JE0UZ24hN4qhM9fx1i+FPS7feLoQDuZRT1+06aRszJ9y1495fm8/bxawH8h2sUzTxtTkhwemxXn19Zo5lpgmi4pSSObfOGta/HnwEcaRjAz2Gh9OBsarpMwFHCgzFbWcfZVLe5I/WSDUIRR6G6MbnSJ0TCoYjgV7EvcXvkOdA7lFPN4wjfn7DMSmqyZOfrFfusdcr9UzMUKNezkzdjkZJz05En2o45FBJIJ4AYX+dpdzQA3kSR+Miin7ose1kTd9/VfS4J/8Yxqg8Fnv6AAltT0uS2dhrvY6PwizA6vecIYGWPQ4z6i2o1lwkLTa8euBVpEzA2AYTkBYPsAkMlbdQyXuA+QZV+Govr+N 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: Arnd Bergmann Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/mman.h | 26 ++++++++++++++++++++++++++ arch/riscv/include/asm/pgtable.h | 1 + arch/riscv/kernel/sys_riscv.c | 10 ++++++++++ arch/riscv/mm/init.c | 2 +- 4 files changed, 38 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..0ad1d19832eb --- /dev/null +++ b/arch/riscv/include/asm/mman.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_MMAN_H__ +#define __ASM_MMAN_H__ + +#include +#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