* [PATCH] efi: capsule: allocate whole capsule into virtual memory
@ 2016-07-15 16:41 ` Austin Christ
0 siblings, 0 replies; 12+ messages in thread
From: Austin Christ @ 2016-07-15 16:41 UTC (permalink / raw)
To: linux-efi, linux-kernel; +Cc: matt, linux-arm-kernel, jbrasen, Austin Christ
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;
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] efi: capsule: allocate whole capsule into virtual memory
@ 2016-07-15 16:41 ` Austin Christ
0 siblings, 0 replies; 12+ messages in thread
From: Austin Christ @ 2016-07-15 16:41 UTC (permalink / raw)
To: linux-efi-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: matt-mF/unelCI9GS6iBeEJttW/XRex20P6io,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
jbrasen-sgV2jX0FEOL9JmXXK+q4OQ, Austin Christ
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-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.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;
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] efi: capsule: allocate whole capsule into virtual memory
@ 2016-07-15 16:41 ` Austin Christ
0 siblings, 0 replies; 12+ messages in thread
From: Austin Christ @ 2016-07-15 16:41 UTC (permalink / raw)
To: linux-arm-kernel
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;
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] efi: capsule: allocate whole capsule into virtual memory
2016-07-15 16:41 ` Austin Christ
@ 2016-07-21 13:12 ` Matt Fleming
-1 siblings, 0 replies; 12+ messages in thread
From: Matt Fleming @ 2016-07-21 13:12 UTC (permalink / raw)
To: Austin Christ
Cc: linux-efi, linux-kernel, linux-arm-kernel, jbrasen,
Kweh Hock Leong, Bryan O'Donoghue
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?
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] efi: capsule: allocate whole capsule into virtual memory
@ 2016-07-21 13:12 ` Matt Fleming
0 siblings, 0 replies; 12+ messages in thread
From: Matt Fleming @ 2016-07-21 13:12 UTC (permalink / raw)
To: linux-arm-kernel
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?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] efi: capsule: allocate whole capsule into virtual memory
@ 2016-07-21 21:05 ` Christ, Austin
0 siblings, 0 replies; 12+ messages in thread
From: Christ, Austin @ 2016-07-21 21:05 UTC (permalink / raw)
To: Matt Fleming
Cc: linux-efi, linux-kernel, linux-arm-kernel, jbrasen,
Kweh Hock Leong, Bryan O'Donoghue
Hey Matt,
On 7/21/2016 7:12 AM, Matt Fleming wrote:
> 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?
That's a great point. The comments will be updated in v2.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-efi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks,
Austin
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] efi: capsule: allocate whole capsule into virtual memory
@ 2016-07-21 21:05 ` Christ, Austin
0 siblings, 0 replies; 12+ messages in thread
From: Christ, Austin @ 2016-07-21 21:05 UTC (permalink / raw)
To: Matt Fleming
Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
jbrasen-sgV2jX0FEOL9JmXXK+q4OQ, Kweh Hock Leong,
Bryan O'Donoghue
Hey Matt,
On 7/21/2016 7:12 AM, Matt Fleming wrote:
> 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-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.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?
That's a great point. The comments will be updated in v2.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-efi" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks,
Austin
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] efi: capsule: allocate whole capsule into virtual memory
@ 2016-07-21 21:05 ` Christ, Austin
0 siblings, 0 replies; 12+ messages in thread
From: Christ, Austin @ 2016-07-21 21:05 UTC (permalink / raw)
To: linux-arm-kernel
Hey Matt,
On 7/21/2016 7:12 AM, Matt Fleming wrote:
> 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?
That's a great point. The comments will be updated in v2.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-efi" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks,
Austin
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] efi: capsule: allocate whole capsule into virtual memory
2016-07-15 16:41 ` Austin Christ
@ 2016-07-28 6:07 ` joeyli
-1 siblings, 0 replies; 12+ messages in thread
From: joeyli @ 2016-07-28 6:07 UTC (permalink / raw)
To: Austin Christ; +Cc: linux-efi, linux-kernel, matt, linux-arm-kernel, jbrasen
Hi Austin,
On Fri, Jul 15, 2016 at 10:41:31AM -0600, Austin Christ 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__);
^^^^^^^^ use vmap()?
I have only a minor suggestion as above.
Reviewed-by: Lee, Chun-Yi <jlee@suse.com>
> 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;
> --
Thanks a lot!
Joey Lee
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] efi: capsule: allocate whole capsule into virtual memory
@ 2016-07-28 6:07 ` joeyli
0 siblings, 0 replies; 12+ messages in thread
From: joeyli @ 2016-07-28 6:07 UTC (permalink / raw)
To: linux-arm-kernel
Hi Austin,
On Fri, Jul 15, 2016 at 10:41:31AM -0600, Austin Christ 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__);
^^^^^^^^ use vmap()?
I have only a minor suggestion as above.
Reviewed-by: Lee, Chun-Yi <jlee@suse.com>
> 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;
> --
Thanks a lot!
Joey Lee
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] efi: capsule: allocate whole capsule into virtual memory
2016-07-28 6:07 ` joeyli
@ 2016-07-28 21:28 ` Christ, Austin
-1 siblings, 0 replies; 12+ messages in thread
From: Christ, Austin @ 2016-07-28 21:28 UTC (permalink / raw)
To: joeyli; +Cc: linux-efi, linux-kernel, matt, linux-arm-kernel, jbrasen
Hello,
On 7/28/2016 12:07 AM, joeyli wrote:
> Hi Austin,
>
> On Fri, Jul 15, 2016 at 10:41:31AM -0600, Austin Christ 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__);
> ^^^^^^^^ use vmap()?
>
> I have only a minor suggestion as above.
>
> Reviewed-by: Lee, Chun-Yi <jlee@suse.com>
Thanks, this will be fixed in v2.
>
>> 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;
>> --
> Thanks a lot!
> Joey Lee
> --
> To unsubscribe from this list: send the line "unsubscribe linux-efi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] efi: capsule: allocate whole capsule into virtual memory
@ 2016-07-28 21:28 ` Christ, Austin
0 siblings, 0 replies; 12+ messages in thread
From: Christ, Austin @ 2016-07-28 21:28 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
On 7/28/2016 12:07 AM, joeyli wrote:
> Hi Austin,
>
> On Fri, Jul 15, 2016 at 10:41:31AM -0600, Austin Christ 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__);
> ^^^^^^^^ use vmap()?
>
> I have only a minor suggestion as above.
>
> Reviewed-by: Lee, Chun-Yi <jlee@suse.com>
Thanks, this will be fixed in v2.
>
>> 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;
>> --
> Thanks a lot!
> Joey Lee
> --
> To unsubscribe from this list: send the line "unsubscribe linux-efi" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-07-28 21:28 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-15 16:41 [PATCH] efi: capsule: allocate whole capsule into virtual memory Austin Christ
2016-07-15 16:41 ` Austin Christ
2016-07-15 16:41 ` Austin Christ
2016-07-21 13:12 ` Matt Fleming
2016-07-21 13:12 ` Matt Fleming
2016-07-21 21:05 ` Christ, Austin
2016-07-21 21:05 ` Christ, Austin
2016-07-21 21:05 ` Christ, Austin
2016-07-28 6:07 ` joeyli
2016-07-28 6:07 ` joeyli
2016-07-28 21:28 ` Christ, Austin
2016-07-28 21:28 ` Christ, Austin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.