Commit 01feba59 authored Aug 18, 2020 by Jonathan Cameron Committed by Rafael J. Wysocki Sep 24, 2020

ACPI: Do not create new NUMA domains from ACPI static tables that are not SRAT

Several ACPI static tables contain references to proximity domains.

ACPI 6.3 has clarified that only entries in SRAT may define a new
domain (sec 5.2.16).

Those tables described in the ACPI spec have additional clarifying text.

NFIT: Table 5-132,

"Integer that represents the proximity domain to which the memory
 belongs. This number must match with corresponding entry in the
 SRAT table."

HMAT: Table 5-145,

"... This number must match with the corresponding entry in the SRAT
 table's processor affinity structure ... if the initiator is a processor,
 or the Generic Initiator Affinity Structure if the initiator is a generic
 initiator".

IORT and DMAR are defined by external specifications.

Intel Virtualization Technology for Directed I/O Rev 3.1 does not make any
explicit statements, but the general SRAT statement above will still apply.
https://software.intel.com/sites/default/files/managed/c5/15/vt-directed-io-spec.pdf

IO Remapping Table, Platform Design Document rev D, also makes not explicit
statement, but refers to ACPI SRAT table for more information and again the
generic SRAT statement above applies.
https://developer.arm.com/documentation/den0049/d/



In conclusion, any proximity domain specified in these tables, should be a
reference to a proximity domain also found in SRAT, and they should not be
able to instantiate a new domain.  Hence we switch to pxm_to_node() which
will only return existing nodes.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Barry Song <song.bao.hua@hisilicon.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 8a3decac

drivers/acpi/arm64/iort.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1335,7 +1335,7 @@ static int __init arm_smmu_v3_set_proximity(struct device *dev,

		smmu = (struct acpi_iort_smmu_v3 *)node->node_data;
		if (smmu->flags & ACPI_IORT_SMMU_V3_PXM_VALID) {
		int dev_node = acpi_map_pxm_to_node(smmu->pxm);
		int dev_node = pxm_to_node(smmu->pxm);

		if (dev_node != NUMA_NO_NODE && !node_online(dev_node))
		return -EINVAL;

drivers/acpi/nfit/core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -3008,8 +3008,7 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc,
		if (spa->flags & ACPI_NFIT_PROXIMITY_VALID) {
		ndr_desc->numa_node = acpi_map_pxm_to_online_node(
		spa->proximity_domain);
		ndr_desc->target_node = acpi_map_pxm_to_node(
		spa->proximity_domain);
		ndr_desc->target_node = pxm_to_node(spa->proximity_domain);
		} else {
		ndr_desc->numa_node = NUMA_NO_NODE;
		ndr_desc->target_node = NUMA_NO_NODE;

drivers/acpi/numa/hmat.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -666,7 +666,7 @@ static void hmat_register_target_device(struct memory_target *target,

		pdev->dev.numa_node = acpi_map_pxm_to_online_node(target->memory_pxm);
		info = (struct memregion_info) {
		.target_node = acpi_map_pxm_to_node(target->memory_pxm),
		.target_node = pxm_to_node(target->memory_pxm),
		};
		rc = platform_device_add_data(pdev, &info, sizeof(info));
		if (rc < 0) {

drivers/iommu/intel/dmar.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -473,7 +473,7 @@ static int dmar_parse_one_rhsa(struct acpi_dmar_header header, void arg)
		rhsa = (struct acpi_dmar_rhsa *)header;
		for_each_drhd_unit(drhd) {
		if (drhd->reg_base_addr == rhsa->base_address) {
		int node = acpi_map_pxm_to_node(rhsa->proximity_domain);
		int node = pxm_to_node(rhsa->proximity_domain);

		if (!node_online(node))
		node = NUMA_NO_NODE;

Admin message