x86/kexec: Add ACPI NVS region to the ident map
Subsystems (3)
PATCH 1/1 x86/kexec: Add ACPI NVS region to the ident map
With the recent addition of RSDP parsing in decompression stage, kexec kernel now needs ACPI tables to be covered by the identity mapping. And in commit 6bbeb276b71f ("x86/kexec: Add the EFI system tables and ACPI tables to the ident map"), ACPI tables memory region was added to the ident map.
But on some machines, there is only ACPI NVS memory region, and the ACPI tables is located in the NVS region instead. In such case second kernel will still fail when trying to access ACPI tables.
So, to fix the problem, add NVS memory region in the ident map as well.
---
Tested with my laptop and VM, on top of current tip:x86/boot.
arch/x86/kernel/machine_kexec_64.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
arch/x86/kernel/machine_kexec_64.c +15 -3
@@ -54,14 +54,26 @@ static int mem_region_callback(struct resource *res, void *arg)static int map_acpi_tables (struct x86_mapping_info *info,pgd_t *level4p) { -unsigned long flags =IORESOURCE_MEM |IORESOURCE_BUSY ; +int ret; +unsigned long flags;struct init_pgtable_data data; data.info = info; data.level4p = level4p; flags =IORESOURCE_MEM |IORESOURCE_BUSY ; -return walk_iomem_res_desc (IORES_DESC_ACPI_TABLES , flags,0 ,-1 , - &data, mem_region_callback); + + ret =walk_iomem_res_desc (IORES_DESC_ACPI_TABLES , flags,0 ,-1 , + &data, mem_region_callback); +if (ret && ret != -EINVAL ) +return ret; + +/* ACPI tables could be located in ACPI Non-volatile Storage region */ + ret =walk_iomem_res_desc (IORES_DESC_ACPI_NV_STORAGE , flags,0 ,-1 , + &data, mem_region_callback); +if (ret && ret != -EINVAL ) +return ret; + +return 0 ; }#else static int map_acpi_tables (struct x86_mapping_info *info,pgd_t *level4p) {return 0 ; }
Signature · 1 line
2.21.0
Borislav Petkov
maintainerQuoted 8 lines · Kairui Song
With the recent addition of RSDP parsing in decompression stage, kexec kernel now needs ACPI tables to be covered by the identity mapping. And in commit
6bbeb276b71f("x86/kexec: Add the EFI system tables and ACPI tables to the ident map"), ACPI tables memory region was added to the ident map.But on some machines, there is only ACPI NVS memory region, and the ACPI tables is located in the NVS region instead. In such case second kernel
*are* located - plural.
Quoted 10 lines
will still fail when trying to access ACPI tables.
So, to fix the problem, add NVS memory region in the ident map as well.
Fixes 6bbeb276b71f ("x86/kexec: Add the EFI system tables and ACPI tables to the ident map")Suggested-by Junichi Nomura <[email protected]>Signed-off-by Kairui Song <[email protected]>---
Tested with my laptop and VM, on top of current tip:x86/boot.
You tested this in a VM and not on the *actual* machine with the NVS region?
This is a joke, right?
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.Quoted 22 lines · Borislav Petkov
Quoted 8 lines · Kairui Song
With the recent addition of RSDP parsing in decompression stage, kexec kernel now needs ACPI tables to be covered by the identity mapping. And in commit
6bbeb276b71f("x86/kexec: Add the EFI system tables and ACPI tables to the ident map"), ACPI tables memory region was added to the ident map.But on some machines, there is only ACPI NVS memory region, and the ACPI tables is located in the NVS region instead. In such case second kernel
*are* located - plural.
Quoted 9 lines
will still fail when trying to access ACPI tables.
So, to fix the problem, add NVS memory region in the ident map as well.
Fixes 6bbeb276b71f ("x86/kexec: Add the EFI system tables and ACPI tables to the ident map")Suggested-by Junichi Nomura <[email protected]>Signed-off-by Kairui Song <[email protected]>---
Quoted 7 lines
Quoted 1 line
Tested with my laptop and VM, on top of current tip:x86/boot.
You tested this in a VM and not on the *actual* machine with the NVS region?
This is a joke, right?
Hi Boris, unfortunately I don't have a real machine which only have the NVS region.
I did fake the memmap to emulate such problem but can't really promise this will fix the real case.
So just declare it won't break anything that is already working. And I'm asking Junichi to have a try as he reported this issue on the machines he has.
Signature · 7 lines
Best Regards, Kairui Song _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Borislav Petkov
maintainerQuoted 5 lines · Kairui Song
Hi Boris, unfortunately I don't have a real machine which only have the NVS region. I did fake the memmap to emulate such problem but can't really promise this will fix the real case. So just declare it won't break anything that is already working. And I'm asking Junichi to have a try as he reported this issue on the machines he has.
Yes, this is how you should do it. First you test on a real hardware - if the issue is such that needs a real hardware to verify - and if it passes, *then* you send the patch.
If you don't have access to the box, then ask someone who has.
But for the future, please do not send untested patches in a hurry, hoping that they would work. This could cause more trouble than the little time you might save speculating it'll all go fine.
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.Hi Kairui, Boris,
Quoted 11 lines · Borislav Petkov
Quoted 5 lines · Kairui Song
Hi Boris, unfortunately I don't have a real machine which only have the NVS region. I did fake the memmap to emulate such problem but can't really promise this will fix the real case. So just declare it won't break anything that is already working. And I'm asking Junichi to have a try as he reported this issue on the machines he has.
Yes, this is how you should do it. First you test on a real hardware - if the issue is such that needs a real hardware to verify - and if it passes, *then* you send the patch.
Quoted 5 lines
If you don't have access to the box, then ask someone who has.
But for the future, please do not send untested patches in a hurry, hoping that they would work. This could cause more trouble than the little time you might save speculating it'll all go fine.
I tested the patch on such a machine on top of the current tip/master f9818950848 ("Marge branch 'linus'") and it works fine. Without the patch, kexec -l fails.
I had tested the version I posted here on bunch of physical machines I had access and confirmed it didn't broke working setups:
https://lore.kernel.org/lkml/[email protected]/
Since the logic in the patch seems unchanged, I'm very sure it's ok.
Signature · 5 lines
Jun'ichi Nomura, NEC Corporation / NEC Solution Innovators, Ltd. _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Borislav Petkov
maintainerQuoted 5 lines · Junichi Nomura
I had tested the version I posted here on bunch of physical machines I had access and confirmed it didn't broke working setups:
https://lore.kernel.org/lkml/[email protected]/Since the logic in the patch seems unchanged, I'm very sure it's ok.
Ok, thanks for testing.
I'll add your Tested-by.
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.Quoted 58 lines · Kairui Song
With the recent addition of RSDP parsing in decompression stage, kexec kernel now needs ACPI tables to be covered by the identity mapping. And in commit
6bbeb276b71f("x86/kexec: Add the EFI system tables and ACPI tables to the ident map"), ACPI tables memory region was added to the ident map.But on some machines, there is only ACPI NVS memory region, and the ACPI tables is located in the NVS region instead. In such case second kernel will still fail when trying to access ACPI tables.
So, to fix the problem, add NVS memory region in the ident map as well.
Fixes 6bbeb276b71f ("x86/kexec: Add the EFI system tables and ACPI tables to the ident map")Suggested-by Junichi Nomura <[email protected]>Signed-off-by Kairui Song <[email protected]>---
Tested with my laptop and VM, on top of current tip:x86/boot.
arch/x86/kernel/machine_kexec_64.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)arch/x86/kernel/machine_kexec_64.c +15
-4@@ -54,14 +54,26 @@ static int mem_region_callback(struct resource *res, void *arg)static int map_acpi_tables (struct x86_mapping_info *info,pgd_t *level4p) { -unsigned long flags =IORESOURCE_MEM |IORESOURCE_BUSY ; +int ret; +unsigned long flags;struct init_pgtable_data data; data.info = info; data.level4p = level4p; flags =IORESOURCE_MEM |IORESOURCE_BUSY ; -return walk_iomem_res_desc (IORES_DESC_ACPI_TABLES , flags,0 ,-1 , - &data, mem_region_callback); + + ret =walk_iomem_res_desc (IORES_DESC_ACPI_TABLES , flags,0 ,-1 , + &data, mem_region_callback); +if (ret && ret != -EINVAL ) +return ret; + +/* ACPI tables could be located in ACPI Non-volatile Storage region */ + ret =walk_iomem_res_desc (IORES_DESC_ACPI_NV_STORAGE , flags,0 ,-1 , + &data, mem_region_callback); +if (ret && ret != -EINVAL ) +return ret; + +return 0 ; }#else static int map_acpi_tables (struct x86_mapping_info *info,pgd_t *level4p) {return 0 ; } --
Quoted 2 lines
2.21.0
Hi, could you help test the tip branch with this applied? This should fix all the issues, I can't find any other issues now. Thanks.
--
Best Regards,
Kairui Song
tip-bot for Kairui Song
merge bot[tip:x86/boot] x86/kexec: Add the ACPI NVS region to the ident map
In reply to Kairui Songx86/kexec: Add the ACPI NVS region to the ident map
Commit-ID: 5a949b38839e284b1307540c56b03caf57da9736 Gitweb: https://git.kernel.org/tip/5a949b38839e284b1307540c56b03caf57da9736 Author: Kairui Song <[email protected]> AuthorDate: Mon, 10 Jun 2019 15:36:17 +0800 Committer: Borislav Petkov <[email protected]> CommitDate: Mon, 10 Jun 2019 22:00:26 +0200
x86/kexec: Add the ACPI NVS region to the ident map
With the recent addition of RSDP parsing in the decompression stage, a kexec-ed kernel now needs ACPI tables to be covered by the identity mapping. And in commit
6bbeb276b71f ("x86/kexec: Add the EFI system tables and ACPI tables to the ident map")
the ACPI tables memory region was added to the ident map.
But some machines have only an ACPI NVS memory region and the ACPI tables are located in that region. In such case, the kexec-ed kernel will still fail when trying to access ACPI tables if they're not mapped.
So add the NVS memory region to the ident map as well.
[ bp: Massage. ]
--- arch/x86/kernel/machine_kexec_64.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
arch/x86/kernel/machine_kexec_64.c +15 -3
@@ -54,14 +54,26 @@ static int mem_region_callback(struct resource *res, void *arg)static int map_acpi_tables (struct x86_mapping_info *info,pgd_t *level4p) { -unsigned long flags =IORESOURCE_MEM |IORESOURCE_BUSY ;struct init_pgtable_data data; +unsigned long flags; +int ret; data.info = info; data.level4p = level4p; flags =IORESOURCE_MEM |IORESOURCE_BUSY ; -return walk_iomem_res_desc (IORES_DESC_ACPI_TABLES , flags,0 ,-1 , - &data, mem_region_callback); + + ret =walk_iomem_res_desc (IORES_DESC_ACPI_TABLES , flags,0 ,-1 , + &data, mem_region_callback); +if (ret && ret != -EINVAL ) +return ret; + +/* ACPI tables could be located in ACPI Non-volatile Storage region */ + ret =walk_iomem_res_desc (IORES_DESC_ACPI_NV_STORAGE , flags,0 ,-1 , + &data, mem_region_callback); +if (ret && ret != -EINVAL ) +return ret; + +return 0 ; }#else static int map_acpi_tables (struct x86_mapping_info *info,pgd_t *level4p) {return 0 ; }