x86/PCI: Ignore E820 reservations for bridge windows on newer systems
Subsystems (4)
PATCH v3 1/1 x86/PCI: Ignore E820 reservations for bridge windows on newer systems
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI bridge memory window returned by the ACPI _CRS method, see commit 4dc2287c1805 ("x86: avoid E820 regions when allocating address space").
To avoid this Linux by default excludes E820 reservations when allocating addresses since 2010. Windows however ignores E820 reserved regions for PCI mem allocations, so in hindsight Linux honoring them is a problem.
Recently (2020) some systems have shown-up with E820 reservations which cover the entire _CRS returned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:
[mem 0x000000004bc50000-0x00000000cfffffff] reserved pci_bus 0000:00: root bus resource [mem 0x65400000-0xbfffffff window]
Ideally Linux would fully stop honoring E820 reservations for PCI mem allocations, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations like Windows does for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that pci_use_e820 will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.
Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
---
Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "defined CONFIG_..."
- Add Mika's Reviewed-by
Changes in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters to Documentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]
--- .../admin-guide/kernel-parameters.txt | 6 ++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 29 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 55 insertions(+)
Documentation/admin-guide/kernel-parameters.txt +6 -0
@@ -3949,6 +3949,12 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Honor E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. + no_e820 [X86] ignore E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaround
arch/x86/include/asm/pci_x86.h +10 -0
@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;
@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {
@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif
arch/x86/kernel/resource.c +4 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)
@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];
arch/x86/pci/acpi.c +29 -0
@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {
@@ -160,6 +162,33 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to system +* RAM in the PCI bridge memory window returned by the ACPI _CRS method, see +* commit 4dc2287c1805 ("x86: avoid E820 regions when allocating address space"). +* To avoid this Linux by default excludes E820 reservations when allocating +* addresses since 2010. Windows however ignores E820 reserved regions for +* PCI mem allocations, so in hindsight Linux honoring them is a problem. +* In 2020 some systems have shown-up with E820 reservations which cover the +* entire _CRS returned PCI bridge memory window, causing all attempts to +* assign memory to PCI BARs to fail if Linux honors the E820 reservations. +* +* Ideally Linux would fully stop honoring E820 reservations for PCI mem +* allocations, but then the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the E820 +* reservations like Windows does for any systems from now on. +*/ +if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 ) + pci_use_e820 = false; +else if (pci_probe &PCI_USE_E820 ) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Honoring" :"Ignoring" ); }#ifdef CONFIG_PCI_MMCONFIG
arch/x86/pci/common.c +6 -0
@@ -595,6 +595,12 @@ char *__init pcibios_setup(char *str) }else if (!strcmp (str,"nocrs" )) { pci_probe |=PCI_ROOT_NO_CRS ;return NULL ; + }else if (!strcmp (str,"use_e820" )) { + pci_probe |=PCI_USE_E820 ; +return NULL ; + }else if (!strcmp (str,"no_e820" )) { + pci_probe |=PCI_NO_E820 ; +return NULL ; #ifdef CONFIG_PHYS_ADDR_T_64BIT }else if (!strcmp (str,"big_root_window" )) { pci_probe |=PCI_BIG_ROOT_WINDOW ;
Signature · 1 line
2.31.1
Quoted 34 lines · Hans de Goede
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI bridge memory window returned by the ACPI
_CRSmethod, see commit4dc2287c1805("x86: avoid E820 regions when allocating address space").To avoid this Linux by default excludes E820 reservations when allocating addresses since 2010. Windows however ignores E820 reserved regions for PCI mem allocations, so in hindsight Linux honoring them is a problem.
Recently (2020) some systems have shown-up with E820 reservations which cover the entire
_CRSreturned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:[mem 0x000000004bc50000-0x00000000cfffffff] reserved
pci_bus0000:00: root bus resource [mem 0x65400000-0xbfffffff window]Ideally Linux would fully stop honoring E820 reservations for PCI mem allocations, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations like Windows does for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that
pci_use_e820will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
Quoted 11 lines
Cc Benoit Grégoire <[email protected]>Cc Hui Wang <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Signed-off-by Hans de Goede <[email protected]>
with one tiny nit below.
Or please let me know if you want me to pick this up.
Quoted 130 lines
---
Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "definedCONFIG_..."
- Add Mika's Reviewed-byChanges in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters toDocumentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]--- .../admin-guide/kernel-parameters.txt | 6 ++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 29 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 55 insertions(+)Documentation/admin-guide/kernel-parameters.txt +6
-0@@ -3949,6 +3949,12 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Honor E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. + no_e820 [X86] ignore E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaroundarch/x86/include/asm/pci_x86.h +10
-0@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif arch/x86/kernel/resource.c +4
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];arch/x86/pci/acpi.c +19
-0@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {@@ -160,6 +162,33 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to system +* RAM in the PCI bridge memory window returned by the ACPI _CRS method, see +* commit 4dc2287c1805 ("x86: avoid E820 regions when allocating address space"). +* To avoid this Linux by default excludes E820 reservations when allocating +* addresses since 2010. Windows however ignores E820 reserved regions for +* PCI mem allocations, so in hindsight Linux honoring them is a problem. +* In 2020 some systems have shown-up with E820 reservations which cover the +* entire _CRS returned PCI bridge memory window, causing all attempts to +* assign memory to PCI BARs to fail if Linux honors the E820 reservations. +* +* Ideally Linux would fully stop honoring E820 reservations for PCI mem +* allocations, but then the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the E820 +* reservations like Windows does for any systems from now on. +*/
arch/x86/pci/acpi.c void __init pci_acpi_crs_quirks(void) · line 191
Quoted 10 lines
arch/x86/pci/acpi.c +10
-0+if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 ) + pci_use_e820 = false; +else if (pci_probe &PCI_USE_E820 ) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Honoring" :"Ignoring" );
Why not pr_info()?
Quoted 21 lines
arch/x86/pci/acpi.c +0
-0}#ifdef CONFIG_PCI_MMCONFIG arch/x86/pci/common.c +6
-1@@ -595,6 +595,12 @@ char *__init pcibios_setup(char *str) }else if (!strcmp (str,"nocrs" )) { pci_probe |=PCI_ROOT_NO_CRS ;return NULL ; + }else if (!strcmp (str,"use_e820" )) { + pci_probe |=PCI_USE_E820 ; +return NULL ; + }else if (!strcmp (str,"no_e820" )) { + pci_probe |=PCI_NO_E820 ; +return NULL ; #ifdef CONFIG_PHYS_ADDR_T_64BIT }else if (!strcmp (str,"big_root_window" )) { pci_probe |=PCI_BIG_ROOT_WINDOW ; --
Hi,
Quoted 47 lines · Rafael J. Wysocki
Quoted 34 lines · Hans de Goede
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI bridge memory window returned by the ACPI
_CRSmethod, see commit4dc2287c1805("x86: avoid E820 regions when allocating address space").To avoid this Linux by default excludes E820 reservations when allocating addresses since 2010. Windows however ignores E820 reserved regions for PCI mem allocations, so in hindsight Linux honoring them is a problem.
Recently (2020) some systems have shown-up with E820 reservations which cover the entire
_CRSreturned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:[mem 0x000000004bc50000-0x00000000cfffffff] reserved
pci_bus0000:00: root bus resource [mem 0x65400000-0xbfffffff window]Ideally Linux would fully stop honoring E820 reservations for PCI mem allocations, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations like Windows does for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that
pci_use_e820will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
Quoted 11 lines
Cc Benoit Grégoire <[email protected]>Cc Hui Wang <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Signed-off-by Hans de Goede <[email protected]>
Quoted 1 line
Thank you.
Quoted 3 lines
with one tiny nit below.
Or please let me know if you want me to pick this up.
Since all of the changes are under arch/x86/ I expect the x86/tip folks to pick this up ?
Quoted 135 lines
Quoted 135 lines
---
Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "definedCONFIG_..."
- Add Mika's Reviewed-byChanges in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters toDocumentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]--- .../admin-guide/kernel-parameters.txt | 6 ++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 29 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 55 insertions(+)Documentation/admin-guide/kernel-parameters.txt +6
-0@@ -3949,6 +3949,12 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Honor E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. + no_e820 [X86] ignore E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaroundarch/x86/include/asm/pci_x86.h +10
-0@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif arch/x86/kernel/resource.c +4
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];arch/x86/pci/acpi.c +23
-0@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {@@ -160,6 +162,33 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to system +* RAM in the PCI bridge memory window returned by the ACPI _CRS method, see +* commit 4dc2287c1805 ("x86: avoid E820 regions when allocating address space"). +* To avoid this Linux by default excludes E820 reservations when allocating +* addresses since 2010. Windows however ignores E820 reserved regions for +* PCI mem allocations, so in hindsight Linux honoring them is a problem. +* In 2020 some systems have shown-up with E820 reservations which cover the +* entire _CRS returned PCI bridge memory window, causing all attempts to +* assign memory to PCI BARs to fail if Linux honors the E820 reservations. +* +* Ideally Linux would fully stop honoring E820 reservations for PCI mem +* allocations, but then the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the E820 +* reservations like Windows does for any systems from now on. +*/ +if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 )
Quoted 8 lines
arch/x86/pci/acpi.c void __init pci_acpi_crs_quirks(void) · line 191
Quoted 6 lines
arch/x86/pci/acpi.c +6
-0+ pci_use_e820 = false; + else if (pci_probe & PCI_USE_E820) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Honoring" :"Ignoring" );Why not
pr_info()?
This file is using printk(KERN_... consistently everywhere. I'm just following the existing style here. I very much dislike mixing styles in a single file.
If we want to change this for this file then IMHO the right thing to do would be a follow up patch changing all the printk-s at once.
Regards,
Hans
Quoted 23 lines
Quoted 22 lines
arch/x86/pci/acpi.c +0
-0}#ifdef CONFIG_PCI_MMCONFIG arch/x86/pci/common.c +6
-1@@ -595,6 +595,12 @@ char *__init pcibios_setup(char *str) }else if (!strcmp (str,"nocrs" )) { pci_probe |=PCI_ROOT_NO_CRS ;return NULL ; + }else if (!strcmp (str,"use_e820" )) { + pci_probe |=PCI_USE_E820 ; +return NULL ; + }else if (!strcmp (str,"no_e820" )) { + pci_probe |=PCI_NO_E820 ; +return NULL ; #ifdef CONFIG_PHYS_ADDR_T_64BIT }else if (!strcmp (str,"big_root_window" )) { pci_probe |=PCI_BIG_ROOT_WINDOW ; --
Rafael J. Wysocki
maintainerQuoted 53 lines · Hans de Goede
Hi,
Quoted 47 lines · Rafael J. Wysocki
Quoted 34 lines · Hans de Goede
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI bridge memory window returned by the ACPI
_CRSmethod, see commit4dc2287c1805("x86: avoid E820 regions when allocating address space").To avoid this Linux by default excludes E820 reservations when allocating addresses since 2010. Windows however ignores E820 reserved regions for PCI mem allocations, so in hindsight Linux honoring them is a problem.
Recently (2020) some systems have shown-up with E820 reservations which cover the entire
_CRSreturned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:[mem 0x000000004bc50000-0x00000000cfffffff] reserved
pci_bus0000:00: root bus resource [mem 0x65400000-0xbfffffff window]Ideally Linux would fully stop honoring E820 reservations for PCI mem allocations, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations like Windows does for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that
pci_use_e820will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
Quoted 11 lines
Cc Benoit Grégoire <[email protected]>Cc Hui Wang <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Signed-off-by Hans de Goede <[email protected]>Quoted 1 line
Quoted 8 lines
Thank you.
Quoted 3 lines
with one tiny nit below.
Or please let me know if you want me to pick this up.
Since all of the changes are under
arch/x86/I expect the x86/tip folks to pick this up ?
OK
Quoted 144 lines
Quoted 135 lines
Quoted 135 lines
---
Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "definedCONFIG_..."
- Add Mika's Reviewed-byChanges in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters toDocumentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]--- .../admin-guide/kernel-parameters.txt | 6 ++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 29 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 55 insertions(+)Documentation/admin-guide/kernel-parameters.txt +6
-0@@ -3949,6 +3949,12 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Honor E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. + no_e820 [X86] ignore E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaroundarch/x86/include/asm/pci_x86.h +10
-0@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif arch/x86/kernel/resource.c +4
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];arch/x86/pci/acpi.c +23
-0@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {@@ -160,6 +162,33 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to system +* RAM in the PCI bridge memory window returned by the ACPI _CRS method, see +* commit 4dc2287c1805 ("x86: avoid E820 regions when allocating address space"). +* To avoid this Linux by default excludes E820 reservations when allocating +* addresses since 2010. Windows however ignores E820 reserved regions for +* PCI mem allocations, so in hindsight Linux honoring them is a problem. +* In 2020 some systems have shown-up with E820 reservations which cover the +* entire _CRS returned PCI bridge memory window, causing all attempts to +* assign memory to PCI BARs to fail if Linux honors the E820 reservations. +* +* Ideally Linux would fully stop honoring E820 reservations for PCI mem +* allocations, but then the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the E820 +* reservations like Windows does for any systems from now on. +*/ +if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 )Quoted 8 lines
arch/x86/pci/acpi.c void __init pci_acpi_crs_quirks(void) · line 191
Quoted 6 lines
arch/x86/pci/acpi.c +6
-0+ pci_use_e820 = false; + else if (pci_probe & PCI_USE_E820) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Honoring" :"Ignoring" );Why not
pr_info()?
Quoted 2 lines
This file is using printk(KERN_... consistently everywhere. I'm just following the existing style here. I very much dislike mixing styles in a single file.
In this particular case, it isn't just a matter of style.
Also, if what is regarded as a good practice has changed since the file was created, should new code added to it be prevented from following the new good practice, because the old code didn't follow it?
Quoted 2 lines
If we want to change this for this file then IMHO the right thing to do would be a follow up patch changing all the printk-s at once.
I would do the pr_info() here in this patch and change the rest of the file to follow in a subsequent patch.
Hi,
Quoted 209 lines · Rafael J. Wysocki
Quoted 53 lines · Hans de Goede
Hi,
Quoted 47 lines · Rafael J. Wysocki
Quoted 34 lines · Hans de Goede
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI bridge memory window returned by the ACPI
_CRSmethod, see commit4dc2287c1805("x86: avoid E820 regions when allocating address space").To avoid this Linux by default excludes E820 reservations when allocating addresses since 2010. Windows however ignores E820 reserved regions for PCI mem allocations, so in hindsight Linux honoring them is a problem.
Recently (2020) some systems have shown-up with E820 reservations which cover the entire
_CRSreturned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:[mem 0x000000004bc50000-0x00000000cfffffff] reserved
pci_bus0000:00: root bus resource [mem 0x65400000-0xbfffffff window]Ideally Linux would fully stop honoring E820 reservations for PCI mem allocations, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations like Windows does for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that
pci_use_e820will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
Quoted 11 lines
Cc Benoit Grégoire <[email protected]>Cc Hui Wang <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Signed-off-by Hans de Goede <[email protected]>Quoted 1 line
Quoted 8 lines
Thank you.
Quoted 3 lines
with one tiny nit below.
Or please let me know if you want me to pick this up.
Since all of the changes are under
arch/x86/I expect the x86/tip folks to pick this up ?OK
Quoted 144 lines
Quoted 143 lines
Quoted 131 lines
---
Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "definedCONFIG_..."
- Add Mika's Reviewed-byChanges in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters toDocumentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]--- .../admin-guide/kernel-parameters.txt | 6 ++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 29 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 55 insertions(+)Documentation/admin-guide/kernel-parameters.txt +6
-0@@ -3949,6 +3949,12 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Honor E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. + no_e820 [X86] ignore E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaroundarch/x86/include/asm/pci_x86.h +10
-0@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif arch/x86/kernel/resource.c +4
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];arch/x86/pci/acpi.c +19
-0@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {@@ -160,6 +162,33 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to system +* RAM in the PCI bridge memory window returned by the ACPI _CRS method, see +* commit 4dc2287c1805 ("x86: avoid E820 regions when allocating address space"). +* To avoid this Linux by default excludes E820 reservations when allocating +* addresses since 2010. Windows however ignores E820 reserved regions for +* PCI mem allocations, so in hindsight Linux honoring them is a problem. +* In 2020 some systems have shown-up with E820 reservations which cover the +* entire _CRS returned PCI bridge memory window, causing all attempts to +* assign memory to PCI BARs to fail if Linux honors the E820 reservations. +* +* Ideally Linux would fully stop honoring E820 reservations for PCI mem +* allocations, but then the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the E820 +* reservations like Windows does for any systems from now on. +*/ arch/x86/pci/acpi.c void __init pci_acpi_crs_quirks(void) · line 191
Quoted 10 lines
arch/x86/pci/acpi.c +10
-0+if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 ) + pci_use_e820 = false; +else if (pci_probe &PCI_USE_E820 ) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Honoring" :"Ignoring" );Why not
pr_info()?
Quoted 4 lines
Quoted 2 lines
This file is using printk(KERN_... consistently everywhere. I'm just following the existing style here. I very much dislike mixing styles in a single file.
In this particular case, it isn't just a matter of style.
Without a #define pr_fmt in the file there is no functional difference.
Quoted 4 lines
Also, if what is regarded as a good practice has changed since the file was created, should new code added to it be prevented from following the new good practice, because the old code didn't follow it?
That is a non trivial question to answer, e.g. using devm_ functions while the rest of the driver is not using them can be tricky and it might be better to convert the whole driver over to devm_ use in one go.
Quoted 5 lines
Quoted 2 lines
If we want to change this for this file then IMHO the right thing to do would be a follow up patch changing all the printk-s at once.
I would do the
pr_info()here in this patch and change the rest of the file to follow in a subsequent patch.
All printk's in this file are prefixed with "PCI: " so converting to pr_info() should probably involve adding this:
#define pr_fmt(fmt) "PCI: " fmt
So should I add that already while using pr_info() in this patch, which would look weird / look like an unrelated change?
Or should I not add that and manually add the "PCI: " prefix, requiring the pr_info to still be replaced in a subsequent patch converting the rest over to pr_info() ?
IMHO it makes the most sense to keep printk here and then replace the printk with a pr_info, dropping the "PCI: " prefix in a subsequent patch converting all the printk-s.
That would also make the subsequent patch cleaner, because replacing a pr_info with a pr_info in that patch would look weird.
Regards,
Hans
Rafael J. Wysocki
maintainerQuoted 220 lines · Hans de Goede
Hi,
Quoted 209 lines · Rafael J. Wysocki
Quoted 53 lines · Hans de Goede
Hi,
Quoted 47 lines · Rafael J. Wysocki
Quoted 34 lines · Hans de Goede
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI bridge memory window returned by the ACPI
_CRSmethod, see commit4dc2287c1805("x86: avoid E820 regions when allocating address space").To avoid this Linux by default excludes E820 reservations when allocating addresses since 2010. Windows however ignores E820 reserved regions for PCI mem allocations, so in hindsight Linux honoring them is a problem.
Recently (2020) some systems have shown-up with E820 reservations which cover the entire
_CRSreturned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:[mem 0x000000004bc50000-0x00000000cfffffff] reserved
pci_bus0000:00: root bus resource [mem 0x65400000-0xbfffffff window]Ideally Linux would fully stop honoring E820 reservations for PCI mem allocations, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations like Windows does for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that
pci_use_e820will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
Quoted 11 lines
Cc Benoit Grégoire <[email protected]>Cc Hui Wang <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Signed-off-by Hans de Goede <[email protected]>Quoted 1 line
Quoted 8 lines
Thank you.
Quoted 3 lines
with one tiny nit below.
Or please let me know if you want me to pick this up.
Since all of the changes are under
arch/x86/I expect the x86/tip folks to pick this up ?OK
Quoted 144 lines
Quoted 143 lines
Quoted 131 lines
---
Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "definedCONFIG_..."
- Add Mika's Reviewed-byChanges in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters toDocumentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]--- .../admin-guide/kernel-parameters.txt | 6 ++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 29 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 55 insertions(+)Documentation/admin-guide/kernel-parameters.txt +6
-0@@ -3949,6 +3949,12 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Honor E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. + no_e820 [X86] ignore E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaroundarch/x86/include/asm/pci_x86.h +10
-0@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif arch/x86/kernel/resource.c +4
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];arch/x86/pci/acpi.c +19
-0@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {@@ -160,6 +162,33 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to system +* RAM in the PCI bridge memory window returned by the ACPI _CRS method, see +* commit 4dc2287c1805 ("x86: avoid E820 regions when allocating address space"). +* To avoid this Linux by default excludes E820 reservations when allocating +* addresses since 2010. Windows however ignores E820 reserved regions for +* PCI mem allocations, so in hindsight Linux honoring them is a problem. +* In 2020 some systems have shown-up with E820 reservations which cover the +* entire _CRS returned PCI bridge memory window, causing all attempts to +* assign memory to PCI BARs to fail if Linux honors the E820 reservations. +* +* Ideally Linux would fully stop honoring E820 reservations for PCI mem +* allocations, but then the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the E820 +* reservations like Windows does for any systems from now on. +*/ arch/x86/pci/acpi.c void __init pci_acpi_crs_quirks(void) · line 191
Quoted 10 lines
arch/x86/pci/acpi.c +10
-0+if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 ) + pci_use_e820 = false; +else if (pci_probe &PCI_USE_E820 ) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Honoring" :"Ignoring" );Why not
pr_info()?Quoted 4 lines
Quoted 2 lines
This file is using printk(KERN_... consistently everywhere. I'm just following the existing style here. I very much dislike mixing styles in a single file.
In this particular case, it isn't just a matter of style.
Without a #define
pr_fmtin the file there is no functional difference.
Quoted 8 lines
Quoted 4 lines
Also, if what is regarded as a good practice has changed since the file was created, should new code added to it be prevented from following the new good practice, because the old code didn't follow it?
That is a non trivial question to answer, e.g. using
devm_functions while the rest of the driver is not using them can be tricky and it might be better to convert the whole driver over todevm_use in one go.
Right.
Quoted 18 lines
Quoted 5 lines
Quoted 2 lines
If we want to change this for this file then IMHO the right thing to do would be a follow up patch changing all the printk-s at once.
I would do the
pr_info()here in this patch and change the rest of the file to follow in a subsequent patch.All printk's in this file are prefixed with "PCI: " so converting to
pr_info()should probably involve adding this:#define
pr_fmt(fmt)"PCI: " fmtSo should I add that already while using
pr_info()in this patch, which would look weird / look like an unrelated change?Or should I not add that and manually add the "PCI: " prefix, requiring the
pr_infoto still be replaced in a subsequent patch converting the rest over topr_info()?
Quoted 7 lines
IMHO it makes the most sense to keep printk here and then replace the printk with a
pr_info, dropping the "PCI: " prefix in a subsequent patch converting all the printk-s.That would also make the subsequent patch cleaner, because replacing a
pr_infowith apr_infoin that patch would look weird.
OK
Review
Quoted 2 lines · Hans de Goede
(quoted diff) +2
-0+ * Some BIOS-es contain a bug where they add addresses which map to system + * RAM in the PCI bridge memory window returned by the ACPI _CRS method,
Please avoid the overly long lines in your comments.
Hi,
Quoted 5 lines · Christoph Hellwig
Review
Quoted 2 lines · Hans de Goede
(quoted diff) +2
-0+ * Some BIOS-es contain a bug where they add addresses which map to system + * RAM in the PCI bridge memory window returned by the ACPI _CRS method,Please avoid the overly long lines in your comments.
?
These lines are easily within the new 100 char line-length-limit ?
And checkpatch also does not complain about this.
Regards,
Hans
Quoted 4 lines · Hans de Goede
Hi,
Quoted 1 line · Christoph Hellwig
On Thu, Oct 14, 2021 at 01:03:57PM +0200, Hans de Goede wrote:
Quoted 8 lines
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ * Some BIOS-es contain a bug where they add addresses which map to system + * RAM in the PCI bridge memory window returned by the ACPI _CRS method,Please avoid the overly long lines in your comments.
?
These lines are easily within the new 100 char line-length-limit ?
That is an exceptional limit if exceeding 80 improves readability for individual lines.
Quoted 1 line
And checkpatch also does not complain about this.
checkpatch has been completely broken for a while and should not be relied on in any way.
Hi,
Quoted 10 lines · Christoph Hellwig
Quoted 9 lines · Hans de Goede
Hi,
Quoted 5 lines · Christoph Hellwig
Review
Quoted 2 lines · Hans de Goede
(quoted diff) +2
-0+ * Some BIOS-es contain a bug where they add addresses which map to system + * RAM in the PCI bridge memory window returned by the ACPI _CRS method,Please avoid the overly long lines in your comments.
Quoted 6 lines
Quoted 3 lines
?
These lines are easily within the new 100 char line-length-limit ?
That is an exceptional limit if exceeding 80 improves readability for individual lines.
Ok, I'll send out a v4 adjusting the comment-block to fit in 80 columns.
Regards,
Hans
Quoted 8 lines · Hans de Goede
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI bridge memory window returned by the ACPI
_CRSmethod, see commit4dc2287c1805("x86: avoid E820 regions when allocating address space").To avoid this Linux by default excludes E820 reservations when allocating addresses since 2010. Windows however ignores E820 reserved regions for PCI mem allocations, so in hindsight Linux honoring them is a problem.
This is a problem not because Windows ignores E820, but because the spec does not support excluding based on E820. We should cite the spec and include the relevant text here.
Quoted 65 lines
Recently (2020) some systems have shown-up with E820 reservations which cover the entire
_CRSreturned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:[mem 0x000000004bc50000-0x00000000cfffffff] reserved
pci_bus0000:00: root bus resource [mem 0x65400000-0xbfffffff window]Ideally Linux would fully stop honoring E820 reservations for PCI mem allocations, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations like Windows does for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that
pci_use_e820will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
Cc Benoit Grégoire <[email protected]>Cc Hui Wang <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Signed-off-by Hans de Goede <[email protected]>---
Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "definedCONFIG_..."
- Add Mika's Reviewed-byChanges in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters toDocumentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]--- .../admin-guide/kernel-parameters.txt | 6 ++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 29 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 55 insertions(+)Documentation/admin-guide/kernel-parameters.txt +0
-0
Documentation/admin-guide/kernel-parameters.txt line 3957
Quoted 9 lines
Documentation/admin-guide/kernel-parameters.txt +6
-0@@ -3949,6 +3949,12 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Honor E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. + no_e820 [X86] ignore E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug.
Inconsistent capitalization.
Should use same terminology as nocrs, i.e., "PCI host bridge windows", not "PCI host bridge memory".
I don't think "Honor E820 reservations" is the right way to describe this. It's not a question of upholding something we *should* be doing. That would be a matter of working around a BIOS defect. Maybe something like this:
Use E820 reservations to exclude parts of PCI host bridge windows. This is a workaround for BIOS defects in host bridge _CRS methods. If you need to use this, please report a bug to [email protected] so we can apply it automatically.
Not 100% sure we need "no_e820" since that should be the default. But I guess it's conceivable some system might need it. I just hate adding additional things for people to try and then spread the resulting misinformation as a "fix" on random forums.
Quoted 80 lines
Documentation/admin-guide/kernel-parameters.txt +0
-0routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaroundarch/x86/include/asm/pci_x86.h +10
-0@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif arch/x86/kernel/resource.c +4
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];arch/x86/pci/acpi.c +8
-0@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {@@ -160,6 +162,33 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to system +* RAM in the PCI bridge memory window returned by the ACPI _CRS method, see +* commit 4dc2287c1805 ("x86: avoid E820 regions when allocating address space"). +* To avoid this Linux by default excludes E820 reservations when allocating
arch/x86/pci/acpi.c void __init pci_acpi_crs_quirks(void) · line 180
Quoted 10 lines
arch/x86/pci/acpi.c +10
-0+* addresses since 2010. Windows however ignores E820 reserved regions for +* PCI mem allocations, so in hindsight Linux honoring them is a problem. +* In 2020 some systems have shown-up with E820 reservations which cover the +* entire _CRS returned PCI bridge memory window, causing all attempts to +* assign memory to PCI BARs to fail if Linux honors the E820 reservations. +* +* Ideally Linux would fully stop honoring E820 reservations for PCI mem +* allocations, but then the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the E820 +* reservations like Windows does for any systems from now on.
Wrap this to fit in 80 columns like the rest of the file. More important for the file to be internally consistent than any new guidelines.
Quoted 19 lines
arch/x86/pci/acpi.c +11
-0+*/ +if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 ) + pci_use_e820 = false; +else if (pci_probe &PCI_USE_E820 ) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Honoring" :"Ignoring" ); }#ifdef CONFIG_PCI_MMCONFIG arch/x86/pci/common.c +0
-0
arch/x86/pci/common.c char *__init pcibios_setup(char *str) · line 603
Quoted 9 lines
arch/x86/pci/common.c +6
-0@@ -595,6 +595,12 @@ char *__init pcibios_setup(char *str) }else if (!strcmp (str,"nocrs" )) { pci_probe |=PCI_ROOT_NO_CRS ;return NULL ; + }else if (!strcmp (str,"use_e820" )) { + pci_probe |=PCI_USE_E820 ; +return NULL ; + }else if (!strcmp (str,"no_e820" )) { + pci_probe |=PCI_NO_E820 ; +return NULL ;
Why does pci_probe have to be involved here? Couldn't we just set pci_use_e820 directly?
Same argument applies to PCI_USE__CRS and PCI_ROOT_NO_CRS of course, and I probably added those, so maybe there was a reason, or maybe I just screwed up that too.
Quoted 6 lines
arch/x86/pci/common.c +0
-0#ifdef CONFIG_PHYS_ADDR_T_64BIT }else if (!strcmp (str,"big_root_window" )) { pci_probe |=PCI_BIG_ROOT_WINDOW ;Signature · 1 line
2.31.1
Hi Bjorn,
Thank you for the review.
Quoted 6 lines · Bjorn Helgaas
Quoted 5 lines · Hans de Goede
Some BIOS-es contain a bug where they add addresses which map to system RAM in the PCI bridge memory window returned by the ACPI
_CRSmethod, see commit4dc2287c1805("x86: avoid E820 regions when allocating address space").
Quoted 7 lines
Quoted 3 lines
To avoid this Linux by default excludes E820 reservations when allocating addresses since 2010. Windows however ignores E820 reserved regions for PCI mem allocations, so in hindsight Linux honoring them is a problem.
This is a problem not because Windows ignores E820, but because the spec does not support excluding based on E820. We should cite the spec and include the relevant text here.
Ok, for v5 I will replace this with your info on the specs from this email:
https://lore.kernel.org/linux-pci/20211008110149.GA1313872@bhelgaas/T/#t
Quoted 86 lines
Quoted 66 lines
Recently (2020) some systems have shown-up with E820 reservations which cover the entire
_CRSreturned PCI bridge memory window, causing all attempts to assign memory to PCI BARs which have not been setup by the BIOS to fail. For example here are the relevant dmesg bits from a Lenovo IdeaPad 3 15IIL 81WE:[mem 0x000000004bc50000-0x00000000cfffffff] reserved
pci_bus0000:00: root bus resource [mem 0x65400000-0xbfffffff window]Ideally Linux would fully stop honoring E820 reservations for PCI mem allocations, but then the old systems this was added for will regress. Instead keep the old behavior for old systems, while ignoring the E820 reservations like Windows does for any systems from now on.
Old systems are defined here as BIOS year < 2018, this was chosen to make sure that
pci_use_e820will not be set on the currently affected systems, while at the same time also taking into account that the systems for which the E820 checking was originally added may have received BIOS updates for quite a while (esp. CVE related ones), giving them a more recent BIOS year then 2010.Also add pci=no_e820 and pci=use_e820 options to allow overriding the BIOS year heuristic.
Cc Benoit Grégoire <[email protected]>Cc Hui Wang <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Signed-off-by Hans de Goede <[email protected]>---
Changes in v3:
- Commit msg tweaks (drop dmesg timestamps, typo fix)
- Use "defined(CONFIG_...)" instead of "definedCONFIG_..."
- Add Mika's Reviewed-byChanges in v2:
- Replace the per model DMI quirk approach with disabling E820 reservations checking for all systems with a BIOS year >= 2018
- Add documentation for the new kernel-parameters toDocumentation/admin-guide/kernel-parameters.txt
---
Other patches trying to address the same issue:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
V1 patch:
https://lore.kernel.org/r/[email protected]--- .../admin-guide/kernel-parameters.txt | 6 ++++ arch/x86/include/asm/pci_x86.h | 10 +++++++ arch/x86/kernel/resource.c | 4 +++ arch/x86/pci/acpi.c | 29 +++++++++++++++++++ arch/x86/pci/common.c | 6 ++++ 5 files changed, 55 insertions(+)Documentation/admin-guide/kernel-parameters.txt +0
-0Documentation/admin-guide/kernel-parameters.txt line 3957
Quoted 9 lines
Documentation/admin-guide/kernel-parameters.txt +6
-0@@ -3949,6 +3949,12 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. + use_e820 [X86] Honor E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug. + no_e820 [X86] ignore E820 reservations when allocating + PCI host bridge memory. If you need to use this, + please report a bug.Inconsistent capitalization.
Should use same terminology as nocrs, i.e., "PCI host bridge windows", not "PCI host bridge memory".
I don't think "Honor E820 reservations" is the right way to describe this. It's not a question of upholding something we *should* be doing. That would be a matter of working around a BIOS defect. Maybe something like this:
Quoted 4 lines
Use E820 reservations to exclude parts of PCI host bridge windows. This is a workaround for BIOS defects in host bridge
_CRSmethods. If you need to use this, please report a bug to [email protected] so we can apply it automatically.
Ok, that works for me, I'll use the above text for v5.
Quoted 4 lines
Not 100% sure we need "
no_e820" since that should be the default. But I guess it's conceivable some system might need it. I just hate adding additional things for people to try and then spread the resulting misinformation as a "fix" on random forums.
no_e820 will be the default for BIOS-year >= 2018, but on older systems my patch preserves the old behavior of use_e820.
So to allow people to easily test if no_e820 behavior helps on older systems we need it.
I fully agree with your worry about 'misinformation as a "fix" on random forums', but I don't have a solution for that.
I guess we could completely omit both cmdline options, but that will make debugging issues a lot header. IMHO it is worthwhile to have this options to allow users to quickly test things when we ask them to do so.
Quoted 87 lines
Quoted 87 lines
Documentation/admin-guide/kernel-parameters.txt +0
-0routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaroundarch/x86/include/asm/pci_x86.h +10
-0@@ -39,6 +39,8 @@ do { \#define PCI_ROOT_NO_CRS 0x100000#define PCI_NOASSIGN_BARS 0x200000#define PCI_BIG_ROOT_WINDOW 0x400000 +#define PCI_USE_E820 0x800000 +#define PCI_NO_E820 0x1000000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;@@ -64,6 +66,8 @@ void pcibios_scan_specific_bus(int busn);/* pci-irq.c */ +struct pci_dev ; +struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct {@@ -232,3 +236,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)# define x86_default_pci_init_irq NULL# define x86_default_pci_fixup_irqs NULL#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_ACPI ) +extern bool pci_use_e820; +#else +#define pci_use_e820 false +#endif arch/x86/kernel/resource.c +4
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/ioport.h> #include <asm/e820/api.h> +#include <asm/pci_x86.h> static void resource_clip (struct resource *res,resource_size_t start,resource_size_t end)@@ -28,6 +29,9 @@ static void remove_e820_regions(struct resource *avail)int i;struct e820_entry *entry; +if (!pci_use_e820) +return ; +for (i =0 ; i < e820_table->nr_entries; i++) { entry = &e820_table->entries[i];arch/x86/pci/acpi.c +14
-0@@ -21,6 +21,8 @@ struct pci_root_info {static bool pci_use_crs = true;static bool pci_ignore_seg = false; +/* Consumed in arch/x86/kernel/resource.c */ +bool pci_use_e820 = false;static int __init set_use_crs (const struct dmi_system_id *id) {@@ -160,6 +162,33 @@ void __init pci_acpi_crs_quirks(void)"if necessary, use \"pci=%s\" and report a bug\n" , pci_use_crs ?"Using" :"Ignoring" , pci_use_crs ? "nocrs" : "use_crs"); + +/* +* Some BIOS-es contain a bug where they add addresses which map to system +* RAM in the PCI bridge memory window returned by the ACPI _CRS method, see +* commit 4dc2287c1805 ("x86: avoid E820 regions when allocating address space"). +* To avoid this Linux by default excludes E820 reservations when allocating +* addresses since 2010. Windows however ignores E820 reserved regions for +* PCI mem allocations, so in hindsight Linux honoring them is a problem. +* In 2020 some systems have shown-up with E820 reservations which cover the +* entire _CRS returned PCI bridge memory window, causing all attempts to +* assign memory to PCI BARs to fail if Linux honors the E820 reservations. +*
Quoted 8 lines
arch/x86/pci/acpi.c void __init pci_acpi_crs_quirks(void) · line 180
Quoted 4 lines
arch/x86/pci/acpi.c +4
-0+* Ideally Linux would fully stop honoring E820 reservations for PCI mem +* allocations, but then the old systems this was added for will regress. +* Instead keep the old behavior for old systems, while ignoring the E820 +* reservations like Windows does for any systems from now on. Wrap this to fit in 80 columns like the rest of the file. More important for the file to be internally consistent than any new guidelines.
Already fixed in v4 (the only change in v4). I'll also drop the "Windows..." sentence which you did not like in the commit msg for v5.
Quoted 24 lines
Quoted 24 lines
arch/x86/pci/acpi.c +11
-0+*/ +if (year >=0 && year <2018 ) + pci_use_e820 = true; + +if (pci_probe &PCI_NO_E820 ) + pci_use_e820 = false; +else if (pci_probe &PCI_USE_E820 ) + pci_use_e820 = true; + +printk (KERN_INFO "PCI: %s E820 reservations for host bridge windows\n" , + pci_use_e820 ?"Honoring" :"Ignoring" ); }#ifdef CONFIG_PCI_MMCONFIG arch/x86/pci/common.c +1
-0@@ -595,6 +595,12 @@ char *__init pcibios_setup(char *str) }else if (!strcmp (str,"nocrs" )) { pci_probe |=PCI_ROOT_NO_CRS ;return NULL ; + }else if (!strcmp (str,"use_e820" )) {
Quoted 8 lines
arch/x86/pci/common.c char *__init pcibios_setup(char *str) · line 603
Quoted 5 lines
arch/x86/pci/common.c +5
-0+ pci_probe |=PCI_USE_E820 ; +return NULL ; + }else if (!strcmp (str,"no_e820" )) { + pci_probe |=PCI_NO_E820 ; +return NULL ;Why does
pci_probehave to be involved here? Couldn't we just setpci_use_e820directly?
This code runs early on, before the heuristics which set pci_use_e820 gets set based on the BIOS year, so this is done indirectly so that the code doing the heuristics (and checking DMI quirks/exceptions if we add any) can set a default and then these flags are checked to override the default.
Quoted 3 lines
Same argument applies to
PCI_USE__CRSandPCI_ROOT_NO_CRSof course, and I probably added those, so maybe there was a reason, or maybe I just screwed up that too.
What I wrote above, also applies to the use_crs handling, which is handled the same for the same reason :)
Regards,
Hans