x86: early_memremap exact size of struct setup_data
PATCH 1/2 x86: early_memremap exact size of struct setup_data
When early remapping setup_data, we can remap the structure alone, use sizeof(struct setup_data). No need to remap a larger area, we never access setup_data->data at that point.
--- arch/x86/kernel/setup.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
arch/x86/kernel/setup.c +3 -5
@@ -431,15 +431,13 @@ static void __init parse_setup_data(void) pa_data = boot_params.hdr.setup_data;while (pa_data) { -u32 data_len, map_len, data_type; +u32 data_len, data_type; - map_len =max (PAGE_SIZE - (pa_data & ~PAGE_MASK ), - (u64 )sizeof (struct setup_data )); - data =early_memremap (pa_data, map_len); + data =early_memremap (pa_data,sizeof (*data)); data_len = data->len +sizeof (struct setup_data ); data_type = data->type; pa_next = data->next; -early_iounmap (data, map_len); +early_iounmap (data,sizeof (*data));switch (data_type) {case SETUP_E820_EXT :
Signature · 1 line
2.1.0
PATCH 2/2 x86: add macro for_each_setup_data()
A common task for parsing setup_data is to iterate over setup_data's linked list, remap and do something and unmap. Now add macro for_each_setup_data() to do that.
--- arch/x86/kernel/setup.c | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-)
arch/x86/kernel/setup.c +12 -25
@@ -424,35 +424,30 @@ static void __init reserve_initrd(void) }#endif /* CONFIG_BLK_DEV_INITRD */ +#define for_each_setup_data (pa_data, data) \ + for (pa_data = boot_params.hdr.setup_data; \ + pa_data && (data = early_memremap(pa_data, sizeof(*data))); \ + pa_data = data->next, early_iounmap(data, sizeof(*data))) +static void __init parse_setup_data (void ) {struct setup_data *data; -u64 pa_data, pa_next; - - pa_data = boot_params.hdr.setup_data; -while (pa_data) { -u32 data_len, data_type; - - data =early_memremap (pa_data,sizeof (*data)); - data_len = data->len +sizeof (struct setup_data ); - data_type = data->type; - pa_next = data->next; -early_iounmap (data,sizeof (*data)); +u64 pa_data; -switch (data_type) { +for_each_setup_data (pa_data, data) { +switch (data->type) {case SETUP_E820_EXT : -parse_e820_ext (pa_data, data_len); +parse_e820_ext (pa_data, data->len +sizeof (*data));break ;case SETUP_DTB :add_dtb (pa_data);break ;case SETUP_EFI : -parse_efi_setup (pa_data, data_len); +parse_efi_setup (pa_data, data->len +sizeof (*data));break ;default :break ; } - pa_data = pa_next; } }
@@ -462,14 +457,10 @@ static void __init e820_reserve_setup_data(void)u64 pa_data;int found =0 ; - pa_data = boot_params.hdr.setup_data; -while (pa_data) { - data =early_memremap (pa_data,sizeof (*data)); +for_each_setup_data (pa_data, data) {e820_update_range (pa_data,sizeof (*data)+data->len,E820_RAM ,E820_RESERVED_KERN ); found =1 ; - pa_data = data->next; -early_iounmap (data,sizeof (*data)); }if (!found)return ;
@@ -485,12 +476,8 @@ static void __init memblock_x86_reserve_range_setup_data(void)struct setup_data *data;u64 pa_data; - pa_data = boot_params.hdr.setup_data; -while (pa_data) { - data =early_memremap (pa_data,sizeof (*data)); +for_each_setup_data (pa_data, data) {memblock_reserve (pa_data,sizeof (*data) + data->len); - pa_data = data->next; -early_iounmap (data,sizeof (*data)); } }
Signature · 1 line
2.1.0
Re: [PATCH 2/2] x86: add macro for_each_setup_data()
arch/x86/kernel/setup.c static void __init reserve_initrd(void) · line 431
Quoted 5 lines · WANG Chao
arch/x86/kernel/setup.c +5
-0+#define for_each_setup_data (pa_data, data) \ + for (pa_data = boot_params.hdr.setup_data; \ + pa_data && (data = early_memremap(pa_data, sizeof(*data))); \ + pa_data = data->next, early_iounmap(data, sizeof(*data))) +
That makes the code obfuscated not clearer. Brain went into spiral mode.
struct setup_iter {
u64 pa_data, pa_next;
u32 len, type;
};....
{
struct setup_iter iter = { .pa_next = boot_params.hdr.setup_data };
while (get_next_setup_data(&iter)) {
switch (iter.type) {
case SETUP_E820_EXT:
parse_e820_ext(iter.pa_data, iter.len); ....
Perhaps?
Thanks,
tglx
tip-bot for WANG Chao
merge bot[tip:x86/mm] x86, setup: Let early_memremap() handle page alignment
In reply to WANG Chaox86, setup: Let early_memremap() handle page alignment
Commit-ID: 7389882c81474d635a208726edb22938645ff9ad Gitweb: http://git.kernel.org/tip/7389882c81474d635a208726edb22938645ff9ad Author: WANG Chao <[email protected]> AuthorDate: Wed, 7 Jan 2015 18:55:48 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 23 Jan 2015 16:14:26 +0100
x86, setup: Let early_memremap() handle page alignment
early_memremap() takes care of page alignment and map size, so we can just remap the required data size and get rid of the adjustments in the setup code.
[tglx: Massaged changelog ]
--- arch/x86/kernel/setup.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
arch/x86/kernel/setup.c +3 -5
@@ -431,15 +431,13 @@ static void __init parse_setup_data(void) pa_data = boot_params.hdr.setup_data;while (pa_data) { -u32 data_len, map_len, data_type; +u32 data_len, data_type; - map_len =max (PAGE_SIZE - (pa_data & ~PAGE_MASK ), - (u64 )sizeof (struct setup_data )); - data =early_memremap (pa_data, map_len); + data =early_memremap (pa_data,sizeof (*data)); data_len = data->len +sizeof (struct setup_data ); data_type = data->type; pa_next = data->next; -early_iounmap (data, map_len); +early_iounmap (data,sizeof (*data));switch (data_type) {case SETUP_E820_EXT :