EFI fixes for v5.5
Subsystems (3)
Ard Biesheuvel
maintainerThe following changes since commit a470552ee8965da0fe6fd4df0aa39c4cda652c7c:
efi: Don't attempt to map RCI2 config table if it doesn't exist (2019-12-10 12:13:02 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-urgent
for you to fetch changes up to 77217fcc8e04f27127b32825376ed508705fd946:
x86/efistub: disable paging at mixed mode entry (2019-12-23 16:25:21 +0100)
----------------------------------------------------------------
Some more fixes for the EFI subsystem:
- Ensure that the EFI framebuffer earlycon uses WC attributes on x86 (Arvind)
- Another mixed mode fix from Hans, for the RNG code this time.
- Fix mixed mode boot from OVMF, by disabling paging at entry.
----------------------------------------------------------------
Ard Biesheuvel (1):
x86/efistub: disable paging at mixed mode entry
Arvind Sankar (1):
efi/earlycon: Fix write-combine mapping on x86
Hans de Goede (1):
efi/libstub/random: Initialize pointer variables to zero for mixed mode
arch/x86/boot/compressed/head_64.S | 5 +++++ drivers/firmware/efi/earlycon.c | 16 +++++++--------- drivers/firmware/efi/libstub/random.c | 6 +++--- 3 files changed, 15 insertions(+), 12 deletions(-)
Ard Biesheuvel
maintainerPATCH 1/3 efi/earlycon: Fix write-combine mapping on x86
From: Arvind Sankar <[email protected]>
On x86, until PAT is initialized, WC translates into UC-. Since we calculate and store pgprot_writecombine(PAGE_KERNEL) when earlycon is initialized, this means we actually use UC- mappings instead of WC mappings, which makes scrolling very slow.
Instead store a boolean flag to indicate whether we want to use writeback or write-combine mappings, and recalculate the actual pgprot_t we need on every mapping. Once PAT is initialized, we will start using write-combine mappings, which speeds up the scrolling considerably.
--- drivers/firmware/efi/earlycon.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/firmware/efi/earlycon.c +7 -9
@@ -17,7 +17,7 @@ static const struct console *earlycon_console __initdata;static const struct font_desc *font;static u32 efi_x, efi_y;static u64 fb_base; -static pgprot_t fb_prot; +static bool fb_wb;static void *efi_fb;/*
@@ -33,10 +33,8 @@ static int __init efi_earlycon_remap_fb(void)if (!earlycon_console || !(earlycon_console->flags &CON_ENABLED ))return 0 ; -if (pgprot_val (fb_prot) ==pgprot_val (PAGE_KERNEL )) - efi_fb =memremap (fb_base, screen_info.lfb_size,MEMREMAP_WB ); -else - efi_fb =memremap (fb_base, screen_info.lfb_size,MEMREMAP_WC ); + efi_fb =memremap (fb_base, screen_info.lfb_size, + fb_wb ?MEMREMAP_WB :MEMREMAP_WC );return efi_fb ?0 : -ENOMEM ; }
@@ -53,9 +51,12 @@ late_initcall(efi_earlycon_unmap_fb);static __ref void *efi_earlycon_map (unsigned long start,unsigned long len) { +pgprot_t fb_prot; +if (efi_fb)return efi_fb + start; + fb_prot = fb_wb ?PAGE_KERNEL :pgprot_writecombine (PAGE_KERNEL );return early_memremap_prot (fb_base + start, len,pgprot_val (fb_prot)); }
@@ -215,10 +216,7 @@ static int __init efi_earlycon_setup(struct earlycon_device *device,if (screen_info.capabilities &VIDEO_CAPABILITY_64BIT_BASE ) fb_base |= (u64 )screen_info.ext_lfb_base <<32 ; -if (opt && !strcmp (opt,"ram" )) - fb_prot =PAGE_KERNEL ; -else - fb_prot =pgprot_writecombine (PAGE_KERNEL ); + fb_wb = opt && !strcmp (opt,"ram" ); si = &screen_info; xres = si->lfb_width;
Signature · 1 line
2.20.1
[tip: efi/urgent] efi/earlycon: Fix write-combine mapping on x86
The following commit has been merged into the efi/urgent branch of tip:
The following commit has been merged into the efi/urgent branch of tip:
Commit-ID: d92b54570d24d017d2630e314b525ed792f5aa6c Gitweb: https://git.kernel.org/tip/d92b54570d24d017d2630e314b525ed792f5aa6c Author: Arvind Sankar <[email protected]> AuthorDate: Tue, 24 Dec 2019 14:29:07 +01:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 25 Dec 2019 10:46:06 +01:00
efi/earlycon: Fix write-combine mapping on x86
On x86, until PAT is initialized, WC translates into UC-. Since we calculate and store pgprot_writecombine(PAGE_KERNEL) when earlycon is initialized, this means we actually use UC- mappings instead of WC mappings, which makes scrolling very slow.
Instead store a boolean flag to indicate whether we want to use writeback or write-combine mappings, and recalculate the actual pgprot_t we need on every mapping. Once PAT is initialized, we will start using write-combine mappings, which speeds up the scrolling considerably.
--- drivers/firmware/efi/earlycon.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/firmware/efi/earlycon.c +7 -9
@@ -17,7 +17,7 @@ static const struct console *earlycon_console __initdata;static const struct font_desc *font;static u32 efi_x, efi_y;static u64 fb_base; -static pgprot_t fb_prot; +static bool fb_wb;static void *efi_fb;/*
@@ -33,10 +33,8 @@ static int __init efi_earlycon_remap_fb(void)if (!earlycon_console || !(earlycon_console->flags &CON_ENABLED ))return 0 ; -if (pgprot_val (fb_prot) ==pgprot_val (PAGE_KERNEL )) - efi_fb =memremap (fb_base, screen_info.lfb_size,MEMREMAP_WB ); -else - efi_fb =memremap (fb_base, screen_info.lfb_size,MEMREMAP_WC ); + efi_fb =memremap (fb_base, screen_info.lfb_size, + fb_wb ?MEMREMAP_WB :MEMREMAP_WC );return efi_fb ?0 : -ENOMEM ; }
@@ -53,9 +51,12 @@ late_initcall(efi_earlycon_unmap_fb);static __ref void *efi_earlycon_map (unsigned long start,unsigned long len) { +pgprot_t fb_prot; +if (efi_fb)return efi_fb + start; + fb_prot = fb_wb ?PAGE_KERNEL :pgprot_writecombine (PAGE_KERNEL );return early_memremap_prot (fb_base + start, len,pgprot_val (fb_prot)); }
@@ -215,10 +216,7 @@ static int __init efi_earlycon_setup(struct earlycon_device *device,if (screen_info.capabilities &VIDEO_CAPABILITY_64BIT_BASE ) fb_base |= (u64 )screen_info.ext_lfb_base <<32 ; -if (opt && !strcmp (opt,"ram" )) - fb_prot =PAGE_KERNEL ; -else - fb_prot =pgprot_writecombine (PAGE_KERNEL ); + fb_wb = opt && !strcmp (opt,"ram" ); si = &screen_info; xres = si->lfb_width;
Ard Biesheuvel
maintainerPATCH 2/3 efi/libstub/random: Initialize pointer variables to zero for mixed mode
In reply to Ard BiesheuvelFrom: Hans de Goede <[email protected]>
Commit 0d95981438c3 ("x86: efi/random: Invoke EFI_RNG_PROTOCOL to seed the UEFI RNG table"), causes the drivers/efi/libstub/random.c code to get used on x86 for the first time.
But this code was not written with EFI mixed mode in mind (running a 64 bit kernel on 32 bit EFI firmware), this causes the kernel to crash during early boot when running in mixed mode.
The problem is that in mixed mode pointers are 64 bit, but when running on a 32 bit firmware, EFI calls which return a pointer value by reference only fill the lower 32 bits of the passed pointer, leaving the upper 32 bits uninitialized which leads to crashes.
This commit fixes this by initializing pointers which are passed by reference to EFI calls to NULL before passing them, so that the upper 32 bits are initialized to 0.
--- drivers/firmware/efi/libstub/random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/firmware/efi/libstub/random.c +3 -3
@@ -33,7 +33,7 @@ efi_status_t efi_get_random_bytes(efi_system_table_t *sys_table_arg, {efi_guid_t rng_proto =EFI_RNG_PROTOCOL_GUID ;efi_status_t status; -struct efi_rng_protocol *rng; +struct efi_rng_protocol *rng =NULL ; status =efi_call_early (locate_protocol, &rng_proto,NULL , (void **)&rng);
@@ -162,8 +162,8 @@ efi_status_t efi_random_get_seed(efi_system_table_t *sys_table_arg)efi_guid_t rng_proto =EFI_RNG_PROTOCOL_GUID ;efi_guid_t rng_algo_raw =EFI_RNG_ALGORITHM_RAW ;efi_guid_t rng_table_guid =LINUX_EFI_RANDOM_SEED_TABLE_GUID ; -struct efi_rng_protocol *rng; -struct linux_efi_random_seed *seed; +struct efi_rng_protocol *rng =NULL ; +struct linux_efi_random_seed *seed =NULL ;efi_status_t status; status = efi_call_early(locate_protocol, &rng_proto, NULL,
Signature · 1 line
2.20.1
[tip: efi/urgent] efi/libstub/random: Initialize pointer variables to zero for mixed mode
The following commit has been merged into the efi/urgent branch of tip:
The following commit has been merged into the efi/urgent branch of tip:
Commit-ID: 818c7ce724770fbcdcd43725c81f2b3535f82b76 Gitweb: https://git.kernel.org/tip/818c7ce724770fbcdcd43725c81f2b3535f82b76 Author: Hans de Goede <[email protected]> AuthorDate: Tue, 24 Dec 2019 14:29:08 +01:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 25 Dec 2019 10:46:06 +01:00
efi/libstub/random: Initialize pointer variables to zero for mixed mode
Commit:
0d95981438c3 ("x86: efi/random: Invoke EFI_RNG_PROTOCOL to seed the UEFI RNG table")
causes the drivers/efi/libstub/random.c code to get used on x86 for the first time.
But this code was not written with EFI mixed mode in mind (running a 64 bit kernel on 32 bit EFI firmware), this causes the kernel to crash during early boot when running in mixed mode.
The problem is that in mixed mode pointers are 64 bit, but when running on a 32 bit firmware, EFI calls which return a pointer value by reference only fill the lower 32 bits of the passed pointer, leaving the upper 32 bits uninitialized which leads to crashes.
This commit fixes this by initializing pointers which are passed by reference to EFI calls to NULL before passing them, so that the upper 32 bits are initialized to 0.
--- drivers/firmware/efi/libstub/random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/firmware/efi/libstub/random.c +3 -3
@@ -33,7 +33,7 @@ efi_status_t efi_get_random_bytes(efi_system_table_t *sys_table_arg, {efi_guid_t rng_proto =EFI_RNG_PROTOCOL_GUID ;efi_status_t status; -struct efi_rng_protocol *rng; +struct efi_rng_protocol *rng =NULL ; status =efi_call_early (locate_protocol, &rng_proto,NULL , (void **)&rng);
@@ -162,8 +162,8 @@ efi_status_t efi_random_get_seed(efi_system_table_t *sys_table_arg)efi_guid_t rng_proto =EFI_RNG_PROTOCOL_GUID ;efi_guid_t rng_algo_raw =EFI_RNG_ALGORITHM_RAW ;efi_guid_t rng_table_guid =LINUX_EFI_RANDOM_SEED_TABLE_GUID ; -struct efi_rng_protocol *rng; -struct linux_efi_random_seed *seed; +struct efi_rng_protocol *rng =NULL ; +struct linux_efi_random_seed *seed =NULL ;efi_status_t status; status = efi_call_early(locate_protocol, &rng_proto, NULL,
Ard Biesheuvel
maintainerPATCH 3/3 x86/efistub: disable paging at mixed mode entry
In reply to Ard BiesheuvelThe EFI mixed mode entry code goes through the ordinary startup_32() routine before jumping into the kernel's EFI boot code in 64-bit mode. The 32-bit startup code must be entered with paging disabled, but this is not documented as a requirement for the EFI handover protocol, and so we should disable paging explicitly when entering the kernel from 32-bit EFI firmware.
--- arch/x86/boot/compressed/head_64.S | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/boot/compressed/head_64.S +5 -0
@@ -244,6 +244,11 @@ SYM_FUNC_START(efi32_stub_entry) leal efi32_config(%ebp), %eax movl %eax, efi_config(%ebp) + /* Disable paging */ + movl %cr0, %eax + btrl $X86_CR0_PG_BIT, %eax + movl %eax, %cr0 + jmp startup_32 SYM_FUNC_END(efi32_stub_entry) #endif
Signature · 1 line
2.20.1
[tip: efi/urgent] x86/efistub: Disable paging at mixed mode entry
The following commit has been merged into the efi/urgent branch of tip:
The following commit has been merged into the efi/urgent branch of tip:
Commit-ID: 4911ee401b7ceff8f38e0ac597cbf503d71e690c Gitweb: https://git.kernel.org/tip/4911ee401b7ceff8f38e0ac597cbf503d71e690c Author: Ard Biesheuvel <[email protected]> AuthorDate: Tue, 24 Dec 2019 14:29:09 +01:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 25 Dec 2019 10:46:07 +01:00
x86/efistub: Disable paging at mixed mode entry
The EFI mixed mode entry code goes through the ordinary startup_32() routine before jumping into the kernel's EFI boot code in 64-bit mode. The 32-bit startup code must be entered with paging disabled, but this is not documented as a requirement for the EFI handover protocol, and so we should disable paging explicitly when entering the kernel from 32-bit EFI firmware.
--- arch/x86/boot/compressed/head_64.S | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/boot/compressed/head_64.S +5 -0
@@ -244,6 +244,11 @@ SYM_FUNC_START(efi32_stub_entry) leal efi32_config(%ebp), %eax movl %eax, efi_config(%ebp) + /* Disable paging */ + movl %cr0, %eax + btrl $X86_CR0_PG_BIT, %eax + movl %eax, %cr0 + jmp startup_32 SYM_FUNC_END(efi32_stub_entry) #endif
Ingo Molnar
AppliedQuoted 25 lines · Ard Biesheuvel
The following changes since commit
a470552ee8965da0fe6fd4df0aa39c4cda652c7c:efi: Don't attempt to map RCI2 config table if it doesn't exist (2019-12-10 12:13:02 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.gittags/efi-urgentfor you to fetch changes up to
77217fcc8e04f27127b32825376ed508705fd946:x86/efistub: disable paging at mixed mode entry (2019-12-23 16:25:21 +0100)
----------------------------------------------------------------
Some more fixes for the EFI subsystem:
- Ensure that the EFI framebuffer earlycon uses WC attributes on x86 (Arvind)
- Another mixed mode fix from Hans, for the RNG code this time.
- Fix mixed mode boot from OVMF, by disabling paging at entry.----------------------------------------------------------------
Ard Biesheuvel (1):
x86/efistub: disable paging at mixed mode entryArvind Sankar (1):
efi/earlycon: Fix write-combine mapping on x86
Quoted 7 lines
Hans de Goede (1):
efi/libstub/random: Initialize pointer variables to zero for mixed modearch/x86/boot/compressed/head_64.S | 5 +++++ drivers/firmware/efi/earlycon.c | 16 +++++++--------- drivers/firmware/efi/libstub/random.c | 6 +++--- 3 files changed, 15 insertions(+), 12 deletions(-)
Applied to tip:efi/urgent, thanks Ard!
Ingo