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 4B927C3ABAC for ; Fri, 2 May 2025 23:31:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AA0326B00A5; Fri, 2 May 2025 19:31:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A2C7F6B00A6; Fri, 2 May 2025 19:31:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80A1B6B00A8; Fri, 2 May 2025 19:31:01 -0400 (EDT) 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 4F2CA6B00A5 for ; Fri, 2 May 2025 19:31:01 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id EB02216097E for ; Fri, 2 May 2025 23:31:01 +0000 (UTC) X-FDA: 83399565522.03.0D12884 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by imf28.hostedemail.com (Postfix) with ESMTP id 0B98AC0009 for ; Fri, 2 May 2025 23:30:59 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=h94QbEsZ; dmarc=none; spf=pass (imf28.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.52 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=1746228660; 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=06o0rj80khDr52OvcFW3/lKgjr+WgBGL3eH/Vl/H/q84Fd/BapkPWS+ZVSxb6Rtc1kkB2z Xi9cIG3kr2eFkmkREtlxlk8Kd7AKqcwD6PO+wwONoqYb00p09xeqvOxG97KdZXdycTMoLc TUKkOF+iiXITyhkSOmFVCzhj350XZ4o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746228660; a=rsa-sha256; cv=none; b=sKzJiAk2yH3Xeo8reVL2L+/8bAfV51TVTsxSLARmedFF1RM617XtNL7ahC4rvU8g7Oe4SD rlSi/Dfc4A1BeWeuK8CUgR4KfX8vzhNkxTZA1En1tAxBUhPCuggigwKXM4RFPBYJbj8Lff /u0hSd1V/ExHZrtbLky4fXEKOhyzDxA= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=h94QbEsZ; dmarc=none; spf=pass (imf28.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.52 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-309fac646adso3557557a91.1 for ; Fri, 02 May 2025 16:30:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1746228659; x=1746833459; 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=h94QbEsZOR954h3Uc7DNXpBUPwPeggYOOsYENjG3PeE+FHWbH6ti5evsHuUuUrT+jh biN5VQtaoVRhFP48mZSLYAexmAB6qs+/YQuSiigVT0v/kbvyxy8OGv0AHrlyvkSsMlvP o2//iT3cjvaBAoeKHyeJXOJt/MV7QxishXCf5uRSjnD3gYv93UgW2c6K0I/aVq06rjt4 FZofsXXcy2mJy25Hfc9vA1J5N3n9vki5OE+QNyYycBzevxd7Sf8hGQA9of9tq5A1nqjP 7SW69/Rqc4nU6Uui8bHxGfULg0zgJyRktB7DDjsLdxD66Iopx7dNh240KDkTpraWVIGE vgyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746228659; x=1746833459; 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=SRayGxgwko8iyBVeRzZzgBoLILLwxKRHEOzobNVdnCcc/LPnfnUGY121S31TqxqLq+ +aGpDoeiv83LIXs/zsLH0yQ5oOXB726zld/YaA3xLPoqRNy5dKMiyJXfSmPIhdXVPGuv Qsx4zR6RZwwXmyCkB7e7xV/yT5n2R/6pwWkW5Ln45rmJzkUPAyiBWIAa23tBaPbP1Zqk XFfRChIpnt9kTrSghREgZ2mRM+ptTMysddpYZFvd+RBDnNmCJUM4JlCvllVkj+Vvi5be qpl+gmZWpEujv15BdLTPg+m4sdXB8yqOAULCqYbg3Fj3fYWKpSAchAHjAlBN9N2w7NzB hjRw== X-Forwarded-Encrypted: i=1; AJvYcCXQhYGwwrlfRllmMuy/SggcxXNofjqrUmTSUCzYwcyz6JCt5hL3crhGYpgxliMB2h+UisAhe5wnuQ==@kvack.org X-Gm-Message-State: AOJu0YyaaTX5rrX6NGrQsPYDaex6sxHaH3+4e5yh+7SQejyEyMZvAXZE MP/A/Ew0Z1JG8NG1+nZlvV3pthckqEgq2YYAJzMV78YJAKC2DQdfKdRk0tEutdU= X-Gm-Gg: ASbGncuPiox+Ezs5oKxSCv5lxPMrJvjp2O+LqXZ05/k5S/GXAhM2wuk6GH8oTCOeqcb To+r6bCdIG94FE0naf50SJBylSVEiyAr7Iivzy/DWdo2hp8SYORTIQEP6KK1pBJaFG7UrDB1XXJ EF6rrNs03NlfTSctRkHM+DZJ6dzoYueX74gyj7zFRuvjKHgBxNkfEHzYszhWxbaXONm9RpAjBvw G1JyKktTGM+WTqkWGFuOQ6/6a+FEqsawrXJ3vXIOFNV2jG/Qzxza4SBpCtneAOjNbFdMHvopZxx rJnHDaM8lorGvTyl4ywecW3BPMFwR8lEnM3zuBsInk/lc0HsAXg= X-Google-Smtp-Source: AGHT+IE4ZkG/27hO5RQDKoxERYjQIr0cMAZhksKWIFN4zGbwE35WXTZLAwKltp7Gw8EDClWnBWZAWA== X-Received: by 2002:a17:90b:498c:b0:309:f46e:a67c with SMTP id 98e67ed59e1d1-30a4e228371mr7740624a91.11.1746228658917; Fri, 02 May 2025 16:30:58 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15228ff2sm13367055ad.180.2025.05.02.16.30.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 16:30:58 -0700 (PDT) From: Deepak Gupta Date: Fri, 02 May 2025 16:30:37 -0700 Subject: [PATCH v15 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: <20250502-v5_user_cfi_series-v15-6-914966471885@rivosinc.com> References: <20250502-v5_user_cfi_series-v15-0-914966471885@rivosinc.com> In-Reply-To: <20250502-v5_user_cfi_series-v15-0-914966471885@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: rspam12 X-Rspamd-Queue-Id: 0B98AC0009 X-Rspam-User: X-Stat-Signature: iq3r9noqxjjtqtn6y5ociqfnrpeepfeb X-HE-Tag: 1746228659-55399 X-HE-Meta: U2FsdGVkX19lX1UnDRyvUdtJ8H9Fm4Cxay9TaiofJ64TyPMhduTmWSITVkwIB6Z/ppPSzwmgBAZoJz6Br/o8W8irMcLaQBZRz07oO1OwtJ2JP5m9pzmrwelW+QPwtE3eDt4el0MJ9p7eXw2uX2+3I+KXGlTCvlQd/38yRjoWd8+mrY6IaGAi+x5P0M32TnBDCfNUu+Rri6Haocm2CWSi7DaFj1BSHcknvEQVVXTOVP8Sln4bFjwVGc7whBvobPmKrOSHFAXxZQaqDcKzcm3v4jmhmTuoyj5cXQTGTkonB7xIzU/OEYL8wxUubF466DKoRoWNC3qncJz7/tJA2906DDd7BE/BOrHt2TH42v7+vjvSVOnBux7eg0UCN5kbcYsl1uUKbWaYZd5dJw3jLP1Nh4f9v4PCOX56v/aSrgd87a7A/R3R/eajqpYEaJp6D6BaKuScK1e2H5PRCqp4L0LFGO/KvU5QwOrSR7rZm22197gKWzsk2peCqitLFRcL45keAAIJm56yDoCmXAhlWcBaRYduX1QaAFE7eZ6OhWtg94q3hpP87W0DyAQw2ze+EeUn05zuCf2aqioW2qc9ExtDmfeWzYL6o5Nr11vHyJjErUq2OS6thusrortJbqLtwKEt9HLSE1DiYgS9kjzFCJ+mmCBRhFLceA9kKV6wWwKCLCkqwKp3A6FNTot4qcDPRGIAAW1AlHJujeGRlbcx5gkN6boa9YZavQpFJuUONxV6qcfZqIqhY41rL6JB/cMw+M++Pl+6MEVaUkGDsglDlCbvELca0aGzM5FGCXb9m7InrDkW/+tkvUCPLNpV2EPLn9RloHXqR64zBdXi6LFck/9iJyytp4dlggI6Kob9y14MQZp0/+H2i7lgprrzeDYBE2G5U7YDAlYrlklPKnwAjZC/kODeXOXWpSfaieI5+TcNszgAnArSRZdhlDkZd9doTxg4D1MxRHX8GxN2DCw1wUt 34vr6drt c3CYypkt2Sx98BaCrTBWX1S1Vj2U+VrmT3aluptgP1h0cQx9RtUbnRKBt93wZwusBQCn9kMVuK8JLHAd9Ij1JQ4hpzfpVPYaPxoMQdMQOWv5nT3UsiKMrD3okC/VO6cBLk91Ud/dz50nkRVA/rEd4Gwxo6tlhmZdWBIbgf0ioJXFOUMkdC1ideFpvB1r+MfDQZ+O9fL7foPBU3ESK8ZtXC3cg/TcPPUsPDyV6uWRcu7zyB4YByqFi9F4xXfT+DEaohmUvWfjhodsaUOj28umBZSlQCQjRiwJxEuUtwXVYzXhP7uBITk5X+RxaXvKzIKLtQpFWFJoWuLhnvu0lh45zie4TtX148YpzshfVY5vUAXSpE/Ln2mxv1aMgdyCA022heG5ME5BHfYEYqEaTIECA/JMynEVVG4V+cKcj8lnPtdaRnqB6oIPn73552V7lXcFvXASu9Ze8Qs18egfR+T+OkH1z6sS+6dhQINks5DklJqEMHBUevAnilCmnYJ8I5t1dYIG30zhzzxq39x8gS81dcddZYSuh1OmFYaSdKk2+hirhNEnKwOtZPkOVM90kq0Zpjj9o 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