lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: fix set_fixmap to use phys_addr_t

Browse Source 
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 <mhiramat@redhat.com>
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: systemtap-ml <systemtap@sources.redhat.com>
Cc: Gary Hade <garyhade@us.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <49DE3695.6040800@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Masami Hiramatsu
2009-04-09 10:55:33 -07:00
committed by Ingo Molnar
parent a0d22f485a
commit 9b987aeb4a
6 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/include/asm/fixmap.h
View File

@@ -151,11 +151,11 @@ extern pte_t *pkmap_page_table;
void __native_set_fixmap(enum fixed_addresses idx, pte_t pte); void __native_set_fixmap(enum fixed_addresses idx, pte_t pte);
void native_set_fixmap(enum fixed_addresses idx, void native_set_fixmap(enum fixed_addresses idx,
unsigned long phys, pgprot_t flags); phys_addr_t phys, pgprot_t flags);
#ifndef CONFIG_PARAVIRT #ifndef CONFIG_PARAVIRT
static inline void __set_fixmap(enum fixed_addresses idx, static inline void __set_fixmap(enum fixed_addresses idx,
unsigned long phys, pgprot_t flags) phys_addr_t phys, pgprot_t flags)
{ {
native_set_fixmap(idx, phys, flags); native_set_fixmap(idx, phys, flags);
} }

6
arch/x86/include/asm/io.h
View File

@@ -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_init(void);
extern void early_ioremap_reset(void); extern void early_ioremap_reset(void);
extern void __iomem *early_ioremap(unsigned long offset, unsigned long size); extern void __iomem *early_ioremap(resource_size_t phys_addr,
extern void __iomem *early_memremap(unsigned long offset, unsigned long size); unsigned long size);
extern void __iomem *early_memremap(resource_size_t phys_addr,
unsigned long size);
extern void early_iounmap(void __iomem *addr, unsigned long size); extern void early_iounmap(void __iomem *addr, unsigned long size);
#define IO_SPACE_LIMIT 0xffff #define IO_SPACE_LIMIT 0xffff

4
arch/x86/include/asm/paravirt.h
View File

@@ -347,7 +347,7 @@ struct pv_mmu_ops {
/* Sometimes the physical address is a pfn, and sometimes its /* Sometimes the physical address is a pfn, and sometimes its
an mfn. We can tell which is which from the index. */ an mfn. We can tell which is which from the index. */
void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
unsigned long phys, pgprot_t flags); phys_addr_t phys, pgprot_t flags);
}; };
struct raw_spinlock; struct raw_spinlock;
@@ -1432,7 +1432,7 @@ static inline void arch_leave_lazy_mmu_mode(void)
void arch_flush_lazy_mmu_mode(void); void arch_flush_lazy_mmu_mode(void);
static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
unsigned long phys, pgprot_t flags) phys_addr_t phys, pgprot_t flags)
{ {
pv_mmu_ops.set_fixmap(idx, phys, flags); pv_mmu_ops.set_fixmap(idx, phys, flags);
} }

23
arch/x86/mm/ioremap.c
View File

@@ -547,7 +547,7 @@ void __init early_ioremap_reset(void)
} }
static void __init __early_set_fixmap(enum fixed_addresses idx, 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); unsigned long addr = __fix_to_virt(idx);
pte_t *pte; 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, 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) if (after_paging_init)
__set_fixmap(idx, phys, prot); __set_fixmap(idx, phys, prot);
@@ -607,9 +607,10 @@ static int __init check_early_ioremap_leak(void)
late_initcall(check_early_ioremap_leak); late_initcall(check_early_ioremap_leak);
static void __init __iomem * 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; unsigned int nrpages;
enum fixed_addresses idx0, idx; enum fixed_addresses idx0, idx;
int i, slot; int i, slot;
@@ -625,15 +626,15 @@ __early_ioremap(unsigned long phys_addr, unsigned long size, pgprot_t prot)
} }
if (slot < 0) { if (slot < 0) {
printk(KERN_INFO "early_iomap(%08lx, %08lx) not found slot\n", printk(KERN_INFO "early_iomap(%08llx, %08lx) not found slot\n",
phys_addr, size); (u64)phys_addr, size);
WARN_ON(1); WARN_ON(1);
return NULL; return NULL;
} }
if (early_ioremap_debug) { if (early_ioremap_debug) {
printk(KERN_INFO "early_ioremap(%08lx, %08lx) [%d] => ", printk(KERN_INFO "early_ioremap(%08llx, %08lx) [%d] => ",
phys_addr, size, slot); (u64)phys_addr, size, slot);
dump_stack(); dump_stack();
} }
@@ -680,13 +681,15 @@ __early_ioremap(unsigned long phys_addr, unsigned long size, pgprot_t prot)
} }
/* Remap an IO device */ /* 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); return __early_ioremap(phys_addr, size, PAGE_KERNEL_IO);
} }
/* Remap memory */ /* 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); return __early_ioremap(phys_addr, size, PAGE_KERNEL);
} }

3
arch/x86/mm/pgtable.c
View File

@@ -345,7 +345,8 @@ void __native_set_fixmap(enum fixed_addresses idx, pte_t pte)
fixmaps_set++; fixmaps_set++;
} }
void native_set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t flags) void native_set_fixmap(enum fixed_addresses idx, phys_addr_t phys,
pgprot_t flags)
{ {
__native_set_fixmap(idx, pfn_pte(phys >> PAGE_SHIFT, flags)); __native_set_fixmap(idx, pfn_pte(phys >> PAGE_SHIFT, flags));
} }

2
arch/x86/xen/mmu.c
View File

@@ -1750,7 +1750,7 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
} }
#endif /* CONFIG_X86_64 */ #endif /* CONFIG_X86_64 */
static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot) static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
{ {
pte_t pte; pte_t pte;