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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B95C1C433EF for ; Thu, 3 Feb 2022 18:16:34 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4JqRh11Jzzz3cRn for ; Fri, 4 Feb 2022 05:16:33 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=n4Qn8EYh; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2604:1380:4641:c500::1; helo=dfw.source.kernel.org; envelope-from=rppt@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=n4Qn8EYh; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4JqRgJ0prjz2xsS for ; Fri, 4 Feb 2022 05:15:55 +1100 (AEDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4E4B0618C2; Thu, 3 Feb 2022 18:15:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E280C340E8; Thu, 3 Feb 2022 18:15:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643912153; bh=BY3UZV02Xh9Phpvcf/vyWzWl1za0GoBYITY+12OY2kw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=n4Qn8EYhsbP3e7GPUom9sYrKL/AYoHQKeoy0sQRJojfA1+H/nlD/IwU0tOCQ3lDsS TjKhyYAgqHhWCQPc2B6bYKH61/FMgjSEWkEeyT88c3t4QTwkRVy7fFpgB3NvF9oe6/ vBa1aqhZmA6bgn1D4nGKqaralwRGnD7Rx5OZC+ae6HDTeO9pgSy/ZLdX3bOwyCS7fx S2rjWgc/cfKNCi4QkZMET2M0dORLomhvoUP27SawXqvXaUC3qq/eCSQoCGHl/mhk9z 3U9O2uAflljkuQw+bXLuSOTPLPVQ05ZpaDgUjmUXTSDBvHeIwbK+d+J9FRCG1uUFk9 a6puoTle2uGkw== Date: Thu, 3 Feb 2022 20:15:43 +0200 From: Mike Rapoport To: Anshuman Khandual Subject: Re: [RFC V1 04/31] powerpc/mm: Enable ARCH_HAS_VM_GET_PAGE_PROT Message-ID: References: <1643029028-12710-1-git-send-email-anshuman.khandual@arm.com> <1643029028-12710-5-git-send-email-anshuman.khandual@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1643029028-12710-5-git-send-email-anshuman.khandual@arm.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, hch@infradead.org, linux-mm@kvack.org, Paul Mackerras , akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Mon, Jan 24, 2022 at 06:26:41PM +0530, Anshuman Khandual wrote: > This defines and exports a platform specific custom vm_get_page_prot() via > subscribing ARCH_HAS_VM_GET_PAGE_PROT. Subsequently all __SXXX and __PXXX > macros can be dropped which are no longer needed. While here, this also > localizes arch_vm_get_page_prot() as powerpc_vm_get_page_prot(). > > Cc: Michael Ellerman > Cc: Paul Mackerras > Cc: linuxppc-dev@lists.ozlabs.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Anshuman Khandual > --- > arch/powerpc/Kconfig | 1 + > arch/powerpc/include/asm/mman.h | 3 +- > arch/powerpc/include/asm/pgtable.h | 19 ------------ > arch/powerpc/mm/mmap.c | 47 ++++++++++++++++++++++++++++++ > 4 files changed, 49 insertions(+), 21 deletions(-) > > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index b779603978e1..ddb4a3687c05 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -135,6 +135,7 @@ config PPC > select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST > select ARCH_HAS_UACCESS_FLUSHCACHE > select ARCH_HAS_UBSAN_SANITIZE_ALL > + select ARCH_HAS_VM_GET_PAGE_PROT > select ARCH_HAVE_NMI_SAFE_CMPXCHG > select ARCH_KEEP_MEMBLOCK > select ARCH_MIGHT_HAVE_PC_PARPORT > diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h > index 7cb6d18f5cd6..7b10c2031e82 100644 > --- a/arch/powerpc/include/asm/mman.h > +++ b/arch/powerpc/include/asm/mman.h > @@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, > } > #define arch_calc_vm_prot_bits(prot, pkey) arch_calc_vm_prot_bits(prot, pkey) > > -static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags) > +static inline pgprot_t powerpc_vm_get_page_prot(unsigned long vm_flags) > { > #ifdef CONFIG_PPC_MEM_KEYS > return (vm_flags & VM_SAO) ? > @@ -34,7 +34,6 @@ static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags) > return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0); > #endif > } > -#define arch_vm_get_page_prot(vm_flags) arch_vm_get_page_prot(vm_flags) > > static inline bool arch_validate_prot(unsigned long prot, unsigned long addr) > { > diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h > index d564d0ecd4cd..3cbb6de20f9d 100644 > --- a/arch/powerpc/include/asm/pgtable.h > +++ b/arch/powerpc/include/asm/pgtable.h > @@ -20,25 +20,6 @@ struct mm_struct; > #include > #endif /* !CONFIG_PPC_BOOK3S */ > > -/* Note due to the way vm flags are laid out, the bits are XWR */ > -#define __P000 PAGE_NONE > -#define __P001 PAGE_READONLY > -#define __P010 PAGE_COPY > -#define __P011 PAGE_COPY > -#define __P100 PAGE_READONLY_X > -#define __P101 PAGE_READONLY_X > -#define __P110 PAGE_COPY_X > -#define __P111 PAGE_COPY_X > - > -#define __S000 PAGE_NONE > -#define __S001 PAGE_READONLY > -#define __S010 PAGE_SHARED > -#define __S011 PAGE_SHARED > -#define __S100 PAGE_READONLY_X > -#define __S101 PAGE_READONLY_X > -#define __S110 PAGE_SHARED_X > -#define __S111 PAGE_SHARED_X > - > #ifndef __ASSEMBLY__ > > #ifndef MAX_PTRS_PER_PGD > diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c > index c475cf810aa8..7f05e7903bd2 100644 > --- a/arch/powerpc/mm/mmap.c > +++ b/arch/powerpc/mm/mmap.c > @@ -254,3 +254,50 @@ void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack) > mm->get_unmapped_area = arch_get_unmapped_area_topdown; > } > } > + > +static inline pgprot_t __vm_get_page_prot(unsigned long vm_flags) > +{ > + switch (vm_flags & (VM_READ | VM_WRITE | VM_EXEC | VM_SHARED)) { > + case VM_NONE: > + return PAGE_NONE; > + case VM_READ: > + return PAGE_READONLY; > + case VM_WRITE: > + return PAGE_COPY; > + case VM_READ | VM_WRITE: > + return PAGE_COPY; > + case VM_EXEC: > + return PAGE_READONLY_X; > + case VM_EXEC | VM_READ: > + return PAGE_READONLY_X; > + case VM_EXEC | VM_WRITE: > + return PAGE_COPY_X; > + case VM_EXEC | VM_READ | VM_WRITE: > + return PAGE_COPY_X; > + case VM_SHARED: > + return PAGE_NONE; > + case VM_SHARED | VM_READ: > + return PAGE_READONLY; > + case VM_SHARED | VM_WRITE: > + return PAGE_SHARED; > + case VM_SHARED | VM_READ | VM_WRITE: > + return PAGE_SHARED; > + case VM_SHARED | VM_EXEC: > + return PAGE_READONLY_X; > + case VM_SHARED | VM_EXEC | VM_READ: > + return PAGE_READONLY_X; > + case VM_SHARED | VM_EXEC | VM_WRITE: > + return PAGE_SHARED_X; > + case VM_SHARED | VM_EXEC | VM_READ | VM_WRITE: > + return PAGE_SHARED_X; > + default: > + BUILD_BUG(); > + } > +} > + > +pgprot_t vm_get_page_prot(unsigned long vm_flags) > +{ > + return __pgprot(pgprot_val(__vm_get_page_prot(vm_flags)) | > + pgprot_val(powerpc_vm_get_page_prot(vm_flags))); Any reason to keep powerpc_vm_get_page_prot() rather than open code it here? This applies to other architectures that implement arch_vm_get_page_prot() and/or arch_filter_pgprot() as well. > +} > +EXPORT_SYMBOL(vm_get_page_prot); > -- > 2.25.1 > > -- Sincerely yours, Mike.