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 D8488C25B4F for ; Sun, 12 May 2024 16:26:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2C4D6B018A; Sun, 12 May 2024 12:26:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CB3AB6B018B; Sun, 12 May 2024 12:26:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B543E6B018C; Sun, 12 May 2024 12:26:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 93AD56B018A for ; Sun, 12 May 2024 12:26:08 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id F3BAF1C0A1B for ; Sun, 12 May 2024 16:26:07 +0000 (UTC) X-FDA: 82110270774.13.52CA80C Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by imf18.hostedemail.com (Postfix) with ESMTP id 1E0321C0003 for ; Sun, 12 May 2024 16:26:04 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of alex@ghiti.fr designates 217.70.183.195 as permitted sender) smtp.mailfrom=alex@ghiti.fr; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715531165; 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; bh=5gXlBJoWrcgvBJ+zZceDLM0IWZF+6jD7azVcNIbzlIE=; b=UIDBo0k0vV7liD5/WzfQ0XjRd8vqgJjJ7feUQB1UwVS2jAIh/v+2NzFNy59ChnjIASWD1Z srS6L8G1HL6K1v9FzSXjPKdZDPCS1xWWUrJ4/mRvFTm34MuEYG4R/44E9hAS9IkoFCzr6M +xp16hW/txSdsUSkMDNtBgVi9sWA0Io= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of alex@ghiti.fr designates 217.70.183.195 as permitted sender) smtp.mailfrom=alex@ghiti.fr; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715531165; a=rsa-sha256; cv=none; b=NZhouwDasRZM0E72OuMxOrkc/kHB92se0RCiM+KtfCdDlyFOo3asz7HCeP1T3EwG4eRi9e JXtHRYnSEEz4mCoMqJKBhGCVZ2zQ+VSzkjExtX+rcGB2aGQb5lFmXj0UogMaqv0k44W2AH Qh0CCJM63eXajNahSnqdDhhgiRCnnWs= Received: by mail.gandi.net (Postfix) with ESMTPSA id C222060002; Sun, 12 May 2024 16:24:50 +0000 (UTC) Message-ID: Date: Sun, 12 May 2024 18:24:45 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 10/29] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE Content-Language: en-US To: Deepak Gupta , paul.walmsley@sifive.com, rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, kito.cheng@sifive.com, keescook@chromium.org, ajones@ventanamicro.com, conor.dooley@microchip.com, cleger@rivosinc.com, atishp@atishpatra.org, bjorn@rivosinc.com, alexghiti@rivosinc.com, samuel.holland@sifive.com, conor@kernel.org Cc: linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, corbet@lwn.net, palmer@dabbelt.com, aou@eecs.berkeley.edu, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, ebiederm@xmission.com, Liam.Howlett@oracle.com, vbabka@suse.cz, lstoakes@gmail.com, shuah@kernel.org, brauner@kernel.org, andy.chiu@sifive.com, jerry.shih@sifive.com, hankuan.chen@sifive.com, greentime.hu@sifive.com, evan@rivosinc.com, xiao.w.wang@intel.com, charlie@rivosinc.com, apatel@ventanamicro.com, mchitale@ventanamicro.com, dbarboza@ventanamicro.com, sameo@rivosinc.com, shikemeng@huaweicloud.com, willy@infradead.org, vincent.chen@sifive.com, guoren@kernel.org, samitolvanen@google.com, songshuaishuai@tinylab.org, gerg@kernel.org, heiko@sntech.de, bhe@redhat.com, jeeheng.sia@starfivetech.com, cyy@cyyself.name, maskray@google.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, cuiyunhui@bytedance.com, bgray@linux.ibm.com, mpe@ellerman.id.au, baruch@tkos.co.il, alx@kernel.org, david@redhat.com, catalin.marinas@arm.com, revest@chromium.org, josh@joshtriplett.org, shr@devkernel.io, deller@gmx.de, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com References: <20240403234054.2020347-1-debug@rivosinc.com> <20240403234054.2020347-11-debug@rivosinc.com> From: Alexandre Ghiti In-Reply-To: <20240403234054.2020347-11-debug@rivosinc.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-GND-Sasl: alex@ghiti.fr X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 1E0321C0003 X-Stat-Signature: 1h1tjrmw7kpbiecdk1untx69ercodgea X-HE-Tag: 1715531164-970027 X-HE-Meta: U2FsdGVkX1/6CA2EXL3UE4nmXNLUJSeL/GZufyFx3y04nGfUzrpJpoUYaPEwsvKNU7TUGwJaFqF/x2o4DnrssPpaZAofKZ17tAhiIk943nWu/xz5JIaqyLkJFje1wRmcUcOtdGh7lolwpYIhhFPFvs0Zd3lpewzvV+DiUlx69nR+HtcIbPY5EzHzYQovE3ZUbZ2bPKlDeaODToTad8dSzDdN0+y5kXaNSEQcEuzRjAkySo4stac7TzHfhjiuMxlSGixIoCLMu9EwfDESQRek1p+nvBIMrKRLGDyidsblO2vtHMhPz8guYgSa3fcxMYkwZ0nJWm/INaXiQIRwoFV3ACwijajsXgSXPX+DHgEC8bHDFEkWMMxNaWNPA2BOCRZMhuewsgu053DG5YSwFG8wUiRK+YolT8nZ60JDCbpesf+9dunAJ7Hkc1F5wtyw6fMnLA8M5hnwM8bpsuOVlUXp+o3icFc+puuBDWU7itvENkV7rwKObXddTEsjQRMe9B+RaaFGY9cCE7fDw2BYcXcv4qETsXuN9wGoBhQ2AlOyBos7ZEt7zXMOkreqBFwJ+3CT1KkBA4ISzDa5PyQqy5P4HGfw++QBi96sJDBF08VDZJMixNbOr4FaguW3wyEcedxJEfd6g1xXl7c0pYwJX/nWiCZLdi/g2YXGNR0/wQvncPYYJxl6H/nqE3QPz5yxAJ99HsE2pimpwMkhV5mo99HcWg9SUY4Fah0G1C4nEE4wGbAka4pTksNAxWLJ9HUkTSKf66DANXgibIKvj6nZ1wxcHVPNPrYvjxcJ9pIoh5/HzJ/M4VdAs1pVIvLgXjMKyXb/Ubvs7JI2axLvx4s0aunElmmck3AkTWjY48QP3ei/Q4TY8mGf0qf9dURP4yGJ0vq9xKvUjdlNYgmuv2+DiVLQ5hBBIlFSA5rTfBv8SsnIe9cBKg+OBmcwbeQ34r1K1uVKMhsqw8oEY/a4GoiIOXv saq6WWOc ErYkI2IKd6B6QDHfkGZMUcR74C6p8ofJMEhwcjz0iyXmV6m5fI+PaqsbkTYcgsKxC3qdNBYebth5BCWxmYPuEoTc35jn0sJs2gREbNsxcHjJXdNKEVObJklPJH3c1V/35vhp584SD/SsWiyAaUh9c/COMm5HCS010uWn85Ut28Uy0NBgl8Ff28C1fiheGkTsRxIE9zzarHdsCp3p7jOAKF52TJLIj/YgTc1D0hYbkLTh+Z4dBb5BAPVwyYTnoQr1jqw0o4eSetPI46Tg= 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: Hi Deepak, On 04/04/2024 01:34, Deepak Gupta wrote: > `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. > > Signed-off-by: Deepak Gupta > --- > arch/riscv/include/asm/mman.h | 24 ++++++++++++++++++++++++ > arch/riscv/include/asm/pgtable.h | 1 + > arch/riscv/kernel/sys_riscv.c | 11 +++++++++++ > arch/riscv/mm/init.c | 2 +- > mm/mmap.c | 1 + > 5 files changed, 38 insertions(+), 1 deletion(-) > create mode 100644 arch/riscv/include/asm/mman.h > > diff --git a/arch/riscv/include/asm/mman.h b/arch/riscv/include/asm/mman.h > new file mode 100644 > index 000000000000..ef9fedf32546 > --- /dev/null > +++ b/arch/riscv/include/asm/mman.h > @@ -0,0 +1,24 @@ > +/* 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 6066822e7396..4d5983bc6766 100644 > --- a/arch/riscv/include/asm/pgtable.h > +++ b/arch/riscv/include/asm/pgtable.h > @@ -184,6 +184,7 @@ extern struct pt_alloc_ops pt_ops __initdata; > #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 f1c1416a9f1e..846c36b1b3d5 100644 > --- a/arch/riscv/kernel/sys_riscv.c > +++ b/arch/riscv/kernel/sys_riscv.c > @@ -8,6 +8,8 @@ > #include > #include > #include > +#include > +#include > > static long riscv_sys_mmap(unsigned long addr, unsigned long len, > unsigned long prot, unsigned long flags, > @@ -17,6 +19,15 @@ static long riscv_sys_mmap(unsigned long addr, unsigned long len, > if (unlikely(offset & (~PAGE_MASK >> page_shift_offset))) > return -EINVAL; > > + /* > + * If only 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 fa34cf55037b..98e5ece4052a 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -299,7 +299,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, > diff --git a/mm/mmap.c b/mm/mmap.c > index d89770eaab6b..57a974f49b00 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -47,6 +47,7 @@ > #include > #include > #include > +#include > > #include > #include What happens if someone restricts the permission to PROT_WRITE using mprotect()? I would say this is an issue since it would turn the pages into shadow stack pages.