x86: dont' define __this_fixmap_does_not_exist
Commit "1b42f51630c7eebce6fb780b480731eb81afd325" defined __this_fixmap_does_not_exist().
This causes linker can't report error when __this_fixmap_does_not_exist() be called with not-constant parameter.
Ingo defined __this_fixmap_does_not_exist() because he want to get virt addresses of fix memory of nest level by non-constant index. After defining __this_fixmap_does_not_exist(), he made the linker stopped complaining "undefined symbol".
How to fix:
The fixmaps are fixed, so we can get the four slot virt addresses on link time and store them to array slot_virt.
Then we can refer the slot_virt with non-constant index.
--- arch/x86/mm/ioremap.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-)
arch/x86/mm/ioremap.c +6 -7
@@ -508,13 +508,17 @@ static inline pte_t * __init early_ioremap_pte(unsigned long addr)return &bm_pte[pte_index (addr)]; } +static unsigned long slot_virt[FIX_BTMAPS_SLOTS ]__initdata ;void __init early_ioremap_init (void ) {pmd_t *pmd; +int i;if (early_ioremap_debug)printk (KERN_INFO "early_ioremap_init()\n" ); +for (i =0 ; i <FIX_BTMAPS_SLOTS ; i++) + slot_virt[i] =fix_to_virt (FIX_BTMAP_BEGIN -NR_FIX_BTMAPS *i); pmd =early_ioremap_pmd (fix_to_virt (FIX_BTMAP_BEGIN ));memset (bm_pte,0 ,sizeof (bm_pte));pmd_populate_kernel (&init_mm, pmd, bm_pte);
@@ -668,9 +672,9 @@ static void __init __iomem *__early_ioremap(unsigned long phys_addr, unsigned lo --nrpages; }if (early_ioremap_debug) -printk (KERN_CONT "%08lx + %08lx\n" , offset,fix_to_virt (idx0)); +printk (KERN_CONT "%08lx + %08lx\n" , offset, slot_virt[slot]); - prev_map[slot] = (void __iomem *)(offset +fix_to_virt (idx0)); + prev_map[slot] = (void __iomem *)(offset + slot_virt[slot]);return prev_map[slot]; }
@@ -738,8 +742,3 @@ void __init early_iounmap(void __iomem *addr, unsigned long size) } prev_map[slot] =NULL ; } - -void __this_fixmap_does_not_exist (void ) -{ -WARN_ON (1 ); -}
Signature · 1 line
1.5.3.4
[tip:x86/fixmap] x86: don't define __this_fixmap_does_not_exist()
Commit-ID: 8827247ffcc9e880cbe4705655065cf011265157 Gitweb: http://git.kernel.org/tip/8827247ffcc9e880cbe4705655065cf011265157 Author: "Wang Chen" <[email protected]> AuthorDate: Sat, 7 Mar 2009 13:34:19 +0800 Commit: Ingo Molnar <[email protected]> CommitDate: Sun, 8 Mar 2009 17:07:47 +0100
x86: don't define __this_fixmap_does_not_exist()
Impact: improve out-of-range fixmap index debugging
Commit "1b42f51630c7eebce6fb780b480731eb81afd325" defined the __this_fixmap_does_not_exist() function with a WARN_ON(1) in it.
This causes the linker to not report an error when __this_fixmap_does_not_exist() is called with a non-constant parameter.
Ingo defined __this_fixmap_does_not_exist() because he wanted to get virt addresses of fix memory of nest level by non-constant index.
But we can fix this and still keep the link-time check:
We can get the four slot virt addresses on link time and store them to array slot_virt[].
Then we can then refer the slot_virt with non-constant index, in the ioremap-leak detection code.
LKML-Reference: <[email protected]>
--- arch/x86/mm/ioremap.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-)
arch/x86/mm/ioremap.c +11 -8
@@ -504,13 +504,19 @@ static inline pte_t * __init early_ioremap_pte(unsigned long addr)return &bm_pte[pte_index (addr)]; } +static unsigned long slot_virt[FIX_BTMAPS_SLOTS ]__initdata ; +void __init early_ioremap_init (void ) {pmd_t *pmd; +int i;if (early_ioremap_debug)printk (KERN_INFO "early_ioremap_init()\n" ); +for (i =0 ; i <FIX_BTMAPS_SLOTS ; i++) + slot_virt[i] =fix_to_virt (FIX_BTMAP_BEGIN -NR_FIX_BTMAPS *i); + pmd =early_ioremap_pmd (fix_to_virt (FIX_BTMAP_BEGIN ));memset (bm_pte,0 ,sizeof (bm_pte));pmd_populate_kernel (&init_mm, pmd, bm_pte);
@@ -577,6 +583,7 @@ static inline void __init early_clear_fixmap(enum fixed_addresses idx)static void __iomem *prev_map[FIX_BTMAPS_SLOTS ]__initdata ;static unsigned long prev_size[FIX_BTMAPS_SLOTS ]__initdata ; +static int __init check_early_ioremap_leak (void ) {int count =0 ;
@@ -598,7 +605,8 @@ 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) +static void __init __iomem * +__early_ioremap (unsigned long phys_addr,unsigned long size,pgprot_t prot) {unsigned long offset, last_addr;unsigned int nrpages;
@@ -664,9 +672,9 @@ static void __init __iomem *__early_ioremap(unsigned long phys_addr, unsigned lo --nrpages; }if (early_ioremap_debug) -printk (KERN_CONT "%08lx + %08lx\n" , offset,fix_to_virt (idx0)); +printk (KERN_CONT "%08lx + %08lx\n" , offset, slot_virt[slot]); - prev_map[slot] = (void __iomem *)(offset +fix_to_virt (idx0)); + prev_map[slot] = (void __iomem *)(offset + slot_virt[slot]);return prev_map[slot]; }
@@ -734,8 +742,3 @@ void __init early_iounmap(void __iomem *addr, unsigned long size) } prev_map[slot] =NULL ; } - -void __this_fixmap_does_not_exist (void ) -{ -WARN_ON (1 ); -}