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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 06CD6C00A89 for ; Mon, 2 Nov 2020 15:20:07 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 A4CE522226 for ; Mon, 2 Nov 2020 15:20:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lbSHPUjj"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="NTxOlDIi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A4CE522226 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject: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=8zuO84RmG0omTSQHBoRZOSYVZeTm9XlXM1+u+QsnooE=; b=lbSHPUjjb9XeyyTZSixL1rS2d qrB2jSdzF++Gmv7lMvoCr401Ndf18DP+3iucRvbmIMLS4W7DvZ088BeyF2RUAh8QwOZ8Qaem0fTqF v9is2H2Sr3j5JTtfnFrV+3yVzlfhEtNH5okpfbYwJP08I2mT9yJSWgx5oyX8gnFfDUSVXuXk8NN80 Q5BeH+7o08ROzFKh2aEFiDkVGO3Y8F3qiPoatxATy1uaqRECtDfNMBHjPOll0MJZdtpMn5RSgCmUg SfsuGd+n90nvJymbGcexlv6UKBjcFNKcBn2yOs0HM+XasDRJ6xLvLnE+v037StM/RZK2Zdz/w044b SFYYXn2eQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZbbd-0000Jg-Gg; Mon, 02 Nov 2020 15:18:49 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZbbZ-0000Dh-Ey; Mon, 02 Nov 2020 15:18:48 +0000 Received: from kernel.org (unknown [87.71.17.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C549122226; Mon, 2 Nov 2020 15:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604330323; bh=BP7NXK/PeknKLWeyovBUOGGTlkdf+pO59OcJEpEzF3Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=NTxOlDIiQILczXFe3vUeE1LWhh4tMDAJPfsMsis8q/6V+hKCXiAy5IWy87AtMzQgK Dv0zj38DAeoAdeT+vHPVnvuz7AP8hm6ElliB8xy73LgDuiMFeuopOYCfTJ/r4Q8oKb Q/oat80trPnnSe/229/7PlCKbYG4VCtKZqTfN03E= Date: Mon, 2 Nov 2020 17:18:29 +0200 From: Mike Rapoport To: David Hildenbrand Subject: Re: [PATCH v3 4/4] arch, mm: make kernel_page_present() always available Message-ID: <20201102151829.GC4879@kernel.org> References: <20201101170815.9795-1-rppt@kernel.org> <20201101170815.9795-5-rppt@kernel.org> <08db307a-b093-d7aa-7364-045f328ab147@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <08db307a-b093-d7aa-7364-045f328ab147@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201102_101845_703895_D5D67578 X-CRM114-Status: GOOD ( 34.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Zijlstra , Benjamin Herrenschmidt , Dave Hansen , linux-mm@kvack.org, Paul Mackerras , Pavel Machek , "H. Peter Anvin" , sparclinux@vger.kernel.org, Christoph Lameter , Will Deacon , linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, Michael Ellerman , x86@kernel.org, Mike Rapoport , Christian Borntraeger , Ingo Molnar , Catalin Marinas , Len Brown , Albert Ou , Vasily Gorbik , linux-pm@vger.kernel.org, Heiko Carstens , David Rientjes , Borislav Petkov , Andy Lutomirski , Paul Walmsley , "Kirill A. Shutemov" , Thomas Gleixner , Joonsoo Kim , linux-arm-kernel@lists.infradead.org, "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, Pekka Enberg , Palmer Dabbelt , Andrew Morton , "Edgecombe, Rick P" , linuxppc-dev@lists.ozlabs.org, "David S. Miller" 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 Mon, Nov 02, 2020 at 10:28:14AM +0100, David Hildenbrand wrote: > On 01.11.20 18:08, Mike Rapoport wrote: > > From: Mike Rapoport > > > > For architectures that enable ARCH_HAS_SET_MEMORY having the ability to > > verify that a page is mapped in the kernel direct map can be useful > > regardless of hibernation. > > > > Add RISC-V implementation of kernel_page_present(), update its forward > > declarations and stubs to be a part of set_memory API and remove ugly > > ifdefery in inlcude/linux/mm.h around current declarations of > > kernel_page_present(). > > > > Signed-off-by: Mike Rapoport > > --- > > arch/arm64/include/asm/cacheflush.h | 1 + > > arch/arm64/mm/pageattr.c | 4 +--- > > arch/riscv/include/asm/set_memory.h | 1 + > > arch/riscv/mm/pageattr.c | 29 +++++++++++++++++++++++++++++ > > arch/x86/include/asm/set_memory.h | 1 + > > arch/x86/mm/pat/set_memory.c | 4 +--- > > include/linux/mm.h | 7 ------- > > include/linux/set_memory.h | 5 +++++ > > 8 files changed, 39 insertions(+), 13 deletions(-) > > > > diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h > > index 9384fd8fc13c..45217f21f1fe 100644 > > --- a/arch/arm64/include/asm/cacheflush.h > > +++ b/arch/arm64/include/asm/cacheflush.h > > @@ -140,6 +140,7 @@ int set_memory_valid(unsigned long addr, int numpages, int enable); > > int set_direct_map_invalid_noflush(struct page *page); > > int set_direct_map_default_noflush(struct page *page); > > +bool kernel_page_present(struct page *page); > > #include > > diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c > > index 439325532be1..92eccaf595c8 100644 > > --- a/arch/arm64/mm/pageattr.c > > +++ b/arch/arm64/mm/pageattr.c > > @@ -186,8 +186,8 @@ void __kernel_map_pages(struct page *page, int numpages, int enable) > > set_memory_valid((unsigned long)page_address(page), numpages, enable); > > } > > +#endif /* CONFIG_DEBUG_PAGEALLOC */ > > -#ifdef CONFIG_HIBERNATION > > /* > > * This function is used to determine if a linear map page has been marked as > > * not-valid. Walk the page table and check the PTE_VALID bit. This is based > > @@ -234,5 +234,3 @@ bool kernel_page_present(struct page *page) > > ptep = pte_offset_kernel(pmdp, addr); > > return pte_valid(READ_ONCE(*ptep)); > > } > > -#endif /* CONFIG_HIBERNATION */ > > -#endif /* CONFIG_DEBUG_PAGEALLOC */ > > diff --git a/arch/riscv/include/asm/set_memory.h b/arch/riscv/include/asm/set_memory.h > > index 4c5bae7ca01c..d690b08dff2a 100644 > > --- a/arch/riscv/include/asm/set_memory.h > > +++ b/arch/riscv/include/asm/set_memory.h > > @@ -24,6 +24,7 @@ static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; } > > int set_direct_map_invalid_noflush(struct page *page); > > int set_direct_map_default_noflush(struct page *page); > > +bool kernel_page_present(struct page *page); > > #endif /* __ASSEMBLY__ */ > > diff --git a/arch/riscv/mm/pageattr.c b/arch/riscv/mm/pageattr.c > > index 321b09d2e2ea..87ba5a68bbb8 100644 > > --- a/arch/riscv/mm/pageattr.c > > +++ b/arch/riscv/mm/pageattr.c > > @@ -198,3 +198,32 @@ void __kernel_map_pages(struct page *page, int numpages, int enable) > > __pgprot(0), __pgprot(_PAGE_PRESENT)); > > } > > #endif > > + > > +bool kernel_page_present(struct page *page) > > +{ > > + unsigned long addr = (unsigned long)page_address(page); > > + pgd_t *pgd; > > + pud_t *pud; > > + p4d_t *p4d; > > + pmd_t *pmd; > > + pte_t *pte; > > + > > + pgd = pgd_offset_k(addr); > > + if (!pgd_present(*pgd)) > > + return false; > > + > > + p4d = p4d_offset(pgd, addr); > > + if (!p4d_present(*p4d)) > > + return false; > > + > > + pud = pud_offset(p4d, addr); > > + if (!pud_present(*pud)) > > + return false; > > + > > + pmd = pmd_offset(pud, addr); > > + if (!pmd_present(*pmd)) > > + return false; > > + > > + pte = pte_offset_kernel(pmd, addr); > > + return pte_present(*pte); > > +} > > diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h > > index 5948218f35c5..4352f08bfbb5 100644 > > --- a/arch/x86/include/asm/set_memory.h > > +++ b/arch/x86/include/asm/set_memory.h > > @@ -82,6 +82,7 @@ int set_pages_rw(struct page *page, int numpages); > > int set_direct_map_invalid_noflush(struct page *page); > > int set_direct_map_default_noflush(struct page *page); > > +bool kernel_page_present(struct page *page); > > extern int kernel_set_to_readonly; > > diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c > > index bc9be96b777f..16f878c26667 100644 > > --- a/arch/x86/mm/pat/set_memory.c > > +++ b/arch/x86/mm/pat/set_memory.c > > @@ -2226,8 +2226,8 @@ void __kernel_map_pages(struct page *page, int numpages, int enable) > > arch_flush_lazy_mmu_mode(); > > } > > +#endif /* CONFIG_DEBUG_PAGEALLOC */ > > -#ifdef CONFIG_HIBERNATION > > bool kernel_page_present(struct page *page) > > { > > unsigned int level; > > @@ -2239,8 +2239,6 @@ bool kernel_page_present(struct page *page) > > pte = lookup_address((unsigned long)page_address(page), &level); > > return (pte_val(*pte) & _PAGE_PRESENT); > > } > > -#endif /* CONFIG_HIBERNATION */ > > -#endif /* CONFIG_DEBUG_PAGEALLOC */ > > int __init kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn, unsigned long address, > > unsigned numpages, unsigned long page_flags) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > > index ab0ef6bd351d..44b82f22e76a 100644 > > --- a/include/linux/mm.h > > +++ b/include/linux/mm.h > > @@ -2937,16 +2937,9 @@ static inline void debug_pagealloc_map_pages(struct page *page, > > if (debug_pagealloc_enabled_static()) > > __kernel_map_pages(page, numpages, enable); > > } > > - > > -#ifdef CONFIG_HIBERNATION > > -extern bool kernel_page_present(struct page *page); > > -#endif /* CONFIG_HIBERNATION */ > > #else /* CONFIG_DEBUG_PAGEALLOC */ > > static inline void debug_pagealloc_map_pages(struct page *page, > > int numpages, int enable) {} > > -#ifdef CONFIG_HIBERNATION > > -static inline bool kernel_page_present(struct page *page) { return true; } > > -#endif /* CONFIG_HIBERNATION */ > > #endif /* CONFIG_DEBUG_PAGEALLOC */ > > #ifdef __HAVE_ARCH_GATE_AREA > > diff --git a/include/linux/set_memory.h b/include/linux/set_memory.h > > index 860e0f843c12..fe1aa4e54680 100644 > > --- a/include/linux/set_memory.h > > +++ b/include/linux/set_memory.h > > @@ -23,6 +23,11 @@ static inline int set_direct_map_default_noflush(struct page *page) > > { > > return 0; > > } > > + > > +static inline bool kernel_page_present(struct page *page) > > +{ > > + return true; > > +} > > #endif > > #ifndef set_mce_nospec > > > > It's somewhat weird to move this to set_memory.h - it's only one possible > user. I think include/linux/mm.h is a better fit. Ack to making it > independent of CONFIG_HIBERNATION. Semantically this is a part of direct map manipulation, that's primarily why I put it into set_memory.h > in include/linux/mm.h , I'd prefer: > > #if defined(CONFIG_DEBUG_PAGEALLOC) || \ > defined(CONFIG_ARCH_HAS_SET_DIRECT_MAP) The second reason was to avoid this ^ and the third is -7 lines to include/linux/mm.h :) > bool kernel_page_present(struct page *page); > #else > static inline bool kernel_page_present(struct page *page) > { > return true; > } > #endif > > -- > Thanks, > > David / dhildenb > > -- Sincerely yours, Mike. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel