Patch "x86/efi: Hoist page table switching code into efi_call_virt()" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
x86/efi: Hoist page table switching code into efi_call_virt()
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-efi-hoist-page-table-switching-code-into-efi_call_virt.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
c9f2a9a65e4855b74d92cdad688f6ee4a1a323ffMon Sep 17 00:00:00 2001
From: Matt Fleming <[email protected]>
Date: Fri, 27 Nov 2015 21:09:33 +0000
Subject: x86/efi: Hoist page table switching code into efi_call_virt()
From: Matt Fleming <[email protected]>
commit c9f2a9a65e4855b74d92cdad688f6ee4a1a323ff upstream.
This change is a prerequisite for pending patches that switch to a dedicated EFI page table, instead of using 'trampoline_pgd' which shares PGD entries with 'swapper_pg_dir'. The pending patches make it impossible to dereference the runtime service function pointer without first switching %cr3.
It's true that we now have duplicated switching code in efi_call_virt() and efi_call_phys_{prolog,epilog}() but we are sacrificing code duplication for a little more clarity and the ease of writing the page table switching code in C instead of asm.
--- arch/x86/include/asm/efi.h | 25 ++++++++++++++++++++ arch/x86/platform/efi/efi_64.c | 24 +++++++++----------- arch/x86/platform/efi/efi_stub_64.S | 43 ------------------------------------ 3 files changed, 36 insertions(+), 56 deletions(-)
arch/x86/include/asm/efi.h +25 -0
@@ -3,6 +3,7 @@#include <asm/fpu/api.h> #include <asm/pgtable.h> +#include <asm/tlb.h> /* * We map the EFI regions needed for runtime services non-contiguously,
@@ -64,6 +65,17 @@ extern u64 asmlinkage efi_call(void *fp, #define efi_call_phys(f, args...) efi_call((f), args) +/* +* Scratch space used for switching the pagetable in the EFI stub +*/ +struct efi_scratch { +u64 r15; +u64 prev_cr3; +pgd_t *efi_pgt; +bool use_pgd; +u64 phys_stack; +} __packed; +#define efi_call_virt (f, ...) \ ({ \ efi_status_t __s; \
@@ -71,7 +83,20 @@ extern u64 asmlinkage efi_call(void *fp,efi_sync_low_kernel_mappings (); \preempt_disable (); \__kernel_fpu_begin (); \ + \ +if (efi_scratch.use_pgd) { \ + efi_scratch.prev_cr3 =read_cr3 (); \ +write_cr3 ((unsigned long )efi_scratch.efi_pgt); \ +__flush_tlb_all (); \ + } \ + \ __s =efi_call ((void *)efi.systab->runtime->f, __VA_ARGS__); \ + \ +if (efi_scratch.use_pgd) { \ +write_cr3 (efi_scratch.prev_cr3); \ +__flush_tlb_all (); \ + } \ + \__kernel_fpu_end (); \preempt_enable (); \ __s; \
arch/x86/platform/efi/efi_64.c +11 -13
@@ -47,16 +47,7 @@*/ static u64 efi_va =EFI_VA_START ; -/* -* Scratch space used for switching the pagetable in the EFI stub -*/ -struct efi_scratch { -u64 r15; -u64 prev_cr3; -pgd_t *efi_pgt; -bool use_pgd; -u64 phys_stack; -} __packed; +struct efi_scratch efi_scratch;static void __init early_code_mapping_set_exec (int executable) {
@@ -83,8 +74,11 @@ pgd_t * __init efi_call_phys_prolog(voidint pgd;int n_pgds; -if (!efi_enabled (EFI_OLD_MEMMAP )) -return NULL ; +if (!efi_enabled (EFI_OLD_MEMMAP )) { + save_pgd = (pgd_t *)read_cr3 (); +write_cr3 ((unsigned long )efi_scratch.efi_pgt); + goto out; + }early_code_mapping_set_exec (1 );
@@ -96,6 +90,7 @@ pgd_t * __init efi_call_phys_prolog(void vaddress = (unsigned long )__va (pgd *PGDIR_SIZE );set_pgd (pgd_offset_k (pgd *PGDIR_SIZE ), *pgd_offset_k (vaddress)); } +out:__flush_tlb_all ();return save_pgd;
@@ -109,8 +104,11 @@ void __init efi_call_phys_epilog(pgd_t *int pgd_idx;int nr_pgds; -if (!save_pgd) +if (!efi_enabled (EFI_OLD_MEMMAP )) { +write_cr3 ((unsigned long )save_pgd); +__flush_tlb_all ();return ; + } nr_pgds =DIV_ROUND_UP ((max_pfn <<PAGE_SHIFT ) ,PGDIR_SIZE );
arch/x86/platform/efi/efi_stub_64.S +0 -43
57 lines not on this page · raw message
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/x86-mm-pat-ensure-cpa-pfn-only-contains-page-frame-numbers.patch queue-4.4/x86-efi-hoist-page-table-switching-code-into-efi_call_virt.patch queue-4.4/x86-efi-build-our-own-page-table-structures.patch