x86: let 'reservetop' functioning right
PATCH v3 1/1 x86: let 'reservetop' functioning right
When specify 'reservetop=0xbadc0de' kernel parameter, the kernel will stop booting due to a early_ioremap bug that relate to commit 8827247ff.
The root cause of boot failure problem is the value of 'slot_virt[i]' was initialized in setup_arch->early_ioremap_init. But later in setup_arch, the function 'parse_early_param' will modify 'FIXADDR_TOP' when 'reservetop=0xbadc0de' being specified.
The simplest fix might be use __fix_to_virt(idx0) to get updated value of 'FIXADDR_TOP' in '__early_ioremap' instead of reference old value from slot_virt[slot] directly.
Changelog since v0:
-v1: When reservetop being handled then FIXADDR_TOP get adjusted, Hence check prev_map then re-initialize slot_virt and PMD based on new FIXADDR_TOP.
-v2: place fixup_early_ioremap hence call early_ioremap_init in reserve_top_address to re-initialize slot_virt and corresponding PMD when parse_reservertop
-v3: move fixup_early_ioremap out of reserve_top_address to make sure other clients of reserve_top_address like xen/lguest won't broken
---
Hi all,
Just resend the patch according to Ingo's demand.
Thanks.
arch/x86/include/asm/io.h | 1 + arch/x86/mm/ioremap.c | 15 +++++++++++++++ arch/x86/mm/pgtable_32.c | 1 + 3 files changed, 17 insertions(+), 0 deletions(-)
arch/x86/include/asm/io.h +1 -0
@@ -347,6 +347,7 @@ extern void __iomem *early_ioremap(resource_size_t phys_addr,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 fixup_early_ioremap (void );#define IO_SPACE_LIMIT 0xffff
arch/x86/mm/ioremap.c +15 -0
@@ -448,6 +448,21 @@ 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 ; +void __init fixup_early_ioremap (void ) +{ +int i; +for (i =0 ; i <FIX_BTMAPS_SLOTS ; i++) { +if (prev_map[i]) +break ; + } + +if (i <FIX_BTMAPS_SLOTS ) +BUG_ON (1 ); + +early_ioremap_init (); +return ; +} +static int __init check_early_ioremap_leak (void ) {int count =0 ;
arch/x86/mm/pgtable_32.c +1 -0
@@ -128,6 +128,7 @@ static int __init parse_reservetop(char *arg) address =memparse (arg, &arg);reserve_top_address (address); +fixup_early_ioremap ();return 0 ; }early_param ("reservetop" , parse_reservetop);
Signature · 1 line
1.6.6
[tip:x86/urgent] x86: Fix 'reservetop=' functionality
Commit-ID: e67a807f3d9a82fa91817871f1c0e2e04da993b8 Gitweb: http://git.kernel.org/tip/e67a807f3d9a82fa91817871f1c0e2e04da993b8 Author: Liang Li <[email protected]> AuthorDate: Fri, 30 Apr 2010 18:01:51 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 30 Apr 2010 12:19:53 +0200
x86: Fix 'reservetop=' functionality
When specifying the 'reservetop=0xbadc0de' kernel parameter, the kernel will stop booting due to a early_ioremap bug that relates to commit 8827247ff.
The root cause of boot failure problem is the value of 'slot_virt[i]' was initialized in setup_arch->early_ioremap_init(). But later in setup_arch, the function 'parse_early_param' will modify 'FIXADDR_TOP' when 'reservetop=0xbadc0de' being specified.
The simplest fix might be use __fix_to_virt(idx0) to get updated value of 'FIXADDR_TOP' in '__early_ioremap' instead of reference old value from slot_virt[slot] directly.
Changelog since v0:
-v1: When reservetop being handled then FIXADDR_TOP get
adjusted, Hence check prev_map then re-initialize slot_virt and PMD based on new FIXADDR_TOP.
-v2: place fixup_early_ioremap hence call early_ioremap_init in
reserve_top_address to re-initialize slot_virt and corresponding PMD when parse_reservertop
-v3: move fixup_early_ioremap out of reserve_top_address to make
sure other clients of reserve_top_address like xen/lguest won't broken
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/io.h | 1 + arch/x86/mm/ioremap.c | 14 ++++++++++++++ arch/x86/mm/pgtable_32.c | 1 + 3 files changed, 16 insertions(+), 0 deletions(-)
arch/x86/include/asm/io.h +1 -0
@@ -347,6 +347,7 @@ extern void __iomem *early_ioremap(resource_size_t phys_addr,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 fixup_early_ioremap (void );#define IO_SPACE_LIMIT 0xffff
arch/x86/mm/ioremap.c +14 -0
@@ -448,6 +448,20 @@ 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 ; +void __init fixup_early_ioremap (void ) +{ +int i; + +for (i =0 ; i <FIX_BTMAPS_SLOTS ; i++) { +if (prev_map[i]) { +WARN_ON (1 ); +break ; + } + } + +early_ioremap_init (); +} +static int __init check_early_ioremap_leak (void ) {int count =0 ;
arch/x86/mm/pgtable_32.c +1 -0
@@ -128,6 +128,7 @@ static int __init parse_reservetop(char *arg) address =memparse (arg, &arg);reserve_top_address (address); +fixup_early_ioremap ();return 0 ; }early_param ("reservetop" , parse_reservetop);
Ingo Molnar
Tested-by Konrad Rzeszutek Wilk Acked-by Yinghai Lu Acked-by Jeremy Fitzhardinge on v3 1/1 AppliedQuoted 37 lines · Liang Li
When specify 'reservetop=0xbadc0de' kernel parameter, the kernel will stop booting due to a
early_ioremapbug that relate to commit8827247ff.The root cause of boot failure problem is the value of 'slot_virt[i]' was initialized in
setup_arch->early_ioremap_init. But later insetup_arch, the function 'parse_early_param' will modify 'FIXADDR_TOP' when 'reservetop=0xbadc0de' being specified.The simplest fix might be use
__fix_to_virt(idx0)to get updated value of 'FIXADDR_TOP' in '__early_ioremap' instead of reference old value from slot_virt[slot] directly.Changelog since v0:
-v1: When reservetop being handled then
FIXADDR_TOPget adjusted, Hence checkprev_mapthen re-initializeslot_virtand PMD based on newFIXADDR_TOP.-v2: place
fixup_early_ioremaphence callearly_ioremap_initinreserve_top_addressto re-initializeslot_virtand corresponding PMD whenparse_reservertop-v3: move
fixup_early_ioremapout ofreserve_top_addressto make sure other clients ofreserve_top_addresslike xen/lguest won't brokenSigned-off-by Liang Li <[email protected]>Cc Wang Chen <[email protected]>Cc Ingo Molnar <[email protected]>Cc Thomas Gleixner <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Andrew Morton <[email protected]>Acked-by Yinghai Lu <[email protected]>---
Hi all,
Quoted 7 lines
Just resend the patch according to Ingo's demand.
Thanks.arch/x86/include/asm/io.h | 1 + arch/x86/mm/ioremap.c | 15 +++++++++++++++ arch/x86/mm/pgtable_32.c | 1 + 3 files changed, 17 insertions(+), 0 deletions(-)
Applied, thanks. Note, i cleaned up the fixup_early_ioremap() code (and changed the BUG_ON to WARN_ON - we dont want to crash the box), mind double checking the end result? See the commit below.
Ingo
----------------->
Quoted 1 line
From
e67a807f3d9a82fa91817871f1c0e2e04da993b8Mon Sep 17 00:00:00 2001
From: Liang Li <[email protected]>
Date: Fri, 30 Apr 2010 18:01:51 +0800
Subject: [PATCH] x86: Fix 'reservetop=' functionality
When specifying the 'reservetop=0xbadc0de' kernel parameter, the kernel will stop booting due to a early_ioremap bug that relates to commit 8827247ff.
The root cause of boot failure problem is the value of 'slot_virt[i]' was initialized in setup_arch->early_ioremap_init(). But later in setup_arch, the function 'parse_early_param' will modify 'FIXADDR_TOP' when 'reservetop=0xbadc0de' being specified.
The simplest fix might be use __fix_to_virt(idx0) to get updated value of 'FIXADDR_TOP' in '__early_ioremap' instead of reference old value from slot_virt[slot] directly.
Changelog since v0:
-v1: When reservetop being handled then FIXADDR_TOP get
adjusted, Hence check prev_map then re-initialize slot_virt and PMD based on new FIXADDR_TOP.
-v2: place fixup_early_ioremap hence call early_ioremap_init in
reserve_top_address to re-initialize slot_virt and corresponding PMD when parse_reservertop
-v3: move fixup_early_ioremap out of reserve_top_address to make
sure other clients of reserve_top_address like xen/lguest won't broken
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/io.h | 1 + arch/x86/mm/ioremap.c | 14 ++++++++++++++ arch/x86/mm/pgtable_32.c | 1 + 3 files changed, 16 insertions(+), 0 deletions(-)
arch/x86/include/asm/io.h +1 -0
@@ -347,6 +347,7 @@ extern void __iomem *early_ioremap(resource_size_t phys_addr,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 fixup_early_ioremap (void );#define IO_SPACE_LIMIT 0xffff
arch/x86/mm/ioremap.c +14 -0
@@ -448,6 +448,20 @@ 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 ; +void __init fixup_early_ioremap (void ) +{ +int i; + +for (i =0 ; i <FIX_BTMAPS_SLOTS ; i++) { +if (prev_map[i]) { +WARN_ON (1 ); +break ; + } + } + +early_ioremap_init (); +} +static int __init check_early_ioremap_leak (void ) {int count =0 ;
arch/x86/mm/pgtable_32.c +1 -0
@@ -128,6 +128,7 @@ static int __init parse_reservetop(char *arg) address =memparse (arg, &arg);reserve_top_address (address); +fixup_early_ioremap ();return 0 ; }early_param ("reservetop" , parse_reservetop);
Quoted 43 lines · Ingo Molnar
Quoted 40 lines · Liang Li
When specify 'reservetop=0xbadc0de' kernel parameter, the kernel will stop booting due to a
early_ioremapbug that relate to commit8827247ff.The root cause of boot failure problem is the value of 'slot_virt[i]' was initialized in
setup_arch->early_ioremap_init. But later insetup_arch, the function 'parse_early_param' will modify 'FIXADDR_TOP' when 'reservetop=0xbadc0de' being specified.The simplest fix might be use
__fix_to_virt(idx0)to get updated value of 'FIXADDR_TOP' in '__early_ioremap' instead of reference old value from slot_virt[slot] directly.Changelog since v0:
-v1: When reservetop being handled then
FIXADDR_TOPget adjusted, Hence checkprev_mapthen re-initializeslot_virtand PMD based on newFIXADDR_TOP.-v2: place
fixup_early_ioremaphence callearly_ioremap_initinreserve_top_addressto re-initializeslot_virtand corresponding PMD whenparse_reservertop-v3: move
fixup_early_ioremapout ofreserve_top_addressto make sure other clients ofreserve_top_addresslike xen/lguest won't brokenSigned-off-by Liang Li <[email protected]>Cc Wang Chen <[email protected]>Cc Ingo Molnar <[email protected]>Cc Thomas Gleixner <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Andrew Morton <[email protected]>Acked-by Yinghai Lu <[email protected]>---
Hi all,Just resend the patch according to Ingo's demand.
Thanks.
Quoted 8 lines
Quoted 4 lines
arch/x86/include/asm/io.h | 1 + arch/x86/mm/ioremap.c | 15 +++++++++++++++ arch/x86/mm/pgtable_32.c | 1 + 3 files changed, 17 insertions(+), 0 deletions(-)Applied, thanks. Note, i cleaned up the
fixup_early_ioremap()code (and changed theBUG_ONtoWARN_ON- we dont want to crash the box), mind double checking the end result? See the commit below.
Checked. It is fine. Thanks. :)
Regards,
-Liang Li
Quoted 101 lines
Ingo
----------------->
Quoted 1 line
From
e67a807f3d9a82fa91817871f1c0e2e04da993b8Mon Sep 17 00:00:00 2001From: Liang Li <[email protected]>
Date: Fri, 30 Apr 2010 18:01:51 +0800
Subject: [PATCH] x86: Fix 'reservetop=' functionalityWhen specifying the 'reservetop=0xbadc0de' kernel parameter, the kernel will stop booting due to a
early_ioremapbug that relates to commit8827247ff.The root cause of boot failure problem is the value of 'slot_virt[i]' was initialized in
setup_arch->early_ioremap_init(). But later insetup_arch, the function 'parse_early_param' will modify 'FIXADDR_TOP' when 'reservetop=0xbadc0de' being specified.The simplest fix might be use
__fix_to_virt(idx0)to get updated value of 'FIXADDR_TOP' in '__early_ioremap' instead of reference old value from slot_virt[slot] directly.Changelog since v0:
(quoted diff) +0
-3-v1: When reservetop being handled then FIXADDR_TOP get adjusted, Hence check prev_map then re-initialize slot_virt and PMD based on new FIXADDR_TOP. -v2: place fixup_early_ioremap hence call early_ioremap_init in reserve_top_address to re-initialize slot_virt and corresponding PMD when parse_reservertop -v3: move fixup_early_ioremap out of reserve_top_address to make sure other clients of reserve_top_address like xen/lguest won't brokenSigned-off-by Liang Li <[email protected]>Acked-by Yinghai Lu <[email protected]>Cc Wang Chen <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Andrew Morton <[email protected]>LKML-Reference: <[email protected]>
[ fixed three small cleanliness details in fixup_early_ioremap() ]Signed-off-by Ingo Molnar <[email protected]>--- arch/x86/include/asm/io.h | 1 + arch/x86/mm/ioremap.c | 14 ++++++++++++++ arch/x86/mm/pgtable_32.c | 1 + 3 files changed, 16 insertions(+), 0 deletions(-)arch/x86/include/asm/io.h +1
-0@@ -347,6 +347,7 @@ extern void __iomem *early_ioremap(resource_size_t phys_addr,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 fixup_early_ioremap (void );#define IO_SPACE_LIMIT 0xffffarch/x86/mm/ioremap.c +14
-0@@ -448,6 +448,20 @@ 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 ; +void __init fixup_early_ioremap (void ) +{ +int i; + +for (i =0 ; i <FIX_BTMAPS_SLOTS ; i++) { +if (prev_map[i]) { +WARN_ON (1 ); +break ; + } + } + +early_ioremap_init (); +} +static int __init check_early_ioremap_leak (void ) {int count =0 ;arch/x86/mm/pgtable_32.c +1
-0@@ -128,6 +128,7 @@ static int __init parse_reservetop(char *arg) address =memparse (arg, &arg);reserve_top_address (address); +fixup_early_ioremap ();return 0 ; }early_param ("reservetop" , parse_reservetop);
[tip:x86/urgent] x86: Fix parse_reservetop() build failure on certain configs
In reply to Liang LiCommit-ID: 56f0e74c9cf98941af700b61466648a2d06277bb Gitweb: http://git.kernel.org/tip/56f0e74c9cf98941af700b61466648a2d06277bb Author: Ingo Molnar <[email protected]> AuthorDate: Mon, 3 May 2010 09:19:43 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 3 May 2010 09:22:19 +0200
x86: Fix parse_reservetop() build failure on certain configs
Commit e67a807 ("x86: Fix 'reservetop=' functionality") added a fixup_early_ioremap() call to parse_reservetop() and declared it in io.h.
But asm/io.h was only included indirectly - and on some configs not at all, causing a build failure on those configs.
Cc: Liang Li <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Yinghai Lu <[email protected]>
Cc: Jeremy Fitzhardinge <[email protected]>
Cc: Wang Chen <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Andrew Morton <[email protected]>
LKML-Reference: <[email protected]>
--- arch/x86/mm/pgtable_32.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/x86/mm/pgtable_32.c +1 -0
@@ -18,6 +18,7 @@#include <asm/e820.h> #include <asm/tlb.h> #include <asm/tlbflush.h> +#include <asm/io.h> unsigned int __VMALLOC_RESERVE =128 <<20 ;