From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 09 Oct 2009 18:20:30 +0200 (CEST) Received: from fg-out-1718.google.com ([72.14.220.159]:31887 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493077AbZJIQUX (ORCPT ); Fri, 9 Oct 2009 18:20:23 +0200 Received: by fg-out-1718.google.com with SMTP id e21so320371fga.6 for ; Fri, 09 Oct 2009 09:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:reply-to:to:cc :in-reply-to:references:content-type:organization:date:message-id :mime-version:x-mailer:content-transfer-encoding; bh=XrhxM7qpNVwfXAHNfA+9xx49RHDxGMYkHegSCJaWsk0=; b=q2KJtWHMEMe+qIwHx6GbYhefVDjllPO20fD4w5dHJ0q2IdgtqhLDNydbvZ+ir4c+RG gXVlob+uQYM0hpX53WIL31dbxapu5G9dOesqCnPjg+lzXTPYSiDUd/z7EZS0hi3/KtJh A5rLvLoivTPKrOIKxL04Y1Wbktri1MxJPQtBU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:reply-to:to:cc:in-reply-to:references:content-type :organization:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=dW5DbGA3kEquVfLFYa9su/Hx6coDTanLVOQmEmmN/U77gVlmALUoycrp9BXrBOcuQp NNo1ElNaBiZHNRghi2Nm0lAUavIHSmF1ANOlQ4WOx5vwIOMIS1GVYYDrYMpM3vDZG6qp wat7do9aNOzwAvJQR6zkrX6+Z1gQah4rRZnO4= Received: by 10.86.220.9 with SMTP id s9mr2583911fgg.40.1255105223268; Fri, 09 Oct 2009 09:20:23 -0700 (PDT) Received: from ?172.16.2.101? ([222.92.8.142]) by mx.google.com with ESMTPS id d4sm293470fga.19.2009.10.09.09.20.18 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 09 Oct 2009 09:20:22 -0700 (PDT) Subject: Re: [PATCH -v1] MIPS: fix pfn_valid() for FLATMEM From: Wu Zhangjin Reply-To: wuzhangjin@gmail.com To: linux-mips Cc: Atsushi Nemoto , ralf@linux-mips.org, rjw@sisk.pl, Sergei Shtylyov , Pavel Machek In-Reply-To: <1255104936-14921-1-git-send-email-wuzhangjin@gmail.com> References: <1255104936-14921-1-git-send-email-wuzhangjin@gmail.com> Content-Type: text/plain Organization: DSLab, Lanzhou University, China Date: Sat, 10 Oct 2009 00:20:13 +0800 Message-Id: <1255105213.3658.124.camel@falcon> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 24209 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: wuzhangjin@gmail.com Precedence: bulk X-list: linux-mips On Sat, 2009-10-10 at 00:15 +0800, Wu Zhangjin wrote: > When CONFIG_FLATMEM enabled, STD/Hiberation will fail on YeeLoong > laptop, This patch fixes it: > > if pfn is between min_low_pfn and max_mapnr, the old pfn_valid() will > return TRUE, but if the memory is not continuous, for example: > > $ cat /proc/iomem | grep "System RAM" > 00000000-0fffffff : System RAM > 90000000-bfffffff : System RAM > > as we can see, it is not continuous, so, some of the memory is not > valid, and at last make STD/Hibernate fail when shrinking a too large > number of invalid memory. > > the "invalid" memory here include the memory space we never used. > > 10000000-3fffffff > 80000000-8fffffff > > and also include the meory space we have mapped into pci space. > > 40000000-7fffffff : pci memory space > what about the "pci memory space"? > Here, we fix it via checking pfn is in the "System RAM" or not. and > Seems pfn_valid() is not called in assembly code, we move it to > "!__ASSEMBLY__" to ensure we can simply declare it via "extern int > pfn_valid(unsigned long)" without Compiling Error. > > (This -v1 version incorporates feedback from Pavel Machek > and Sergei Shtylyov and Ralf) > > Signed-off-by: Wu Zhangjin > --- > arch/mips/include/asm/page.h | 50 ++++++++++++++++++----------------------- > arch/mips/mm/page.c | 18 +++++++++++++++ > 2 files changed, 40 insertions(+), 28 deletions(-) > > diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h > index f266295..dc28d0a 100644 > --- a/arch/mips/include/asm/page.h > +++ b/arch/mips/include/asm/page.h > @@ -146,36 +146,9 @@ typedef struct { unsigned long pgprot; } pgprot_t; > */ > #define ptep_buddy(x) ((pte_t *)((unsigned long)(x) ^ sizeof(pte_t))) > > -#endif /* !__ASSEMBLY__ */ > - > -/* > - * __pa()/__va() should be used only during mem init. > - */ > -#ifdef CONFIG_64BIT > -#define __pa(x) \ > -({ \ > - unsigned long __x = (unsigned long)(x); \ > - __x < CKSEG0 ? XPHYSADDR(__x) : CPHYSADDR(__x); \ > -}) > -#else > -#define __pa(x) \ > - ((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET) > -#endif > -#define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET - PHYS_OFFSET)) > -#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0)) > - > -#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) > - > #ifdef CONFIG_FLATMEM > > -#define pfn_valid(pfn) \ > -({ \ > - unsigned long __pfn = (pfn); \ > - /* avoid include hell */ \ > - extern unsigned long min_low_pfn; \ > - \ > - __pfn >= min_low_pfn && __pfn < max_mapnr; \ > -}) > +extern int pfn_valid(unsigned long); > > #elif defined(CONFIG_SPARSEMEM) > > @@ -194,6 +167,27 @@ typedef struct { unsigned long pgprot; } pgprot_t; > > #endif > > + > +#endif /* !__ASSEMBLY__ */ > + > +/* > + * __pa()/__va() should be used only during mem init. > + */ > +#ifdef CONFIG_64BIT > +#define __pa(x) \ > +({ \ > + unsigned long __x = (unsigned long)(x); \ > + __x < CKSEG0 ? XPHYSADDR(__x) : CPHYSADDR(__x); \ > +}) > +#else > +#define __pa(x) \ > + ((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET) > +#endif > +#define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET - PHYS_OFFSET)) > +#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0)) > + > +#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) > + > #define virt_to_page(kaddr) pfn_to_page(PFN_DOWN(virt_to_phys(kaddr))) > #define virt_addr_valid(kaddr) pfn_valid(PFN_DOWN(virt_to_phys(kaddr))) > > diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c > index f5c7375..203d805 100644 > --- a/arch/mips/mm/page.c > +++ b/arch/mips/mm/page.c > @@ -689,3 +689,21 @@ void copy_page(void *to, void *from) > } > > #endif /* CONFIG_SIBYTE_DMA_PAGEOPS */ > + > +#ifdef CONFIG_FLATMEM > +int pfn_valid(unsigned long pfn) > +{ > + int i; > + > + for (i = 0; i < boot_mem_map.nr_map; i++) { > + if ((boot_mem_map.map[i].type == BOOT_MEM_RAM) || > + (boot_mem_map.map[i].type == BOOT_MEM_ROM_DATA)) { > + if ((pfn >= PFN_DOWN(boot_mem_map.map[i].addr)) && > + (pfn < PFN_UP(boot_mem_map.map[i].addr + > + boot_mem_map.map[i].size))) > + return 1; > + } > + } > + return 0; > +} > +#endif