Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1557249 > unrolled thread
| Started by | Dave Young <dyoung@redhat.com> |
|---|---|
| First post | 2017-01-12 10:50 +0100 |
| Last post | 2017-01-16 16:20 +0100 |
| Articles | 12 — 4 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 2/4] efi/x86: move efi bgrt init code to early init code Dave Young <dyoung@redhat.com> - 2017-01-12 10:50 +0100
Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Dave Young <dyoung@redhat.com> - 2017-01-12 11:00 +0100
Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Nicolai Stange <nicstange@gmail.com> - 2017-01-12 13:00 +0100
Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Dave Young <dyoung@redhat.com> - 2017-01-12 22:40 +0100
Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Nicolai Stange <nicstange@gmail.com> - 2017-01-13 00:20 +0100
Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Dave Young <dyoung@redhat.com> - 2017-01-13 03:30 +0100
Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Dave Young <dyoung@redhat.com> - 2017-01-13 04:10 +0100
Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Nicolai Stange <nicstange@gmail.com> - 2017-01-13 13:30 +0100
Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Dave Young <dyoung@redhat.com> - 2017-01-16 04:00 +0100
Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2017-01-12 17:30 +0100
Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Dave Young <dyoung@redhat.com> - 2017-01-12 22:40 +0100
Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Bhupesh Sharma <bhsharma@redhat.com> - 2017-01-16 16:20 +0100
| From | Dave Young <dyoung@redhat.com> |
|---|---|
| Date | 2017-01-12 10:50 +0100 |
| Subject | [PATCH 2/4] efi/x86: move efi bgrt init code to early init code |
| Message-ID | <sYKb7-2kU-7@gated-at.bofh.it> |
Before invoking the arch specific handler, efi_mem_reserve() reserves
the given memory region through memblock.
efi_bgrt_init will call efi_mem_reserve after mm_init(), at that time
memblock is dead and it should not be used any more.
efi bgrt code depend on acpi intialization to get the bgrt acpi table,
moving bgrt parsing to acpi early boot code can make sure efi_mem_reserve
in efi bgrt code still use memblock safely.
Signed-off-by: Dave Young <dyoung@redhat.com>
---
arch/x86/kernel/acpi/boot.c | 12 +++++++++++
arch/x86/platform/efi/efi-bgrt.c | 42 +++++++++++++--------------------------
arch/x86/platform/efi/efi.c | 5 ----
drivers/acpi/bgrt.c | 21 +++++++++++++------
include/linux/efi-bgrt.h | 7 ++----
init/main.c | 1
6 files changed, 45 insertions(+), 43 deletions(-)
--- linux-x86.orig/arch/x86/kernel/acpi/boot.c
+++ linux-x86/arch/x86/kernel/acpi/boot.c
@@ -35,6 +35,7 @@
#include <linux/bootmem.h>
#include <linux/ioport.h>
#include <linux/pci.h>
+#include <linux/efi-bgrt.h>
#include <asm/irqdomain.h>
#include <asm/pci_x86.h>
@@ -1557,6 +1558,14 @@ int __init early_acpi_boot_init(void)
return 0;
}
+#ifdef CONFIG_ACPI_BGRT
+static int __init acpi_parse_bgrt(struct acpi_table_header *table)
+{
+ efi_bgrt_init(table);
+ return 0;
+}
+#endif
+
int __init acpi_boot_init(void)
{
/* those are executed after early-quirks are executed */
@@ -1581,6 +1590,9 @@ int __init acpi_boot_init(void)
acpi_process_madt();
acpi_table_parse(ACPI_SIG_HPET, acpi_parse_hpet);
+#ifdef CONFIG_ACPI_BGRT
+ acpi_table_parse("BGRT", acpi_parse_bgrt);
+#endif
if (!acpi_noirq)
x86_init.pci.init = pci_acpi_init;
--- linux-x86.orig/arch/x86/platform/efi/efi-bgrt.c
+++ linux-x86/arch/x86/platform/efi/efi-bgrt.c
@@ -19,8 +19,7 @@
#include <linux/efi.h>
#include <linux/efi-bgrt.h>
-struct acpi_table_bgrt *bgrt_tab;
-void *__initdata bgrt_image;
+struct acpi_table_bgrt bgrt_tab;
size_t __initdata bgrt_image_size;
struct bmp_header {
@@ -28,53 +27,49 @@ struct bmp_header {
u32 size;
} __packed;
-void __init efi_bgrt_init(void)
+void __init efi_bgrt_init(struct acpi_table_header *table)
{
- acpi_status status;
void *image;
struct bmp_header bmp_header;
if (acpi_disabled)
return;
- status = acpi_get_table("BGRT", 0,
- (struct acpi_table_header **)&bgrt_tab);
- if (ACPI_FAILURE(status))
- return;
+ bgrt_tab = *(struct acpi_table_bgrt *)table;
- if (bgrt_tab->header.length < sizeof(*bgrt_tab)) {
+ if (bgrt_tab.header.length < sizeof(bgrt_tab)) {
pr_notice("Ignoring BGRT: invalid length %u (expected %zu)\n",
- bgrt_tab->header.length, sizeof(*bgrt_tab));
+ bgrt_tab.header.length, sizeof(bgrt_tab));
return;
}
- if (bgrt_tab->version != 1) {
+ if (bgrt_tab.version != 1) {
pr_notice("Ignoring BGRT: invalid version %u (expected 1)\n",
- bgrt_tab->version);
+ bgrt_tab.version);
return;
}
- if (bgrt_tab->status & 0xfe) {
+ if (bgrt_tab.status & 0xfe) {
pr_notice("Ignoring BGRT: reserved status bits are non-zero %u\n",
- bgrt_tab->status);
+ bgrt_tab.status);
return;
}
- if (bgrt_tab->image_type != 0) {
+ if (bgrt_tab.image_type != 0) {
pr_notice("Ignoring BGRT: invalid image type %u (expected 0)\n",
- bgrt_tab->image_type);
+ bgrt_tab.image_type);
return;
}
- if (!bgrt_tab->image_address) {
+ if (!bgrt_tab.image_address) {
pr_notice("Ignoring BGRT: null image address\n");
return;
}
- image = memremap(bgrt_tab->image_address, sizeof(bmp_header), MEMREMAP_WB);
+ image = early_memremap(bgrt_tab.image_address, sizeof(bmp_header));
if (!image) {
pr_notice("Ignoring BGRT: failed to map image header memory\n");
return;
}
memcpy(&bmp_header, image, sizeof(bmp_header));
- memunmap(image);
+ early_memunmap(image, sizeof(bmp_header));
if (bmp_header.id != 0x4d42) {
pr_notice("Ignoring BGRT: Incorrect BMP magic number 0x%x (expected 0x4d42)\n",
bmp_header.id);
@@ -82,12 +77,5 @@ void __init efi_bgrt_init(void)
}
bgrt_image_size = bmp_header.size;
- bgrt_image = memremap(bgrt_tab->image_address, bmp_header.size, MEMREMAP_WB);
- if (!bgrt_image) {
- pr_notice("Ignoring BGRT: failed to map image memory\n");
- bgrt_image = NULL;
- return;
- }
-
- efi_mem_reserve(bgrt_tab->image_address, bgrt_image_size);
+ efi_mem_reserve(bgrt_tab.image_address, bgrt_image_size);
}
--- linux-x86.orig/drivers/acpi/bgrt.c
+++ linux-x86/drivers/acpi/bgrt.c
@@ -15,40 +15,41 @@
#include <linux/sysfs.h>
#include <linux/efi-bgrt.h>
+static void *bgrt_image;
static struct kobject *bgrt_kobj;
static ssize_t show_version(struct device *dev,
struct device_attribute *attr, char *buf)
{
- return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->version);
+ return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.version);
}
static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
static ssize_t show_status(struct device *dev,
struct device_attribute *attr, char *buf)
{
- return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->status);
+ return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.status);
}
static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);
static ssize_t show_type(struct device *dev,
struct device_attribute *attr, char *buf)
{
- return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->image_type);
+ return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.image_type);
}
static DEVICE_ATTR(type, S_IRUGO, show_type, NULL);
static ssize_t show_xoffset(struct device *dev,
struct device_attribute *attr, char *buf)
{
- return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->image_offset_x);
+ return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.image_offset_x);
}
static DEVICE_ATTR(xoffset, S_IRUGO, show_xoffset, NULL);
static ssize_t show_yoffset(struct device *dev,
struct device_attribute *attr, char *buf)
{
- return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->image_offset_y);
+ return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.image_offset_y);
}
static DEVICE_ATTR(yoffset, S_IRUGO, show_yoffset, NULL);
@@ -84,9 +85,17 @@ static int __init bgrt_init(void)
{
int ret;
- if (!bgrt_image)
+ if (!bgrt_tab.image_address)
return -ENODEV;
+ bgrt_image = memremap(bgrt_tab.image_address, bgrt_image_size,
+ MEMREMAP_WB);
+ if (!bgrt_image) {
+ pr_notice("Ignoring BGRT: failed to map image memory\n");
+ bgrt_image = NULL;
+ return -ENOMEM;
+ }
+
bin_attr_image.private = bgrt_image;
bin_attr_image.size = bgrt_image_size;
--- linux-x86.orig/include/linux/efi-bgrt.h
+++ linux-x86/include/linux/efi-bgrt.h
@@ -5,16 +5,15 @@
#include <linux/acpi.h>
-void efi_bgrt_init(void);
+void efi_bgrt_init(struct acpi_table_header *table);
/* The BGRT data itself; only valid if bgrt_image != NULL. */
-extern void *bgrt_image;
extern size_t bgrt_image_size;
-extern struct acpi_table_bgrt *bgrt_tab;
+extern struct acpi_table_bgrt bgrt_tab;
#else /* !CONFIG_ACPI_BGRT */
-static inline void efi_bgrt_init(void) {}
+static inline void efi_bgrt_init(struct acpi_table_header *table) {}
#endif /* !CONFIG_ACPI_BGRT */
--- linux-x86.orig/arch/x86/platform/efi/efi.c
+++ linux-x86/arch/x86/platform/efi/efi.c
@@ -476,11 +476,6 @@ void __init efi_init(void)
efi_print_memmap();
}
-void __init efi_late_init(void)
-{
- efi_bgrt_init();
-}
-
void __init efi_set_executable(efi_memory_desc_t *md, bool executable)
{
u64 addr, npages;
--- linux-x86.orig/init/main.c
+++ linux-x86/init/main.c
@@ -663,7 +663,6 @@ asmlinkage __visible void __init start_k
sfi_init_late();
if (efi_enabled(EFI_RUNTIME_SERVICES)) {
- efi_late_init();
efi_free_boot_services();
}
[toc] | [next] | [standalone]
| From | Dave Young <dyoung@redhat.com> |
|---|---|
| Date | 2017-01-12 11:00 +0100 |
| Message-ID | <sYKkN-2oa-19@gated-at.bofh.it> |
| In reply to | #1557249 |
[snip]
> --- linux-x86.orig/drivers/acpi/bgrt.c
> +++ linux-x86/drivers/acpi/bgrt.c
[snip]
>
> @@ -84,9 +85,17 @@ static int __init bgrt_init(void)
> {
> int ret;
>
> - if (!bgrt_image)
> + if (!bgrt_tab.image_address)
> return -ENODEV;
>
> + bgrt_image = memremap(bgrt_tab.image_address, bgrt_image_size,
> + MEMREMAP_WB);
> + if (!bgrt_image) {
> + pr_notice("Ignoring BGRT: failed to map image memory\n");
> + bgrt_image = NULL;
> + return -ENOMEM;
> + }
> +
Oops, later error path need unmap bgrt_image, will update in next
version after collecting more comments.
Also bgrt_image = NULL is useless, will drop it.
> bin_attr_image.private = bgrt_image;
> bin_attr_image.size = bgrt_image_size;
>
Thanks
Dave
[toc] | [prev] | [next] | [standalone]
| From | Nicolai Stange <nicstange@gmail.com> |
|---|---|
| Date | 2017-01-12 13:00 +0100 |
| Message-ID | <sYMcV-3w1-1@gated-at.bofh.it> |
| In reply to | #1557249 |
On Thu, Jan 12 2017, Dave Young wrote:
> -void __init efi_bgrt_init(void)
> +void __init efi_bgrt_init(struct acpi_table_header *table)
> {
> - acpi_status status;
> void *image;
> struct bmp_header bmp_header;
>
> if (acpi_disabled)
> return;
>
> - status = acpi_get_table("BGRT", 0,
> - (struct acpi_table_header **)&bgrt_tab);
> - if (ACPI_FAILURE(status))
> - return;
Not sure, but wouldn't it be safer to reverse the order of this assignment
> + bgrt_tab = *(struct acpi_table_bgrt *)table;
and this length check
> - if (bgrt_tab->header.length < sizeof(*bgrt_tab)) {
> + if (bgrt_tab.header.length < sizeof(bgrt_tab)) {
> pr_notice("Ignoring BGRT: invalid length %u (expected %zu)\n",
> - bgrt_tab->header.length, sizeof(*bgrt_tab));
> + bgrt_tab.header.length, sizeof(bgrt_tab));
> return;
> }
?
Also, from here on, all error paths should zero out
bgrt_tab.image_address (or so) to signal failure to bgrt_init():
bgrt_init() now checks for !bgrt_tab.image_address whereas before it had
tested bgrt_image and the latter used to be set at the very end of
efi_bgrt_init().
> - if (bgrt_tab->version != 1) {
> + if (bgrt_tab.version != 1) {
> pr_notice("Ignoring BGRT: invalid version %u (expected 1)\n",
> - bgrt_tab->version);
> + bgrt_tab.version);
> return;
> }
> - if (bgrt_tab->status & 0xfe) {
> + if (bgrt_tab.status & 0xfe) {
> pr_notice("Ignoring BGRT: reserved status bits are non-zero %u\n",
> - bgrt_tab->status);
> + bgrt_tab.status);
> return;
> }
> - if (bgrt_tab->image_type != 0) {
> + if (bgrt_tab.image_type != 0) {
> pr_notice("Ignoring BGRT: invalid image type %u (expected 0)\n",
> - bgrt_tab->image_type);
> + bgrt_tab.image_type);
> return;
> }
> - if (!bgrt_tab->image_address) {
> + if (!bgrt_tab.image_address) {
> pr_notice("Ignoring BGRT: null image address\n");
> return;
> }
>
> - image = memremap(bgrt_tab->image_address, sizeof(bmp_header), MEMREMAP_WB);
> + image = early_memremap(bgrt_tab.image_address, sizeof(bmp_header));
> if (!image) {
> pr_notice("Ignoring BGRT: failed to map image header memory\n");
> return;
> }
>
> memcpy(&bmp_header, image, sizeof(bmp_header));
> - memunmap(image);
> + early_memunmap(image, sizeof(bmp_header));
> if (bmp_header.id != 0x4d42) {
> pr_notice("Ignoring BGRT: Incorrect BMP magic number 0x%x (expected 0x4d42)\n",
> bmp_header.id);
> @@ -82,12 +77,5 @@ void __init efi_bgrt_init(void)
> }
> bgrt_image_size = bmp_header.size;
>
> - bgrt_image = memremap(bgrt_tab->image_address, bmp_header.size, MEMREMAP_WB);
> - if (!bgrt_image) {
> - pr_notice("Ignoring BGRT: failed to map image memory\n");
> - bgrt_image = NULL;
> - return;
> - }
> -
> - efi_mem_reserve(bgrt_tab->image_address, bgrt_image_size);
> + efi_mem_reserve(bgrt_tab.image_address, bgrt_image_size);
> }
> --- linux-x86.orig/drivers/acpi/bgrt.c
> +++ linux-x86/drivers/acpi/bgrt.c
> @@ -15,40 +15,41 @@
> #include <linux/sysfs.h>
> #include <linux/efi-bgrt.h>
>
> +static void *bgrt_image;
[...]
> @@ -84,9 +85,17 @@ static int __init bgrt_init(void)
> {
> int ret;
>
> - if (!bgrt_image)
> + if (!bgrt_tab.image_address)
> return -ENODEV;
>
> + bgrt_image = memremap(bgrt_tab.image_address, bgrt_image_size,
> + MEMREMAP_WB);
> + if (!bgrt_image) {
> + pr_notice("Ignoring BGRT: failed to map image memory\n");
> + bgrt_image = NULL;
> + return -ENOMEM;
> + }
> +
> bin_attr_image.private = bgrt_image;
> bin_attr_image.size = bgrt_image_size;
>
Thanks,
Nicolai
[toc] | [prev] | [next] | [standalone]
| From | Dave Young <dyoung@redhat.com> |
|---|---|
| Date | 2017-01-12 22:40 +0100 |
| Message-ID | <sYVge-Ak-7@gated-at.bofh.it> |
| In reply to | #1557395 |
On 01/12/17 at 12:54pm, Nicolai Stange wrote:
> On Thu, Jan 12 2017, Dave Young wrote:
>
> > -void __init efi_bgrt_init(void)
> > +void __init efi_bgrt_init(struct acpi_table_header *table)
> > {
> > - acpi_status status;
> > void *image;
> > struct bmp_header bmp_header;
> >
> > if (acpi_disabled)
> > return;
> >
> > - status = acpi_get_table("BGRT", 0,
> > - (struct acpi_table_header **)&bgrt_tab);
> > - if (ACPI_FAILURE(status))
> > - return;
>
>
> Not sure, but wouldn't it be safer to reverse the order of this assignment
>
> > + bgrt_tab = *(struct acpi_table_bgrt *)table;
Nicolai, sorry, I'm not sure I understand the comment, is it about above line?
Could you elaborate a bit?
>
> and this length check
>
I also do not get this :(
> > - if (bgrt_tab->header.length < sizeof(*bgrt_tab)) {
> > + if (bgrt_tab.header.length < sizeof(bgrt_tab)) {
> > pr_notice("Ignoring BGRT: invalid length %u (expected %zu)\n",
> > - bgrt_tab->header.length, sizeof(*bgrt_tab));
> > + bgrt_tab.header.length, sizeof(bgrt_tab));
> > return;
> > }
>
> ?
>
> Also, from here on, all error paths should zero out
> bgrt_tab.image_address (or so) to signal failure to bgrt_init():
> bgrt_init() now checks for !bgrt_tab.image_address whereas before it had
> tested bgrt_image and the latter used to be set at the very end of
> efi_bgrt_init().
>
Will do, thanks!
>
> > - if (bgrt_tab->version != 1) {
> > + if (bgrt_tab.version != 1) {
> > pr_notice("Ignoring BGRT: invalid version %u (expected 1)\n",
> > - bgrt_tab->version);
> > + bgrt_tab.version);
> > return;
> > }
> > - if (bgrt_tab->status & 0xfe) {
> > + if (bgrt_tab.status & 0xfe) {
> > pr_notice("Ignoring BGRT: reserved status bits are non-zero %u\n",
> > - bgrt_tab->status);
> > + bgrt_tab.status);
> > return;
> > }
> > - if (bgrt_tab->image_type != 0) {
> > + if (bgrt_tab.image_type != 0) {
> > pr_notice("Ignoring BGRT: invalid image type %u (expected 0)\n",
> > - bgrt_tab->image_type);
> > + bgrt_tab.image_type);
> > return;
> > }
> > - if (!bgrt_tab->image_address) {
> > + if (!bgrt_tab.image_address) {
> > pr_notice("Ignoring BGRT: null image address\n");
> > return;
> > }
> >
> > - image = memremap(bgrt_tab->image_address, sizeof(bmp_header), MEMREMAP_WB);
> > + image = early_memremap(bgrt_tab.image_address, sizeof(bmp_header));
> > if (!image) {
> > pr_notice("Ignoring BGRT: failed to map image header memory\n");
> > return;
> > }
> >
> > memcpy(&bmp_header, image, sizeof(bmp_header));
> > - memunmap(image);
> > + early_memunmap(image, sizeof(bmp_header));
> > if (bmp_header.id != 0x4d42) {
> > pr_notice("Ignoring BGRT: Incorrect BMP magic number 0x%x (expected 0x4d42)\n",
> > bmp_header.id);
> > @@ -82,12 +77,5 @@ void __init efi_bgrt_init(void)
> > }
> > bgrt_image_size = bmp_header.size;
> >
> > - bgrt_image = memremap(bgrt_tab->image_address, bmp_header.size, MEMREMAP_WB);
> > - if (!bgrt_image) {
> > - pr_notice("Ignoring BGRT: failed to map image memory\n");
> > - bgrt_image = NULL;
> > - return;
> > - }
> > -
> > - efi_mem_reserve(bgrt_tab->image_address, bgrt_image_size);
> > + efi_mem_reserve(bgrt_tab.image_address, bgrt_image_size);
> > }
> > --- linux-x86.orig/drivers/acpi/bgrt.c
> > +++ linux-x86/drivers/acpi/bgrt.c
> > @@ -15,40 +15,41 @@
> > #include <linux/sysfs.h>
> > #include <linux/efi-bgrt.h>
> >
> > +static void *bgrt_image;
>
> [...]
>
> > @@ -84,9 +85,17 @@ static int __init bgrt_init(void)
> > {
> > int ret;
> >
> > - if (!bgrt_image)
> > + if (!bgrt_tab.image_address)
> > return -ENODEV;
> >
> > + bgrt_image = memremap(bgrt_tab.image_address, bgrt_image_size,
> > + MEMREMAP_WB);
> > + if (!bgrt_image) {
> > + pr_notice("Ignoring BGRT: failed to map image memory\n");
> > + bgrt_image = NULL;
> > + return -ENOMEM;
> > + }
> > +
> > bin_attr_image.private = bgrt_image;
> > bin_attr_image.size = bgrt_image_size;
> >
>
> Thanks,
>
> Nicolai
Thanks
Dave
[toc] | [prev] | [next] | [standalone]
| From | Nicolai Stange <nicstange@gmail.com> |
|---|---|
| Date | 2017-01-13 00:20 +0100 |
| Message-ID | <sYWOZ-1DN-13@gated-at.bofh.it> |
| In reply to | #1557826 |
On Fri, Jan 13 2017, Dave Young wrote:
> On 01/12/17 at 12:54pm, Nicolai Stange wrote:
>> On Thu, Jan 12 2017, Dave Young wrote:
>>
>> > -void __init efi_bgrt_init(void)
>> > +void __init efi_bgrt_init(struct acpi_table_header *table)
>> > {
>> > - acpi_status status;
>> > void *image;
>> > struct bmp_header bmp_header;
>> >
>> > if (acpi_disabled)
>> > return;
>> >
>> > - status = acpi_get_table("BGRT", 0,
>> > - (struct acpi_table_header **)&bgrt_tab);
>> > - if (ACPI_FAILURE(status))
>> > - return;
>>
>>
>> Not sure, but wouldn't it be safer to reverse the order of this assignment
>>
>> > + bgrt_tab = *(struct acpi_table_bgrt *)table;
>
> Nicolai, sorry, I'm not sure I understand the comment, is it about above line?
> Could you elaborate a bit?
>
>>
>> and this length check
>>
>
> I also do not get this :(
Ah sorry, my point is this: the length check should perhaps be made
before doing the assignment to bgrt_tab because otherwise, we might end
up reading from invalid memory.
I.e. if (struct acpi_table_bgrt *)table->length < sizeof(bgrt_tab), then
bgrt_tab = *(struct acpi_table_bgrt *)table;
would read past the table's end.
I'm not sure whether this is a real problem though -- that is, whether
this read could ever hit some unmapped memory.
>> > - if (bgrt_tab->header.length < sizeof(*bgrt_tab)) {
>> > + if (bgrt_tab.header.length < sizeof(bgrt_tab)) {
>> > pr_notice("Ignoring BGRT: invalid length %u (expected %zu)\n",
>> > - bgrt_tab->header.length, sizeof(*bgrt_tab));
>> > + bgrt_tab.header.length, sizeof(bgrt_tab));
>> > return;
>> > }
>>
>> ?
Thanks,
Nicolai
[toc] | [prev] | [next] | [standalone]
| From | Dave Young <dyoung@redhat.com> |
|---|---|
| Date | 2017-01-13 03:30 +0100 |
| Message-ID | <sYZMR-3st-3@gated-at.bofh.it> |
| In reply to | #1557912 |
On 01/13/17 at 12:11am, Nicolai Stange wrote:
> On Fri, Jan 13 2017, Dave Young wrote:
>
> > On 01/12/17 at 12:54pm, Nicolai Stange wrote:
> >> On Thu, Jan 12 2017, Dave Young wrote:
> >>
> >> > -void __init efi_bgrt_init(void)
> >> > +void __init efi_bgrt_init(struct acpi_table_header *table)
> >> > {
> >> > - acpi_status status;
> >> > void *image;
> >> > struct bmp_header bmp_header;
> >> >
> >> > if (acpi_disabled)
> >> > return;
> >> >
> >> > - status = acpi_get_table("BGRT", 0,
> >> > - (struct acpi_table_header **)&bgrt_tab);
> >> > - if (ACPI_FAILURE(status))
> >> > - return;
> >>
> >>
> >> Not sure, but wouldn't it be safer to reverse the order of this assignment
> >>
> >> > + bgrt_tab = *(struct acpi_table_bgrt *)table;
> >
> > Nicolai, sorry, I'm not sure I understand the comment, is it about above line?
> > Could you elaborate a bit?
> >
> >>
> >> and this length check
> >>
> >
> > I also do not get this :(
>
> Ah sorry, my point is this: the length check should perhaps be made
> before doing the assignment to bgrt_tab because otherwise, we might end
> up reading from invalid memory.
>
> I.e. if (struct acpi_table_bgrt *)table->length < sizeof(bgrt_tab), then
>
> bgrt_tab = *(struct acpi_table_bgrt *)table;
>
> would read past the table's end.
>
> I'm not sure whether this is a real problem though -- that is, whether
> this read could ever hit some unmapped memory.
Nicolai, thanks for the explanation. It make sense to move it to even later
at the end of the function.
Thanks
Dave
[toc] | [prev] | [next] | [standalone]
| From | Dave Young <dyoung@redhat.com> |
|---|---|
| Date | 2017-01-13 04:10 +0100 |
| Message-ID | <sZ0pA-3X6-5@gated-at.bofh.it> |
| In reply to | #1557962 |
On 01/13/17 at 10:21am, Dave Young wrote:
> On 01/13/17 at 12:11am, Nicolai Stange wrote:
> > On Fri, Jan 13 2017, Dave Young wrote:
> >
> > > On 01/12/17 at 12:54pm, Nicolai Stange wrote:
> > >> On Thu, Jan 12 2017, Dave Young wrote:
> > >>
> > >> > -void __init efi_bgrt_init(void)
> > >> > +void __init efi_bgrt_init(struct acpi_table_header *table)
> > >> > {
> > >> > - acpi_status status;
> > >> > void *image;
> > >> > struct bmp_header bmp_header;
> > >> >
> > >> > if (acpi_disabled)
> > >> > return;
> > >> >
> > >> > - status = acpi_get_table("BGRT", 0,
> > >> > - (struct acpi_table_header **)&bgrt_tab);
> > >> > - if (ACPI_FAILURE(status))
> > >> > - return;
> > >>
> > >>
> > >> Not sure, but wouldn't it be safer to reverse the order of this assignment
> > >>
> > >> > + bgrt_tab = *(struct acpi_table_bgrt *)table;
> > >
> > > Nicolai, sorry, I'm not sure I understand the comment, is it about above line?
> > > Could you elaborate a bit?
> > >
> > >>
> > >> and this length check
> > >>
> > >
> > > I also do not get this :(
> >
> > Ah sorry, my point is this: the length check should perhaps be made
> > before doing the assignment to bgrt_tab because otherwise, we might end
> > up reading from invalid memory.
> >
> > I.e. if (struct acpi_table_bgrt *)table->length < sizeof(bgrt_tab), then
> >
> > bgrt_tab = *(struct acpi_table_bgrt *)table;
> >
> > would read past the table's end.
> >
> > I'm not sure whether this is a real problem though -- that is, whether
> > this read could ever hit some unmapped memory.
>
> Nicolai, thanks for the explanation. It make sense to move it to even later
> at the end of the function.
Indeed assignment should be after the length checking, but with another
tmp variable the assignment to global var can be moved to the end to
avoid clear the image_address field..
>
> Thanks
> Dave
[toc] | [prev] | [next] | [standalone]
| From | Nicolai Stange <nicstange@gmail.com> |
|---|---|
| Date | 2017-01-13 13:30 +0100 |
| Message-ID | <sZ99w-Oh-5@gated-at.bofh.it> |
| In reply to | #1557974 |
On Fri, Jan 13 2017, Dave Young wrote:
> On 01/13/17 at 10:21am, Dave Young wrote:
>> On 01/13/17 at 12:11am, Nicolai Stange wrote:
>> > On Fri, Jan 13 2017, Dave Young wrote:
>> >
>> > > On 01/12/17 at 12:54pm, Nicolai Stange wrote:
>> > >> On Thu, Jan 12 2017, Dave Young wrote:
>> > >>
>> > >> > -void __init efi_bgrt_init(void)
>> > >> > +void __init efi_bgrt_init(struct acpi_table_header *table)
>> > >> > {
>> > >> > - acpi_status status;
>> > >> > void *image;
>> > >> > struct bmp_header bmp_header;
>> > >> >
>> > >> > if (acpi_disabled)
>> > >> > return;
>> > >> >
>> > >> > - status = acpi_get_table("BGRT", 0,
>> > >> > - (struct acpi_table_header **)&bgrt_tab);
>> > >> > - if (ACPI_FAILURE(status))
>> > >> > - return;
>> > >>
>> > >>
>> > >> Not sure, but wouldn't it be safer to reverse the order of this
>> > >> assignment
>> > >>
>> > >> > + bgrt_tab = *(struct acpi_table_bgrt *)table;
>> > >
>> > > Nicolai, sorry, I'm not sure I understand the comment, is it
>> > > about above line?
>> > > Could you elaborate a bit?
>> > >
>> > >>
>> > >> and this length check
>> > >>
>> > >
>> > > I also do not get this :(
>> >
>> > Ah sorry, my point is this: the length check should perhaps be made
>> > before doing the assignment to bgrt_tab because otherwise, we might end
>> > up reading from invalid memory.
>> >
>> > I.e. if (struct acpi_table_bgrt *)table->length < sizeof(bgrt_tab), then
>> >
>> > bgrt_tab = *(struct acpi_table_bgrt *)table;
>> >
>> > would read past the table's end.
>> >
>> > I'm not sure whether this is a real problem though -- that is, whether
>> > this read could ever hit some unmapped memory.
>>
>> Nicolai, thanks for the explanation. It make sense to move it to even later
>> at the end of the function.
>
> Indeed assignment should be after the length checking, but with another
> tmp variable the assignment to global var can be moved to the end to
> avoid clear the image_address field..
I had a look at your updated patches at
http://people.redhat.com/~ruyang/efi-bgrt/ and they look fine to me.
One minor remark:
sizeof(acpi_table_bgrt) == 56 and it might be better to avoid the extra
tmp copy in efi_bgrt_init() by
- assigning directly to bgrt_tab
- do a 'goto err' rather than a 'return' from all the error paths
- do a memset(&bgrt_tab, 0, sizeof(bgrt_tab)) at 'err:'
With the copy to the on-stack 'bgrt', gcc 6.2.0 emits this for each of
the two copies:
41: 8a 07 mov (%rdi),%al
43: 88 45 d7 mov %al,-0x29(%rbp)
46: 8a 47 01 mov 0x1(%rdi),%al
49: 88 45 d6 mov %al,-0x2a(%rbp)
4c: 8a 47 02 mov 0x2(%rdi),%al
4f: 88 45 d5 mov %al,-0x2b(%rbp)
52: 8a 47 03 mov 0x3(%rdi),%al
55: 88 45 d4 mov %al,-0x2c(%rbp)
58: 8a 47 08 mov 0x8(%rdi),%al
5b: 88 45 d3 mov %al,-0x2d(%rbp)
5e: 8a 47 09 mov 0x9(%rdi),%al
61: 88 45 d2 mov %al,-0x2e(%rbp)
64: 8a 47 0a mov 0xa(%rdi),%al
67: 88 45 d1 mov %al,-0x2f(%rbp)
6a: 8a 47 0b mov 0xb(%rdi),%al
6d: 88 45 d0 mov %al,-0x30(%rbp)
70: 8a 47 0c mov 0xc(%rdi),%al
73: 88 45 cf mov %al,-0x31(%rbp)
76: 8a 47 0d mov 0xd(%rdi),%al
79: 88 45 ce mov %al,-0x32(%rbp)
7c: 8a 47 0e mov 0xe(%rdi),%al
7f: 88 45 cd mov %al,-0x33(%rbp)
82: 8a 47 0f mov 0xf(%rdi),%al
85: 88 45 cc mov %al,-0x34(%rbp)
88: 8a 47 10 mov 0x10(%rdi),%al
8b: 88 45 cb mov %al,-0x35(%rbp)
8e: 8a 47 11 mov 0x11(%rdi),%al
91: 88 45 ca mov %al,-0x36(%rbp)
94: 8a 47 12 mov 0x12(%rdi),%al
97: 88 45 c9 mov %al,-0x37(%rbp)
9a: 8a 47 13 mov 0x13(%rdi),%al
9d: 88 45 c8 mov %al,-0x38(%rbp)
a0: 8a 47 14 mov 0x14(%rdi),%al
a3: 8a 5f 26 mov 0x26(%rdi),%bl
a6: 0f b6 77 27 movzbl 0x27(%rdi),%esi
aa: 4c 8b 67 28 mov 0x28(%rdi),%r12
ae: 88 45 c7 mov %al,-0x39(%rbp)
b1: 8a 47 15 mov 0x15(%rdi),%al
b4: 44 8b 6f 30 mov 0x30(%rdi),%r13d
b8: 44 8b 7f 34 mov 0x34(%rdi),%r15d
bc: 88 45 c6 mov %al,-0x3a(%rbp)
bf: 8a 47 16 mov 0x16(%rdi),%al
c2: 88 45 c5 mov %al,-0x3b(%rbp)
c5: 8a 47 17 mov 0x17(%rdi),%al
c8: 88 45 c4 mov %al,-0x3c(%rbp)
cb: 8b 47 18 mov 0x18(%rdi),%eax
ce: 89 45 c0 mov %eax,-0x40(%rbp)
d1: 8a 47 1c mov 0x1c(%rdi),%al
d4: 88 45 bf mov %al,-0x41(%rbp)
d7: 8a 47 1d mov 0x1d(%rdi),%al
da: 88 45 be mov %al,-0x42(%rbp)
dd: 8a 47 1e mov 0x1e(%rdi),%al
e0: 88 45 bd mov %al,-0x43(%rbp)
e3: 8a 47 1f mov 0x1f(%rdi),%al
e6: 88 45 bc mov %al,-0x44(%rbp)
e9: 8b 47 20 mov 0x20(%rdi),%eax
ec: 89 45 b8 mov %eax,-0x48(%rbp)
ef: 66 8b 47 24 mov 0x24(%rdi),%ax
Not sure why gcc would think that storing bgrt in reversed order on the
stack might be a good idea, but well...
Thanks,
Nicolai
[toc] | [prev] | [next] | [standalone]
| From | Dave Young <dyoung@redhat.com> |
|---|---|
| Date | 2017-01-16 04:00 +0100 |
| Message-ID | <t05Gy-2ly-17@gated-at.bofh.it> |
| In reply to | #1558369 |
On 01/13/17 at 01:21pm, Nicolai Stange wrote:
> On Fri, Jan 13 2017, Dave Young wrote:
>
> > On 01/13/17 at 10:21am, Dave Young wrote:
> >> On 01/13/17 at 12:11am, Nicolai Stange wrote:
> >> > On Fri, Jan 13 2017, Dave Young wrote:
> >> >
> >> > > On 01/12/17 at 12:54pm, Nicolai Stange wrote:
> >> > >> On Thu, Jan 12 2017, Dave Young wrote:
> >> > >>
> >> > >> > -void __init efi_bgrt_init(void)
> >> > >> > +void __init efi_bgrt_init(struct acpi_table_header *table)
> >> > >> > {
> >> > >> > - acpi_status status;
> >> > >> > void *image;
> >> > >> > struct bmp_header bmp_header;
> >> > >> >
> >> > >> > if (acpi_disabled)
> >> > >> > return;
> >> > >> >
> >> > >> > - status = acpi_get_table("BGRT", 0,
> >> > >> > - (struct acpi_table_header **)&bgrt_tab);
> >> > >> > - if (ACPI_FAILURE(status))
> >> > >> > - return;
> >> > >>
> >> > >>
> >> > >> Not sure, but wouldn't it be safer to reverse the order of this
> >> > >> assignment
> >> > >>
> >> > >> > + bgrt_tab = *(struct acpi_table_bgrt *)table;
> >> > >
> >> > > Nicolai, sorry, I'm not sure I understand the comment, is it
> >> > > about above line?
> >> > > Could you elaborate a bit?
> >> > >
> >> > >>
> >> > >> and this length check
> >> > >>
> >> > >
> >> > > I also do not get this :(
> >> >
> >> > Ah sorry, my point is this: the length check should perhaps be made
> >> > before doing the assignment to bgrt_tab because otherwise, we might end
> >> > up reading from invalid memory.
> >> >
> >> > I.e. if (struct acpi_table_bgrt *)table->length < sizeof(bgrt_tab), then
> >> >
> >> > bgrt_tab = *(struct acpi_table_bgrt *)table;
> >> >
> >> > would read past the table's end.
> >> >
> >> > I'm not sure whether this is a real problem though -- that is, whether
> >> > this read could ever hit some unmapped memory.
> >>
> >> Nicolai, thanks for the explanation. It make sense to move it to even later
> >> at the end of the function.
> >
> > Indeed assignment should be after the length checking, but with another
> > tmp variable the assignment to global var can be moved to the end to
> > avoid clear the image_address field..
>
> I had a look at your updated patches at
> http://people.redhat.com/~ruyang/efi-bgrt/ and they look fine to me.
Many thanks~
>
> One minor remark:
>
> sizeof(acpi_table_bgrt) == 56 and it might be better to avoid the extra
> tmp copy in efi_bgrt_init() by
> - assigning directly to bgrt_tab
> - do a 'goto err' rather than a 'return' from all the error paths
> - do a memset(&bgrt_tab, 0, sizeof(bgrt_tab)) at 'err:'
Updated in V2, indeed text size shrunk from 1199 to 762.
>
>
> With the copy to the on-stack 'bgrt', gcc 6.2.0 emits this for each of
> the two copies:
>
> 41: 8a 07 mov (%rdi),%al
> 43: 88 45 d7 mov %al,-0x29(%rbp)
> 46: 8a 47 01 mov 0x1(%rdi),%al
> 49: 88 45 d6 mov %al,-0x2a(%rbp)
> 4c: 8a 47 02 mov 0x2(%rdi),%al
> 4f: 88 45 d5 mov %al,-0x2b(%rbp)
> 52: 8a 47 03 mov 0x3(%rdi),%al
> 55: 88 45 d4 mov %al,-0x2c(%rbp)
> 58: 8a 47 08 mov 0x8(%rdi),%al
> 5b: 88 45 d3 mov %al,-0x2d(%rbp)
> 5e: 8a 47 09 mov 0x9(%rdi),%al
> 61: 88 45 d2 mov %al,-0x2e(%rbp)
> 64: 8a 47 0a mov 0xa(%rdi),%al
> 67: 88 45 d1 mov %al,-0x2f(%rbp)
> 6a: 8a 47 0b mov 0xb(%rdi),%al
> 6d: 88 45 d0 mov %al,-0x30(%rbp)
> 70: 8a 47 0c mov 0xc(%rdi),%al
> 73: 88 45 cf mov %al,-0x31(%rbp)
> 76: 8a 47 0d mov 0xd(%rdi),%al
> 79: 88 45 ce mov %al,-0x32(%rbp)
> 7c: 8a 47 0e mov 0xe(%rdi),%al
> 7f: 88 45 cd mov %al,-0x33(%rbp)
> 82: 8a 47 0f mov 0xf(%rdi),%al
> 85: 88 45 cc mov %al,-0x34(%rbp)
> 88: 8a 47 10 mov 0x10(%rdi),%al
> 8b: 88 45 cb mov %al,-0x35(%rbp)
> 8e: 8a 47 11 mov 0x11(%rdi),%al
> 91: 88 45 ca mov %al,-0x36(%rbp)
> 94: 8a 47 12 mov 0x12(%rdi),%al
> 97: 88 45 c9 mov %al,-0x37(%rbp)
> 9a: 8a 47 13 mov 0x13(%rdi),%al
> 9d: 88 45 c8 mov %al,-0x38(%rbp)
> a0: 8a 47 14 mov 0x14(%rdi),%al
> a3: 8a 5f 26 mov 0x26(%rdi),%bl
> a6: 0f b6 77 27 movzbl 0x27(%rdi),%esi
> aa: 4c 8b 67 28 mov 0x28(%rdi),%r12
> ae: 88 45 c7 mov %al,-0x39(%rbp)
> b1: 8a 47 15 mov 0x15(%rdi),%al
> b4: 44 8b 6f 30 mov 0x30(%rdi),%r13d
> b8: 44 8b 7f 34 mov 0x34(%rdi),%r15d
> bc: 88 45 c6 mov %al,-0x3a(%rbp)
> bf: 8a 47 16 mov 0x16(%rdi),%al
> c2: 88 45 c5 mov %al,-0x3b(%rbp)
> c5: 8a 47 17 mov 0x17(%rdi),%al
> c8: 88 45 c4 mov %al,-0x3c(%rbp)
> cb: 8b 47 18 mov 0x18(%rdi),%eax
> ce: 89 45 c0 mov %eax,-0x40(%rbp)
> d1: 8a 47 1c mov 0x1c(%rdi),%al
> d4: 88 45 bf mov %al,-0x41(%rbp)
> d7: 8a 47 1d mov 0x1d(%rdi),%al
> da: 88 45 be mov %al,-0x42(%rbp)
> dd: 8a 47 1e mov 0x1e(%rdi),%al
> e0: 88 45 bd mov %al,-0x43(%rbp)
> e3: 8a 47 1f mov 0x1f(%rdi),%al
> e6: 88 45 bc mov %al,-0x44(%rbp)
> e9: 8b 47 20 mov 0x20(%rdi),%eax
> ec: 89 45 b8 mov %eax,-0x48(%rbp)
> ef: 66 8b 47 24 mov 0x24(%rdi),%ax
>
> Not sure why gcc would think that storing bgrt in reversed order on the
> stack might be a good idea, but well...
I have no idea about this..
>
> Thanks,
>
> Nicolai
Thanks
Dave
[toc] | [prev] | [next] | [standalone]
| From | Ard Biesheuvel <ard.biesheuvel@linaro.org> |
|---|---|
| Date | 2017-01-12 17:30 +0100 |
| Message-ID | <sYQqd-69X-11@gated-at.bofh.it> |
| In reply to | #1557249 |
On 12 January 2017 at 09:41, Dave Young <dyoung@redhat.com> wrote:
> Before invoking the arch specific handler, efi_mem_reserve() reserves
> the given memory region through memblock.
>
> efi_bgrt_init will call efi_mem_reserve after mm_init(), at that time
> memblock is dead and it should not be used any more.
>
> efi bgrt code depend on acpi intialization to get the bgrt acpi table,
> moving bgrt parsing to acpi early boot code can make sure efi_mem_reserve
> in efi bgrt code still use memblock safely.
>
> Signed-off-by: Dave Young <dyoung@redhat.com>
I know this is probably out of scope for you, but since we're moving
things around, any chance we could do so in a manner that will enable
BGRT support for arm64/ACPI? Happy to test/collaborate on this.
> ---
> arch/x86/kernel/acpi/boot.c | 12 +++++++++++
> arch/x86/platform/efi/efi-bgrt.c | 42 +++++++++++++--------------------------
> arch/x86/platform/efi/efi.c | 5 ----
> drivers/acpi/bgrt.c | 21 +++++++++++++------
> include/linux/efi-bgrt.h | 7 ++----
> init/main.c | 1
> 6 files changed, 45 insertions(+), 43 deletions(-)
>
> --- linux-x86.orig/arch/x86/kernel/acpi/boot.c
> +++ linux-x86/arch/x86/kernel/acpi/boot.c
> @@ -35,6 +35,7 @@
> #include <linux/bootmem.h>
> #include <linux/ioport.h>
> #include <linux/pci.h>
> +#include <linux/efi-bgrt.h>
>
> #include <asm/irqdomain.h>
> #include <asm/pci_x86.h>
> @@ -1557,6 +1558,14 @@ int __init early_acpi_boot_init(void)
> return 0;
> }
>
> +#ifdef CONFIG_ACPI_BGRT
> +static int __init acpi_parse_bgrt(struct acpi_table_header *table)
> +{
> + efi_bgrt_init(table);
> + return 0;
> +}
> +#endif
> +
> int __init acpi_boot_init(void)
> {
> /* those are executed after early-quirks are executed */
> @@ -1581,6 +1590,9 @@ int __init acpi_boot_init(void)
> acpi_process_madt();
>
> acpi_table_parse(ACPI_SIG_HPET, acpi_parse_hpet);
> +#ifdef CONFIG_ACPI_BGRT
> + acpi_table_parse("BGRT", acpi_parse_bgrt);
> +#endif
>
> if (!acpi_noirq)
> x86_init.pci.init = pci_acpi_init;
> --- linux-x86.orig/arch/x86/platform/efi/efi-bgrt.c
> +++ linux-x86/arch/x86/platform/efi/efi-bgrt.c
> @@ -19,8 +19,7 @@
> #include <linux/efi.h>
> #include <linux/efi-bgrt.h>
>
> -struct acpi_table_bgrt *bgrt_tab;
> -void *__initdata bgrt_image;
> +struct acpi_table_bgrt bgrt_tab;
> size_t __initdata bgrt_image_size;
>
> struct bmp_header {
> @@ -28,53 +27,49 @@ struct bmp_header {
> u32 size;
> } __packed;
>
> -void __init efi_bgrt_init(void)
> +void __init efi_bgrt_init(struct acpi_table_header *table)
> {
> - acpi_status status;
> void *image;
> struct bmp_header bmp_header;
>
> if (acpi_disabled)
> return;
>
> - status = acpi_get_table("BGRT", 0,
> - (struct acpi_table_header **)&bgrt_tab);
> - if (ACPI_FAILURE(status))
> - return;
> + bgrt_tab = *(struct acpi_table_bgrt *)table;
>
> - if (bgrt_tab->header.length < sizeof(*bgrt_tab)) {
> + if (bgrt_tab.header.length < sizeof(bgrt_tab)) {
> pr_notice("Ignoring BGRT: invalid length %u (expected %zu)\n",
> - bgrt_tab->header.length, sizeof(*bgrt_tab));
> + bgrt_tab.header.length, sizeof(bgrt_tab));
> return;
> }
> - if (bgrt_tab->version != 1) {
> + if (bgrt_tab.version != 1) {
> pr_notice("Ignoring BGRT: invalid version %u (expected 1)\n",
> - bgrt_tab->version);
> + bgrt_tab.version);
> return;
> }
> - if (bgrt_tab->status & 0xfe) {
> + if (bgrt_tab.status & 0xfe) {
> pr_notice("Ignoring BGRT: reserved status bits are non-zero %u\n",
> - bgrt_tab->status);
> + bgrt_tab.status);
> return;
> }
> - if (bgrt_tab->image_type != 0) {
> + if (bgrt_tab.image_type != 0) {
> pr_notice("Ignoring BGRT: invalid image type %u (expected 0)\n",
> - bgrt_tab->image_type);
> + bgrt_tab.image_type);
> return;
> }
> - if (!bgrt_tab->image_address) {
> + if (!bgrt_tab.image_address) {
> pr_notice("Ignoring BGRT: null image address\n");
> return;
> }
>
> - image = memremap(bgrt_tab->image_address, sizeof(bmp_header), MEMREMAP_WB);
> + image = early_memremap(bgrt_tab.image_address, sizeof(bmp_header));
> if (!image) {
> pr_notice("Ignoring BGRT: failed to map image header memory\n");
> return;
> }
>
> memcpy(&bmp_header, image, sizeof(bmp_header));
> - memunmap(image);
> + early_memunmap(image, sizeof(bmp_header));
> if (bmp_header.id != 0x4d42) {
> pr_notice("Ignoring BGRT: Incorrect BMP magic number 0x%x (expected 0x4d42)\n",
> bmp_header.id);
> @@ -82,12 +77,5 @@ void __init efi_bgrt_init(void)
> }
> bgrt_image_size = bmp_header.size;
>
> - bgrt_image = memremap(bgrt_tab->image_address, bmp_header.size, MEMREMAP_WB);
> - if (!bgrt_image) {
> - pr_notice("Ignoring BGRT: failed to map image memory\n");
> - bgrt_image = NULL;
> - return;
> - }
> -
> - efi_mem_reserve(bgrt_tab->image_address, bgrt_image_size);
> + efi_mem_reserve(bgrt_tab.image_address, bgrt_image_size);
> }
> --- linux-x86.orig/drivers/acpi/bgrt.c
> +++ linux-x86/drivers/acpi/bgrt.c
> @@ -15,40 +15,41 @@
> #include <linux/sysfs.h>
> #include <linux/efi-bgrt.h>
>
> +static void *bgrt_image;
> static struct kobject *bgrt_kobj;
>
> static ssize_t show_version(struct device *dev,
> struct device_attribute *attr, char *buf)
> {
> - return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->version);
> + return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.version);
> }
> static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
>
> static ssize_t show_status(struct device *dev,
> struct device_attribute *attr, char *buf)
> {
> - return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->status);
> + return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.status);
> }
> static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);
>
> static ssize_t show_type(struct device *dev,
> struct device_attribute *attr, char *buf)
> {
> - return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->image_type);
> + return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.image_type);
> }
> static DEVICE_ATTR(type, S_IRUGO, show_type, NULL);
>
> static ssize_t show_xoffset(struct device *dev,
> struct device_attribute *attr, char *buf)
> {
> - return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->image_offset_x);
> + return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.image_offset_x);
> }
> static DEVICE_ATTR(xoffset, S_IRUGO, show_xoffset, NULL);
>
> static ssize_t show_yoffset(struct device *dev,
> struct device_attribute *attr, char *buf)
> {
> - return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab->image_offset_y);
> + return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.image_offset_y);
> }
> static DEVICE_ATTR(yoffset, S_IRUGO, show_yoffset, NULL);
>
> @@ -84,9 +85,17 @@ static int __init bgrt_init(void)
> {
> int ret;
>
> - if (!bgrt_image)
> + if (!bgrt_tab.image_address)
> return -ENODEV;
>
> + bgrt_image = memremap(bgrt_tab.image_address, bgrt_image_size,
> + MEMREMAP_WB);
> + if (!bgrt_image) {
> + pr_notice("Ignoring BGRT: failed to map image memory\n");
> + bgrt_image = NULL;
> + return -ENOMEM;
> + }
> +
> bin_attr_image.private = bgrt_image;
> bin_attr_image.size = bgrt_image_size;
>
> --- linux-x86.orig/include/linux/efi-bgrt.h
> +++ linux-x86/include/linux/efi-bgrt.h
> @@ -5,16 +5,15 @@
>
> #include <linux/acpi.h>
>
> -void efi_bgrt_init(void);
> +void efi_bgrt_init(struct acpi_table_header *table);
>
> /* The BGRT data itself; only valid if bgrt_image != NULL. */
> -extern void *bgrt_image;
> extern size_t bgrt_image_size;
> -extern struct acpi_table_bgrt *bgrt_tab;
> +extern struct acpi_table_bgrt bgrt_tab;
>
> #else /* !CONFIG_ACPI_BGRT */
>
> -static inline void efi_bgrt_init(void) {}
> +static inline void efi_bgrt_init(struct acpi_table_header *table) {}
>
> #endif /* !CONFIG_ACPI_BGRT */
>
> --- linux-x86.orig/arch/x86/platform/efi/efi.c
> +++ linux-x86/arch/x86/platform/efi/efi.c
> @@ -476,11 +476,6 @@ void __init efi_init(void)
> efi_print_memmap();
> }
>
> -void __init efi_late_init(void)
> -{
> - efi_bgrt_init();
> -}
> -
> void __init efi_set_executable(efi_memory_desc_t *md, bool executable)
> {
> u64 addr, npages;
> --- linux-x86.orig/init/main.c
> +++ linux-x86/init/main.c
> @@ -663,7 +663,6 @@ asmlinkage __visible void __init start_k
> sfi_init_late();
>
> if (efi_enabled(EFI_RUNTIME_SERVICES)) {
> - efi_late_init();
> efi_free_boot_services();
> }
>
>
>
[toc] | [prev] | [next] | [standalone]
| From | Dave Young <dyoung@redhat.com> |
|---|---|
| Date | 2017-01-12 22:40 +0100 |
| Message-ID | <sYVgf-Ak-35@gated-at.bofh.it> |
| In reply to | #1557575 |
On 01/12/17 at 04:20pm, Ard Biesheuvel wrote: > On 12 January 2017 at 09:41, Dave Young <dyoung@redhat.com> wrote: > > Before invoking the arch specific handler, efi_mem_reserve() reserves > > the given memory region through memblock. > > > > efi_bgrt_init will call efi_mem_reserve after mm_init(), at that time > > memblock is dead and it should not be used any more. > > > > efi bgrt code depend on acpi intialization to get the bgrt acpi table, > > moving bgrt parsing to acpi early boot code can make sure efi_mem_reserve > > in efi bgrt code still use memblock safely. > > > > Signed-off-by: Dave Young <dyoung@redhat.com> > > I know this is probably out of scope for you, but since we're moving > things around, any chance we could do so in a manner that will enable > BGRT support for arm64/ACPI? Happy to test/collaborate on this. > I'm happy to do so, Bhupesh Sharma <bhsharma@redhat.com> said he had some investigation on that already, I would like to ask him to help on that. Already cced him.. Thanks Dave
[toc] | [prev] | [next] | [standalone]
| From | Bhupesh Sharma <bhsharma@redhat.com> |
|---|---|
| Date | 2017-01-16 16:20 +0100 |
| Message-ID | <t0heG-271-25@gated-at.bofh.it> |
| In reply to | #1557833 |
Thanks Dave. On Fri, Jan 13, 2017 at 3:03 AM, Dave Young <dyoung@redhat.com> wrote: > On 01/12/17 at 04:20pm, Ard Biesheuvel wrote: >> On 12 January 2017 at 09:41, Dave Young <dyoung@redhat.com> wrote: >> > Before invoking the arch specific handler, efi_mem_reserve() reserves >> > the given memory region through memblock. >> > >> > efi_bgrt_init will call efi_mem_reserve after mm_init(), at that time >> > memblock is dead and it should not be used any more. >> > >> > efi bgrt code depend on acpi intialization to get the bgrt acpi table, >> > moving bgrt parsing to acpi early boot code can make sure efi_mem_reserve >> > in efi bgrt code still use memblock safely. >> > >> > Signed-off-by: Dave Young <dyoung@redhat.com> >> >> I know this is probably out of scope for you, but since we're moving >> things around, any chance we could do so in a manner that will enable >> BGRT support for arm64/ACPI? Happy to test/collaborate on this. >> > > I'm happy to do so, Bhupesh Sharma <bhsharma@redhat.com> said he had > some investigation on that already, I would like to ask him to help on that. > > Already cced him.. Hi Ard, I have started working on an implementation where most of the BGRT code which exists inside 'arch/x86/platform/efi-bgrt.c' can be reused for ARM/ARM64. I am testing a RFC approach for the same using Qemu for AARCH64. I have sent out a patch to enable BGRT support in ArmVirtPkg (see [1]) I have one question regarding the placement of the early bgrt handling code so that it can be reused on both arm/arm64 and x86: - Should I consider moving the current code from arch/x86/platform/efi-bgrt.c to outside arch/x86 so that it can be used by both the ARCHs or should I reuse the existing x86 stuff in a ARM specific way - no mem_remap for e.g. in a find inside arch/arm - say efi-arm-bgrt.c Suggestions? [1] https://lists.01.org/pipermail/edk2-devel/2017-January/006588.html Regards, Bhupesh
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web