Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp4463512imm; Tue, 11 Sep 2018 12:18:03 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZPuJux4rFQrGompHo2OM9gRKy0JJpVt68tcSBZwtszntjnH6JlPK/MVs+ixD1E2LcG58W0 X-Received: by 2002:aa7:82c3:: with SMTP id f3-v6mr31786319pfn.136.1536693483483; Tue, 11 Sep 2018 12:18:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536693483; cv=none; d=google.com; s=arc-20160816; b=vrmK0DJ4J1Z5vQG0HGkD65VgD05cJLdMx3SApzZiefee82PNG5QgzOmP0gW5+aBzcy l3VnADwvirvri8CVhVS393YfyPb2YNNIw/L9i38MgNPgOFl691EWYmkI9p89VJ2IgtD6 UXA5FNbvQ9W2mKTncUjRlRSyIVoRNgxK1TgXVSZ5GBFXw5GvFVO6MflnR7smXlPl9+5q QivyHo4hJr3MS5RcYa+q/iVgaIx7Ej7dAs+QNivpyt6RqERyN92S1UcODJhc2t7dLIW7 pVMNeBnpmogupzsYcZjbNfaof4FXChQcRHVH3vhhLkBGNxjWWTBpp2pAw5Efe7ScoASO j2XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=ZZx0itGeKG1S1zcxXKXTcFXaABtQsV8aBvhesAyWhKs=; b=ZG1+HSd5j//KUCx+EKjO8nQ8qtGNu0w7GUA3BNLujm7J8NDX2X2PBq+kGbcg+z+mqG b+ms0kvM2MSBelHTyEtKcXB3iy0ENR40YwEnGqBTOlqpkjXx7yXc9209cG6c6eTg43Sx d0jAZVVgh5pKe0y5yNLyefYjYwX8oUN1g1G0RLw2YJFiU9dpV4EM351dkQtqr6f1XIsh rJec0LkRaQ1mzNkZ375KMY06wx6KulsgUZ+4ANf9qtfLoq+9br0wIBttDgcB8Zb/vnlO 6Nndq2AEfkei4SmPV7ZBnmd1w8mhHSZjoeOXPNZFEzAWj/eNW3aAakPuivBoIsKrD10O rXSA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bg5-v6si19734329plb.368.2018.09.11.12.17.47; Tue, 11 Sep 2018 12:18:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726980AbeILARA (ORCPT + 99 others); Tue, 11 Sep 2018 20:17:00 -0400 Received: from mga05.intel.com ([192.55.52.43]:35217 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726775AbeILARA (ORCPT ); Tue, 11 Sep 2018 20:17:00 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Sep 2018 12:16:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,361,1531810800"; d="scan'208";a="72154303" Received: from sai-dev-mach.sc.intel.com ([143.183.140.52]) by orsmga007.jf.intel.com with ESMTP; 11 Sep 2018 12:16:17 -0700 From: Sai Praneeth Prakhya To: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org Cc: Sai Praneeth , Al Stone , Borislav Petkov , Ingo Molnar , Andy Lutomirski , Bhupesh Sharma , Thomas Gleixner , Peter Zijlstra , Ard Biesheuvel Subject: [PATCH V6 0/2] Add efi page fault handler to recover from page Date: Tue, 11 Sep 2018 12:15:20 -0700 Message-Id: <1536693322-8335-1-git-send-email-sai.praneeth.prakhya@intel.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sai Praneeth There may exist some buggy UEFI firmware implementations that access efi memory regions other than EFI_RUNTIME_SERVICES_ even after the kernel has assumed control of the platform. This violates UEFI specification. Hence, provide a efi specific page fault handler which recovers from page faults caused by buggy firmware. Page faults triggered by firmware happen at ring 0 and if unhandled, hangs the kernel. So, provide an efi specific page fault handler to: 1. Avoid panics/hangs caused by buggy firmware. 2. Shout loud that the firmware is buggy and hence is not a kernel bug. The efi page fault handler will check if the access is by efi_reset_system(). 1. If so, then the efi page fault handler will reboot the machine through BIOS and not through efi_reset_system(). 2. If not, then the efi page fault handler will freeze efi_rts_wq and schedules a new process. This issue was reported by Al Stone when he saw that reboot via EFI hangs the machine. Upon debugging, I found that it's efi_reset_system() that's touching memory regions which it shouldn't. To reproduce the same behavior, I have hacked OVMF and made efi_reset_system() buggy. Along with efi_reset_system(), I have also modified get_next_high_mono_count() and set_virtual_address_map(). They illegally access both boot time and other efi regions. Testing the patch set: ---------------------- 1. Download buggy firmware from here [1]. 2. Run a qemu instance with this buggy BIOS and boot mainline kernel. Add reboot=efi to the kernel command line arguments and after the kernel is up and running, type "reboot". The kernel should hang while rebooting. 3. With the same setup, boot kernel after applying patches and the reboot should work fine. Also please notice warning/error messages printed by kernel. Changes from RFC to V1: ----------------------- 1. Drop "long jump" technique of dealing with illegal access and instead use scheduling away from efi_rts_wq. Changes from V1 to V2: ---------------------- 1. Shortened config name to CONFIG_EFI_WARN_ON_ILLEGAL_ACCESS from CONFIG_EFI_WARN_ON_ILLEGAL_ACCESSES. 2. Made the config option available only to expert users. 3. efi_free_boot_services() should be called only when CONFIG_EFI_WARN_ON_ILLEGAL_ACCESS is not enabled. Previously, this was part of init/main.c file. As it is an architecture agnostic code, moved the change to arch/x86/platform/efi/quirks.c file. Changes from V2 to V3: ---------------------- 1. Drop treating illegal access to EFI_BOOT_SERVICES_ regions separately from illegal accesses to other regions like EFI_CONVENTIONAL_MEMORY or EFI_LOADER_. In previous versions, illegal access to EFI_BOOT_SERVICES_ regions were handled by mapping requested region to efi_pgd but from V3 they are handled similar to illegal access to other regions i.e by freezing efi_rts_wq and scheduling new process. 2. Change __efi_init_fixup attribute to __efi_init. Changes from V3 to V4: ---------------------- 1. Drop saving original memory map passed by kernel. It also means less checks in efi page fault handler. 2. Change the config name to EFI_PAGE_FAULT_HANDLER to reflect it's functionality more appropriately. Changes from V4 to V5: ---------------------- 1. Drop config option that enables efi page fault handler, instead make it default. 2. Call schedule() in an infinite loop to account for spurious wake ups. 3. Introduce "NONE" as an efi runtime service function identifier so that it could be used in efi_recover_from_page_fault() to check if the page fault was indeed triggered by an efi runtime service. Changes from V5 to V6: ---------------------- 1. Thanks to 0-day for reporting build error when CONFIG_EFI is not enabled. Fixed it by calling efi page fault handler only when CONFIG_EFI is enabled. 2. Change return type of efi page fault handler from int to void. void return type should do (and int is not needed) because the efi page fault handler returns only upon a failure to handle page fault. Note: ----- Patch set based on "next" branch in efi tree. [1] https://drive.google.com/drive/folders/1VozKTms92ifyVHAT0ZDQe55ZYL1UE5wt Sai Praneeth (2): efi: Make efi_rts_work accessible to efi page fault handler x86/efi: Add efi page fault handler to recover from page faults caused by the firmware arch/x86/include/asm/efi.h | 1 + arch/x86/mm/fault.c | 9 ++++ arch/x86/platform/efi/quirks.c | 78 +++++++++++++++++++++++++++++++++ drivers/firmware/efi/runtime-wrappers.c | 61 +++++++------------------- include/linux/efi.h | 42 ++++++++++++++++++ 5 files changed, 147 insertions(+), 44 deletions(-) Tested-by: Bhupesh Sharma Suggested-by: Matt Fleming Based-on-code-from: Ricardo Neri Signed-off-by: Sai Praneeth Prakhya Cc: Al Stone Cc: Borislav Petkov Cc: Ingo Molnar Cc: Andy Lutomirski Cc: Bhupesh Sharma Cc: Thomas Gleixner Cc: Peter Zijlstra Cc: Ard Biesheuvel -- 2.7.4