linux/x86: Initialize high_memory as early as possible
PATCH 1/1 linux/x86: Initialize high_memory as early as possible
Also all other variables dependent on the same input(s). This is a prerequisite patch for two ones to follow. I will post a similar change for mainline Linux soon.
linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c +8 -0
@@ -1210,6 +1210,14 @@ static unsigned long __init setup_memory }printk (KERN_NOTICE "%ldMB HIGHMEM available.\n" ,pages_to_mb (highend_pfn - highstart_pfn)); + num_physpages = highend_pfn; + high_memory = (void *)__va (highstart_pfn *PAGE_SIZE -1 ) +1 ; +#else + num_physpages = max_low_pfn; + high_memory = (void *)__va (max_low_pfn *PAGE_SIZE -1 ) +1 ; +#endif +#ifdef CONFIG_FLATMEM + max_mapnr = num_physpages;#endif printk (KERN_NOTICE "%ldMB LOWMEM available.\n" ,pages_to_mb (max_low_pfn));
linux-2.6-xen-sparse/arch/i386/mm/init-xen.c +0 -19
@@ -600,18 +600,6 @@ static void __init test_wp_bit(void) } } -static void __init set_max_mapnr_init (void ) -{ -#ifdef CONFIG_HIGHMEM - num_physpages = highend_pfn; -#else - num_physpages = max_low_pfn; -#endif -#ifdef CONFIG_FLATMEM - max_mapnr = num_physpages; -#endif -} -static struct kcore_list kcore_mem, kcore_vmalloc;void __init mem_init (void )
@@ -648,13 +636,6 @@ void __init mem_init(void) }#endif -set_max_mapnr_init (); - -#ifdef CONFIG_HIGHMEM - high_memory = (void *)__va (highstart_pfn *PAGE_SIZE -1 ) +1 ; -#else - high_memory = (void *)__va (max_low_pfn *PAGE_SIZE -1 ) +1 ; -#endif printk ("vmalloc area: %lx-%lx, maxmem %lx\n" ,VMALLOC_START ,VMALLOC_END ,MAXMEM );BUG_ON (VMALLOC_START >VMALLOC_END );
linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c +5 -0
@@ -706,6 +706,11 @@ void __init setup_arch(char **cmdline_p)* we are rounding upwards: */ end_pfn =e820_end_of_ram (); +/* How many end-of-memory variables you have, grandma! */ + max_low_pfn = end_pfn; + max_pfn = end_pfn; + num_physpages = end_pfn; + high_memory = (void *)__va (end_pfn *PAGE_SIZE -1 ) +1 ;check_efer ();
linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c +0 -6
@@ -894,12 +894,6 @@ void __init mem_init(void)#endif no_iommu_init (); -/* How many end-of-memory variables you have, grandma! */ - max_low_pfn = end_pfn; - max_pfn = end_pfn; - num_physpages = end_pfn; - high_memory = (void *)__va (end_pfn *PAGE_SIZE ); -/* clear the zero-page */ memset (empty_zero_page,0 ,PAGE_SIZE );
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 4 lines · Jan Beulich
Also all other variables dependent on the same input(s). This is a prerequisite patch for two ones to follow. I will post a similar change for mainline Linux soon.
Signed-off-by [email protected]
Is this just for the usage in kunmap_atomic? Why did you change that, by the way: FIXADDR_START looked like a safe enough test to me.
-- Keir
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Keir Fraser <[email protected]> 29.06.06 15:55 >>>
Quoted 5 lines · Jan Beulich
Also all other variables dependent on the same input(s). This is a prerequisite patch for two ones to follow. I will
post a similar change for mainline Linux soon.Signed-off-by [email protected]Is this just for the usage in
kunmap_atomic? Why did you change that,
Not only, also for the added check in xen_{create,destroy}_contiguous_region in another of the patches just sent.
Quoted 1 line
by the way:
FIXADDR_STARTlooked like a safe enough test to me.
This didn't seem safe enough to me, and apparently also not to the original author (at least I attribute the FIXME comment to this) - after all not everything before FIXADDR_START is high memory.
One could say that under DEBUG_HIGHMEM the check should be more strict (so that the subsequent BUG() condition fires in more broken cases), but without DEBUG_HIGHMEM it might be left as-is to avoid zapping incorrect page table entries.
Jan
Quoted 7 lines · Jan Beulich
This didn't seem safe enough to me, and apparently also not to the original author (at least I attribute the FIXME comment to this) - after all not everything before
FIXADDR_STARTis high memory.
One could say that underDEBUG_HIGHMEMthe check should be more strict (so that the subsequentBUG()condition fires in more broken cases), but withoutDEBUG_HIGHMEMit might be left as-is to avoid zapping incorrect page table entries.
Any kmap_atomic virtual address should be above FIXADDR_START. You have a point about debugging though (e.g., passing a non-atomic kmap address to kunmap_atomic).
-- Keir