From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAEE38288F for ; Mon, 13 May 2024 21:26:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715635601; cv=none; b=dZxp26TgZBXJX1dHJrn+ZJGln2ISn4UQA38ev3R4oXWKzu4TvYB1zEn0uVp/UYwGqp2bD9Pg/iosFmp/UnYt+HPkroRBQ7m2wJwZ9F4+vQSOsUEE0UcL40vRAKqS//AcFnrVvlZlca1Pd9bbOBzfc6LmMUXxxBUURAo1AFIUGXQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715635601; c=relaxed/simple; bh=LL2yga6BJDDS1lQbTpoY1aPGh2IjnTTQmfv5jkqA1s8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=AoN5G3Zp2mrEmD9ezURf4uNkggWlm6WtB4uUPk5wjJpZfTBKkzVTRcvRWYDPbw0ebMbmUzbFVSm0GCnbxc/wKPu9RtCT3z3oGxje7AEpf/oPNtX6QwnegkeJ2VnzGKojbcIXTiKwUfiT+GFT6krBkwE2uNYq+alTNV8NYkFnTi8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=cxzeRZLH; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="cxzeRZLH" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1ec486198b6so36328555ad.1 for ; Mon, 13 May 2024 14:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1715635599; x=1716240399; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=1Av9RgaPQsUZwKrihewqWhIa6dx8V7kURy0F4c3tXz8=; b=cxzeRZLHNBmK/8Lc1wnLOUzjDMM3GQZd/VqYlrvJ2obmSRyj/KTBzKPzaxHveSOxF1 mattY3ofeUvwYcKE4mVln0uMGfNInWX7Tgv3TWA9OdrHC7MUwCaJGZLp92sC9i5EVchy zt/zwjloqe8jQ4r0n7Tk9ktj2tyVD+LgeEK5HPsGfYgj87YmQgiX1G5Ykd2CkRuCa41w VSw93P36BkT0w5UTkyiVZz5MnSo3osOR84xOHYTRJRO1afLhibTzzwt4cpL5++wYb8qZ RUZfQ8SawGgVX85CsDl7zn0iN4or6SI+JUgJ+hX9twlAnpcFVwZo0SxNDeGvtZEaBFyC urRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715635599; x=1716240399; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1Av9RgaPQsUZwKrihewqWhIa6dx8V7kURy0F4c3tXz8=; b=Lx1IgbHfLrTUQgHBECseUotL2wIoqYWOfABAT7BSTA8pkcnswdxKdQ7Dg2PqO7O7Kk IgTJt+PKwkCh+bCeHcoTGuQ/9iY07cMPysuEyn6gX0n1oxDMZByP+X+QO/LY5j/ZGzgp UrThPau7ckCEIEuYyDbZbVtcHCqL3fY9HoH3rUkKvfxXOxMCahsWcg/5BV5qPp4ALNS1 rAPmsok+iz5f9c0A3iav/Q9dzlzPgBmYIQzDjW7nknk54TtSz445ah06pY31sjD2ayzu XmPidCcjct7ZJIf1K4o3/koj9VTvOMQCp+U3hAVPHPrarlYimMtAgW6rhDHw1KEopXLJ VMhg== X-Forwarded-Encrypted: i=1; AJvYcCVJ33ppHABJa80w5E/KWMn0uwFkRakkpru0wX6L37fVJsKjJ6hI7NVN4U/ErP28ejL5K3XWO3R5FJwUqIFJUvu+Yvyb0qh2tv95JGuaz0nG X-Gm-Message-State: AOJu0Yz6Oft+28sxgEWQxAgBgHti3enry0NOYWZ+vvKGHhwaM2OkEMeq tpKmkc6jg9GxXnk5CBEt2B17aXtkmwqJ16J2rug9DrDnM1ZzQSd+j/rzsvOV1lM= X-Google-Smtp-Source: AGHT+IF+SpgNET3nuWJL5IGg9s5FZ86fG3Sc9l5DoORtZhuAz8MnSfbhg/ec9V32N2UyWUAOUoMzhg== X-Received: by 2002:a17:902:b70b:b0:1ec:76a6:ea9 with SMTP id d9443c01a7336-1ef43e338fcmr103173085ad.26.1715635598847; Mon, 13 May 2024 14:26:38 -0700 (PDT) Received: from ghost ([50.145.13.30]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0b9d16cfsm84105425ad.18.2024.05.13.14.26.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 14:26:38 -0700 (PDT) Date: Mon, 13 May 2024 14:26:31 -0700 From: Charlie Jenkins To: Deepak Gupta Cc: 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, alex@ghiti.fr, bjorn@rivosinc.com, alexghiti@rivosinc.com, samuel.holland@sifive.com, conor@kernel.org, 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, 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 Subject: Re: [PATCH v3 10/29] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE Message-ID: References: <20240403234054.2020347-1-debug@rivosinc.com> <20240403234054.2020347-11-debug@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Mon, May 13, 2024 at 11:41:34AM -0700, Deepak Gupta wrote: > On Mon, May 13, 2024 at 11:36:49AM -0700, Charlie Jenkins wrote: > > On Mon, May 13, 2024 at 10:47:25AM -0700, Deepak Gupta wrote: > > > On Fri, May 10, 2024 at 02:02:54PM -0700, Charlie Jenkins wrote: > > > > On Wed, Apr 03, 2024 at 04:34:58PM -0700, 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))) > > > > > > > > The comments says that this should extend to PROT_READ if only > > > > PROT_WRITE is specified. This condition instead is checking if > > > > PROT_WRITE is selected but PROT_READ is not. If prot is (VM_EXEC | > > > > VM_WRITE) then it would be extended to (VM_EXEC | VM_WRITE | VM_READ). > > > > This will not currently cause any issues because these both map to the > > > > same value in the protection_map PAGE_COPY_EXEC, however this seems to > > > > be not the intention of this change. > > > > > > > > prot == PROT_WRITE better suits the condition explained in the comment. > > > > > > If someone specifies this (PROT_EXEC | PROT_WRITE) today, it works because > > > of the way permissions are setup in `protection_map`. On risc-v there is no > > > way to have a page which is execute and write only. So expectation is that > > > if some apps were using `PROT_EXEC | PROT_WRITE` today, they were working > > > because internally it was translating to read, write and execute on page > > > permissions level. This patch make sure that, it stays same from page > > > permissions perspective. > > > > > > If someone was using PROT_EXEC, it may translate to execute only and this change > > > doesn't impact that. > > > > > > Patch simply looks for presence of `PROT_WRITE` and absence of `PROT_READ` in > > > protection flags and if that condition is satisfied, it assumes that caller assumed > > > page is going to be read allowed as well. > > > > The purpose of this change is for compatibility with shadow stack pages > > but this affects flags for pages that are not shadow stack pages. > > Adding PROT_READ to the other cases is redundant as protection_map > > already handles that mapping. Permissions being strictly PROT_WRITE is > > the only case that needs to be handled, and is the only case that is > > called out in the commit message and in the comment. > > Yeah that's fine. > I can change the commit message or just strictly check for PROT_WRITE. > It doesn't change bottomline, I am fine with either option. > > Let me know your preference. I would prefer the strict check. This is not critical though so I will support whatever you decide! - Charlie > > > > > - Charlie > > > > > > > > > > > > > > > > > + 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 > > > > > > > > It doesn't seem like this is necessary for this patch. > > > > > > Thanks. Yeah it looks like I forgot to remove this over the churn. > > > Will fix it. > > > > > > > > > > > - Charlie > > > > > > > > > > > > > > #include > > > > > #include > > > > > -- > > > > > 2.43.2 > > > > >