Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939180AbZDJRuh (ORCPT ); Fri, 10 Apr 2009 13:50:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S939163AbZDJRuM (ORCPT ); Fri, 10 Apr 2009 13:50:12 -0400 Received: from mx2.redhat.com ([66.187.237.31]:38520 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S939102AbZDJRuH (ORCPT ); Fri, 10 Apr 2009 13:50:07 -0400 Message-ID: <49DF8670.20101@redhat.com> Date: Fri, 10 Apr 2009 10:48:32 -0700 From: Masami Hiramatsu User-Agent: Thunderbird 2.0.0.21 (X11/20090320) MIME-Version: 1.0 To: Mathieu Desnoyers CC: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, ananth@in.ibm.com, garyhade@us.ibm.com, akpm@linux-foundation.org, tglx@linutronix.de, systemtap@sources.redhat.com, mingo@elte.hu, linux-tip-commits@vger.kernel.org Subject: Re: [tip:x86/urgent] x86: fix set_fixmap to use phys_addr_t References: <49DE3695.6040800@redhat.com> <49DF63C3.7000406@redhat.com> <20090410160547.GA31132@Krystal> In-Reply-To: <20090410160547.GA31132@Krystal> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6174 Lines: 186 Mathieu Desnoyers wrote: > * Masami Hiramatsu (mhiramat@redhat.com) wrote: >> Masami Hiramatsu wrote: >>> Commit-ID: 189cdc2b41fce3a780a6f3aa963cc4e8114aec6b >>> Gitweb: http://git.kernel.org/tip/189cdc2b41fce3a780a6f3aa963cc4e8114aec6b >>> Author: Masami Hiramatsu >>> AuthorDate: Thu, 9 Apr 2009 10:55:33 -0700 >>> Committer: Ingo Molnar >>> CommitDate: Fri, 10 Apr 2009 15:52:59 +0200 >>> >>> x86: fix set_fixmap to use phys_addr_t >>> >>> Impact: fix kprobes crash on 32-bit with RAM above 4G >>> >>> Use phys_addr_t for receiving a physical address argument >>> instead of unsigned long. This allows fixmap to handle >>> pages higher than 4GB on x86-32. >>> >>> Signed-off-by: Masami Hiramatsu >>> Acked-by: Mathieu Desnoyers >> I thought I had to update ioremap.c too... >> Anyway, here is the ioremap.c update. If you think it is useful, >> please merge it. >> >> Thank you, >> ---- >> >> x86: fix early_ioremap and early_set_fixmap to handle over 4G pages >> >> From: Masami Hiramatsu >> >> Impact: Allow early_ioremap to handle over 4G pages >> >> Use phys_addr_t and resource_size_t for receiving a physical >> address argument instead of unsigned long in early_set_fixmap >> and early_ioremap. This allows early_ioremap to handle >> pages higher than 4GB on x86-32 with PAE. >> >> Signed-off-by: Masami Hiramatsu >> Cc: Mathieu Desnoyers >> Cc: Ingo Molnar >> --- >> >> arch/x86/include/asm/io.h | 6 ++++-- >> arch/x86/mm/ioremap.c | 23 +++++++++++++---------- >> 2 files changed, 17 insertions(+), 12 deletions(-) >> >> >> diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h >> index e5383e3..7373932 100644 >> --- a/arch/x86/include/asm/io.h >> +++ b/arch/x86/include/asm/io.h >> @@ -193,8 +193,10 @@ extern void __iomem *ioremap_wc(resource_size_t offset, unsigned long size); >> */ >> extern void early_ioremap_init(void); >> extern void early_ioremap_reset(void); >> -extern void __iomem *early_ioremap(unsigned long offset, unsigned long size); >> -extern void __iomem *early_memremap(unsigned long offset, unsigned long size); >> +extern void __iomem *early_ioremap(resource_size_t phys_addr, >> + unsigned long size); >> +extern void __iomem *early_memremap(resource_size_t phys_addr, >> + unsigned long size); > > > Nitpick : those second lines are not aligned with each other. The rest > has my hmm, after being patched, those are aligned to the first line... --- extern void __iomem *early_ioremap(resource_size_t phys_addr, unsigned long size); extern void __iomem *early_memremap(resource_size_t phys_addr, unsigned long size); --- Thank you, > > Acked-by: Mathieu Desnoyers > > Thanks ! > > Mathieu > >> extern void early_iounmap(void __iomem *addr, unsigned long size); >> >> #define IO_SPACE_LIMIT 0xffff >> diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c >> index 0dfa09d..09daebf 100644 >> --- a/arch/x86/mm/ioremap.c >> +++ b/arch/x86/mm/ioremap.c >> @@ -547,7 +547,7 @@ void __init early_ioremap_reset(void) >> } >> >> static void __init __early_set_fixmap(enum fixed_addresses idx, >> - unsigned long phys, pgprot_t flags) >> + phys_addr_t phys, pgprot_t flags) >> { >> unsigned long addr = __fix_to_virt(idx); >> pte_t *pte; >> @@ -566,7 +566,7 @@ static void __init __early_set_fixmap(enum fixed_addresses idx, >> } >> >> static inline void __init early_set_fixmap(enum fixed_addresses idx, >> - unsigned long phys, pgprot_t prot) >> + phys_addr_t phys, pgprot_t prot) >> { >> if (after_paging_init) >> __set_fixmap(idx, phys, prot); >> @@ -607,9 +607,10 @@ static int __init check_early_ioremap_leak(void) >> late_initcall(check_early_ioremap_leak); >> >> static void __init __iomem * >> -__early_ioremap(unsigned long phys_addr, unsigned long size, pgprot_t prot) >> +__early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot) >> { >> - unsigned long offset, last_addr; >> + unsigned long offset; >> + resource_size_t last_addr; >> unsigned int nrpages; >> enum fixed_addresses idx0, idx; >> int i, slot; >> @@ -625,15 +626,15 @@ __early_ioremap(unsigned long phys_addr, unsigned long size, pgprot_t prot) >> } >> >> if (slot < 0) { >> - printk(KERN_INFO "early_iomap(%08lx, %08lx) not found slot\n", >> - phys_addr, size); >> + printk(KERN_INFO "early_iomap(%08llx, %08lx) not found slot\n", >> + (u64)phys_addr, size); >> WARN_ON(1); >> return NULL; >> } >> >> if (early_ioremap_debug) { >> - printk(KERN_INFO "early_ioremap(%08lx, %08lx) [%d] => ", >> - phys_addr, size, slot); >> + printk(KERN_INFO "early_ioremap(%08llx, %08lx) [%d] => ", >> + (u64)phys_addr, size, slot); >> dump_stack(); >> } >> >> @@ -680,13 +681,15 @@ __early_ioremap(unsigned long phys_addr, unsigned long size, pgprot_t prot) >> } >> >> /* Remap an IO device */ >> -void __init __iomem *early_ioremap(unsigned long phys_addr, unsigned long size) >> +void __init __iomem * >> +early_ioremap(resource_size_t phys_addr, unsigned long size) >> { >> return __early_ioremap(phys_addr, size, PAGE_KERNEL_IO); >> } >> >> /* Remap memory */ >> -void __init __iomem *early_memremap(unsigned long phys_addr, unsigned long size) >> +void __init __iomem * >> +early_memremap(resource_size_t phys_addr, unsigned long size) >> { >> return __early_ioremap(phys_addr, size, PAGE_KERNEL); >> } >> -- >> Masami Hiramatsu >> >> Software Engineer >> Hitachi Computer Products (America) Inc. >> Software Solutions Division >> >> e-mail: mhiramat@redhat.com >> > -- Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: mhiramat@redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/