efi: Remove virtual-mode SetVirtualAddressMap call
PATCH 1/5 efi: Remove virtual-mode SetVirtualAddressMap call
The spec says that SetVirtualAddressMap doesn't work once you're in virtual mode, so there's no point in having infrastructure for calling it from there.
--- arch/x86/platform/efi/efi.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-)
arch/x86/platform/efi/efi.c +1 -12
@@ -145,17 +145,6 @@ static void virt_efi_reset_system(int reset_type, data_size, data); } -static efi_status_t virt_efi_set_virtual_address_map ( -unsigned long memory_map_size, -unsigned long descriptor_size, -u32 descriptor_version, -efi_memory_desc_t *virtual_map) -{ -return efi_call_virt4 (set_virtual_address_map, - memory_map_size, descriptor_size, - descriptor_version, virtual_map); -} - static efi_status_t __init phys_efi_set_virtual_address_map( unsigned long memory_map_size, unsigned long descriptor_size,
@@ -572,7 +561,7 @@ void __init efi_enter_virtual_mode(void) efi.set_variable = virt_efi_set_variable; efi.get_next_high_mono_count = virt_efi_get_next_high_mono_count; efi.reset_system = virt_efi_reset_system; - efi.set_virtual_address_map = virt_efi_set_virtual_address_map; + efi.set_virtual_address_map =NULL ;if (__supported_pte_mask & _PAGE_NX)runtime_code_page_mkexec ();early_iounmap (memmap.map, memmap.nr_map * memmap.desc_size);
Signature · 1 line
1.7.5
PATCH 2/5 efi: Consolidate EFI nx control
The core EFI code and 64-bit EFI code currently have independent implementations of code for setting memory regions as executable or not. Let's consolidate them.
--- arch/x86/include/asm/efi.h | 1 + arch/x86/platform/efi/efi.c | 21 ++++++++++++++++----- arch/x86/platform/efi/efi_64.c | 28 +++++----------------------- 3 files changed, 22 insertions(+), 28 deletions(-)
arch/x86/include/asm/efi.h +1 -0
@@ -90,6 +90,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,#endif /* CONFIG_X86_32 */ extern int add_efi_memmap; +extern void efi_set_executable (efi_memory_desc_t *md,bool executable);extern void efi_memblock_x86_reserve_range (void );extern void efi_call_phys_prelog (void );extern void efi_call_phys_epilog (void );
arch/x86/platform/efi/efi.c +16 -5
@@ -457,11 +457,25 @@ void __init efi_init(void)#endif } +void __init efi_set_executable (efi_memory_desc_t *md,bool executable) +{ +u64 addr, npages; + + addr = md->virt_addr; + npages = md->num_pages; + +memrange_efi_to_native (&addr, &npages); + +if (executable) +set_memory_x (addr, npages); +else +set_memory_nx (addr, npages); +} +static void __init runtime_code_page_mkexec (void ) {efi_memory_desc_t *md;void *p; -u64 addr, npages;/* Make EFI runtime service code area executable */ for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
@@ -470,10 +484,7 @@ static void __init runtime_code_page_mkexec(void)if (md->type !=EFI_RUNTIME_SERVICES_CODE )continue ; - addr = md->virt_addr; - npages = md->num_pages; -memrange_efi_to_native (&addr, &npages); -set_memory_x (addr, npages); +efi_set_executable (md, true); } }
arch/x86/platform/efi/efi_64.c +5 -23
@@ -41,22 +41,7 @@static pgd_t save_pgd__initdata ;static unsigned long efi_flags__initdata ; -static void __init early_mapping_set_exec (unsigned long start, -unsigned long end, -int executable) -{ -unsigned long num_pages; - - start &=PMD_MASK ; - end = (end +PMD_SIZE -1 ) &PMD_MASK ; - num_pages = (end - start) >>PAGE_SHIFT ; -if (executable) -set_memory_x ((unsigned long )__va (start), num_pages); -else -set_memory_nx ((unsigned long )__va (start), num_pages); -} - -static void __init early_runtime_code_mapping_set_exec (int executable) +static void __init early_code_mapping_set_exec (int executable) {efi_memory_desc_t *md;void *p;
@@ -67,11 +52,8 @@ static void __init early_runtime_code_mapping_set_exec(int executable)/* Make EFI runtime service code area executable */ for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { md = p; -if (md->type ==EFI_RUNTIME_SERVICES_CODE ) { -unsigned long end; - end = md->phys_addr + (md->num_pages <<EFI_PAGE_SHIFT ); -early_mapping_set_exec (md->phys_addr, end, executable); - } +if (md->type ==EFI_RUNTIME_SERVICES_CODE ) +efi_set_executable (md, executable); } }
@@ -79,7 +61,7 @@ void __init efi_call_phys_prelog(void) {unsigned long vaddress; -early_runtime_code_mapping_set_exec (1 ); +early_code_mapping_set_exec (1 );local_irq_save (efi_flags); vaddress = (unsigned long )__va (0x0UL ); save_pgd = *pgd_offset_k (0x0UL );
@@ -95,7 +77,7 @@ void __init efi_call_phys_epilog(void)set_pgd (pgd_offset_k (0x0UL ), save_pgd);__flush_tlb_all ();local_irq_restore (efi_flags); -early_runtime_code_mapping_set_exec (0 ); +early_code_mapping_set_exec (0 ); } void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,
Signature · 1 line
1.7.5
[tip:x86/efi] x86, efi: Consolidate EFI nx control
Commit-ID: 9cd2b07c197e3ff594fc04f5fb3d86efbeab6ad8 Gitweb: http://git.kernel.org/tip/9cd2b07c197e3ff594fc04f5fb3d86efbeab6ad8 Author: Matthew Garrett <[email protected]> AuthorDate: Thu, 5 May 2011 15:19:43 -0400 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 9 May 2011 12:14:29 -0700
x86, efi: Consolidate EFI nx control
The core EFI code and 64-bit EFI code currently have independent implementations of code for setting memory regions as executable or not. Let's consolidate them.
--- arch/x86/include/asm/efi.h | 1 + arch/x86/platform/efi/efi.c | 21 ++++++++++++++++----- arch/x86/platform/efi/efi_64.c | 28 +++++----------------------- 3 files changed, 22 insertions(+), 28 deletions(-)
arch/x86/include/asm/efi.h +1 -0
@@ -90,6 +90,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,#endif /* CONFIG_X86_32 */ extern int add_efi_memmap; +extern void efi_set_executable (efi_memory_desc_t *md,bool executable);extern void efi_memblock_x86_reserve_range (void );extern void efi_call_phys_prelog (void );extern void efi_call_phys_epilog (void );
arch/x86/platform/efi/efi.c +16 -5
@@ -457,11 +457,25 @@ void __init efi_init(void)#endif } +void __init efi_set_executable (efi_memory_desc_t *md,bool executable) +{ +u64 addr, npages; + + addr = md->virt_addr; + npages = md->num_pages; + +memrange_efi_to_native (&addr, &npages); + +if (executable) +set_memory_x (addr, npages); +else +set_memory_nx (addr, npages); +} +static void __init runtime_code_page_mkexec (void ) {efi_memory_desc_t *md;void *p; -u64 addr, npages;/* Make EFI runtime service code area executable */ for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
@@ -470,10 +484,7 @@ static void __init runtime_code_page_mkexec(void)if (md->type !=EFI_RUNTIME_SERVICES_CODE )continue ; - addr = md->virt_addr; - npages = md->num_pages; -memrange_efi_to_native (&addr, &npages); -set_memory_x (addr, npages); +efi_set_executable (md, true); } }
arch/x86/platform/efi/efi_64.c +5 -23
@@ -41,22 +41,7 @@static pgd_t save_pgd__initdata ;static unsigned long efi_flags__initdata ; -static void __init early_mapping_set_exec (unsigned long start, -unsigned long end, -int executable) -{ -unsigned long num_pages; - - start &=PMD_MASK ; - end = (end +PMD_SIZE -1 ) &PMD_MASK ; - num_pages = (end - start) >>PAGE_SHIFT ; -if (executable) -set_memory_x ((unsigned long )__va (start), num_pages); -else -set_memory_nx ((unsigned long )__va (start), num_pages); -} - -static void __init early_runtime_code_mapping_set_exec (int executable) +static void __init early_code_mapping_set_exec (int executable) {efi_memory_desc_t *md;void *p;
@@ -67,11 +52,8 @@ static void __init early_runtime_code_mapping_set_exec(int executable)/* Make EFI runtime service code area executable */ for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { md = p; -if (md->type ==EFI_RUNTIME_SERVICES_CODE ) { -unsigned long end; - end = md->phys_addr + (md->num_pages <<EFI_PAGE_SHIFT ); -early_mapping_set_exec (md->phys_addr, end, executable); - } +if (md->type ==EFI_RUNTIME_SERVICES_CODE ) +efi_set_executable (md, executable); } }
@@ -79,7 +61,7 @@ void __init efi_call_phys_prelog(void) {unsigned long vaddress; -early_runtime_code_mapping_set_exec (1 ); +early_code_mapping_set_exec (1 );local_irq_save (efi_flags); vaddress = (unsigned long )__va (0x0UL ); save_pgd = *pgd_offset_k (0x0UL );
@@ -95,7 +77,7 @@ void __init efi_call_phys_epilog(void)set_pgd (pgd_offset_k (0x0UL ), save_pgd);__flush_tlb_all ();local_irq_restore (efi_flags); -early_runtime_code_mapping_set_exec (0 ); +early_code_mapping_set_exec (0 ); } void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,
PATCH 3/5 efi: Merge contiguous memory regions of the same type and attribute
In reply to Matthew GarrettSome firmware implementations assume that physically contiguous regions will be contiguous in virtual address space. This assumption is, obviously, entirely unjustifiable. Said firmware implementations lack the good grace to handle their failings in a measured and reasonable manner, instead tending to shit all over address space and oopsing the kernel.
In an ideal universe these firmware implementations would simultaneously catch fire and cease to be a problem, but since some of them are present in attractively thin and shiny metal devices vanity wins out and some poor developer spends an extended period of time surrounded by a growing array of empty bottles until the underlying reason becomes apparent. Said developer presents this patch, which simply merges adjacent regions if they happen to be contiguous and have the same EFI memory type and caching attributes.
--- arch/x86/platform/efi/efi.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-)
arch/x86/platform/efi/efi.c +29 -1
@@ -498,13 +498,41 @@ static void __init runtime_code_page_mkexec(void)*/ void __init efi_enter_virtual_mode (void ) { -efi_memory_desc_t *md; +efi_memory_desc_t *md, *prev_md =NULL ;efi_status_t status;unsigned long size;u64 end, systab, addr, npages, end_pfn;void *p, *va; efi.systab =NULL ; + +/* Merge contiguous regions of the same type and attribute */ +for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { +u64 prev_size; + md = p; + +if (!prev_md) { + prev_md = md; +continue ; + } + +if (prev_md->type != md->type || + prev_md->attribute != md->attribute) { + prev_md = md; +continue ; + } + + prev_size = prev_md->num_pages <<EFI_PAGE_SHIFT ; + +if (md->phys_addr == (prev_md->phys_addr + prev_size)) { + prev_md->num_pages += md->num_pages; + md->type =EFI_RESERVED_TYPE ; + md->attribute =0 ; +continue ; + } + prev_md = md; + } +for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { md = p;if (!(md->attribute &EFI_MEMORY_RUNTIME ))
Signature · 1 line
1.7.5
[tip:x86/efi] x86, efi: Merge contiguous memory regions of the same type and attribute
Commit-ID: 202f9d0a41809e3424af5f61489b48b622824aed Gitweb: http://git.kernel.org/tip/202f9d0a41809e3424af5f61489b48b622824aed Author: Matthew Garrett <[email protected]> AuthorDate: Thu, 5 May 2011 15:19:44 -0400 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 9 May 2011 12:14:34 -0700
x86, efi: Merge contiguous memory regions of the same type and attribute
Some firmware implementations assume that physically contiguous regions will be contiguous in virtual address space. This assumption is, obviously, entirely unjustifiable. Said firmware implementations lack the good grace to handle their failings in a measured and reasonable manner, instead tending to shit all over address space and oopsing the kernel.
In an ideal universe these firmware implementations would simultaneously catch fire and cease to be a problem, but since some of them are present in attractively thin and shiny metal devices vanity wins out and some poor developer spends an extended period of time surrounded by a growing array of empty bottles until the underlying reason becomes apparent. Said developer presents this patch, which simply merges adjacent regions if they happen to be contiguous and have the same EFI memory type and caching attributes.
--- arch/x86/platform/efi/efi.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-)
arch/x86/platform/efi/efi.c +29 -1
@@ -498,13 +498,41 @@ static void __init runtime_code_page_mkexec(void)*/ void __init efi_enter_virtual_mode (void ) { -efi_memory_desc_t *md; +efi_memory_desc_t *md, *prev_md =NULL ;efi_status_t status;unsigned long size;u64 end, systab, addr, npages, end_pfn;void *p, *va; efi.systab =NULL ; + +/* Merge contiguous regions of the same type and attribute */ +for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { +u64 prev_size; + md = p; + +if (!prev_md) { + prev_md = md; +continue ; + } + +if (prev_md->type != md->type || + prev_md->attribute != md->attribute) { + prev_md = md; +continue ; + } + + prev_size = prev_md->num_pages <<EFI_PAGE_SHIFT ; + +if (md->phys_addr == (prev_md->phys_addr + prev_size)) { + prev_md->num_pages += md->num_pages; + md->type =EFI_RESERVED_TYPE ; + md->attribute =0 ; +continue ; + } + prev_md = md; + } +for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { md = p;if (!(md->attribute &EFI_MEMORY_RUNTIME ))
PATCH 4/5 efi: Pass a minimal map to SetVirtualAddressMap()
In reply to Matthew GarrettExperimentation with various EFI implementations has shown that functions outside runtime services will still update their pointers if SetVirtualAddressMap() is called with memory descriptors outside the runtime area. This is obviously insane, and therefore is unsurprising. Evidence from instrumenting another EFI implementation suggests that it only passes the set of descriptors covering runtime regions, so let's avoid any problems by doing the same. Runtime descriptors are copied to a separate memory map, and only that map is passed back to the firmware.
--- arch/x86/platform/efi/efi.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)
arch/x86/platform/efi/efi.c +11 -3
@@ -502,7 +502,8 @@ void __init efi_enter_virtual_mode(void)efi_status_t status;unsigned long size;u64 end, systab, addr, npages, end_pfn; -void *p, *va; +void *p, *va, *new_memmap =NULL ; +int count =0 ; efi.systab =NULL ;
@@ -569,15 +570,21 @@ void __init efi_enter_virtual_mode(void) systab += md->virt_addr - md->phys_addr; efi.systab = (efi_system_table_t *) (unsigned long ) systab; } + new_memmap =krealloc (new_memmap, + (count +1 ) * memmap.desc_size, +GFP_KERNEL ); +memcpy (new_memmap + (count * memmap.desc_size), md, + memmap.desc_size); + count++; }BUG_ON (!efi.systab); status =phys_efi_set_virtual_address_map ( - memmap.desc_size * memmap.nr_map, + memmap.desc_size * count, memmap.desc_size, memmap.desc_version, - memmap.phys_map); + (efi_memory_desc_t *)__pa (new_memmap));if (status !=EFI_SUCCESS ) { printk(KERN_ALERT "Unable to switch EFI into virtual mode "
@@ -605,6 +612,7 @@ void __init efi_enter_virtual_mode(void)runtime_code_page_mkexec ();early_iounmap (memmap.map, memmap.nr_map * memmap.desc_size); memmap.map =NULL ; +kfree (new_memmap); }/*
Signature · 1 line
1.7.5
[tip:x86/efi] x86, efi: Pass a minimal map to SetVirtualAddressMap()
Commit-ID: 7cb00b72876ea2451eb79d468da0e8fb9134aa8a Gitweb: http://git.kernel.org/tip/7cb00b72876ea2451eb79d468da0e8fb9134aa8a Author: Matthew Garrett <[email protected]> AuthorDate: Thu, 5 May 2011 15:19:45 -0400 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 9 May 2011 12:14:39 -0700
x86, efi: Pass a minimal map to SetVirtualAddressMap()
Experimentation with various EFI implementations has shown that functions outside runtime services will still update their pointers if SetVirtualAddressMap() is called with memory descriptors outside the runtime area. This is obviously insane, and therefore is unsurprising. Evidence from instrumenting another EFI implementation suggests that it only passes the set of descriptors covering runtime regions, so let's avoid any problems by doing the same. Runtime descriptors are copied to a separate memory map, and only that map is passed back to the firmware.
--- arch/x86/platform/efi/efi.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)
arch/x86/platform/efi/efi.c +11 -3
@@ -502,7 +502,8 @@ void __init efi_enter_virtual_mode(void)efi_status_t status;unsigned long size;u64 end, systab, addr, npages, end_pfn; -void *p, *va; +void *p, *va, *new_memmap =NULL ; +int count =0 ; efi.systab =NULL ;
@@ -569,15 +570,21 @@ void __init efi_enter_virtual_mode(void) systab += md->virt_addr - md->phys_addr; efi.systab = (efi_system_table_t *) (unsigned long ) systab; } + new_memmap =krealloc (new_memmap, + (count +1 ) * memmap.desc_size, +GFP_KERNEL ); +memcpy (new_memmap + (count * memmap.desc_size), md, + memmap.desc_size); + count++; }BUG_ON (!efi.systab); status =phys_efi_set_virtual_address_map ( - memmap.desc_size * memmap.nr_map, + memmap.desc_size * count, memmap.desc_size, memmap.desc_version, - memmap.phys_map); + (efi_memory_desc_t *)__pa (new_memmap));if (status !=EFI_SUCCESS ) { printk(KERN_ALERT "Unable to switch EFI into virtual mode "
@@ -605,6 +612,7 @@ void __init efi_enter_virtual_mode(void)runtime_code_page_mkexec ();early_iounmap (memmap.map, memmap.nr_map * memmap.desc_size); memmap.map =NULL ; +kfree (new_memmap); }/*
PATCH 5/5 efi: Ensure that the entirity of a region is mapped
In reply to Matthew GarrettIt's possible for init_memory_mapping() to fail to map the entire region if it crosses a boundary, so ensure that we complete the mapping.
--- arch/x86/platform/efi/efi_64.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/platform/efi/efi_64.c +4 -2
@@ -89,8 +89,10 @@ void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,return ioremap (phys_addr, size); last_map_pfn =init_memory_mapping (phys_addr, phys_addr + size); -if ((last_map_pfn <<PAGE_SHIFT ) < phys_addr + size) -return NULL ; +if ((last_map_pfn <<PAGE_SHIFT ) < phys_addr + size) { +unsigned long top = last_map_pfn <<PAGE_SHIFT ; +efi_ioremap (top, size - (top - phys_addr), type); + }return (void __iomem *)__va (phys_addr); }
Signature · 1 line
1.7.5
[tip:x86/efi] x86, efi: Ensure that the entirity of a region is mapped
Commit-ID: 935a638241b0658b9749edd060f972575f9d4a78 Gitweb: http://git.kernel.org/tip/935a638241b0658b9749edd060f972575f9d4a78 Author: Matthew Garrett <[email protected]> AuthorDate: Thu, 5 May 2011 15:19:46 -0400 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 9 May 2011 12:14:45 -0700
x86, efi: Ensure that the entirity of a region is mapped
It's possible for init_memory_mapping() to fail to map the entire region if it crosses a boundary, so ensure that we complete the mapping.
--- arch/x86/platform/efi/efi_64.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/platform/efi/efi_64.c +4 -2
@@ -89,8 +89,10 @@ void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,return ioremap (phys_addr, size); last_map_pfn =init_memory_mapping (phys_addr, phys_addr + size); -if ((last_map_pfn <<PAGE_SHIFT ) < phys_addr + size) -return NULL ; +if ((last_map_pfn <<PAGE_SHIFT ) < phys_addr + size) { +unsigned long top = last_map_pfn <<PAGE_SHIFT ; +efi_ioremap (top, size - (top - phys_addr), type); + }return (void __iomem *)__va (phys_addr); }
[tip:x86/efi] x86, efi: Remove virtual-mode SetVirtualAddressMap call
In reply to Matthew GarrettCommit-ID: 2b5e8ef35bc89eee944c0627edacbb1fea5a1b84 Gitweb: http://git.kernel.org/tip/2b5e8ef35bc89eee944c0627edacbb1fea5a1b84 Author: Matthew Garrett <[email protected]> AuthorDate: Thu, 5 May 2011 15:19:42 -0400 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 9 May 2011 12:14:25 -0700
x86, efi: Remove virtual-mode SetVirtualAddressMap call
The spec says that SetVirtualAddressMap doesn't work once you're in virtual mode, so there's no point in having infrastructure for calling it from there.
--- arch/x86/platform/efi/efi.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-)
arch/x86/platform/efi/efi.c +1 -12
@@ -145,17 +145,6 @@ static void virt_efi_reset_system(int reset_type, data_size, data); } -static efi_status_t virt_efi_set_virtual_address_map ( -unsigned long memory_map_size, -unsigned long descriptor_size, -u32 descriptor_version, -efi_memory_desc_t *virtual_map) -{ -return efi_call_virt4 (set_virtual_address_map, - memory_map_size, descriptor_size, - descriptor_version, virtual_map); -} - static efi_status_t __init phys_efi_set_virtual_address_map( unsigned long memory_map_size, unsigned long descriptor_size,
@@ -572,7 +561,7 @@ void __init efi_enter_virtual_mode(void) efi.set_variable = virt_efi_set_variable; efi.get_next_high_mono_count = virt_efi_get_next_high_mono_count; efi.reset_system = virt_efi_reset_system; - efi.set_virtual_address_map = virt_efi_set_virtual_address_map; + efi.set_virtual_address_map =NULL ;if (__supported_pte_mask & _PAGE_NX)runtime_code_page_mkexec ();early_iounmap (memmap.map, memmap.nr_map * memmap.desc_size);