Commit bcf6f175 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Rafael J. Wysocki
Browse files

ACPI: NUMA: Process hotpluggable memblocks when !CONFIG_MEMORY_HOTPLUG 



Some systems (e.g. Hyper-V guests) have all their memory marked as
hotpluggable in SRAT. acpi_numa_memory_affinity_init(), however,
ignores all such regions when !CONFIG_MEMORY_HOTPLUG and this is
unfortunate as memory affinity (NUMA) information gets lost.

'Hot Pluggable' flag in SRAT only means that "system hardware supports
hot-add and hot-remove of this memory region", it doesn't prevent
memory from being cold-plugged there.

Ignore 'Hot Pluggable' bit instead of skipping the whole memory
affinity information when !CONFIG_MEMORY_HOTPLUG.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 2585cf9d

drivers/acpi/numa/srat.c

+2 −3
Original line number Diff line number Diff line
@@ -254,9 +254,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) 
	}

	if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)

		goto out_err;

	hotpluggable = ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE;

	if (hotpluggable && !IS_ENABLED(CONFIG_MEMORY_HOTPLUG))

		goto out_err;

	hotpluggable = IS_ENABLED(CONFIG_MEMORY_HOTPLUG) &&

		(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE);



	start = ma->base_address;

	end = start + ma->length;