linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matt Fleming <matt@codeblueprint.co.uk>
To: Austin Christ <austinwc@codeaurora.org>
Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, jbrasen@codeaurora.org,
	Kweh Hock Leong <hock.leong.kweh@intel.com>,
	"Bryan O'Donoghue" <pure.logic@nexus-software.ie>
Subject: Re: [PATCH] efi: capsule: allocate whole capsule into virtual memory
Date: Thu, 21 Jul 2016 14:12:30 +0100	[thread overview]
Message-ID: <20160721131230.GH26504@codeblueprint.co.uk> (raw)
In-Reply-To: <1468600891-15794-1-git-send-email-austinwc@codeaurora.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 <austinwc@codeaurora.org>
> ---
>  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 <linux/slab.h>
>  #include <linux/mutex.h>
>  #include <linux/efi.h>
> +#include <linux/vmalloc.h>
>  
>  #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?

  reply	other threads:[~2016-07-21 13:12 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-15 16:41 [PATCH] efi: capsule: allocate whole capsule into virtual memory Austin Christ
2016-07-21 13:12 ` Matt Fleming [this message]
2016-07-21 21:05   ` Christ, Austin
2016-07-28  6:07 ` joeyli
2016-07-28 21:28   ` Christ, Austin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160721131230.GH26504@codeblueprint.co.uk \
    --to=matt@codeblueprint.co.uk \
    --cc=austinwc@codeaurora.org \
    --cc=hock.leong.kweh@intel.com \
    --cc=jbrasen@codeaurora.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pure.logic@nexus-software.ie \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).