Skip to contentSkip to conversation

RISC-V: ACPI: Fix acpi_os_ioremap to return iomem address

PATCH Superseded Sunil V L 2 participants 3 messages Jul 23, 2023 RISC-V

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Sunil V L

author
#0 lore raw

PATCH 1/1 RISC-V: ACPI: Fix acpi_os_ioremap to return iomem address

Fix the acpi_os_ioremap() to return iomem address and use memory attributes from EFI memory map while remapping.

Fixes a91a9ffbd3a5 ("RISC-V: Add support to build the ACPI core")
---
 arch/riscv/Kconfig       |  1 +
 arch/riscv/kernel/acpi.c | 88 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 87 insertions(+), 2 deletions(-)
arch/riscv/Kconfig +1 -0
index 4c07b9189c86..4892418e0821 100644
@@ -38,6 +38,7 @@ config RISCV
 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
 	select ARCH_HAS_UBSAN_SANITIZE_ALL
 	select ARCH_HAS_VDSO_DATA
+	select ARCH_KEEP_MEMBLOCK
 	select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
 	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT
 	select ARCH_STACKWALK
arch/riscv/kernel/acpi.c +86 -2

101 lines not on this page · raw message

Signature · 1 line
2.39.2
#1 lore raw

Hey Sunil,

Quoted 7 lines · Sunil V L

Fix the acpi_os_ioremap() to return iomem address and use memory attributes from EFI memory map while remapping.

Fixes a91a9ffbd3a5 ("RISC-V: Add support to build the ACPI core")

Huh, there's quite a lot more going on here than $subject would suggest... This really seems like it should be a pair of commits, with a trivial one fixing the lkp reported sparse issue & a second one, with a more detailed commit message, implementing the memory attributes stuff. Doing it as an "afterthought" as part of the LKP fix does not seem at all right to me.

When you split it, I figure you should CC Ard and Alex Ghiti on the patch adding the EFI attribute stuff.

Thanks,
Conor.

Quoted 127 lines
---
 arch/riscv/Kconfig       |  1 +
 arch/riscv/kernel/acpi.c | 88 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 87 insertions(+), 2 deletions(-)
arch/riscv/Kconfig +1 -0
index 4c07b9189c86..4892418e0821 100644
@@ -38,6 +38,7 @@ config RISCV
 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
 	select ARCH_HAS_UBSAN_SANITIZE_ALL
 	select ARCH_HAS_VDSO_DATA
+	select ARCH_KEEP_MEMBLOCK
 	select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
 	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT
 	select ARCH_STACKWALK
arch/riscv/kernel/acpi.c +86 -2
index 5ee03ebab80e..ce28a530c81d 100644
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/pci.h>
 #include <linux/efi.h>
+#include <linux/memblock.h>
 
 int acpi_noirq = 1;		/* skip ACPI IRQ initialization */
 int acpi_disabled = 1;
@@ -215,9 +216,92 @@ void __init __acpi_unmap_table(void __iomem *map, unsigned long size)
 	early_iounmap(map, size);
 }
 
-void *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)
+void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)
 {
-	return memremap(phys, size, MEMREMAP_WB);
+	efi_memory_desc_t *md, *region = NULL;
+	pgprot_t prot;
+
+	if (WARN_ON_ONCE(!efi_enabled(EFI_MEMMAP)))
+		return NULL;
+
+	for_each_efi_memory_desc(md) {
+		u64 end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT);
+
+		if (phys < md->phys_addr || phys >= end)
+			continue;
+
+		if (phys + size > end) {
+			pr_warn(FW_BUG "requested region covers multiple EFI memory regions\n");
+			return NULL;
+		}
+		region = md;
+		break;
+	}
+
+	/*
+	 * It is fine for AML to remap regions that are not represented in the
+	 * EFI memory map at all, as it only describes normal memory, and MMIO
+	 * regions that require a virtual mapping to make them accessible to
+	 * the EFI runtime services.
+	 */
+	prot = PAGE_KERNEL_IO;
+	if (region) {
+		switch (region->type) {
+		case EFI_LOADER_CODE:
+		case EFI_LOADER_DATA:
+		case EFI_BOOT_SERVICES_CODE:
+		case EFI_BOOT_SERVICES_DATA:
+		case EFI_CONVENTIONAL_MEMORY:
+		case EFI_PERSISTENT_MEMORY:
+			if (memblock_is_map_memory(phys) ||
+			    !memblock_is_region_memory(phys, size)) {
+				pr_warn(FW_BUG "requested region covers kernel memory @ %p\n",
+					&phys);
+				return NULL;
+			}
+
+			/*
+			 * Mapping kernel memory is permitted if the region in
+			 * question is covered by a single memblock with the
+			 * NOMAP attribute set: this enables the use of ACPI
+			 * table overrides passed via initramfs.
+			 * This particular use case only requires read access.
+			 */
+			fallthrough;
+
+		case EFI_RUNTIME_SERVICES_CODE:
+			/*
+			 * This would be unusual, but not problematic per se,
+			 * as long as we take care not to create a writable
+			 * mapping for executable code.
+			 */
+			prot = PAGE_KERNEL_RO;
+			break;
+
+		case EFI_ACPI_RECLAIM_MEMORY:
+			/*
+			 * ACPI reclaim memory is used to pass firmware tables
+			 * and other data that is intended for consumption by
+			 * the OS only, which may decide it wants to reclaim
+			 * that memory and use it for something else. We never
+			 * do that, but we usually add it to the linear map
+			 * anyway, in which case we should use the existing
+			 * mapping.
+			 */
+			if (memblock_is_map_memory(phys))
+				return (void __iomem *)__va(phys);
+			fallthrough;
+
+		default:
+			if (region->attribute & EFI_MEMORY_WB)
+				prot = PAGE_KERNEL;
+			else if ((region->attribute & EFI_MEMORY_WC) ||
+				(region->attribute & EFI_MEMORY_WT))
+				prot = pgprot_writecombine(PAGE_KERNEL);
+		}
+	}
+
+	return ioremap_prot(phys, size, pgprot_val(prot));
 }
 
 #ifdef CONFIG_PCI
Signature · 1 line
2.39.2
author
#2 lore raw
Quoted 11 lines · Conor Dooley

Hey Sunil,

Quoted 7 lines · Sunil V L

Fix the acpi_os_ioremap() to return iomem address and use memory attributes from EFI memory map while remapping.

Fixes a91a9ffbd3a5 ("RISC-V: Add support to build the ACPI core")
Quoted 7 lines

Huh, there's quite a lot more going on here than $subject would suggest... This really seems like it should be a pair of commits, with a trivial one fixing the lkp reported sparse issue & a second one, with a more detailed commit message, implementing the memory attributes stuff. Doing it as an "afterthought" as part of the LKP fix does not seem at all right to me.

Thanks!, Conor. Yeah, I agree. I had the patch ready to enhance this function and when I saw today bot finding the issue, I just updated to make it fix patch. Let me split to two patches.

Quoted 3 lines

When you split it, I figure you should CC Ard and Alex Ghiti on the patch adding the EFI attribute stuff.

Sure.

Thanks,
Sunil