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 X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C151C433ED for ; Wed, 21 Apr 2021 12:22:17 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AB77E61413 for ; Wed, 21 Apr 2021 12:22:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB77E61413 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RoJhsuJQ4bsSRoFNUZ7XsgNA3pf81JaVqH9IdJ9aEWk=; b=FZs0tZBGTGJVbebikALfsHWQG AcbLrhWNLXSNbQBmV4TYqgGsp8vLV1oNeYiKP2atYJmZDAjJBUu2jnW2n+QP/FsazNAs1+nH/gvB4 y2mTab2y4qqIWQtMn628JwrZYwMRzFMPXxmI1oITjF9nCO77txTph7RKO1zYF0qnq7zuRWx5lKwBN oIgfNAmmPKcNvdLvh2XbnaUXp6h7OVgmOlYwVSh7iDlC+n+EyXeqLbL16M9qrHRcKlxPwKfdPGq4O 7eVJQDyUuhqmXvYPGBxD+w77ZiIO6lpt5YJ8g62noPUPEE0WXWmN3AkvNwavotv5Q9vIySqIE0PW2 aSUwCaMOg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZBpp-00ENH4-CV; Wed, 21 Apr 2021 12:20:01 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZBpm-00ENGw-8j for linux-arm-kernel@desiato.infradead.org; Wed, 21 Apr 2021 12:19:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=Jnm3DEiPr0CWgmAVMniTJa610YRrB3VrwO8xqeqZJVU=; b=E0kxHt2odG+AFyc+frzGyNh+qV B+QNNnhN6SEroVcfeLXMQPqALl0upuQqmNlpwLzYIsYs8WtMFXBAe53R3M70sjbxXaKhgH/BnwjNU qyMocgVyIoJAZX8hXJ7i1pCEi3Bk12Y5cE4/htO68hfIdd+EkCv2mm7RCPzIVGASeU9tU7ZgFnklE +lTPnkrzqyJtbNR5MfUjEgLz9rwFVjEQNQDnAWLSR7uoS/Y9XcdncJwN8j34AvjdJLxD+byr8US1R rKdF7URp2hkY8q7eU2/tFEpTTV3f1lQB5PpRIlTRqNCDkGmDNZ9eXBDBS84BNx1CTLonAQywRCRmX K0EKjnRA==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZBpj-00Crco-I0 for linux-arm-kernel@lists.infradead.org; Wed, 21 Apr 2021 12:19:57 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 530AD6145E; Wed, 21 Apr 2021 12:19:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619007594; bh=0a/68dskNDkLo1uroY57KwbRLZLoROR0e1l6xfjDK20=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=vKCh5xS88oZEFh3+M2mJmlwblhZLKM9ca2XwXEkYyFGXs/vJENDTcp2+xVkbz/Mzj a336WGXWzU9a73VFVT3k//XwYrweCrOwX9FoEZ+l+wMJLIS6ZWccT0MXaPLhgkIcoW Xn/V1hwDCFfL9dCpaHCPUWV8flXl+ZDAdyfpfjvTPz9BhcB5j2/YiiIP8EDCvXkMTa SGZLlMLO3ygFxsXJzDB/5B+/T9wRSQ+Lh7rx5YMShZc41aJh9h/IMyNNdqcC5Xvk2k jILPvY/LEsPWuJkwDiIP0ddmDjA84qv4go3Q++WnfolKm5AxJlm7flKGb1N5EeO33H huVQegj1NaxhQ== Date: Wed, 21 Apr 2021 15:19:45 +0300 From: Mike Rapoport To: Anshuman Khandual Cc: linux-arm-kernel@lists.infradead.org, Andrew Morton , Ard Biesheuvel , Catalin Marinas , David Hildenbrand , Marc Zyngier , Mark Rutland , Mike Rapoport , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v2 3/4] arm64: decouple check whether pfn is in linear map from pfn_valid() Message-ID: References: <20210421065108.1987-1-rppt@kernel.org> <20210421065108.1987-4-rppt@kernel.org> <0a7cc0d4-5d3d-7d6d-f4c3-bb2965b810e6@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <0a7cc0d4-5d3d-7d6d-f4c3-bb2965b810e6@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210421_051955_711407_44834113 X-CRM114-Status: GOOD ( 29.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Apr 21, 2021 at 04:29:48PM +0530, Anshuman Khandual wrote: > > On 4/21/21 12:21 PM, Mike Rapoport wrote: > > From: Mike Rapoport > > > > The intended semantics of pfn_valid() is to verify whether there is a > > struct page for the pfn in question and nothing else. > > > > Yet, on arm64 it is used to distinguish memory areas that are mapped in the > > linear map vs those that require ioremap() to access them. > > > > Introduce a dedicated pfn_is_map_memory() wrapper for > > memblock_is_map_memory() to perform such check and use it where > > appropriate. > > > > Using a wrapper allows to avoid cyclic include dependencies. > > > > Signed-off-by: Mike Rapoport > > --- > > arch/arm64/include/asm/memory.h | 2 +- > > arch/arm64/include/asm/page.h | 1 + > > arch/arm64/kvm/mmu.c | 2 +- > > arch/arm64/mm/init.c | 11 +++++++++++ > > arch/arm64/mm/ioremap.c | 4 ++-- > > arch/arm64/mm/mmu.c | 2 +- > > 6 files changed, 17 insertions(+), 5 deletions(-) > > > > diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h > > index 0aabc3be9a75..194f9f993d30 100644 > > --- a/arch/arm64/include/asm/memory.h > > +++ b/arch/arm64/include/asm/memory.h > > @@ -351,7 +351,7 @@ static inline void *phys_to_virt(phys_addr_t x) > > > > #define virt_addr_valid(addr) ({ \ > > __typeof__(addr) __addr = __tag_reset(addr); \ > > - __is_lm_address(__addr) && pfn_valid(virt_to_pfn(__addr)); \ > > + __is_lm_address(__addr) && pfn_is_map_memory(virt_to_pfn(__addr)); \ > > }) > > > > void dump_mem_limit(void); > > diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h > > index 012cffc574e8..99a6da91f870 100644 > > --- a/arch/arm64/include/asm/page.h > > +++ b/arch/arm64/include/asm/page.h > > @@ -38,6 +38,7 @@ void copy_highpage(struct page *to, struct page *from); > > typedef struct page *pgtable_t; > > > > extern int pfn_valid(unsigned long); > > +extern int pfn_is_map_memory(unsigned long); > > Check patch is complaining about this. > > WARNING: function definition argument 'unsigned long' should also have an identifier name > #50: FILE: arch/arm64/include/asm/page.h:41: > +extern int pfn_is_map_memory(unsigned long); > > > > > > #include > > > > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > > index 8711894db8c2..23dd99e29b23 100644 > > --- a/arch/arm64/kvm/mmu.c > > +++ b/arch/arm64/kvm/mmu.c > > @@ -85,7 +85,7 @@ void kvm_flush_remote_tlbs(struct kvm *kvm) > > > > static bool kvm_is_device_pfn(unsigned long pfn) > > { > > - return !pfn_valid(pfn); > > + return !pfn_is_map_memory(pfn); > > } > > > > /* > > diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c > > index 3685e12aba9b..dc03bdc12c0f 100644 > > --- a/arch/arm64/mm/init.c > > +++ b/arch/arm64/mm/init.c > > @@ -258,6 +258,17 @@ int pfn_valid(unsigned long pfn) > > } > > EXPORT_SYMBOL(pfn_valid); > > > > +int pfn_is_map_memory(unsigned long pfn) > > +{ > > + phys_addr_t addr = PFN_PHYS(pfn); > > + > > Should also bring with it, the comment regarding upper bits in > the pfn from arm64 pfn_valid(). I think a reference to the comment in pfn_valid() will suffice. BTW, I wonder how is that other architectures do not need this check? > > + if (PHYS_PFN(addr) != pfn) > > + return 0; > > + > > ^^^^^ trailing spaces here. > > ERROR: trailing whitespace > #81: FILE: arch/arm64/mm/init.c:263: > +^I$ Oops :) > > + return memblock_is_map_memory(addr); > > +} > > +EXPORT_SYMBOL(pfn_is_map_memory); > > + > > Is the EXPORT_SYMBOL() required to build drivers which will use > pfn_is_map_memory() but currently use pfn_valid() ? Yes, this is required for virt_addr_valid() that is used by modules. -- Sincerely yours, Mike. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel