From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932754AbcHKQVY (ORCPT ); Thu, 11 Aug 2016 12:21:24 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60150 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932717AbcHKQVT (ORCPT ); Thu, 11 Aug 2016 12:21:19 -0400 Date: Thu, 11 Aug 2016 09:20:11 -0700 From: tip-bot for Austin Christ Message-ID: Cc: ard.biesheuvel@linaro.org, mingo@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, bp@alien8.de, austinwc@codeaurora.org, luto@kernel.org, brgerst@gmail.com, peterz@infradead.org, jlee@suse.com, pure.logic@nexus-software.ie, hock.leong.kweh@intel.com, tglx@linutronix.de, matt@codeblueprint.co.uk, hpa@zytor.com, dvlasenk@redhat.com Reply-To: pure.logic@nexus-software.ie, hock.leong.kweh@intel.com, matt@codeblueprint.co.uk, tglx@linutronix.de, hpa@zytor.com, dvlasenk@redhat.com, mingo@kernel.org, ard.biesheuvel@linaro.org, bp@alien8.de, jpoimboe@redhat.com, austinwc@codeaurora.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, brgerst@gmail.com, luto@kernel.org, peterz@infradead.org, jlee@suse.com In-Reply-To: <1470912120-22831-3-git-send-email-matt@codeblueprint.co.uk> References: <1470912120-22831-3-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/urgent] efi/capsule: Allocate whole capsule into virtual memory Git-Commit-ID: 6862e6ad95e984991a6ceec592cf67831658f928 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6862e6ad95e984991a6ceec592cf67831658f928 Gitweb: http://git.kernel.org/tip/6862e6ad95e984991a6ceec592cf67831658f928 Author: Austin Christ AuthorDate: Thu, 11 Aug 2016 11:42:00 +0100 Committer: Ingo Molnar CommitDate: Thu, 11 Aug 2016 13:55:36 +0200 efi/capsule: Allocate whole capsule into virtual memory According to UEFI 2.6 section 7.5.3, the capsule should be in contiguous virtual memory and firmware may consume the capsule immediately. To correctly implement this functionality, the kernel driver needs to vmap the entire capsule at the time it is made available to firmware. The virtual allocation of the capsule update has been changed from kmap, which was only allocating the first page of the update, to vmap, and allocates the entire data payload. Signed-off-by: Austin Christ Signed-off-by: Matt Fleming Reviewed-by: Matt Fleming Reviewed-by: Lee, Chun-Yi Cc: # v4.7 Cc: Andy Lutomirski Cc: Ard Biesheuvel Cc: Borislav Petkov Cc: Brian Gerst Cc: Bryan O'Donoghue Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Kweh Hock Leong Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1470912120-22831-3-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- drivers/firmware/efi/capsule-loader.c | 8 +++++--- drivers/firmware/efi/capsule.c | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c index c99c24b..9ae6c11 100644 --- a/drivers/firmware/efi/capsule-loader.c +++ b/drivers/firmware/efi/capsule-loader.c @@ -16,6 +16,7 @@ #include #include #include +#include #define NO_FURTHER_WRITE_ACTION -1 @@ -108,14 +109,15 @@ static ssize_t efi_capsule_submit_update(struct capsule_info *cap_info) int ret; void *cap_hdr_temp; - cap_hdr_temp = kmap(cap_info->pages[0]); + cap_hdr_temp = vmap(cap_info->pages, cap_info->index, + VM_MAP, PAGE_KERNEL); if (!cap_hdr_temp) { - pr_debug("%s: kmap() failed\n", __func__); + pr_debug("%s: vmap() failed\n", __func__); return -EFAULT; } ret = efi_capsule_update(cap_hdr_temp, cap_info->pages); - kunmap(cap_info->pages[0]); + vunmap(cap_hdr_temp); if (ret) { pr_err("%s: efi_capsule_update() failed\n", __func__); return ret; diff --git a/drivers/firmware/efi/capsule.c b/drivers/firmware/efi/capsule.c index 53b9fd2..6eedff4 100644 --- a/drivers/firmware/efi/capsule.c +++ b/drivers/firmware/efi/capsule.c @@ -190,9 +190,9 @@ efi_capsule_update_locked(efi_capsule_header_t *capsule, * map the capsule described by @capsule with its data in @pages and * send it to the firmware via the UpdateCapsule() runtime service. * - * @capsule must be a virtual mapping of the first page in @pages - * (@pages[0]) in the kernel address space. That is, a - * capsule_header_t that describes the entire contents of the capsule + * @capsule must be a virtual mapping of the complete capsule update in the + * kernel address space, as the capsule can be consumed immediately. + * A capsule_header_t that describes the entire contents of the capsule * must be at the start of the first data page. * * Even though this function will validate that the firmware supports