Commit 0e797399 authored by Wang ShaoBo's avatar Wang ShaoBo Committed by Zheng Zengkai
Browse files

ACPI/MPAM: Use acpi_map_pxm_to_node() to get node id for memory node 

hulk inclusion
category: feature
bugzilla: 34278, https://gitee.com/openeuler/kernel/issues/I4K27D


CVE: NA

-------------------------------------------------

Proximity domain of Memory MSC node cannot be treated as node id for
components' index, we should use acpi_map_pxm_to_node() to get the exact
node id anyway, for instance, after DIE interleaving, we can only use
node id instead, for pxm is discontinuous at this time.

Signed-off-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Reviewed-by: default avatarCheng Jian <cj.chengjian@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent e163ff16

drivers/acpi/arm64/mpam.c

+4 −29
Original line number Diff line number Diff line
@@ -71,42 +71,17 @@ acpi_mpam_label_cache_component_id(struct acpi_table_header *table_hdr, 
	return 0;

}



/**

 * acpi_mpam_label_memory_component_id() - Use proximity_domain id to

 * label mpam memory node, which be signed by @component_id.

 * @proximity_domain: proximity_domain of ACPI MPAM memory node

 * @component_id: The id labels the structure mpam_node memory

 */

static int acpi_mpam_label_memory_component_id(u8 proximity_domain,

					u32 *component_id)

{

	u32 nid = (u32)proximity_domain;



	if (nid >= nr_online_nodes) {

		pr_err_once("Invalid proximity domain\n");

		return -EINVAL;

	}



	*component_id = nid;

	return 0;

}



static int __init acpi_mpam_parse_memory(struct acpi_mpam_header *h)

{

	int ret;

	u32 component_id;

	struct mpam_device *dev;

	struct acpi_mpam_node_memory *node = (struct acpi_mpam_node_memory *)h;



	ret = acpi_mpam_label_memory_component_id(node->proximity_domain,

							&component_id);

	if (ret) {

		pr_err("Failed to label memory component id\n");

		return -EINVAL;

	}

	component_id = acpi_map_pxm_to_node(node->proximity_domain);

	if (component_id == NUMA_NO_NODE)

		component_id = 0;



	dev = mpam_device_create_memory(component_id,

					node->header.base_address);

	dev = mpam_device_create_memory(component_id, node->header.base_address);

	if (IS_ERR(dev)) {

		pr_err("Failed to create memory node\n");

		return -EINVAL;