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=-5.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 7553FC31E40 for ; Fri, 9 Aug 2019 19:03:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E68D214C6 for ; Fri, 9 Aug 2019 19:03:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726634AbfHITDy (ORCPT ); Fri, 9 Aug 2019 15:03:54 -0400 Received: from ale.deltatee.com ([207.54.116.67]:47776 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726168AbfHITDx (ORCPT ); Fri, 9 Aug 2019 15:03:53 -0400 Received: from guinness.priv.deltatee.com ([172.16.1.162]) by ale.deltatee.com with esmtp (Exim 4.89) (envelope-from ) id 1hwAAm-0003Rn-Q1; Fri, 09 Aug 2019 13:03:33 -0600 To: Greentime Hu Cc: greentime.hu@sifive.com, paul.walmsley@sifive.com, Rob Herring , Albert Ou , Andrew Waterman , Palmer Dabbelt , Linux Kernel Mailing List , Stephen Bates , Zong Li , Olof Johansson , linux-riscv@lists.infradead.org, Michael Clark , Christoph Hellwig References: <20190109203911.7887-1-logang@deltatee.com> <20190109203911.7887-3-logang@deltatee.com> <0926a261-520e-4c40-f926-ddd40bb8ce44@deltatee.com> From: Logan Gunthorpe Message-ID: Date: Fri, 9 Aug 2019 13:03:30 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-CA Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 172.16.1.162 X-SA-Exim-Rcpt-To: hch@lst.de, michaeljclark@mac.com, linux-riscv@lists.infradead.org, olof@lixom.net, zong@andestech.com, sbates@raithlin.com, linux-kernel@vger.kernel.org, palmer@sifive.com, andrew@sifive.com, aou@eecs.berkeley.edu, robh@kernel.org, paul.walmsley@sifive.com, greentime.hu@sifive.com, green.hu@gmail.com X-SA-Exim-Mail-From: logang@deltatee.com Subject: Re: [PATCH v4 2/2] RISC-V: Implement sparsemem X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2019-08-09 11:01 a.m., Greentime Hu wrote: > Hi Logan, > > Logan Gunthorpe 於 2019年8月9日 週五 下午11:47寫道： >> >> >> >> On 2019-08-08 10:23 p.m., Greentime Hu wrote: >>> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig >>> index 3f12b069af1d..208b3e14ccd8 100644 >>> --- a/arch/riscv/Kconfig >>> +++ b/arch/riscv/Kconfig >>> @@ -116,7 +116,8 @@ config PGTABLE_LEVELS >>> default 2 >>> >>> config HAVE_ARCH_PFN_VALID >>> - def_bool y >>> + bool >>> + default !SPARSEMEM_VMEMMAP >>> >>> menu "Platform type" >>> >>> diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h >>> index 8ddb6c7fedac..6991f7a5a4a7 100644 >>> --- a/arch/riscv/include/asm/page.h >>> +++ b/arch/riscv/include/asm/page.h >>> @@ -93,16 +93,20 @@ extern unsigned long min_low_pfn; >>> #define virt_to_pfn(vaddr) (phys_to_pfn(__pa(vaddr))) >>> #define pfn_to_virt(pfn) (__va(pfn_to_phys(pfn))) >>> >>> +#if !defined(CONFIG_SPARSEMEM_VMEMMAP) >>> +#define pfn_valid(pfn) \ >>> + (((pfn) >= pfn_base) && (((pfn)-pfn_base) < max_mapnr)) >>> #define virt_to_page(vaddr) (pfn_to_page(virt_to_pfn(vaddr))) >>> #define page_to_virt(page) (pfn_to_virt(page_to_pfn(page))) >>> +#else >>> +#define virt_to_page(vaddr) ((struct page *)((((u64)vaddr - >>> va_pa_offset) / PAGE_SIZE) * sizeof(struct page) + VMEMMAP_START)) >>> +#define page_to_virt(pg) ((void *)(((((u64)pg - VMEMMAP_START) / >>> sizeof(struct page)) * PAGE_SIZE) + va_pa_offset)) >>> +#endif >> >> This doesn't make sense to me at all. It should always use pfn_to_page() >> for virt_to_page() and the generic pfn_to_page()/page_to_pfn() >> implementations essentially already do what you are doing in a cleaner >> way. So I'd be really surprised if this does anything at all. >> > > Thank you for point me out that. I just checked the generic > implementation and I should use that one. > Sorry I didn't check the generic one and just implement it again. > I think the only patch we need is the first part to use generic > pfn_valid(). I just tested it and yes it can boot successfully in dts > with hole. > > It will fail in this check ((pfn)-pfn_base) < max_mapnr. Sounds to me like max_mapnr is not set correctly. See the code in setup_bootmem(). Seems like 'mem_size' should be set to the largest memory block, not just the one that contains the kernel... > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index 3f12b069af1d..208b3e14ccd8 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -116,7 +116,8 @@ config PGTABLE_LEVELS > default 2 > > config HAVE_ARCH_PFN_VALID > - def_bool y > + bool > + default !SPARSEMEM_VMEMMAP > > menu "Platform type" > > diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h > index 8ddb6c7fedac..80d28fa1e2eb 100644 > --- a/arch/riscv/include/asm/page.h > +++ b/arch/riscv/include/asm/page.h > @@ -100,8 +100,10 @@ extern unsigned long min_low_pfn; > #define page_to_bus(page) (page_to_phys(page)) > #define phys_to_page(paddr) (pfn_to_page(phys_to_pfn(paddr))) > > +#if !defined(CONFIG_SPARSEMEM_VMEMMAP) > #define pfn_valid(pfn) \ > (((pfn) >= pfn_base) && (((pfn)-pfn_base) < max_mapnr)) > +#endif > > #define ARCH_PFN_OFFSET (pfn_base) This patch still makes no sense. I'm not sure why we have an arch specific pfn_valid() because it's very similar to the generic one. But my guess is there's a reason for it and it's not doing what it is supposed when you remove it for the sparsemem case. Logan