41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
|
References: bnc#848014
|
||
|
|
|
||
|
|
# Commit a5db2c7aab7a638d84f22ac8fe5089d81175438b
|
||
|
|
# Date 2013-11-18 13:57:20 +0100
|
||
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
||
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
||
|
|
x86: consider modules when cutting off memory
|
||
|
|
|
||
|
|
The code in question runs after module ranges got already removed from
|
||
|
|
the E820 table, so when determining the new maximum page/PDX we need to
|
||
|
|
explicitly take them into account.
|
||
|
|
|
||
|
|
Furthermore we need to round up the ending addresses here, in order to
|
||
|
|
fully cover eventual partial trailing pages.
|
||
|
|
|
||
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
||
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
||
|
|
|
||
|
|
--- a/xen/arch/x86/setup.c
|
||
|
|
+++ b/xen/arch/x86/setup.c
|
||
|
|
@@ -1012,9 +1012,17 @@ void __init __start_xen(unsigned long mb
|
||
|
|
ASSERT(j);
|
||
|
|
}
|
||
|
|
map_e = boot_e820.map[j].addr + boot_e820.map[j].size;
|
||
|
|
- if ( (map_e >> PAGE_SHIFT) < max_page )
|
||
|
|
+ for ( j = 0; j < mbi->mods_count; ++j )
|
||
|
|
{
|
||
|
|
- max_page = map_e >> PAGE_SHIFT;
|
||
|
|
+ uint64_t end = pfn_to_paddr(mod[j].mod_start) +
|
||
|
|
+ mod[j].mod_end;
|
||
|
|
+
|
||
|
|
+ if ( map_e < end )
|
||
|
|
+ map_e = end;
|
||
|
|
+ }
|
||
|
|
+ if ( PFN_UP(map_e) < max_page )
|
||
|
|
+ {
|
||
|
|
+ max_page = PFN_UP(map_e);
|
||
|
|
max_pdx = pfn_to_pdx(max_page - 1) + 1;
|
||
|
|
}
|
||
|
|
printk(XENLOG_WARNING "Ignoring inaccessible memory range"
|