* [PATCH] x86/efi-bgrt: Replace early_memremap() with memremap()
@ 2015-12-21 14:12 Matt Fleming
2015-12-21 20:07 ` Josh Triplett
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Matt Fleming @ 2015-12-21 14:12 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H . Peter Anvin
Cc: linux-efi, linux-kernel, Matt Fleming, Josh Triplett,
Sai Praneeth Prakhya, Borislav Petkov, Môshe van der Sterre
Môshe reported the following warning triggered on his machine since
commit 50a0cb565246 ("x86/efi-bgrt: Fix kernel panic when mapping BGRT
data"),
[ 0.026936] ------------[ cut here ]------------
[ 0.026941] WARNING: CPU: 0 PID: 0 at mm/early_ioremap.c:137 __early_ioremap+0x102/0x1bb()
[ 0.026941] Modules linked in:
[ 0.026944] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.4.0-rc1 #2
[ 0.026945] Hardware name: Dell Inc. XPS 13 9343/09K8G1, BIOS A05 07/14/2015
[ 0.026946] 0000000000000000 900f03d5a116524d ffffffff81c03e60 ffffffff813a3fff
[ 0.026948] 0000000000000000 ffffffff81c03e98 ffffffff810a0852 00000000d7b76000
[ 0.026949] 0000000000000000 0000000000000001 0000000000000001 000000000000017c
[ 0.026951] Call Trace:
[ 0.026955] [<ffffffff813a3fff>] dump_stack+0x44/0x55
[ 0.026958] [<ffffffff810a0852>] warn_slowpath_common+0x82/0xc0
[ 0.026959] [<ffffffff810a099a>] warn_slowpath_null+0x1a/0x20
[ 0.026961] [<ffffffff81d8c395>] __early_ioremap+0x102/0x1bb
[ 0.026962] [<ffffffff81d8c602>] early_memremap+0x13/0x15
[ 0.026964] [<ffffffff81d78361>] efi_bgrt_init+0x162/0x1ad
[ 0.026966] [<ffffffff81d778ec>] efi_late_init+0x9/0xb
[ 0.026968] [<ffffffff81d58ff5>] start_kernel+0x46f/0x49f
[ 0.026970] [<ffffffff81d58120>] ? early_idt_handler_array+0x120/0x120
[ 0.026972] [<ffffffff81d58339>] x86_64_start_reservations+0x2a/0x2c
[ 0.026974] [<ffffffff81d58485>] x86_64_start_kernel+0x14a/0x16d
[ 0.026977] ---[ end trace f9b3812eb8e24c58 ]---
[ 0.026978] efi_bgrt: Ignoring BGRT: failed to map image memory
early_memremap() has an upper limit on the size of mapping it can
handle which is ~200KB. Clearly the BGRT image on Môshe's machine is
much larger than that.
There's actually no reason to restrict ourselves to using the early_*
version of memremap() - the ACPI BGRT driver is invoked late enough in
boot that we can use the standard version, with the benefit that the
late version allows mappings of arbitrary size.
Reported-by: Môshe van der Sterre <me@moshe.nl>
Tested-by: Môshe van der Sterre <me@moshe.nl>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
---
arch/x86/platform/efi/efi-bgrt.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/platform/efi/efi-bgrt.c b/arch/x86/platform/efi/efi-bgrt.c
index bf51f4c02562..b0970661870a 100644
--- a/arch/x86/platform/efi/efi-bgrt.c
+++ b/arch/x86/platform/efi/efi-bgrt.c
@@ -72,14 +72,14 @@ void __init efi_bgrt_init(void)
return;
}
- image = early_memremap(bgrt_tab->image_address, sizeof(bmp_header));
+ image = memremap(bgrt_tab->image_address, sizeof(bmp_header), MEMREMAP_WB);
if (!image) {
pr_err("Ignoring BGRT: failed to map image header memory\n");
return;
}
memcpy(&bmp_header, image, sizeof(bmp_header));
- early_memunmap(image, sizeof(bmp_header));
+ memunmap(image);
bgrt_image_size = bmp_header.size;
bgrt_image = kmalloc(bgrt_image_size, GFP_KERNEL | __GFP_NOWARN);
@@ -89,7 +89,7 @@ void __init efi_bgrt_init(void)
return;
}
- image = early_memremap(bgrt_tab->image_address, bmp_header.size);
+ image = memremap(bgrt_tab->image_address, bmp_header.size, MEMREMAP_WB);
if (!image) {
pr_err("Ignoring BGRT: failed to map image memory\n");
kfree(bgrt_image);
@@ -98,5 +98,5 @@ void __init efi_bgrt_init(void)
}
memcpy(bgrt_image, image, bgrt_image_size);
- early_memunmap(image, bmp_header.size);
+ memunmap(image);
}
--
2.6.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] x86/efi-bgrt: Replace early_memremap() with memremap()
2015-12-21 14:12 [PATCH] x86/efi-bgrt: Replace early_memremap() with memremap() Matt Fleming
@ 2015-12-21 20:07 ` Josh Triplett
2016-01-04 13:12 ` Matt Fleming
2016-01-06 17:33 ` [tip:x86/efi] " tip-bot for Matt Fleming
2 siblings, 0 replies; 4+ messages in thread
From: Josh Triplett @ 2015-12-21 20:07 UTC (permalink / raw)
To: Matt Fleming
Cc: Ingo Molnar, Thomas Gleixner, H . Peter Anvin, linux-efi,
linux-kernel, Sai Praneeth Prakhya, Borislav Petkov,
Môshe van der Sterre
On Mon, Dec 21, 2015 at 02:12:52PM +0000, Matt Fleming wrote:
> Môshe reported the following warning triggered on his machine since
> commit 50a0cb565246 ("x86/efi-bgrt: Fix kernel panic when mapping BGRT
> data"),
>
> [ 0.026936] ------------[ cut here ]------------
> [ 0.026941] WARNING: CPU: 0 PID: 0 at mm/early_ioremap.c:137 __early_ioremap+0x102/0x1bb()
> [ 0.026941] Modules linked in:
> [ 0.026944] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.4.0-rc1 #2
> [ 0.026945] Hardware name: Dell Inc. XPS 13 9343/09K8G1, BIOS A05 07/14/2015
> [ 0.026946] 0000000000000000 900f03d5a116524d ffffffff81c03e60 ffffffff813a3fff
> [ 0.026948] 0000000000000000 ffffffff81c03e98 ffffffff810a0852 00000000d7b76000
> [ 0.026949] 0000000000000000 0000000000000001 0000000000000001 000000000000017c
> [ 0.026951] Call Trace:
> [ 0.026955] [<ffffffff813a3fff>] dump_stack+0x44/0x55
> [ 0.026958] [<ffffffff810a0852>] warn_slowpath_common+0x82/0xc0
> [ 0.026959] [<ffffffff810a099a>] warn_slowpath_null+0x1a/0x20
> [ 0.026961] [<ffffffff81d8c395>] __early_ioremap+0x102/0x1bb
> [ 0.026962] [<ffffffff81d8c602>] early_memremap+0x13/0x15
> [ 0.026964] [<ffffffff81d78361>] efi_bgrt_init+0x162/0x1ad
> [ 0.026966] [<ffffffff81d778ec>] efi_late_init+0x9/0xb
> [ 0.026968] [<ffffffff81d58ff5>] start_kernel+0x46f/0x49f
> [ 0.026970] [<ffffffff81d58120>] ? early_idt_handler_array+0x120/0x120
> [ 0.026972] [<ffffffff81d58339>] x86_64_start_reservations+0x2a/0x2c
> [ 0.026974] [<ffffffff81d58485>] x86_64_start_kernel+0x14a/0x16d
> [ 0.026977] ---[ end trace f9b3812eb8e24c58 ]---
> [ 0.026978] efi_bgrt: Ignoring BGRT: failed to map image memory
>
> early_memremap() has an upper limit on the size of mapping it can
> handle which is ~200KB. Clearly the BGRT image on Môshe's machine is
> much larger than that.
>
> There's actually no reason to restrict ourselves to using the early_*
> version of memremap() - the ACPI BGRT driver is invoked late enough in
> boot that we can use the standard version, with the benefit that the
> late version allows mappings of arbitrary size.
>
> Reported-by: Môshe van der Sterre <me@moshe.nl>
> Tested-by: Môshe van der Sterre <me@moshe.nl>
> Cc: Josh Triplett <josh@joshtriplett.org>
> Cc: Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>
> Cc: Borislav Petkov <bp@suse.de>
> Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> arch/x86/platform/efi/efi-bgrt.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/platform/efi/efi-bgrt.c b/arch/x86/platform/efi/efi-bgrt.c
> index bf51f4c02562..b0970661870a 100644
> --- a/arch/x86/platform/efi/efi-bgrt.c
> +++ b/arch/x86/platform/efi/efi-bgrt.c
> @@ -72,14 +72,14 @@ void __init efi_bgrt_init(void)
> return;
> }
>
> - image = early_memremap(bgrt_tab->image_address, sizeof(bmp_header));
> + image = memremap(bgrt_tab->image_address, sizeof(bmp_header), MEMREMAP_WB);
> if (!image) {
> pr_err("Ignoring BGRT: failed to map image header memory\n");
> return;
> }
>
> memcpy(&bmp_header, image, sizeof(bmp_header));
> - early_memunmap(image, sizeof(bmp_header));
> + memunmap(image);
> bgrt_image_size = bmp_header.size;
>
> bgrt_image = kmalloc(bgrt_image_size, GFP_KERNEL | __GFP_NOWARN);
> @@ -89,7 +89,7 @@ void __init efi_bgrt_init(void)
> return;
> }
>
> - image = early_memremap(bgrt_tab->image_address, bmp_header.size);
> + image = memremap(bgrt_tab->image_address, bmp_header.size, MEMREMAP_WB);
> if (!image) {
> pr_err("Ignoring BGRT: failed to map image memory\n");
> kfree(bgrt_image);
> @@ -98,5 +98,5 @@ void __init efi_bgrt_init(void)
> }
>
> memcpy(bgrt_image, image, bgrt_image_size);
> - early_memunmap(image, bmp_header.size);
> + memunmap(image);
> }
> --
> 2.6.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] x86/efi-bgrt: Replace early_memremap() with memremap()
2015-12-21 14:12 [PATCH] x86/efi-bgrt: Replace early_memremap() with memremap() Matt Fleming
2015-12-21 20:07 ` Josh Triplett
@ 2016-01-04 13:12 ` Matt Fleming
2016-01-06 17:33 ` [tip:x86/efi] " tip-bot for Matt Fleming
2 siblings, 0 replies; 4+ messages in thread
From: Matt Fleming @ 2016-01-04 13:12 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H . Peter Anvin
Cc: linux-efi, linux-kernel, Josh Triplett, Sai Praneeth Prakhya,
Borislav Petkov, Môshe van der Sterre
On Mon, 21 Dec, at 02:12:52PM, Matt Fleming wrote:
> Môshe reported the following warning triggered on his machine since
> commit 50a0cb565246 ("x86/efi-bgrt: Fix kernel panic when mapping BGRT
> data"),
>
> [ 0.026936] ------------[ cut here ]------------
> [ 0.026941] WARNING: CPU: 0 PID: 0 at mm/early_ioremap.c:137 __early_ioremap+0x102/0x1bb()
> [ 0.026941] Modules linked in:
> [ 0.026944] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.4.0-rc1 #2
> [ 0.026945] Hardware name: Dell Inc. XPS 13 9343/09K8G1, BIOS A05 07/14/2015
> [ 0.026946] 0000000000000000 900f03d5a116524d ffffffff81c03e60 ffffffff813a3fff
> [ 0.026948] 0000000000000000 ffffffff81c03e98 ffffffff810a0852 00000000d7b76000
> [ 0.026949] 0000000000000000 0000000000000001 0000000000000001 000000000000017c
> [ 0.026951] Call Trace:
> [ 0.026955] [<ffffffff813a3fff>] dump_stack+0x44/0x55
> [ 0.026958] [<ffffffff810a0852>] warn_slowpath_common+0x82/0xc0
> [ 0.026959] [<ffffffff810a099a>] warn_slowpath_null+0x1a/0x20
> [ 0.026961] [<ffffffff81d8c395>] __early_ioremap+0x102/0x1bb
> [ 0.026962] [<ffffffff81d8c602>] early_memremap+0x13/0x15
> [ 0.026964] [<ffffffff81d78361>] efi_bgrt_init+0x162/0x1ad
> [ 0.026966] [<ffffffff81d778ec>] efi_late_init+0x9/0xb
> [ 0.026968] [<ffffffff81d58ff5>] start_kernel+0x46f/0x49f
> [ 0.026970] [<ffffffff81d58120>] ? early_idt_handler_array+0x120/0x120
> [ 0.026972] [<ffffffff81d58339>] x86_64_start_reservations+0x2a/0x2c
> [ 0.026974] [<ffffffff81d58485>] x86_64_start_kernel+0x14a/0x16d
> [ 0.026977] ---[ end trace f9b3812eb8e24c58 ]---
> [ 0.026978] efi_bgrt: Ignoring BGRT: failed to map image memory
>
> early_memremap() has an upper limit on the size of mapping it can
> handle which is ~200KB. Clearly the BGRT image on Môshe's machine is
> much larger than that.
>
> There's actually no reason to restrict ourselves to using the early_*
> version of memremap() - the ACPI BGRT driver is invoked late enough in
> boot that we can use the standard version, with the benefit that the
> late version allows mappings of arbitrary size.
>
> Reported-by: Môshe van der Sterre <me@moshe.nl>
> Tested-by: Môshe van der Sterre <me@moshe.nl>
> Cc: Josh Triplett <josh@joshtriplett.org>
> Cc: Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>
> Cc: Borislav Petkov <bp@suse.de>
> Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
> ---
> arch/x86/platform/efi/efi-bgrt.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
Ping? Could someone please pick this up for the 'x86/efi' branch? It
fixes a bug in 50a0cb565246 ("x86/efi-bgrt: Fix kernel panic when
mapping BGRT data").
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:x86/efi] x86/efi-bgrt: Replace early_memremap() with memremap()
2015-12-21 14:12 [PATCH] x86/efi-bgrt: Replace early_memremap() with memremap() Matt Fleming
2015-12-21 20:07 ` Josh Triplett
2016-01-04 13:12 ` Matt Fleming
@ 2016-01-06 17:33 ` tip-bot for Matt Fleming
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Matt Fleming @ 2016-01-06 17:33 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, me, bp, tglx, josh, mingo, sai.praneeth.prakhya,
hpa, matt
Commit-ID: e2c90dd7e11e3025b46719a79fb4bb1e7a5cef9f
Gitweb: http://git.kernel.org/tip/e2c90dd7e11e3025b46719a79fb4bb1e7a5cef9f
Author: Matt Fleming <matt@codeblueprint.co.uk>
AuthorDate: Mon, 21 Dec 2015 14:12:52 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 6 Jan 2016 18:28:52 +0100
x86/efi-bgrt: Replace early_memremap() with memremap()
Môshe reported the following warning triggered on his machine since
commit 50a0cb565246 ("x86/efi-bgrt: Fix kernel panic when mapping BGRT
data"),
[ 0.026936] ------------[ cut here ]------------
[ 0.026941] WARNING: CPU: 0 PID: 0 at mm/early_ioremap.c:137 __early_ioremap+0x102/0x1bb()
[ 0.026941] Modules linked in:
[ 0.026944] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.4.0-rc1 #2
[ 0.026945] Hardware name: Dell Inc. XPS 13 9343/09K8G1, BIOS A05 07/14/2015
[ 0.026946] 0000000000000000 900f03d5a116524d ffffffff81c03e60 ffffffff813a3fff
[ 0.026948] 0000000000000000 ffffffff81c03e98 ffffffff810a0852 00000000d7b76000
[ 0.026949] 0000000000000000 0000000000000001 0000000000000001 000000000000017c
[ 0.026951] Call Trace:
[ 0.026955] [<ffffffff813a3fff>] dump_stack+0x44/0x55
[ 0.026958] [<ffffffff810a0852>] warn_slowpath_common+0x82/0xc0
[ 0.026959] [<ffffffff810a099a>] warn_slowpath_null+0x1a/0x20
[ 0.026961] [<ffffffff81d8c395>] __early_ioremap+0x102/0x1bb
[ 0.026962] [<ffffffff81d8c602>] early_memremap+0x13/0x15
[ 0.026964] [<ffffffff81d78361>] efi_bgrt_init+0x162/0x1ad
[ 0.026966] [<ffffffff81d778ec>] efi_late_init+0x9/0xb
[ 0.026968] [<ffffffff81d58ff5>] start_kernel+0x46f/0x49f
[ 0.026970] [<ffffffff81d58120>] ? early_idt_handler_array+0x120/0x120
[ 0.026972] [<ffffffff81d58339>] x86_64_start_reservations+0x2a/0x2c
[ 0.026974] [<ffffffff81d58485>] x86_64_start_kernel+0x14a/0x16d
[ 0.026977] ---[ end trace f9b3812eb8e24c58 ]---
[ 0.026978] efi_bgrt: Ignoring BGRT: failed to map image memory
early_memremap() has an upper limit on the size of mapping it can
handle which is ~200KB. Clearly the BGRT image on Môshe's machine is
much larger than that.
There's actually no reason to restrict ourselves to using the early_*
version of memremap() - the ACPI BGRT driver is invoked late enough in
boot that we can use the standard version, with the benefit that the
late version allows mappings of arbitrary size.
Reported-by: Môshe van der Sterre <me@moshe.nl>
Tested-by: Môshe van der Sterre <me@moshe.nl>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1450707172-12561-1-git-send-email-matt@codeblueprint.co.uk
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/platform/efi/efi-bgrt.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/platform/efi/efi-bgrt.c b/arch/x86/platform/efi/efi-bgrt.c
index bf51f4c..b097066 100644
--- a/arch/x86/platform/efi/efi-bgrt.c
+++ b/arch/x86/platform/efi/efi-bgrt.c
@@ -72,14 +72,14 @@ void __init efi_bgrt_init(void)
return;
}
- image = early_memremap(bgrt_tab->image_address, sizeof(bmp_header));
+ image = memremap(bgrt_tab->image_address, sizeof(bmp_header), MEMREMAP_WB);
if (!image) {
pr_err("Ignoring BGRT: failed to map image header memory\n");
return;
}
memcpy(&bmp_header, image, sizeof(bmp_header));
- early_memunmap(image, sizeof(bmp_header));
+ memunmap(image);
bgrt_image_size = bmp_header.size;
bgrt_image = kmalloc(bgrt_image_size, GFP_KERNEL | __GFP_NOWARN);
@@ -89,7 +89,7 @@ void __init efi_bgrt_init(void)
return;
}
- image = early_memremap(bgrt_tab->image_address, bmp_header.size);
+ image = memremap(bgrt_tab->image_address, bmp_header.size, MEMREMAP_WB);
if (!image) {
pr_err("Ignoring BGRT: failed to map image memory\n");
kfree(bgrt_image);
@@ -98,5 +98,5 @@ void __init efi_bgrt_init(void)
}
memcpy(bgrt_image, image, bgrt_image_size);
- early_memunmap(image, bmp_header.size);
+ memunmap(image);
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-01-06 17:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-21 14:12 [PATCH] x86/efi-bgrt: Replace early_memremap() with memremap() Matt Fleming
2015-12-21 20:07 ` Josh Triplett
2016-01-04 13:12 ` Matt Fleming
2016-01-06 17:33 ` [tip:x86/efi] " tip-bot for Matt Fleming
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).