iommu/vt-d bad RMRR workarounds
v2 cover iommu/vt-d bad RMRR workarounds
Commit f036c7fa0ab6 ("iommu/vt-d: Check VT-d RMRR region in BIOS is reported as reserved") caused a machine to fail to boot for me, but only after a kexec.
Buggy firmware provided an RMRR entry with base and end both == 0. That is an invalid RMRR format, and only happens to pass the RMRR sanity check. After a kexec, that entry fails the RMRR sanity check, due to a slight change in the first e820 mapping. See the v1 link for details.
v1->v2:
v1: https://lore.kernel.org/lkml/[email protected]/
- Added the TAINT_FIRMWARE_WORKAROUND
- Dropped the commit that treated missing e820 regions as "RMRR OK"
Barret Rhoden (2):
iommu/vt-d: skip RMRR entries that fail the sanity check iommu/vt-d: skip invalid RMRR entries
drivers/iommu/intel-iommu.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-)
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 1/2 iommu/vt-d: skip RMRR entries that fail the sanity check
RMRR entries describe memory regions that are DMA targets for devices outside the kernel's control.
RMRR entries that fail the sanity check are pointing to regions of memory that the firmware did not tell the kernel are reserved or otherwise should not be used.
Instead of aborting DMAR processing, this commit skips these RMRR entries and marks the firmware as tainted. They will not be mapped into the IOMMU, but the IOMMU can still be utilized. If anything, when the IOMMU is on, those devices will not be able to clobber RAM that the kernel has allocated from those regions.
--- drivers/iommu/intel-iommu.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/iommu/intel-iommu.c +10 -4
@@ -4319,12 +4319,18 @@ int __init dmar_parse_one_rmrr(struct acpi_dmar_header *header, void *arg) {struct acpi_dmar_reserved_memory *rmrr;struct dmar_rmrr_unit *rmrru; -int ret; rmrr = (struct acpi_dmar_reserved_memory *)header; - ret =arch_rmrr_sanity_check (rmrr); -if (ret) -return ret; +if (arch_rmrr_sanity_check (rmrr)) { +WARN_TAINT (1 ,TAINT_FIRMWARE_WORKAROUND , +"Your BIOS is broken; bad RMRR [%#018Lx-%#018Lx]\n" +"BIOS vendor: %s; Ver: %s; Product Version: %s\n" , + rmrr->base_address, rmrr->end_address, +dmi_get_system_info (DMI_BIOS_VENDOR ), +dmi_get_system_info (DMI_BIOS_VERSION ), +dmi_get_system_info (DMI_PRODUCT_VERSION )); +return 0 ; + } rmrru =kzalloc (sizeof (*rmrru),GFP_KERNEL );if (!rmrru)
Signature · 1 line
2.24.1.735.g03f4e72817-goog
PATCH v2 2/2 iommu/vt-d: skip invalid RMRR entries
In reply to Barret RhodenThe VT-d docs specify requirements for the RMRR entries base and end (called 'Limit' in the docs) addresses.
This commit will cause the DMAR processing to skip any RMRR entries that do not meet these requirements and mark the firmware as tainted, since the firmware is giving us junk.
--- drivers/iommu/intel-iommu.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/iommu/intel-iommu.c +13 -1
@@ -4315,13 +4315,25 @@ static void __init init_iommu_pm_ops(void)static inline void init_iommu_pm_ops (void ) {}#endif /* CONFIG_PM */ +static int rmrr_validity_check (struct acpi_dmar_reserved_memory *rmrr) +{ +if ((rmrr->base_address &PAGE_MASK ) || + (rmrr->end_address <= rmrr->base_address) || + ((rmrr->end_address - rmrr->base_address +1 ) &PAGE_MASK )) { +pr_err (FW_BUG "Broken RMRR base: %#018Lx end: %#018Lx\n" , + rmrr->base_address, rmrr->end_address); +return -EINVAL ; + } +return 0 ; +} +int __init dmar_parse_one_rmrr (struct acpi_dmar_header *header,void *arg) {struct acpi_dmar_reserved_memory *rmrr;struct dmar_rmrr_unit *rmrru; rmrr = (struct acpi_dmar_reserved_memory *)header; -if (arch_rmrr_sanity_check (rmrr)) { +if (rmrr_validity_check (rmrr) ||arch_rmrr_sanity_check (rmrr)) { WARN_TAINT(1, TAINT_FIRMWARE_WORKAROUND, "Your BIOS is broken; bad RMRR [%#018Lx-%#018Lx]\n" "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
Signature · 1 line
2.24.1.735.g03f4e72817-goog
Re: [PATCH v2 2/2] iommu/vt-d: skip invalid RMRR entries
Hi,
Quoted 17 lines · Barret Rhoden via iommu
The VT-d docs specify requirements for the RMRR entries base and end (called 'Limit' in the docs) addresses.
This commit will cause the DMAR processing to skip any RMRR entries that do not meet these requirements and mark the firmware as tainted, since the firmware is giving us junk.
Signed-off-by Barret Rhoden <[email protected]>--- drivers/iommu/intel-iommu.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)drivers/iommu/intel-iommu.c +0
-0
drivers/iommu/intel-iommu.c static void __init init_iommu_pm_ops(void) · line 4324
Quoted 10 lines
drivers/iommu/intel-iommu.c +7
-0@@ -4315,13 +4315,25 @@ static void __init init_iommu_pm_ops(void)static inline void init_iommu_pm_ops (void ) {}#endif /* CONFIG_PM */ +static int rmrr_validity_check (struct acpi_dmar_reserved_memory *rmrr) +{ +if ((rmrr->base_address &PAGE_MASK ) || + (rmrr->end_address <= rmrr->base_address) || + ((rmrr->end_address - rmrr->base_address +1 ) &PAGE_MASK )) { +pr_err (FW_BUG "Broken RMRR base: %#018Lx end: %#018Lx\n" , + rmrr->base_address, rmrr->end_address);
Since you will WARN_TAINT below, do you still want an error message here?
Quoted 7 lines
drivers/iommu/intel-iommu.c +5
-0+return -EINVAL ; + } +return 0 ; +} +int __init dmar_parse_one_rmrr (struct acpi_dmar_header *header,void *arg)
drivers/iommu/intel-iommu.c static void __init init_iommu_pm_ops(void) · line 4339
Quoted 10 lines
drivers/iommu/intel-iommu.c +1
-1{struct acpi_dmar_reserved_memory *rmrr;struct dmar_rmrr_unit *rmrru; rmrr = (struct acpi_dmar_reserved_memory *)header; -if (arch_rmrr_sanity_check (rmrr)) { +if (rmrr_validity_check (rmrr) ||arch_rmrr_sanity_check (rmrr)) { WARN_TAINT(1, TAINT_FIRMWARE_WORKAROUND, "Your BIOS is broken; bad RMRR [%#018Lx-%#018Lx]\n" "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
Best regards,
baolu
Re: [PATCH v2 2/2] iommu/vt-d: skip invalid RMRR entries
Quoted 9 lines · Lu Baolu
Quoted 9 lines
drivers/iommu/intel-iommu.c +2
-0@@ -4315,13 +4315,25 @@ static void __init init_iommu_pm_ops(void) static inline void init_iommu_pm_ops(void) {} #endif /* CONFIG_PM */ +static int rmrr_validity_check (struct acpi_dmar_reserved_memory *rmrr) +{
Quoted 8 lines
drivers/iommu/intel-iommu.c static void __init init_iommu_pm_ops(void) · line 4324
Quoted 5 lines
drivers/iommu/intel-iommu.c +5
-0+ if ((rmrr->base_address & PAGE_MASK) || + (rmrr->end_address <= rmrr->base_address) || + ((rmrr->end_address - rmrr->base_address + 1) & PAGE_MASK)) { + pr_err(FW_BUG "Broken RMRR base: %#018Lx end: %#018Lx\n", + rmrr->base_address, rmrr->end_address);Since you will
WARN_TAINTbelow, do you still want an error message here?
I'm fine either way.
I put it in since arch_rmrr_sanity_check() also has a pr_err():
pr_err(FW_BUG "No firmware reserved region can cover this RMRR
[%#018Lx-%#018Lx], contact BIOS vendor for fixes\n",
start, end - 1);Thanks,
Barret
Re: [PATCH v2 2/2] iommu/vt-d: skip invalid RMRR entries
In reply to Barret RhodenHi Barret,
this looks good.
thanks
Yian
Quoted 43 lines · Barret Rhoden
The VT-d docs specify requirements for the RMRR entries base and end (called 'Limit' in the docs) addresses.
This commit will cause the DMAR processing to skip any RMRR entries that do not meet these requirements and mark the firmware as tainted, since the firmware is giving us junk.
Signed-off-by Barret Rhoden <[email protected]>--- drivers/iommu/intel-iommu.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)drivers/iommu/intel-iommu.c +13
-1@@ -4315,13 +4315,25 @@ static void __init init_iommu_pm_ops(void)static inline void init_iommu_pm_ops (void ) {}#endif /* CONFIG_PM */ +static int rmrr_validity_check (struct acpi_dmar_reserved_memory *rmrr) +{ +if ((rmrr->base_address &PAGE_MASK ) || + (rmrr->end_address <= rmrr->base_address) || + ((rmrr->end_address - rmrr->base_address +1 ) &PAGE_MASK )) { +pr_err (FW_BUG "Broken RMRR base: %#018Lx end: %#018Lx\n" , + rmrr->base_address, rmrr->end_address); +return -EINVAL ; + } +return 0 ; +} +int __init dmar_parse_one_rmrr (struct acpi_dmar_header *header,void *arg) {struct acpi_dmar_reserved_memory *rmrr;struct dmar_rmrr_unit *rmrru; rmrr = (struct acpi_dmar_reserved_memory *)header; -if (arch_rmrr_sanity_check (rmrr)) { +if (rmrr_validity_check (rmrr) ||arch_rmrr_sanity_check (rmrr)) { WARN_TAINT(1, TAINT_FIRMWARE_WORKAROUND, "Your BIOS is broken; bad RMRR [%#018Lx-%#018Lx]\n" "BIOS vendor: %s; Ver: %s; Product Version: %s\n",