[032/181] ACPI: HMAT: attach a device for each soft-reserved range

Commit Message

Andrew Morton Oct. 13, 2020, 11:49 p.m. UTC

From: Dan Williams <[e-mail]>
Subject: ACPI: HMAT: attach a device for each soft-reserved range

The hmem enabling in commit cf8741ac57ed ("ACPI: NUMA: HMAT: Register
"soft reserved" memory as an "hmem" device") only registered ranges to the
hmem driver for each soft-reservation that also appeared in the HMAT. 
While this is meant to encourage platform firmware to "do the right thing"
and publish an HMAT, the corollary is that platforms that fail to publish
an accurate HMAT will strand memory from Linux usage.  Additionally, the
"efi_fake_mem" kernel command line option enabling will strand memory by
default without an HMAT.

Arrange for "soft reserved" memory that goes unclaimed by HMAT entries to
be published as raw resource ranges for the hmem driver to consume.

Include a module parameter to disable either this fallback behavior, or
the hmat enabling from creating hmem devices.  The module parameter
requires the hmem device enabling to have unique name in the module
namespace: "device_hmem".

The driver depends on the architecture providing phys_to_target_node()
which is only x86 via numa_meminfo() and arm64 via a generic memblock
implementation.

[[e-mail]: require NUMA_KEEP_MEMINFO for phys_to_target_node()]
  Link: https://lkml.kernel.org/r/[e-mail]
Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Dan Williams <[e-mail]>
Signed-off-by: Joao Martins <[e-mail]>
Reviewed-by: Joao Martins <[e-mail]>
Cc: Jonathan Cameron <[e-mail]>
Cc: Brice Goglin <[e-mail]>
Cc: Jeff Moyer <[e-mail]>
Cc: Catalin Marinas <[e-mail]>
Cc: Will Deacon <[e-mail]>
Cc: Andy Lutomirski <[e-mail]>
Cc: Ard Biesheuvel <[e-mail]>
Cc: Benjamin Herrenschmidt <[e-mail]>
Cc: Ben Skeggs <[e-mail]>
Cc: Borislav Petkov <[e-mail]>
Cc: Daniel Vetter <[e-mail]>
Cc: Dave Hansen <[e-mail]>
Cc: Dave Jiang <[e-mail]>
Cc: David Airlie <[e-mail]>
Cc: David Hildenbrand <[e-mail]>
Cc: Greg Kroah-Hartman <[e-mail]>
Cc: "H. Peter Anvin" <[e-mail]>
Cc: Ingo Molnar <[e-mail]>
Cc: Ira Weiny <[e-mail]>
Cc: Jason Gunthorpe <[e-mail]>
Cc: Jia He <[e-mail]>
Cc: Michael Ellerman <[e-mail]>
Cc: Mike Rapoport <[e-mail]>
Cc: Paul Mackerras <[e-mail]>
Cc: Pavel Tatashin <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Rafael J. Wysocki <[e-mail]>
Cc: Thomas Gleixner <[e-mail]>
Cc: Tom Lendacky <[e-mail]>
Cc: Vishal Verma <[e-mail]>
Cc: Wei Yang <[e-mail]>
Cc: Ard Biesheuvel <[e-mail]>
Cc: Bjorn Helgaas <[e-mail]>
Cc: Boris Ostrovsky <[e-mail]>
Cc: Hulk Robot <[e-mail]>
Cc: Jason Yan <[e-mail]>
Cc: "Jérôme Glisse" <[e-mail]>
Cc: Juergen Gross <[e-mail]>
Cc: kernel test robot <[e-mail]>
Cc: Randy Dunlap <[e-mail]>
Cc: Stefano Stabellini <[e-mail]>
Cc: Vivek Goyal <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 drivers/dax/Kconfig       |    2 ++
 drivers/dax/hmem/Makefile |    3 ++-
 drivers/dax/hmem/device.c |   35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

Patch

--- a/drivers/dax/hmem/device.c~acpi-hmat-attach-a-device-for-each-soft-reserved-range
+++ a/drivers/dax/hmem/device.c
@@ -5,6 +5,9 @@ 
 #include <linux/dax.h>
 #include <linux/mm.h>
 
+static bool nohmem;
+module_param_named(disable, nohmem, bool, 0444);
+
 void hmem_register_device(int target_nid, struct resource *r)
 {
 	/* define a clean / non-busy resource for the platform device */
@@ -17,6 +20,9 @@  void hmem_register_device(int target_nid
 	struct memregion_info info;
 	int rc, id;
 
+	if (nohmem)
+		return;
+
 	rc = region_intersects(res.start, resource_size(&res), IORESOURCE_MEM,
 			IORES_DESC_SOFT_RESERVED);
 	if (rc != REGION_INTERSECTS)
@@ -63,3 +69,32 @@  out_resource:
 out_pdev:
 	memregion_free(id);
 }
+
+static __init int hmem_register_one(struct resource *res, void *data)
+{
+	/*
+	 * If the resource is not a top-level resource it was already
+	 * assigned to a device by the HMAT parsing.
+	 */
+	if (res->parent != &iomem_resource) {
+		pr_info("HMEM: skip %pr, already claimed\n", res);
+		return 0;
+	}
+
+	hmem_register_device(phys_to_target_node(res->start), res);
+
+	return 0;
+}
+
+static __init int hmem_init(void)
+{
+	walk_iomem_res_desc(IORES_DESC_SOFT_RESERVED,
+			IORESOURCE_MEM, 0, -1, NULL, hmem_register_one);
+	return 0;
+}
+
+/*
+ * As this is a fallback for address ranges unclaimed by the ACPI HMAT
+ * parsing it must be at an initcall level greater than hmat_init().
+ */
+late_initcall(hmem_init);
--- a/drivers/dax/hmem/Makefile~acpi-hmat-attach-a-device-for-each-soft-reserved-range
+++ a/drivers/dax/hmem/Makefile
@@ -1,5 +1,6 @@ 
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_DEV_DAX_HMEM) += dax_hmem.o
-obj-$(CONFIG_DEV_DAX_HMEM_DEVICES) += device.o
+obj-$(CONFIG_DEV_DAX_HMEM_DEVICES) += device_hmem.o
 
+device_hmem-y := device.o
 dax_hmem-y := hmem.o
--- a/drivers/dax/Kconfig~acpi-hmat-attach-a-device-for-each-soft-reserved-range
+++ a/drivers/dax/Kconfig
@@ -35,6 +35,7 @@  config DEV_DAX_PMEM
 config DEV_DAX_HMEM
 	tristate "HMEM DAX: direct access to 'specific purpose' memory"
 	depends on EFI_SOFT_RESERVE
+	select NUMA_KEEP_MEMINFO if (NUMA && X86)
 	default DEV_DAX
 	help
 	  EFI 2.8 platforms, and others, may advertise 'specific purpose'
@@ -49,6 +50,7 @@  config DEV_DAX_HMEM
 	  Say M if unsure.
 
 config DEV_DAX_HMEM_DEVICES
+	depends on NUMA_KEEP_MEMINFO # for phys_to_target_node()
 	depends on DEV_DAX_HMEM && DAX=y
 	def_bool y