Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp1046727imm; Mon, 21 May 2018 20:14:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpp9YbNSYGX1jSYCKn+f/fYLxl4uRIDTe3KV6AiEmnCbEZlR+u3aqQp1TLEPr6CDqvqChjn X-Received: by 2002:a65:4945:: with SMTP id q5-v6mr15450613pgs.177.1526958843766; Mon, 21 May 2018 20:14:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526958843; cv=none; d=google.com; s=arc-20160816; b=Jn4CexJbqt/0hoF0IdRymy8b3pzARRjP5Ppg1+npnZoXuK0cjI8vVEz/fcAJ+DApLV eKbXMBzhXEAtybUY9orGSxU3znKcqrqCebZrlYYLtoSRfGQunVqm/zWegrElJedeHLYu E/prA6vJjvfnF2RKC8ALyN9FHvc7IXfc/ZpjigtwZDss8+jBAuGGFn0ox/qywe0Tqd2d dupZFj7kXQPyddEkI0UTPJzwTQwhYKgSyR2lKBtqTzRAFd/vNN3XPQ52xzGs/z5ginZv gZWguhk0/jVsgHe0A7JfZHSKThO4T3Z6raZ+sGmshSEqwZTgK+KwItw1qQp3iR74gIRI PKVA== 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 :arc-authentication-results; bh=iHfJYUL44ODVgFMRSwZjwa+1qfGVTYyR6i/8B+Nu2P8=; b=KHPUXsqNr2V1lT1CPG3OI7X7Kg1zEjKPmGENg5T4l0DCwx+zHfSotAXIVkOcJ96xjf /llHcK+T7td9Q6ua9iNkaHjlv09Okr+9P2UJQrmKkxaqTPX9JdnpYRAnE1LzvJfX4efp 7TrihmjCm036Vl9KOJQOxuVCxO2oqlBhhNYs3QopFvtXH2KizAQC00DC6XE1zeTAcGMB GtLrh8/QmN26B1n+yYn6AIEjI0+jYEYCwK42GSsXNoNi9eZFE4NrCD/URUo7PTaOh1Qi 1m9zglpekVD6IXTNygJWwYQjUP5rLkQ1RJ6SmKj3fT7QyCK6SCIUJMNULbxov5LCVOjp wlWg== 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 z8-v6si11887019pgc.693.2018.05.21.20.13.49; Mon, 21 May 2018 20:14: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 S1752629AbeEVDNQ (ORCPT + 99 others); Mon, 21 May 2018 23:13:16 -0400 Received: from mga06.intel.com ([134.134.136.31]:55066 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751932AbeEVDNO (ORCPT ); Mon, 21 May 2018 23:13:14 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2018 20:13:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,428,1520924400"; d="scan'208";a="41795474" Received: from sai-dev-mach.sc.intel.com ([143.183.140.145]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2018 20:13:13 -0700 From: Sai Praneeth Prakhya To: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sai Praneeth , Lee Chun-Yi , Borislav Petkov , Tony Luck , Will Deacon , Dave Hansen , Mark Rutland , Bhupesh Sharma , Naresh Bhat , Ricardo Neri , Peter Zijlstra , Ravi Shankar , Matt Fleming , Dan Williams , Ard Biesheuvel , Miguel Ojeda Subject: [PATCH V3 0/3] Use efi_rts_wq to invoke EFI Runtime Services Date: Mon, 21 May 2018 20:13:01 -0700 Message-Id: <1526958784-14688-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 Problem statement: ------------------ Presently, efi_runtime_services() silently switch %cr3 from swapper_pgd to efi_pgd. As a consequence, kernel code that runs in efi_pgd (e.g., perf code via an NMI) will have incorrect user space mappings[1]. This could lead to otherwise unexpected access errors and, worse, unauthorized access to firmware code and data. Detailed discussion of problem statement: ----------------------------------------- As this switch is not propagated to other kernel subsystems; they will wrongly assume that swapper_pgd is still in use and it can lead to following issues: 1. If kernel code tries to access user space addresses while in efi_pgd, it could lead to unauthorized accesses to firmware code/data. (e.g: <__>/copy_from_user_nmi()). [This could also be disastrous if the frame pointer happens to point at MMIO in the EFI runtime mappings] - Mark Rutland. An example of a subsystem that could touch user space while in efi_pgd is perf. Assume that we are in efi_pgd, a user could use perf to profile some user data and depending on the address the user is trying to profile, two things could happen. 1. If the mappings are absent, perf fails to profile. 2. If efi_pgd does have mappings for the requested address (these mappings are erroneous), perf profiles firmware code/data. If the address is MMIO'ed, perf could have potentially changed some device state. The culprit in both the cases is, EFI subsystem swapping out pgd and not perf. Because, EFI subsystem has broken the *general assumption* that all other subsystems rely on - "user space might be valid and nobody has switched %cr3". Solutions: ---------- There are two ways to fix this issue: 1. Educate about pgd change to *all* the subsystems that could potentially access user space while in efi_pgd. On x86, AFAIK, it could happen only when some one touches user space from the back of an NMI (a quick audit on <__>/copy_from_user_nmi, showed perf and oprofile). On arm, it could happen from multiple places as arm runs efi_runtime_services() interrupts enabled (ARM folks, please comment on this as I might be wrong); whereas x86 runs efi_runtime_services() interrupts disabled. I think, this solution isn't holistic because a. Any other subsystem might well do the same, if not now, in future. b. Also, this solutions looks simpler on x86 but not true if it's the same for arm (ARM folks, please comment on this as I might be wrong). c. This solution looks like a work around rather than addressing the issue. 2. Running efi_runtime_services() in kthread context. This makes sense because efi_pgd doesn't have user space and kthread by definition means that user space is not valid. Any kernel code that tries to touch user space while in kthread is buggy in itself. If so, it should be an easy fix in the other subsystem. This also take us one step closer to long awaiting proposal of Andy - Running EFI at CPL 3. What does this patch set do? ---------------------------- Introduce efi_rts_wq (EFI runtime services work queue). When a user process requests the kernel to execute any efi_runtime_service(), kernel queues the work to efi_rts_wq, a kthread comes along, switches to efi_pgd and executes efi_runtime_service() in kthread context. IOW, this patch set adds support to the EFI subsystem to handle all calls to efi_runtime_services() using a work queue (which in turn uses kthread). How running efi_runtime_services() in kthread fixes above discussed issues? --------------------------------------------------------------------------- If we run efi_runtime_services() in kthread context and if perf checks for it, we could get both the above scenarios correct by perf aborting the profiling. Not only perf, but any subsystem that tries to touch user space should first check for kthread context and if so, should abort. Q. If we still need check for kthread context in other subsystems that access user space, what does this patch set fix? A. This patch set makes sure that EFI subsystem is not at fault. Without this patch set the blame is upon EFI subsystem, because it's the one that changed pgd and hasn't communicated this change to everyone and hence broke the general assumption. Running efi_runtime_services() in kthread means explicitly communicating that user space is invalid, now it's the responsibility of other subsystem to make sure that it's running in right context. Testing: -------- Tested using LUV (Linux UEFI Validation) for x86_64, x86_32 and arm64 (qemu only). Will appreciate the effort if someone could test the patches on real ARM/ARM64 machines. LUV: https://01.org/linux-uefi-validation Credits: -------- Thanks to Ricardo, Dan, Miguel and Mark for initial reviews and suggestions. Thanks to Boris and Andy for making me think through/help on what I am addressing with this patch set. Please feel free to pour in your comments and concerns. Note: ----- Patches are based on Linus's kernel v4.17-rc6 [1] Backup: Detailing efi_pgd: ------------------------------ efi_pgd has mappings for EFI Runtime Code/Data (on x86, plus EFI Boot time Code/Data) regions. Due to the nature of these mappings, they fall in user space address ranges and they are not the same as swapper. [On arm64, the EFI mappings are in the VA range usually used for user space. The two halves of the address space are managed by separate tables, TTBR0 and TTBR1. We always map the kernel in TTBR1, and we map user space or EFI runtime mappings in TTBR0.] - Mark Rutland Changes from V2 to V3: ---------------------- 1. Rewrite the cover letter to clearly state the problem. What we are fixing and what we are not fixing. 2. Make efi_delete_dummy_variable() change local to x86. 3. Avoid using BUG(), instead, print error message and exit gracefully. 4. Move struct efi_runtime_work to runtime-wrappers.c file. 5. Give enum a name (efi_rts_ids) and use it in efi_runtime_work. 6. Add Naresh (maintainer of LUV for ARM) and Miguel to the CC list. Changes from V1 to V2: ---------------------- 1. Remove unnecessary include of asm/efi.h file - Fixes build error on ia64, reported by 0-day 2. Use enum to identify efi_runtime_services() 3. Use alloc_ordered_workqueue() to create efi_rts_wq as create_workqueue() is scheduled for depreciation. 4. Make efi_call_rts() static, as it has no callers outside runtime-wrappers.c 5. Use BUG(), when we are unable to queue work or unable to identify requested efi_runtime_service() - Because these two situations should *never* happen. Sai Praneeth (3): x86/efi: Call efi_delete_dummy_variable() after creating efi_rts_wq efi: Introduce efi_queue_work() to queue any efi_runtime_service() on efi_rts_wq efi: Use efi_rts_wq to invoke EFI Runtime Services arch/x86/platform/efi/efi.c | 15 +- drivers/firmware/efi/arm-runtime.c | 3 + drivers/firmware/efi/efi.c | 25 ++++ drivers/firmware/efi/runtime-wrappers.c | 250 +++++++++++++++++++++++++++++--- include/linux/efi.h | 4 + 5 files changed, 271 insertions(+), 26 deletions(-) Signed-off-by: Sai Praneeth Prakhya Suggested-by: Andy Lutomirski Cc: Lee Chun-Yi Cc: Borislav Petkov Cc: Tony Luck Cc: Will Deacon Cc: Dave Hansen Cc: Mark Rutland Cc: Bhupesh Sharma Cc: Naresh Bhat Cc: Ricardo Neri Cc: Peter Zijlstra Cc: Ravi Shankar Cc: Matt Fleming Cc: Dan Williams Cc: Ard Biesheuvel Cc: Miguel Ojeda -- 2.7.4