Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b987aeb authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

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: default avatarMasami Hiramatsu <mhiramat@redhat.com>
Acked-by: default avatarMathieu 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: default avatarIngo Molnar <mingo@elte.hu>
parent a0d22f48

arch/x86/include/asm/fixmap.h

+2 −2
Original line number Diff line number Diff line
@@ -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,

		       unsigned long phys, pgprot_t flags);

		       phys_addr_t phys, pgprot_t flags);



#ifndef CONFIG_PARAVIRT

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);

}

arch/x86/include/asm/io.h

+4 −2
Original line number Diff line number Diff line
@@ -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);

extern void early_iounmap(void __iomem *addr, unsigned long size);



#define IO_SPACE_LIMIT 0xffff

arch/x86/include/asm/paravirt.h

+2 −2
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ struct pv_mmu_ops { 
	/* Sometimes the physical address is a pfn, and sometimes its

	   an mfn.  We can tell which is which from the index. */

	void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,

			   unsigned long phys, pgprot_t flags);

			   phys_addr_t phys, pgprot_t flags);

};



struct raw_spinlock;
@@ -1432,7 +1432,7 @@ static inline void arch_leave_lazy_mmu_mode(void) 
void arch_flush_lazy_mmu_mode(void);



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);

}

arch/x86/mm/ioremap.c

+13 −10
Original line number Diff line number Diff line
@@ -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);

}

arch/x86/mm/pgtable.c

+2 −1
Original line number Diff line number Diff line
@@ -345,7 +345,8 @@ void __native_set_fixmap(enum fixed_addresses idx, pte_t pte) 
	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));

}