Run EFI in physical mode
Subsystems (4)
PATCH 1/1 Run EFI in physical mode
Hi all,
The attached patch enables EFI to run in physical mode.
Basically EFI is in physical mode at first and it's switched to virtual mode after calling SetVirtualAddressMap. By applying this patch, you can run EFI always in physical mode. And you can also specify "virtefi" as kernel boot parameter to run EFI in virtual mode as before. Note that this patch supports only x86_64.
This is needed to run kexec/kdump in EFI-booted system. The following is an original discussion. In this thread, I explained that kdump does not work because EFI system table is modified by SetVirtualAddressMap. And the idea to run EFI in physical mode was proposed. This patch implements it.
http://marc.info/?l=linux-kernel&m=128018221820234&w=2
Quoted 9 lines
When the 1st kernel boots, EFI system
table(efi_system_table_t)is modified by SetVirtualAddressMap, which is one of EFI runtime service. This runtime changes physical address in EFI system table to virtual address.When the 2nd kernel boots, it also receives the same EFI system table, and the address included in it is already virtual address(1st kernel rewrote it). But 2nd kernel does not know that, 2nd kernel thinks it is a physical address. This causes problems.
Basic idea of this patch is to create EFI own pagetable. This pagetable maps physical address of EFI runtime to the virtual address which is the same value so that we can call it directly. For example, physical address 0x800000 is mapped to virtual address 0x800000. Before calling EFI runtime, cr3 register is switched to this pagetable, and restored when we come back from EFI.
Any comments would be appreciated.
--- arch/x86/include/asm/efi.h | 3 arch/x86/kernel/efi.c | 142 ++++++++++++++++++++++++++++++++++- arch/x86/kernel/efi_32.c | 4 arch/x86/kernel/efi_64.c | 92 ++++++++++++++++++++++ include/linux/efi.h | 1 include/linux/init.h | 1 init/main.c | 16 +++ 7 files changed, 254 insertions(+), 5 deletions(-)
arch/x86/include/asm/efi.h +3 -0
@@ -93,6 +93,9 @@ extern int add_efi_memmap;extern void efi_reserve_early (void );extern void efi_call_phys_prelog (void );extern void efi_call_phys_epilog (void ); +extern void efi_call_phys_prelog_in_physmode (void ); +extern void efi_call_phys_epilog_in_physmode (void ); +extern void efi_pagetable_init (void );#ifndef CONFIG_EFI /*
arch/x86/kernel/efi.c +140 -2
178 lines not on this page · raw message
arch/x86/kernel/efi_32.c +4 -0
@@ -110,3 +110,7 @@ void efi_call_phys_epilog(void)local_irq_restore (efi_rt_eflags); } + +void efi_call_phys_prelog_in_physmode (void ) {/* Not supported */ } +void efi_call_phys_epilog_in_physmode (void ) {/* Not supported */ } +
arch/x86/kernel/efi_64.c +91 -1
107 lines not on this page · raw message
include/linux/efi.h +1 -0
@@ -290,6 +290,7 @@ extern void efi_map_pal_code (void);extern void efi_memmap_walk (efi_freemem_callback_t callback,void *arg);extern void efi_gettimeofday (struct timespec *ts);extern void efi_enter_virtual_mode (void );/* switch EFI to virtual mode, if possible */ +extern void efi_setup_physical_mode (void );extern u64 efi_get_iobase (void );extern u32 efi_mem_type (unsigned long phys_addr);extern u64 efi_mem_attributes (unsigned long phys_addr);
include/linux/init.h +1 -0
@@ -142,6 +142,7 @@ extern int do_one_initcall(initcall_t fnextern char __initdata boot_command_line[];extern char *saved_command_line;extern unsigned int reset_devices; +extern unsigned int usevirtefi;/* used by init/main.c */ void setup_arch (char **);
init/main.c +14 -2
@@ -200,6 +200,14 @@ static int __init set_reset_devices(char__setup ("reset_devices" , set_reset_devices); +unsigned int usevirtefi; +static int __init set_virt_efi (char *str) +{ + usevirtefi =1 ; +return 1 ; +} +__setup ("virtefi" , set_virt_efi); +static char * argv_init[MAX_INIT_ARGS +2 ] = {"init" ,NULL , };char * envp_init[MAX_INIT_ENVS +2 ] = {"HOME=/" ,"TERM=linux" ,NULL , };static const char *panic_later, *panic_param;
@@ -676,8 +684,12 @@ asmlinkage void __init start_kernel(voidpidmap_init ();anon_vma_init ();#ifdef CONFIG_X86 -if (efi_enabled) -efi_enter_virtual_mode (); +if (efi_enabled) { +if (usevirtefi) +efi_enter_virtual_mode (); +else +efi_setup_physical_mode (); + }#endif thread_info_cache_init ();cred_init ();
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 34 lines · Takao Indoh
Hi all,
The attached patch enables EFI to run in physical mode.
Basically EFI is in physical mode at first and it's switched to virtual mode after calling SetVirtualAddressMap. By applying this patch, you can run EFI always in physical mode. And you can also specify "virtefi" as kernel boot parameter to run EFI in virtual mode as before. Note that this patch supports only
x86_64.This is needed to run kexec/kdump in EFI-booted system. The following is an original discussion. In this thread, I explained that kdump does not work because EFI system table is modified by SetVirtualAddressMap. And the idea to run EFI in physical mode was proposed. This patch implements it.
http://marc.info/?l=linux-kernel&m=128018221820234&w=2
Quoted 9 lines
When the 1st kernel boots, EFI system
table(efi_system_table_t)is modified by SetVirtualAddressMap, which is one of EFI runtime service. This runtime changes physical address in EFI system table to virtual address.When the 2nd kernel boots, it also receives the same EFI system table, and the address included in it is already virtual address(1st kernel rewrote it). But 2nd kernel does not know that, 2nd kernel thinks it is a physical address. This causes problems.
Basic idea of this patch is to create EFI own pagetable. This pagetable maps physical address of EFI runtime to the virtual address which is the same value so that we can call it directly. For example, physical address
0x800000is mapped to virtual address0x800000. Before calling EFI runtime, cr3 register is switched to this pagetable, and restored when we come back from EFI.
Quoted 3 lines
Any comments would be appreciated.
Signed-off-by Takao Indoh <[email protected]>
There is what appears to be unneeded redundancy (we need two implementations of physciall calls into efi?), but that is confined to the weird efi state.
It is a shame you haven't done the little bit extra to get efi_pagetable_init working on x86_32.
Overall this seems sane and confined to the x86 efi, and it looks like further improvements could easily be layered on top of this one.
Eric
Quoted 40 lines · Eric W. Biederman
Quoted 34 lines · Takao Indoh
Hi all,
The attached patch enables EFI to run in physical mode.
Basically EFI is in physical mode at first and it's switched to virtual mode after calling SetVirtualAddressMap. By applying this patch, you can run EFI always in physical mode. And you can also specify "virtefi" as kernel boot parameter to run EFI in virtual mode as before. Note that this patch supports only
x86_64.This is needed to run kexec/kdump in EFI-booted system. The following is an original discussion. In this thread, I explained that kdump does not work because EFI system table is modified by SetVirtualAddressMap. And the idea to run EFI in physical mode was proposed. This patch implements it.
http://marc.info/?l=linux-kernel&m=128018221820234&w=2
Quoted 9 lines
When the 1st kernel boots, EFI system
table(efi_system_table_t)is modified by SetVirtualAddressMap, which is one of EFI runtime service. This runtime changes physical address in EFI system table to virtual address.When the 2nd kernel boots, it also receives the same EFI system table, and the address included in it is already virtual address(1st kernel rewrote it). But 2nd kernel does not know that, 2nd kernel thinks it is a physical address. This causes problems.
Basic idea of this patch is to create EFI own pagetable. This pagetable maps physical address of EFI runtime to the virtual address which is the same value so that we can call it directly. For example, physical address
0x800000is mapped to virtual address0x800000. Before calling EFI runtime, cr3 register is switched to this pagetable, and restored when we come back from EFI.Quoted 3 lines
Any comments would be appreciated.
Signed-off-by Takao Indoh <[email protected]>
Quoted 8 lines
There is what appears to be unneeded redundancy (we need two implementations of physciall calls into efi?), but that is confined to the weird efi state.
It is a shame you haven't done the little bit extra to get
efi_pagetable_initworking onx86_32.
Unfortunately I don't have a machine to test. The machine I'm using does not support EFI on x86_32:-( I'd appreciate it if anyone try it...
Thanks,
Takao Indoh
Quoted 5 lines
Overall this seems sane and confined to the x86 efi, and it looks like further improvements could easily be layered on top of this one.
Eric
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
H. Peter Anvin
reviewerQuoted 7 lines · Takao Indoh
Basically EFI is in physical mode at first and it's switched to virtual mode after calling SetVirtualAddressMap. By applying this patch, you can run EFI always in physical mode. And you can also specify "virtefi" as kernel boot parameter to run EFI in virtual mode as before. Note that this patch supports only
x86_64.
Any hope to get a followon patch for i386 as well? That would make it largely a no-brainer.
Tony, does this affect ia64 in any way?
-hpa
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 1 line
does this affect ia64 in any way?
I remember Eric complaining that set_virtual_address_map() was a one way trap door with no way to get back to physical mode ... and thus this was a big problem to support kexec on ia64. And yet we still call it, and ia64 can do kexec. So some other work around must have been found. Can't immediately remember what it was though.
-Tony
Quoted 7 lines · Tony
Quoted 1 line
does this affect ia64 in any way?
I remember Eric complaining that
set_virtual_address_map()was a one way trap door with no way to get back to physical mode ... and thus this was a big problem to support kexec on ia64. And yet we still call it, and ia64 can do kexec. So some other work around must have been found. Can't immediately remember what it was though.
There is a hack in the code someplace on ia64 to pass the virtual address efi was mapped at to the next kernel, and have the kernel make certain to use efi there, without calling set_virtual_address_map(). For similar kernels that is fine at some point I expect kernel divergence will make that scheme unworkable. Essentially this is the same as using physical addresses but starting with the virtual addresses.
For ia64 I seem to recall some weird floating point fixup routines that benefited from the speed set_virtual_address_map() provided. For x86_64 where the primary (sole?) reason for enabling EFI handling is to set efi variables from linux, I don't see a case where enabling virtual mode makes sense. If EFI stays around on x86, always running the calls in physical mode and in other ways slowly decreasing our dependence on perfect efi implementations seems necessary.
As to Peter's question I did not see any of that code that affected anything that ia64 used.
Eric
H. Peter Anvin
reviewerQuoted 4 lines · Eric W. Biederman
As to Peter's question I did not see any of that code that affected anything that ia64 used.
I guess my real question was "is this something IA64 could benefit from and/or could we make the IA64 code more similar to the x86 bits"?
-hpa
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 2 lines · H. Peter Anvin
I guess my real question was "is this something IA64 could benefit from and/or could we make the IA64 code more similar to the x86 bits"?
If Eric's recollection about the "weird floating point fixup routines"[1] performance issues are correct - then ia64 won't want to do this.
-Tony
[1] more usually called FPSWA - floating point software assist - which handle a bunch or corner cases in denormalized floating point values that the h/w doesn't cover.
Quoted 6 lines · Tony Luck
Quoted 2 lines · H. Peter Anvin
I guess my real question was "is this something IA64 could benefit from and/or could we make the IA64 code more similar to the x86 bits"?
If Eric's recollection about the "weird floating point fixup routines"[1] performance issues are correct - then ia64 won't want to do this.
I proposed something similar to this for ia64 at one point to solve the problem of kexecing to Xen - which at that time mapped EFI to a different location to Linux.
As I recall, the idea was shot-down by SGI Altix people on the basis potential performance problems. I don't recall any reasons more specific than that being given (and to be honest I was less than happy about it at the time).
In the end I moved EFI in Xen to match Linux and have been able to ignore the problem ever since. Though as Eric pointed out elsewhere in this thread, there is ample scope for incompatibilities with future/other kernels.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
H. Peter Anvin
reviewerQuoted 27 lines · Takao Indoh
Hi all,
The attached patch enables EFI to run in physical mode.
Basically EFI is in physical mode at first and it's switched to virtual mode after calling SetVirtualAddressMap. By applying this patch, you can run EFI always in physical mode. And you can also specify "virtefi" as kernel boot parameter to run EFI in virtual mode as before. Note that this patch supports only
x86_64.This is needed to run kexec/kdump in EFI-booted system. The following is an original discussion. In this thread, I explained that kdump does not work because EFI system table is modified by SetVirtualAddressMap. And the idea to run EFI in physical mode was proposed. This patch implements it.
http://marc.info/?l=linux-kernel&m=128018221820234&w=2
Quoted 9 lines
When the 1st kernel boots, EFI system
table(efi_system_table_t)is modified by SetVirtualAddressMap, which is one of EFI runtime service. This runtime changes physical address in EFI system table to virtual address.When the 2nd kernel boots, it also receives the same EFI system table, and the address included in it is already virtual address(1st kernel rewrote it). But 2nd kernel does not know that, 2nd kernel thinks it is a physical address. This causes problems.
Quoted 9 lines
Basic idea of this patch is to create EFI own pagetable. This pagetable maps physical address of EFI runtime to the virtual address which is the same value so that we can call it directly. For example, physical address
0x800000is mapped to virtual address0x800000. Before calling EFI runtime, cr3 register is switched to this pagetable, and restored when we come back from EFI.Any comments would be appreciated.
Another aspect of this... this plays well into the already-outstanding proposal to keep an identity-mapped set of page tables around at all times. Right now we do it ad hoc for 64 bits and not really for 32 bits, but that is being changed, see the thread starting at:
http://marc.info/[email protected]
This would definitely be better than keeping yet another private page table.
-hpa
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 20 lines · Takao Indoh
diff -Nurp
linux-2.6.35.org/arch/x86/kernel/efi_64.clinux-2.6.35/arch/x86/kernel/efi_64.carch/x86/kernel/efi_64.c 2010-08-13 14:39:25.819105004 -0400 renamed from arch/x86/kernel/efi_64.c 2010-08-01 18:11:14.000000000 -0400 +5
-1@@ -39,7 +39,9 @@ #include <asm/fixmap.h> static pgd_t save_pgd __initdata; -static unsigned long efi_flags __initdata; +static unsigned long efi_flags; +static pgd_t efi_pgd[PTRS_PER_PGD] __page_aligned_bss; +static unsigned long save_cr3; static void __init early_mapping_set_exec(unsigned long start, unsigned long end,@@ -98,6 +100,19 @@ void __init efi_call_phys_epilog(void) early_runtime_code_mapping_set_exec(0); } +void efi_call_phys_prelog_in_physmode(void) +{
arch/x86/kernel/efi_64.c 2010-08-13 14:39:25.819105004 -0400 void __init efi_call_phys_epilog(void) · line 114
Quoted 10 lines
arch/x86/kernel/efi_64.c 2010-08-13 14:39:25.819105004 -0400 renamed from arch/x86/kernel/efi_64.c 2010-08-01 18:11:14.000000000 -0400 +10
-0+ local_irq_save(efi_flags); + save_cr3 = read_cr3(); + write_cr3(virt_to_phys(efi_pgd)); +} + +void efi_call_phys_epilog_in_physmode(void) +{ + write_cr3(save_cr3); + local_irq_restore(efi_flags); +}
efi_flags and save_cr3 should be per-CPU, because they now will be used after SMP is enabled.
efi_pgd should be dynamically allocated instead of statically allocated, because EFI may be not enabled on some platform.
And I think it is better to unify early physical mode with run-time physical mode. Just allocate the page table with early page allocator (lmb?).
Best Regards,
Huang Ying
H. Peter Anvin
reviewerNo, it should not be dynamic; rather we should unify all the users who need a 1:1 map and just keep that page table set around.
Quoted 45 lines · huang ying
Quoted 20 lines · Takao Indoh
diff -Nurp
linux-2.6.35.org/arch/x86/kernel/efi_64.clinux-2.6.35/arch/x86/kernel/efi_64.carch/x86/kernel/efi_64.c 2010-08-13 14:39:25.819105004 -0400 renamed from arch/x86/kernel/efi_64.c 2010-08-01 18:11:14.000000000 -0400 +5
-1@@ -39,7 +39,9 @@ #include <asm/fixmap.h> static pgd_t save_pgd __initdata; -static unsigned long efi_flags __initdata; +static unsigned long efi_flags; +static pgd_t efi_pgd[PTRS_PER_PGD] __page_aligned_bss; +static unsigned long save_cr3; static void __init early_mapping_set_exec(unsigned long start, unsigned long end,@@ -98,6 +100,19 @@ void __init efi_call_phys_epilog(void) early_runtime_code_mapping_set_exec(0); } +void efi_call_phys_prelog_in_physmode(void) +{arch/x86/kernel/efi_64.c 2010-08-13 14:39:25.819105004 -0400 void __init efi_call_phys_epilog(void) · line 114
Quoted 10 lines
arch/x86/kernel/efi_64.c 2010-08-13 14:39:25.819105004 -0400 renamed from arch/x86/kernel/efi_64.c 2010-08-01 18:11:14.000000000 -0400 +10
-0+ local_irq_save(efi_flags); + save_cr3 = read_cr3(); + write_cr3(virt_to_phys(efi_pgd)); +} + +void efi_call_phys_epilog_in_physmode(void) +{ + write_cr3(save_cr3); + local_irq_restore(efi_flags); +}
efi_flagsandsave_cr3should be per-CPU, because they now will be used after SMP is enabled.
efi_pgdshould be dynamically allocated instead of statically allocated, because EFI may be not enabled on some platform.And I think it is better to unify early physical mode with run-time physical mode. Just allocate the page table with early page allocator (lmb?).
Best Regards,
Huang Ying
Signature · 1 line
Sent from my mobile phone. Please pardon any lack of formatting.
Quoted 1 line · H. Peter Anvin
No, it should not be dynamic; rather we should unify all the users who need a 1:1 map and just keep that page table set around.
Agree. One known issue of global 1:1 map is that we need to make at least part of page table PAGE_KERNEL_EXEC for EFI runtime code, and change_page_attr can not be used before page allocator is available.
Best Regards,
Huang Ying
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
H. Peter Anvin
reviewerFor the 1:1 map we probably should make all pages executable; other things need it too, but we shouldn't have it mapped in except when needed.
Quoted 9 lines · huang ying
Quoted 1 line · H. Peter Anvin
No, it should not be dynamic; rather we should unify all the users who need a 1:1 map and just keep that page table set around.
Agree. One known issue of global 1:1 map is that we need to make at least part of page table
PAGE_KERNEL_EXECfor EFI runtime code, andchange_page_attrcan not be used before page allocator is available.Best Regards,
Huang Ying
Signature · 6 lines
Sent from my mobile phone. Please pardon any lack of formatting. _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Quoted 5 lines · H. Peter Anvin
Quoted 3 lines · huang ying
Quoted 2 lines · H. Peter Anvin
No, it should not be dynamic; rather we should unify all the users who need a 1:1 map and just keep that page table set around.
We still want to restore cr3 from the local task structure as soon as is reasonable, as an identity mapped page table will have page 0 mapped and thus hide null pointer dereferences.
Quoted 7 lines
Quoted 3 lines
Agree. One known issue of global 1:1 map is that we need to make at least part of page table
PAGE_KERNEL_EXECfor EFI runtime code, andchange_page_attrcan not be used before page allocator is available.For the 1:1 map we probably should make all pages executable; other things need it too, but we shouldn't have it mapped in except when needed.
We need to be careful in the setup of the global page table so that we are in sync with the pat structure for the attributes pages are mapped so that we don't map a page as cached and uncached at the same time. Otherwise we could accidentally get cache corruption. To do that would seem to mean change_page_attr is relevant at least after we switch from our default set of page permissions.
Eric
H. Peter Anvin
reviewerQuoted 4 lines · Eric W. Biederman
Quoted 2 lines · H. Peter Anvin
"huang ying" <[email protected]> wrote:
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines · H. Peter Anvin
Quoted 2 lines
No, it should not be dynamic; rather we should unify all the users who need a 1:1 map and just keep that page table set around.
We still want to restore cr3 from the local task structure as soon as is reasonable, as an identity mapped page table will have page 0 mapped and thus hide null pointer dereferences.
Absolutely!
Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
Agree. One known issue of global 1:1 map is that we need to make at least part of page table
PAGE_KERNEL_EXECfor EFI runtime code, andchange_page_attrcan not be used before page allocator is available.For the 1:1 map we probably should make all pages executable; other things need it too, but we shouldn't have it mapped in except when needed.
Quoted 7 lines
We need to be careful in the setup of the global page table so that we are in sync with the pat structure for the attributes pages are mapped so that we don't map a page as cached and uncached at the same time. Otherwise we could accidentally get cache corruption. To do that would seem to mean
change_page_attris relevant at least after we switch from our default set of page permissions.
Quite, which is yet another reason to have a common global page table for all the 1:1 users... right now this is all ad hoc.
-hpa
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec