x86, e820: clean up around sanitize_e820_map()
PATCH 1/1 x86, e820: clean up around sanitize_e820_map()
The argument 3 of sanitize_e820_map() will only update upon a successful sanitization. Some of the callers may not be aware of this in the past. Now clean up these callers.
--- arch/x86/kernel/e820.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)
arch/x86/kernel/e820.c +6 -16
@@ -185,7 +185,7 @@ void __init e820_print_map(char *who)* * The integer pointed to by pnr_map must be valid on entry (the * current number of valid entries located at biosmap) and will -* be updated on return, with the new number of valid entries +* only be updated on return 0, with the new number of valid entries * (something no more than max_nr_map.) * * The return value from sanitize_e820_map() is zero if it
@@ -561,23 +561,15 @@ u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type,void __init update_e820 (void ) { -u32 nr_map; - - nr_map = e820.nr_map; -if (sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &nr_map)) +if (sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &e820.nr_map))return ; - e820.nr_map = nr_map;printk (KERN_INFO "e820: modified physical RAM map:\n" );e820_print_map ("modified" ); }static void __init update_e820_saved (void ) { -u32 nr_map; - - nr_map = e820_saved.nr_map; -if (sanitize_e820_map (e820_saved.map,ARRAY_SIZE (e820_saved.map), &nr_map)) -return ; - e820_saved.nr_map = nr_map; +sanitize_e820_map (e820_saved.map,ARRAY_SIZE (e820_saved.map), + &e820_saved.nr_map); }#define MAX_GAP_END 0x100000000ull/*
@@ -898,11 +890,9 @@ early_param("memmap", parse_memmap_opt);void __init finish_e820_parsing (void ) {if (userdef) { -u32 nr = e820.nr_map; - -if (sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &nr) <0 ) +if (sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), + &e820.nr_map) <0 )early_panic ("Invalid user supplied memory map" ); - e820.nr_map = nr;printk (KERN_INFO "e820: user-defined physical RAM map:\n" );e820_print_map ("user" );
Signature · 1 line
2.1.0
Quoted 5 lines · WANG Chao
The argument 3 of
sanitize_e820_map()will only update upon a successful sanitization. Some of the callers may not be aware of this in the past. Now clean up these callers.Signed-off-by WANG Chao <[email protected]>
Nice, but it's incomplete: it should also cleanup default_machine_specific_memory_setup(). After that's fixed, feel free to add my
Hi, David
Quoted 10 lines · David Rientjes
Quoted 5 lines · WANG Chao
The argument 3 of
sanitize_e820_map()will only update upon a successful sanitization. Some of the callers may not be aware of this in the past. Now clean up these callers.Signed-off-by WANG Chao <[email protected]>Nice, but it's incomplete: it should also cleanup
default_machine_specific_memory_setup().
default_machine_specific_memory_setup() is special. Because boot_params.e820_entries is 8bit unsigned, and sanitize_e820_map() which takes 32bit unsigned, will step on other member of boot_params next to e820_entries.
Thanks
WANG Chao
tip-bot for WANG Chao
merge bot[tip:x86/mm] x86, e820: Clean up sanitize_e820_map() users
In reply to WANG Chaox86, e820: Clean up sanitize_e820_map() users
Commit-ID: d574ffa1066003569ed5cdaeabf44597564ce975 Gitweb: http://git.kernel.org/tip/d574ffa1066003569ed5cdaeabf44597564ce975 Author: WANG Chao <[email protected]> AuthorDate: Wed, 7 Jan 2015 11:37:38 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 23 Jan 2015 16:14:27 +0100
x86, e820: Clean up sanitize_e820_map() users
The argument 3 of sanitize_e820_map() will only be updated upon a successful sanitization. Some of the callers have extra conditionals for the same purpose. Clean them up.
default_machine_specific_memory_setup() must keep the extra conditional because boot_params.e820_entries is an u8 and not an u32, so the direct update would overwrite other fields in boot_params.
[ tglx: Massaged changelog ]
--- arch/x86/kernel/e820.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-)
arch/x86/kernel/e820.c +8 -18
@@ -184,9 +184,9 @@ void __init e820_print_map(char *who)* overwritten in the same location, starting at biosmap. * * The integer pointed to by pnr_map must be valid on entry (the -* current number of valid entries located at biosmap) and will -* be updated on return, with the new number of valid entries -* (something no more than max_nr_map.) +* current number of valid entries located at biosmap). If the +* sanitizing succeeds the *pnr_map will be updated with the new +* number of valid entries (something no more than max_nr_map). * * The return value from sanitize_e820_map() is zero if it * successfully 'sanitized' the map entries passed in, and is -1
@@ -561,23 +561,15 @@ u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type,void __init update_e820 (void ) { -u32 nr_map; - - nr_map = e820.nr_map; -if (sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &nr_map)) +if (sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &e820.nr_map))return ; - e820.nr_map = nr_map;printk (KERN_INFO "e820: modified physical RAM map:\n" );e820_print_map ("modified" ); }static void __init update_e820_saved (void ) { -u32 nr_map; - - nr_map = e820_saved.nr_map; -if (sanitize_e820_map (e820_saved.map,ARRAY_SIZE (e820_saved.map), &nr_map)) -return ; - e820_saved.nr_map = nr_map; +sanitize_e820_map (e820_saved.map,ARRAY_SIZE (e820_saved.map), + &e820_saved.nr_map); }#define MAX_GAP_END 0x100000000ull/*
@@ -898,11 +890,9 @@ early_param("memmap", parse_memmap_opt);void __init finish_e820_parsing (void ) {if (userdef) { -u32 nr = e820.nr_map; - -if (sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &nr) <0 ) +if (sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), + &e820.nr_map) <0 )early_panic ("Invalid user supplied memory map" ); - e820.nr_map = nr;printk (KERN_INFO "e820: user-defined physical RAM map:\n" );e820_print_map ("user" );