diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2024-03-07 16:03:25 +0000 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2024-03-12 17:59:40 -0400 |
| commit | 2eb6672cfdaea7dacd8e9bb0523887f13b9f85ce (patch) | |
| tree | d17765e251de02316e2495fd4779e6531048028d | |
| parent | f7ada75b3f7dd1369b10bac7f8297831c3a80967 (diff) | |
| download | qemu-2eb6672cfdaea7dacd8e9bb0523887f13b9f85ce.zip qemu-2eb6672cfdaea7dacd8e9bb0523887f13b9f85ce.tar.gz qemu-2eb6672cfdaea7dacd8e9bb0523887f13b9f85ce.tar.bz2 | |
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 <Jonathan.Cameron@huawei.com>
Message-Id: <20240307160326.31570-2-Jonathan.Cameron@huawei.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/acpi/hmat.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/acpi/hmat.c b/hw/acpi/hmat.c index 2242981..8ea2408 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) { |