Hello Sai,
On Thu, Aug 9, 2018 at 10:01 AM, Sai Praneeth Prakhya
<sai.praneeth.prakhya@xxxxxxxxx> wrote:
> From: Sai Praneeth <sai.praneeth.prakhya@xxxxxxxxx>
>
> There may exist some buggy UEFI firmware implementations that might
> access efi regions other than EFI_RUNTIME_SERVICES_<CODE/DATA> even
> after the kernel has assumed control of the platform. This violates UEFI
> specification.
>
> If selected, this debug option will print a warning message if the UEFI
> firmware tries to access any memory region which it shouldn't. Along
> with the warning, the efi page fault handler will also try to
> fixup/recover from the page fault triggered by the firmware so that the
> machine doesn't hang.
>
> To support this feature, two changes should be made to the existing efi
> subsystem
> 1. Map EFI_BOOT_SERVICES_<CODE/DATA> regions only when
> EFI_WARN_ON_ILLEGAL_ACCESSES is disabled
> Presently, the kernel maps EFI_BOOT_SERVICES_<CODE/DATA> regions as
> a workaround for buggy firmware that accesses them even when they
> shouldn't. With EFI_WARN_ON_ILLEGAL_ACCESSES enabled (and hence efi
> page fault handler) kernel can now detect and handle such accesses
> dynamically. Hence, rather than safely mapping
> EFI_BOOT_SERVICES_<CODE/DATA> regions *all* the time, map them on
> demand.
>
> 2. If EFI_WARN_ON_ILLEGAL_ACCESSES is enabled don't call
> efi_free_boot_services()
> Presently, during early boot phase EFI_BOOT_SERVICES_<CODE/DATA>
> regions are marked as reserved by kernel
> (see efi_reserve_boot_services()) and are freed before entering
> runtime (see efi_free_boot_services()). But, while dynamically
> fixing page faults caused by the firmware, efi page fault handler
> assumes that EFI_BOOT_SERVICES_<CODE/DATA> regions are still intact.
> Hence, to make this assumption true, don't call
> efi_free_boot_services() if EFI_WARN_ON_ILLEGAL_ACCESSES is enabled.
>
> Suggested-by: Matt Fleming <matt@xxxxxxxxxxxxxxxxxxx>
> Based-on-code-from: Ricardo Neri <ricardo.neri@xxxxxxxxx>
> Signed-off-by: Sai Praneeth Prakhya <sai.praneeth.prakhya@xxxxxxxxx>
> Cc: Lee Chun-Yi <jlee@xxxxxxxx>
> Cc: Al Stone <astone@xxxxxxxxxx>
> Cc: Borislav Petkov <bp@xxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> Cc: Andy Lutomirski <luto@xxxxxxxxxx>
> Cc: Bhupesh Sharma <bhsharma@xxxxxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
> ---
> arch/x86/Kconfig | 21 +++++++++++++++++++++
> arch/x86/platform/efi/efi.c | 4 ++++
> init/main.c | 3 ++-
> 3 files changed, 27 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index f1dbb4ee19d7..278e5820e8dd 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -1957,6 +1957,27 @@ config EFI_MIXED
>
> If unsure, say N.
>
> +config EFI_WARN_ON_ILLEGAL_ACCESSES
How about shortening the name to just 'EFI_WARN_ON_ILLEGAL_ACCESS'?
> + bool "Warn about illegal memory accesses by firmware"
> + depends on EFI
>From a distribution p-o-v, I would suggest that we set this CONFIG
option only if we are in the EXPERT mode, as this need more thrashing
with the behaviour we see on old, buggy EFI firmwares available on
very old x86 machines. So something like:
bool "Warn about illegal memory accesses by firmware" if EXPERT
> + help
> + Enable this debug feature so that the kernel can detect illegal
> + memory accesses by firmware and issue a warning. Also,
> + 1. If the illegally accessed region is EFI_BOOT_SERVICES_<CODE/DATA>,
> + the kernel fixes it up by mapping the requested region.
> + 2. If the illegally accessed region is any other region (Eg:
> + EFI_CONVENTIONAL_MEMORY or EFI_LOADER_<CODE/DATA>), then the
> + kernel freezes efi_rts_wq and schedules a new process. Also, it
> + disables EFI Runtime Services, so that it will never again call
> + buggy firmware.
> + 3. If the access is to any other efi region like above but if the
> + buggy efi runtime service is efi_reset_system(), then the
> + platform is rebooted through BIOS.
> + Please see the UEFI specification for details on the expectations
> + of memory usage.
> +
> + If unsure, say N.
> +
> config SECCOMP
> def_bool y
> prompt "Enable seccomp to safely compute untrusted bytecode"
> diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
> index 7d18b7ed5d41..0ddb22a03d88 100644
> --- a/arch/x86/platform/efi/efi.c
> +++ b/arch/x86/platform/efi/efi.c
> @@ -768,9 +768,13 @@ static bool should_map_region(efi_memory_desc_t *md)
> /*
> * Map boot services regions as a workaround for buggy
> * firmware that accesses them even when they shouldn't.
> + * (only if CONFIG_EFI_WARN_ON_ILLEGAL_ACCESSES is disabled)
> *
> * See efi_{reserve,free}_boot_services().
> */
> + if (IS_ENABLED(CONFIG_EFI_WARN_ON_ILLEGAL_ACCESSES))
> + return false;
> +
> if (md->type == EFI_BOOT_SERVICES_CODE ||
> md->type == EFI_BOOT_SERVICES_DATA)
> return true;
> diff --git a/init/main.c b/init/main.c
> index 3b4ada11ed52..dce0520861a1 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -730,7 +730,8 @@ asmlinkage __visible void __init start_kernel(void)
> arch_post_acpi_subsys_init();
> sfi_init_late();
>
> - if (efi_enabled(EFI_RUNTIME_SERVICES)) {
> + if (efi_enabled(EFI_RUNTIME_SERVICES) &&
> + !IS_ENABLED(CONFIG_EFI_WARN_ON_ILLEGAL_ACCESSES)) {
Since this is an arch agnostic code leg, do we really want to
introduce a generic check for CONFIG_EFI_WARN_ON_ILLEGAL_ACCESSES
here, without checking for whether we are actually running this on a
x86 hardware, or alternatively we can consider moving
CONFIG_EFI_WARN_ON_ILLEGAL_ACCESSES out of 'arch/x86/Kconfig' to
'arch/Kconfig' so that later it can be used on other archs like ARM64
as well.
I think the later would be more useful..
Thanks,
Bhupesh
> efi_free_boot_services();
> }
>
> --
> 2.7.4
>
