From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752525AbcGUNMg (ORCPT ); Thu, 21 Jul 2016 09:12:36 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:37918 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752475AbcGUNMe (ORCPT ); Thu, 21 Jul 2016 09:12:34 -0400 Date: Thu, 21 Jul 2016 14:12:30 +0100 From: Matt Fleming To: Austin Christ Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, jbrasen@codeaurora.org, Kweh Hock Leong , "Bryan O'Donoghue" Subject: Re: [PATCH] efi: capsule: allocate whole capsule into virtual memory Message-ID: <20160721131230.GH26504@codeblueprint.co.uk> References: <1468600891-15794-1-git-send-email-austinwc@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1468600891-15794-1-git-send-email-austinwc@codeaurora.org> User-Agent: Mutt/1.5.24+41 (02bc14ed1569) (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 15 Jul, at 10:41:31AM, Christ, Austin wrote: > 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 > --- > drivers/firmware/efi/capsule-loader.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c > index c99c24b..c4f3c20 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__); > 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; Looks OK to me but could you also update the comments above efi_capsule_update() that mention the virtual mapping only being required for the first page? From mboxrd@z Thu Jan 1 00:00:00 1970 From: matt@codeblueprint.co.uk (Matt Fleming) Date: Thu, 21 Jul 2016 14:12:30 +0100 Subject: [PATCH] efi: capsule: allocate whole capsule into virtual memory In-Reply-To: <1468600891-15794-1-git-send-email-austinwc@codeaurora.org> References: <1468600891-15794-1-git-send-email-austinwc@codeaurora.org> Message-ID: <20160721131230.GH26504@codeblueprint.co.uk> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, 15 Jul, at 10:41:31AM, Christ, Austin wrote: > 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 > --- > drivers/firmware/efi/capsule-loader.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c > index c99c24b..c4f3c20 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__); > 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; Looks OK to me but could you also update the comments above efi_capsule_update() that mention the virtual mapping only being required for the first page?