Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp683933ybl; Fri, 9 Aug 2019 12:05:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqw49HyM1hGxZ3undzLPqwk3eamO4vjzf4kpXAt+mdcqwrWdccMZGkQoo8r7dn5kBFHWTFX4 X-Received: by 2002:a17:90a:206a:: with SMTP id n97mr10791084pjc.10.1565377509958; Fri, 09 Aug 2019 12:05:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565377509; cv=none; d=google.com; s=arc-20160816; b=Lg8V8uoYvtX4FmdgvPqkWbs3bl3l5zjGVH4YWq13YM6B12quhtypg0lYGeMpR69c8d UaKUMlPjQH2VgF129w9+zDHdtdgCzN/hwQdiucDhKZE/qaiZmGhiu8zkBmVErGi0+1Q6 9F+7pbA5hWKrUOKWwf3YPN1Btmo8+iZIJkwilkLO9fcvKUUiM58d1Z7WSB+95mZI8Jdt IKm78qQ4X4R1cxmDqd7lr4N9lsIAykwlt+LHf8C1LWAeb9v0QLm+iERlkeeTZNoAtvGx m3A9O+uF1gukgAfYDV7YmNklyj0ea4XGmwC2SGFNYptHsLWZmhXs+EGrxEsAlAnbJLu1 4TEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:subject:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to; bh=VdvgBz5QHsbGETIub+7sxKd6BbUmHvlAM2hytEmrd3w=; b=tszvVSpd+CeHF4CLOnt3IDQXn7T0xtOgB+rWwc4FYEs3VtiSW+5EqTEln2BUBnvWHZ 6IBQ+3sj4d/DTm8lat9BgT2N9rfpL9dLHeTCIMA2UirqBWEJ8Ap7Id3aNhnDb+IJKuHh A3njeJlo3JLoPKOH0+nhXOWg69vsOBVVS75wr9siP3+TlxqiPEFe/7uXjfuy6+78G9O4 hx4kNXJCnj3fkWzSZdyasd67pm9SbgbBx9ZT3VmOKz5wYotZI/6+uIV0DudX9dOXo9yw okNv8hRI1xErHQ+hWTKENC+BhmmEpgfH8LQGHdFL+xxKu/nd2zeYQcJ+a4fHa9cqbYbd rxEg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s13si4729526pji.109.2019.08.09.12.04.54; Fri, 09 Aug 2019 12:05:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726556AbfHITDy (ORCPT + 99 others); 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 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on ale.deltatee.com X-Spam-Level: X-Spam-Status: No, score=-8.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, GREYLIST_ISWHITE autolearn=ham autolearn_force=no version=3.4.2 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