From: Jonathan Cameron Date: Thu, 7 Mar 2024 16:03:25 +0000 (+0000) Subject: hmat acpi: Do not add Memory Proximity Domain Attributes Structure targetting non... X-Git-Tag: v9.0.0-rc0~9^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2eb6672cfdaea7dacd8e9bb0523887f13b9f85ce;p=thirdparty%2Fqemu.git hmat acpi: Do not add Memory Proximity Domain Attributes Structure targetting non existent memory. If qemu is started with a proximity node containing CPUs alone, it will provide one of these structures to say memory in this node is directly connected to itself. This description is arguably pointless even if there is memory in the node. If there is no memory present, and hence no SRAT entry it breaks Linux HMAT passing and the table is rejected. https://elixir.bootlin.com/linux/v6.7/source/drivers/acpi/numa/hmat.c#L444 Signed-off-by: Jonathan Cameron Message-Id: <20240307160326.31570-2-Jonathan.Cameron@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- diff --git a/hw/acpi/hmat.c b/hw/acpi/hmat.c index 2242981e180..8ea240878ae 100644 --- a/hw/acpi/hmat.c +++ b/hw/acpi/hmat.c @@ -204,6 +204,13 @@ static void hmat_build_table_structs(GArray *table_data, NumaState *numa_state) build_append_int_noprefix(table_data, 0, 4); /* Reserved */ for (i = 0; i < numa_state->num_nodes; i++) { + /* + * Linux rejects whole HMAT table if a node with no memory + * has one of these structures listing it as a target. + */ + if (!numa_state->nodes[i].node_mem) { + continue; + } flags = 0; if (numa_state->nodes[i].initiator < MAX_NODES) {