* [PATCH v3 1/8] hmat acpi: Don't require initiator value in -numa
2022-10-27 10:00 [PATCH v3 0/8] AArch64/HMAT support and tests Hesham Almatary via
@ 2022-10-27 10:00 ` Hesham Almatary via
2022-10-27 10:00 ` [PATCH v3 2/8] tests: acpi: add and whitelist *.hmat-noinitiator expected blobs Hesham Almatary via
` (8 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Hesham Almatary via @ 2022-10-27 10:00 UTC (permalink / raw)
To: jonathan.cameron, qemu-devel
Cc: yangyicong, chenxiang66, linuxarm, qemu-arm, peter.maydell,
imammedo, wangyanan55, marcel.apfelbaum, eduardo, Brice.Goglin,
mst
From: Brice Goglin <Brice.Goglin@inria.fr>
The "Memory Proximity Domain Attributes" structure of the ACPI HMAT
has a "Processor Proximity Domain Valid" flag that is currently
always set because Qemu -numa requires an initiator=X value
when hmat=on. Unsetting this flag allows to create more complex
memory topologies by having multiple best initiators for a single
memory target.
This patch allows -numa without initiator=X when hmat=on by keeping
the default value MAX_NODES in numa_state->nodes[i].initiator.
All places reading numa_state->nodes[i].initiator already check
whether it's different from MAX_NODES before using it.
Tested with
qemu-system-x86_64 -accel kvm \
-machine pc,hmat=on \
-drive if=pflash,format=raw,file=./OVMF.fd \
-drive media=disk,format=qcow2,file=efi.qcow2 \
-smp 4 \
-m 3G \
-object memory-backend-ram,size=1G,id=ram0 \
-object memory-backend-ram,size=1G,id=ram1 \
-object memory-backend-ram,size=1G,id=ram2 \
-numa node,nodeid=0,memdev=ram0,cpus=0-1 \
-numa node,nodeid=1,memdev=ram1,cpus=2-3 \
-numa node,nodeid=2,memdev=ram2 \
-numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-latency,latency=10 \
-numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=10485760 \
-numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-latency,latency=20 \
-numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=5242880 \
-numa hmat-lb,initiator=0,target=2,hierarchy=memory,data-type=access-latency,latency=30 \
-numa hmat-lb,initiator=0,target=2,hierarchy=memory,data-type=access-bandwidth,bandwidth=1048576 \
-numa hmat-lb,initiator=1,target=0,hierarchy=memory,data-type=access-latency,latency=20 \
-numa hmat-lb,initiator=1,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=5242880 \
-numa hmat-lb,initiator=1,target=1,hierarchy=memory,data-type=access-latency,latency=10 \
-numa hmat-lb,initiator=1,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=10485760 \
-numa hmat-lb,initiator=1,target=2,hierarchy=memory,data-type=access-latency,latency=30 \
-numa hmat-lb,initiator=1,target=2,hierarchy=memory,data-type=access-bandwidth,bandwidth=1048576
which reports NUMA node2 at same distance from both node0 and node1 as seen in lstopo:
Machine (2966MB total) + Package P#0
NUMANode P#2 (979MB)
Group0
NUMANode P#0 (980MB)
Core P#0 + PU P#0
Core P#1 + PU P#1
Group0
NUMANode P#1 (1007MB)
Core P#2 + PU P#2
Core P#3 + PU P#3
Before this patch, we had to add ",initiator=X" to "-numa node,nodeid=2,memdev=ram2".
The lstopo output difference between initiator=1 and no initiator is:
@@ -1,10 +1,10 @@
Machine (2966MB total) + Package P#0
+ NUMANode P#2 (979MB)
Group0
NUMANode P#0 (980MB)
Core P#0 + PU P#0
Core P#1 + PU P#1
Group0
NUMANode P#1 (1007MB)
- NUMANode P#2 (979MB)
Core P#2 + PU P#2
Core P#3 + PU P#3
Corresponding changes in the HMAT MPDA structure:
@@ -49,10 +49,10 @@
[078h 0120 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[07Ah 0122 2] Reserved : 0000
[07Ch 0124 4] Length : 00000028
-[080h 0128 2] Flags (decoded below) : 0001
- Processor Proximity Domain Valid : 1
+[080h 0128 2] Flags (decoded below) : 0000
+ Processor Proximity Domain Valid : 0
[082h 0130 2] Reserved1 : 0000
-[084h 0132 4] Attached Initiator Proximity Domain : 00000001
+[084h 0132 4] Attached Initiator Proximity Domain : 00000080
[088h 0136 4] Memory Proximity Domain : 00000002
[08Ch 0140 4] Reserved2 : 00000000
[090h 0144 8] Reserved3 : 0000000000000000
Final HMAT SLLB structures:
[0A0h 0160 2] Structure Type : 0001 [System Locality Latency and Bandwidth Information]
[0A2h 0162 2] Reserved : 0000
[0A4h 0164 4] Length : 00000040
[0A8h 0168 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0A9h 0169 1] Data Type : 00
[0AAh 0170 2] Reserved1 : 0000
[0ACh 0172 4] Initiator Proximity Domains # : 00000002
[0B0h 0176 4] Target Proximity Domains # : 00000003
[0B4h 0180 4] Reserved2 : 00000000
[0B8h 0184 8] Entry Base Unit : 0000000000002710
[0C0h 0192 4] Initiator Proximity Domain List : 00000000
[0C4h 0196 4] Initiator Proximity Domain List : 00000001
[0C8h 0200 4] Target Proximity Domain List : 00000000
[0CCh 0204 4] Target Proximity Domain List : 00000001
[0D0h 0208 4] Target Proximity Domain List : 00000002
[0D4h 0212 2] Entry : 0001
[0D6h 0214 2] Entry : 0002
[0D8h 0216 2] Entry : 0003
[0DAh 0218 2] Entry : 0002
[0DCh 0220 2] Entry : 0001
[0DEh 0222 2] Entry : 0003
[0E0h 0224 2] Structure Type : 0001 [System Locality Latency and Bandwidth Information]
[0E2h 0226 2] Reserved : 0000
[0E4h 0228 4] Length : 00000040
[0E8h 0232 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0E9h 0233 1] Data Type : 03
[0EAh 0234 2] Reserved1 : 0000
[0ECh 0236 4] Initiator Proximity Domains # : 00000002
[0F0h 0240 4] Target Proximity Domains # : 00000003
[0F4h 0244 4] Reserved2 : 00000000
[0F8h 0248 8] Entry Base Unit : 0000000000000001
[100h 0256 4] Initiator Proximity Domain List : 00000000
[104h 0260 4] Initiator Proximity Domain List : 00000001
[108h 0264 4] Target Proximity Domain List : 00000000
[10Ch 0268 4] Target Proximity Domain List : 00000001
[110h 0272 4] Target Proximity Domain List : 00000002
[114h 0276 2] Entry : 000A
[116h 0278 2] Entry : 0005
[118h 0280 2] Entry : 0001
[11Ah 0282 2] Entry : 0005
[11Ch 0284 2] Entry : 000A
[11Eh 0286 2] Entry : 0001
Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
Signed-off-by: Hesham Almatary <hesham.almatary@huawei.com>
Reviewed-by: Jingqi Liu <jingqi.liu@intel.com>
---
hw/core/machine.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index aa520e74a8..e686bb48a0 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -1176,9 +1176,7 @@ static void numa_validate_initiator(NumaState *numa_state)
for (i = 0; i < numa_state->num_nodes; i++) {
if (numa_info[i].initiator == MAX_NODES) {
- error_report("The initiator of NUMA node %d is missing, use "
- "'-numa node,initiator' option to declare it", i);
- exit(1);
+ continue;
}
if (!numa_info[numa_info[i].initiator].present) {
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v3 2/8] tests: acpi: add and whitelist *.hmat-noinitiator expected blobs
2022-10-27 10:00 [PATCH v3 0/8] AArch64/HMAT support and tests Hesham Almatary via
2022-10-27 10:00 ` [PATCH v3 1/8] hmat acpi: Don't require initiator value in -numa Hesham Almatary via
@ 2022-10-27 10:00 ` Hesham Almatary via
2022-10-27 10:00 ` [PATCH v3 3/8] tests: acpi: q35: add test for hmat nodes without initiators Hesham Almatary via
` (7 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Hesham Almatary via @ 2022-10-27 10:00 UTC (permalink / raw)
To: jonathan.cameron, qemu-devel
Cc: yangyicong, chenxiang66, linuxarm, qemu-arm, peter.maydell,
imammedo, wangyanan55, marcel.apfelbaum, eduardo, Brice.Goglin,
mst
From: Brice Goglin <Brice.Goglin@inria.fr>
.. which will be used by follow up hmat-noinitiator test-case.
Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
Signed-off-by: Hesham Almatary <hesham.almatary@huawei.com>
---
tests/data/acpi/q35/APIC.acpihmat-noinitiator | 0
tests/data/acpi/q35/DSDT.acpihmat-noinitiator | 0
tests/data/acpi/q35/HMAT.acpihmat-noinitiator | 0
tests/data/acpi/q35/SRAT.acpihmat-noinitiator | 0
tests/qtest/bios-tables-test-allowed-diff.h | 4 ++++
5 files changed, 4 insertions(+)
create mode 100644 tests/data/acpi/q35/APIC.acpihmat-noinitiator
create mode 100644 tests/data/acpi/q35/DSDT.acpihmat-noinitiator
create mode 100644 tests/data/acpi/q35/HMAT.acpihmat-noinitiator
create mode 100644 tests/data/acpi/q35/SRAT.acpihmat-noinitiator
diff --git a/tests/data/acpi/q35/APIC.acpihmat-noinitiator b/tests/data/acpi/q35/APIC.acpihmat-noinitiator
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/q35/DSDT.acpihmat-noinitiator b/tests/data/acpi/q35/DSDT.acpihmat-noinitiator
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/q35/HMAT.acpihmat-noinitiator b/tests/data/acpi/q35/HMAT.acpihmat-noinitiator
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/q35/SRAT.acpihmat-noinitiator b/tests/data/acpi/q35/SRAT.acpihmat-noinitiator
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..245fa66bcc 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,5 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/q35/APIC.acpihmat-noinitiator",
+"tests/data/acpi/q35/DSDT.acpihmat-noinitiator",
+"tests/data/acpi/q35/HMAT.acpihmat-noinitiator",
+"tests/data/acpi/q35/SRAT.acpihmat-noinitiator",
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v3 3/8] tests: acpi: q35: add test for hmat nodes without initiators
2022-10-27 10:00 [PATCH v3 0/8] AArch64/HMAT support and tests Hesham Almatary via
2022-10-27 10:00 ` [PATCH v3 1/8] hmat acpi: Don't require initiator value in -numa Hesham Almatary via
2022-10-27 10:00 ` [PATCH v3 2/8] tests: acpi: add and whitelist *.hmat-noinitiator expected blobs Hesham Almatary via
@ 2022-10-27 10:00 ` Hesham Almatary via
2022-10-27 10:00 ` [PATCH v3 4/8] tests: acpi: q35: update expected blobs *.hmat-noinitiators expected HMAT: Hesham Almatary via
` (6 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Hesham Almatary via @ 2022-10-27 10:00 UTC (permalink / raw)
To: jonathan.cameron, qemu-devel
Cc: yangyicong, chenxiang66, linuxarm, qemu-arm, peter.maydell,
imammedo, wangyanan55, marcel.apfelbaum, eduardo, Brice.Goglin,
mst
From: Brice Goglin <Brice.Goglin@inria.fr>
expected HMAT:
[000h 0000 4] Signature : "HMAT" [Heterogeneous Memory Attributes Table]
[004h 0004 4] Table Length : 00000120
[008h 0008 1] Revision : 02
[009h 0009 1] Checksum : 4F
[00Ah 0010 6] Oem ID : "BOCHS "
[010h 0016 8] Oem Table ID : "BXPC "
[018h 0024 4] Oem Revision : 00000001
[01Ch 0028 4] Asl Compiler ID : "BXPC"
[020h 0032 4] Asl Compiler Revision : 00000001
[024h 0036 4] Reserved : 00000000
[028h 0040 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[02Ah 0042 2] Reserved : 0000
[02Ch 0044 4] Length : 00000028
[030h 0048 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[032h 0050 2] Reserved1 : 0000
[034h 0052 4] Attached Initiator Proximity Domain : 00000000
[038h 0056 4] Memory Proximity Domain : 00000000
[03Ch 0060 4] Reserved2 : 00000000
[040h 0064 8] Reserved3 : 0000000000000000
[048h 0072 8] Reserved4 : 0000000000000000
[050h 0080 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[052h 0082 2] Reserved : 0000
[054h 0084 4] Length : 00000028
[058h 0088 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[05Ah 0090 2] Reserved1 : 0000
[05Ch 0092 4] Attached Initiator Proximity Domain : 00000001
[060h 0096 4] Memory Proximity Domain : 00000001
[064h 0100 4] Reserved2 : 00000000
[068h 0104 8] Reserved3 : 0000000000000000
[070h 0112 8] Reserved4 : 0000000000000000
[078h 0120 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[07Ah 0122 2] Reserved : 0000
[07Ch 0124 4] Length : 00000028
[080h 0128 2] Flags (decoded below) : 0000
Processor Proximity Domain Valid : 0
[082h 0130 2] Reserved1 : 0000
[084h 0132 4] Attached Initiator Proximity Domain : 00000080
[088h 0136 4] Memory Proximity Domain : 00000002
[08Ch 0140 4] Reserved2 : 00000000
[090h 0144 8] Reserved3 : 0000000000000000
[098h 0152 8] Reserved4 : 0000000000000000
[0A0h 0160 2] Structure Type : 0001 [System Locality Latency and Bandwidth Information]
[0A2h 0162 2] Reserved : 0000
[0A4h 0164 4] Length : 00000040
[0A8h 0168 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0A9h 0169 1] Data Type : 00
[0AAh 0170 2] Reserved1 : 0000
[0ACh 0172 4] Initiator Proximity Domains # : 00000002
[0B0h 0176 4] Target Proximity Domains # : 00000003
[0B4h 0180 4] Reserved2 : 00000000
[0B8h 0184 8] Entry Base Unit : 0000000000002710
[0C0h 0192 4] Initiator Proximity Domain List : 00000000
[0C4h 0196 4] Initiator Proximity Domain List : 00000001
[0C8h 0200 4] Target Proximity Domain List : 00000000
[0CCh 0204 4] Target Proximity Domain List : 00000001
[0D0h 0208 4] Target Proximity Domain List : 00000002
[0D4h 0212 2] Entry : 0001
[0D6h 0214 2] Entry : 0002
[0D8h 0216 2] Entry : 0003
[0DAh 0218 2] Entry : 0002
[0DCh 0220 2] Entry : 0001
[0DEh 0222 2] Entry : 0003
[0E0h 0224 2] Structure Type : 0001 [System Locality Latency and Bandwidth Information]
[0E2h 0226 2] Reserved : 0000
[0E4h 0228 4] Length : 00000040
[0E8h 0232 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0E9h 0233 1] Data Type : 03
[0EAh 0234 2] Reserved1 : 0000
[0ECh 0236 4] Initiator Proximity Domains # : 00000002
[0F0h 0240 4] Target Proximity Domains # : 00000003
[0F4h 0244 4] Reserved2 : 00000000
[0F8h 0248 8] Entry Base Unit : 0000000000000001
[100h 0256 4] Initiator Proximity Domain List : 00000000
[104h 0260 4] Initiator Proximity Domain List : 00000001
[108h 0264 4] Target Proximity Domain List : 00000000
[10Ch 0268 4] Target Proximity Domain List : 00000001
[110h 0272 4] Target Proximity Domain List : 00000002
[114h 0276 2] Entry : 000A
[116h 0278 2] Entry : 0005
[118h 0280 2] Entry : 0001
[11Ah 0282 2] Entry : 0005
[11Ch 0284 2] Entry : 000A
[11Eh 0286 2] Entry : 0001
Raw Table Data: Length 288 (0x120)
0000: 48 4D 41 54 20 01 00 00 02 4F 42 4F 43 48 53 20 // HMAT ....OBOCHS
0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC
0020: 01 00 00 00 00 00 00 00 00 00 00 00 28 00 00 00 // ............(...
0030: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0050: 00 00 00 00 28 00 00 00 01 00 00 00 01 00 00 00 // ....(...........
0060: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0070: 00 00 00 00 00 00 00 00 00 00 00 00 28 00 00 00 // ............(...
0080: 00 00 00 00 80 00 00 00 02 00 00 00 00 00 00 00 // ................
0090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00A0: 01 00 00 00 40 00 00 00 00 00 00 00 02 00 00 00 // ....@...........
00B0: 03 00 00 00 00 00 00 00 10 27 00 00 00 00 00 00 // .........'......
00C0: 00 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 // ................
00D0: 02 00 00 00 01 00 02 00 03 00 02 00 01 00 03 00 // ................
00E0: 01 00 00 00 40 00 00 00 00 03 00 00 02 00 00 00 // ....@...........
00F0: 03 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 // ................
0100: 00 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 // ................
0110: 02 00 00 00 0A 00 05 00 01 00 05 00 0A 00 01 00 // ................
Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
Signed-off-by: Hesham Almatary <hesham.almatary@huawei.com>
---
tests/qtest/bios-tables-test.c | 50 ++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index e6096e7f73..02fe59fbf8 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1461,6 +1461,54 @@ static void test_acpi_piix4_tcg_acpi_hmat(void)
test_acpi_tcg_acpi_hmat(MACHINE_PC);
}
+static void test_acpi_q35_tcg_acpi_hmat_noinitiator(void)
+{
+ test_data data;
+
+ memset(&data, 0, sizeof(data));
+ data.machine = MACHINE_Q35;
+ data.variant = ".acpihmat-noinitiator";
+ test_acpi_one(" -machine hmat=on"
+ " -smp 4,sockets=2"
+ " -m 128M"
+ " -object memory-backend-ram,size=32M,id=ram0"
+ " -object memory-backend-ram,size=32M,id=ram1"
+ " -object memory-backend-ram,size=64M,id=ram2"
+ " -numa node,nodeid=0,memdev=ram0"
+ " -numa node,nodeid=1,memdev=ram1"
+ " -numa node,nodeid=2,memdev=ram2"
+ " -numa cpu,node-id=0,socket-id=0"
+ " -numa cpu,node-id=0,socket-id=0"
+ " -numa cpu,node-id=1,socket-id=1"
+ " -numa cpu,node-id=1,socket-id=1"
+ " -numa hmat-lb,initiator=0,target=0,hierarchy=memory,"
+ "data-type=access-latency,latency=10"
+ " -numa hmat-lb,initiator=0,target=0,hierarchy=memory,"
+ "data-type=access-bandwidth,bandwidth=10485760"
+ " -numa hmat-lb,initiator=0,target=1,hierarchy=memory,"
+ "data-type=access-latency,latency=20"
+ " -numa hmat-lb,initiator=0,target=1,hierarchy=memory,"
+ "data-type=access-bandwidth,bandwidth=5242880"
+ " -numa hmat-lb,initiator=0,target=2,hierarchy=memory,"
+ "data-type=access-latency,latency=30"
+ " -numa hmat-lb,initiator=0,target=2,hierarchy=memory,"
+ "data-type=access-bandwidth,bandwidth=1048576"
+ " -numa hmat-lb,initiator=1,target=0,hierarchy=memory,"
+ "data-type=access-latency,latency=20"
+ " -numa hmat-lb,initiator=1,target=0,hierarchy=memory,"
+ "data-type=access-bandwidth,bandwidth=5242880"
+ " -numa hmat-lb,initiator=1,target=1,hierarchy=memory,"
+ "data-type=access-latency,latency=10"
+ " -numa hmat-lb,initiator=1,target=1,hierarchy=memory,"
+ "data-type=access-bandwidth,bandwidth=10485760"
+ " -numa hmat-lb,initiator=1,target=2,hierarchy=memory,"
+ "data-type=access-latency,latency=30"
+ " -numa hmat-lb,initiator=1,target=2,hierarchy=memory,"
+ "data-type=access-bandwidth,bandwidth=1048576",
+ &data);
+ free_test_data(&data);
+}
+
#ifdef CONFIG_POSIX
static void test_acpi_erst(const char *machine)
{
@@ -1824,6 +1872,8 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/q35/nohpet", test_acpi_q35_tcg_nohpet);
qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
qtest_add_func("acpi/q35/acpihmat", test_acpi_q35_tcg_acpi_hmat);
+ qtest_add_func("acpi/q35/acpihmat-noinitiator",
+ test_acpi_q35_tcg_acpi_hmat_noinitiator);
#ifdef CONFIG_POSIX
qtest_add_func("acpi/q35/acpierst", test_acpi_q35_acpi_erst);
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v3 4/8] tests: acpi: q35: update expected blobs *.hmat-noinitiators expected HMAT:
2022-10-27 10:00 [PATCH v3 0/8] AArch64/HMAT support and tests Hesham Almatary via
` (2 preceding siblings ...)
2022-10-27 10:00 ` [PATCH v3 3/8] tests: acpi: q35: add test for hmat nodes without initiators Hesham Almatary via
@ 2022-10-27 10:00 ` Hesham Almatary via
2022-10-27 10:00 ` [PATCH v3 5/8] tests: Add HMAT AArch64/virt empty table files Hesham Almatary via
` (5 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Hesham Almatary via @ 2022-10-27 10:00 UTC (permalink / raw)
To: jonathan.cameron, qemu-devel
Cc: yangyicong, chenxiang66, linuxarm, qemu-arm, peter.maydell,
imammedo, wangyanan55, marcel.apfelbaum, eduardo, Brice.Goglin,
mst
From: Brice Goglin <Brice.Goglin@inria.fr>
[000h 0000 4] Signature : "HMAT" [Heterogeneous Memory Attributes Table]
[004h 0004 4] Table Length : 00000120
[008h 0008 1] Revision : 02
[009h 0009 1] Checksum : 4F
[00Ah 0010 6] Oem ID : "BOCHS "
[010h 0016 8] Oem Table ID : "BXPC "
[018h 0024 4] Oem Revision : 00000001
[01Ch 0028 4] Asl Compiler ID : "BXPC"
[020h 0032 4] Asl Compiler Revision : 00000001
[024h 0036 4] Reserved : 00000000
[028h 0040 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[02Ah 0042 2] Reserved : 0000
[02Ch 0044 4] Length : 00000028
[030h 0048 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[032h 0050 2] Reserved1 : 0000
[034h 0052 4] Attached Initiator Proximity Domain : 00000000
[038h 0056 4] Memory Proximity Domain : 00000000
[03Ch 0060 4] Reserved2 : 00000000
[040h 0064 8] Reserved3 : 0000000000000000
[048h 0072 8] Reserved4 : 0000000000000000
[050h 0080 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[052h 0082 2] Reserved : 0000
[054h 0084 4] Length : 00000028
[058h 0088 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[05Ah 0090 2] Reserved1 : 0000
[05Ch 0092 4] Attached Initiator Proximity Domain : 00000001
[060h 0096 4] Memory Proximity Domain : 00000001
[064h 0100 4] Reserved2 : 00000000
[068h 0104 8] Reserved3 : 0000000000000000
[070h 0112 8] Reserved4 : 0000000000000000
[078h 0120 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[07Ah 0122 2] Reserved : 0000
[07Ch 0124 4] Length : 00000028
[080h 0128 2] Flags (decoded below) : 0000
Processor Proximity Domain Valid : 0
[082h 0130 2] Reserved1 : 0000
[084h 0132 4] Attached Initiator Proximity Domain : 00000080
[088h 0136 4] Memory Proximity Domain : 00000002
[08Ch 0140 4] Reserved2 : 00000000
[090h 0144 8] Reserved3 : 0000000000000000
[098h 0152 8] Reserved4 : 0000000000000000
[0A0h 0160 2] Structure Type : 0001 [System Locality Latency and Bandwidth Information]
[0A2h 0162 2] Reserved : 0000
[0A4h 0164 4] Length : 00000040
[0A8h 0168 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0A9h 0169 1] Data Type : 00
[0AAh 0170 2] Reserved1 : 0000
[0ACh 0172 4] Initiator Proximity Domains # : 00000002
[0B0h 0176 4] Target Proximity Domains # : 00000003
[0B4h 0180 4] Reserved2 : 00000000
[0B8h 0184 8] Entry Base Unit : 0000000000002710
[0C0h 0192 4] Initiator Proximity Domain List : 00000000
[0C4h 0196 4] Initiator Proximity Domain List : 00000001
[0C8h 0200 4] Target Proximity Domain List : 00000000
[0CCh 0204 4] Target Proximity Domain List : 00000001
[0D0h 0208 4] Target Proximity Domain List : 00000002
[0D4h 0212 2] Entry : 0001
[0D6h 0214 2] Entry : 0002
[0D8h 0216 2] Entry : 0003
[0DAh 0218 2] Entry : 0002
[0DCh 0220 2] Entry : 0001
[0DEh 0222 2] Entry : 0003
[0E0h 0224 2] Structure Type : 0001 [System Locality Latency and Bandwidth Information]
[0E2h 0226 2] Reserved : 0000
[0E4h 0228 4] Length : 00000040
[0E8h 0232 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0E9h 0233 1] Data Type : 03
[0EAh 0234 2] Reserved1 : 0000
[0ECh 0236 4] Initiator Proximity Domains # : 00000002
[0F0h 0240 4] Target Proximity Domains # : 00000003
[0F4h 0244 4] Reserved2 : 00000000
[0F8h 0248 8] Entry Base Unit : 0000000000000001
[100h 0256 4] Initiator Proximity Domain List : 00000000
[104h 0260 4] Initiator Proximity Domain List : 00000001
[108h 0264 4] Target Proximity Domain List : 00000000
[10Ch 0268 4] Target Proximity Domain List : 00000001
[110h 0272 4] Target Proximity Domain List : 00000002
[114h 0276 2] Entry : 000A
[116h 0278 2] Entry : 0005
[118h 0280 2] Entry : 0001
[11Ah 0282 2] Entry : 0005
[11Ch 0284 2] Entry : 000A
[11Eh 0286 2] Entry : 0001
Raw Table Data: Length 288 (0x120)
0000: 48 4D 41 54 20 01 00 00 02 4F 42 4F 43 48 53 20 // HMAT ....OBOCHS
0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC
0020: 01 00 00 00 00 00 00 00 00 00 00 00 28 00 00 00 // ............(...
0030: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0050: 00 00 00 00 28 00 00 00 01 00 00 00 01 00 00 00 // ....(...........
0060: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0070: 00 00 00 00 00 00 00 00 00 00 00 00 28 00 00 00 // ............(...
0080: 00 00 00 00 80 00 00 00 02 00 00 00 00 00 00 00 // ................
0090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00A0: 01 00 00 00 40 00 00 00 00 00 00 00 02 00 00 00 // ....@...........
00B0: 03 00 00 00 00 00 00 00 10 27 00 00 00 00 00 00 // .........'......
00C0: 00 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 // ................
00D0: 02 00 00 00 01 00 02 00 03 00 02 00 01 00 03 00 // ................
00E0: 01 00 00 00 40 00 00 00 00 03 00 00 02 00 00 00 // ....@...........
00F0: 03 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 // ................
0100: 00 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 // ................
0110: 02 00 00 00 0A 00 05 00 01 00 05 00 0A 00 01 00 // ................
Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
Signed-off-by: Hesham Almatary <hesham.almatary@huawei.com>
---
tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 0 -> 144 bytes
tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 0 -> 8553 bytes
tests/data/acpi/q35/HMAT.acpihmat-noinitiator | Bin 0 -> 288 bytes
tests/data/acpi/q35/SRAT.acpihmat-noinitiator | Bin 0 -> 312 bytes
tests/qtest/bios-tables-test-allowed-diff.h | 4 ----
5 files changed, 4 deletions(-)
diff --git a/tests/data/acpi/q35/APIC.acpihmat-noinitiator b/tests/data/acpi/q35/APIC.acpihmat-noinitiator
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d904d4a70ddecbb79a83a267af8e26f925e9f4c6 100644
GIT binary patch
literal 144
zcmZ<^@N}NQz`(%h?d0$55v<@85#X!<1dKp25F11@Fg*ANra6G>KwJ(+MhMNs1fiLk
tK{O)|Nb<lx5Xr;^#2^NU#mWk#c|j~rP8f>|r~o3y%?)O;u>A)b0RWi;3;_TD
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/q35/DSDT.acpihmat-noinitiator b/tests/data/acpi/q35/DSDT.acpihmat-noinitiator
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c767d11cb1d088f613c49e55a7139cccababf66c 100644
GIT binary patch
literal 8553
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
E0Xe$wY5)KL
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/q35/HMAT.acpihmat-noinitiator b/tests/data/acpi/q35/HMAT.acpihmat-noinitiator
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6494d11b9fff54f8c403ec9e4893fdff72bde9c9 100644
GIT binary patch
literal 288
zcmaJ)F%Ezr5IZ0&Og@24pP{g@7)*5VIX>Ms;S4dxCU-4Odz5uKq7kt*)m-+N&Mij(
zmQa%w6GZ=3|IM0X_Ak#IabYaQ2iTvR&x~t&7@Gj;A7o|>w!;|gr;lRa*AB0!)_xEV
I&r86*0dKzu0RR91
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/q35/SRAT.acpihmat-noinitiator b/tests/data/acpi/q35/SRAT.acpihmat-noinitiator
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a11d3119ab3538d9cf821a4fe0fccb0f1dc96359 100644
GIT binary patch
literal 312
zcmWFzatyIxWME)?>E!S15v<@85#X!<1VAAM5F12;FdPVA@EK9%8JW=d%*cF34Y)~A
u1{YiayE>qSVDJGh4QBww88zTMCa6LfjpA-b4Y)81R2_^)QwNnLKmh<Kp$P#1
literal 0
HcmV?d00001
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 245fa66bcc..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,5 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/q35/APIC.acpihmat-noinitiator",
-"tests/data/acpi/q35/DSDT.acpihmat-noinitiator",
-"tests/data/acpi/q35/HMAT.acpihmat-noinitiator",
-"tests/data/acpi/q35/SRAT.acpihmat-noinitiator",
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v3 5/8] tests: Add HMAT AArch64/virt empty table files
2022-10-27 10:00 [PATCH v3 0/8] AArch64/HMAT support and tests Hesham Almatary via
` (3 preceding siblings ...)
2022-10-27 10:00 ` [PATCH v3 4/8] tests: acpi: q35: update expected blobs *.hmat-noinitiators expected HMAT: Hesham Almatary via
@ 2022-10-27 10:00 ` Hesham Almatary via
2022-10-27 10:00 ` [PATCH v3 6/8] hw/arm/virt: Enable HMAT on arm virt machine Hesham Almatary via
` (4 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Hesham Almatary via @ 2022-10-27 10:00 UTC (permalink / raw)
To: jonathan.cameron, qemu-devel
Cc: yangyicong, chenxiang66, linuxarm, qemu-arm, peter.maydell,
imammedo, wangyanan55, marcel.apfelbaum, eduardo, Brice.Goglin,
mst
Signed-off-by: Hesham Almatary <hesham.almatary@huawei.com>
---
tests/data/acpi/virt/APIC.acpihmatvirt | 0
tests/data/acpi/virt/DSDT.acpihmatvirt | 0
tests/data/acpi/virt/HMAT.acpihmatvirt | 0
tests/data/acpi/virt/PPTT.acpihmatvirt | 0
tests/data/acpi/virt/SRAT.acpihmatvirt | 0
tests/qtest/bios-tables-test-allowed-diff.h | 5 +++++
6 files changed, 5 insertions(+)
create mode 100644 tests/data/acpi/virt/APIC.acpihmatvirt
create mode 100644 tests/data/acpi/virt/DSDT.acpihmatvirt
create mode 100644 tests/data/acpi/virt/HMAT.acpihmatvirt
create mode 100644 tests/data/acpi/virt/PPTT.acpihmatvirt
create mode 100644 tests/data/acpi/virt/SRAT.acpihmatvirt
diff --git a/tests/data/acpi/virt/APIC.acpihmatvirt b/tests/data/acpi/virt/APIC.acpihmatvirt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/virt/DSDT.acpihmatvirt b/tests/data/acpi/virt/DSDT.acpihmatvirt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/virt/HMAT.acpihmatvirt b/tests/data/acpi/virt/HMAT.acpihmatvirt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/virt/PPTT.acpihmatvirt b/tests/data/acpi/virt/PPTT.acpihmatvirt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/virt/SRAT.acpihmatvirt b/tests/data/acpi/virt/SRAT.acpihmatvirt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..4f849715bd 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,6 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/virt/APIC.acpihmatvirt",
+"tests/data/acpi/virt/DSDT.acpihmatvirt",
+"tests/data/acpi/virt/HMAT.acpihmatvirt",
+"tests/data/acpi/virt/PPTT.acpihmatvirt",
+"tests/data/acpi/virt/SRAT.acpihmatvirt",
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v3 6/8] hw/arm/virt: Enable HMAT on arm virt machine
2022-10-27 10:00 [PATCH v3 0/8] AArch64/HMAT support and tests Hesham Almatary via
` (4 preceding siblings ...)
2022-10-27 10:00 ` [PATCH v3 5/8] tests: Add HMAT AArch64/virt empty table files Hesham Almatary via
@ 2022-10-27 10:00 ` Hesham Almatary via
2022-10-27 10:00 ` [PATCH v3 7/8] tests: acpi: aarch64/virt: add a test for hmat nodes with no initiators Hesham Almatary via
` (3 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Hesham Almatary via @ 2022-10-27 10:00 UTC (permalink / raw)
To: jonathan.cameron, qemu-devel
Cc: yangyicong, chenxiang66, linuxarm, qemu-arm, peter.maydell,
imammedo, wangyanan55, marcel.apfelbaum, eduardo, Brice.Goglin,
mst
From: Xiang Chen <chenxiang66@hisilicon.com>
Since the patchset ("Build ACPI Heterogeneous Memory Attribute Table (HMAT)"),
HMAT is supported, but only x86 is enabled. Enable HMAT on arm virt machine.
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: Hesham Almatary <hesham.almatary@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
hw/arm/Kconfig | 1 +
hw/arm/virt-acpi-build.c | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 15fa79afd3..17fcde8e1c 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -30,6 +30,7 @@ config ARM_VIRT
select ACPI_VIOT
select VIRTIO_MEM_SUPPORTED
select ACPI_CXL
+ select ACPI_HMAT
config CHEETAH
bool
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 13c6e3e468..7f706f72bb 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -42,6 +42,7 @@
#include "hw/acpi/memory_hotplug.h"
#include "hw/acpi/generic_event_device.h"
#include "hw/acpi/tpm.h"
+#include "hw/acpi/hmat.h"
#include "hw/pci/pcie_host.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
@@ -989,6 +990,12 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
build_slit(tables_blob, tables->linker, ms, vms->oem_id,
vms->oem_table_id);
}
+
+ if (ms->numa_state->hmat_enabled) {
+ acpi_add_table(table_offsets, tables_blob);
+ build_hmat(tables_blob, tables->linker, ms->numa_state,
+ vms->oem_id, vms->oem_table_id);
+ }
}
if (ms->nvdimms_state->is_enabled) {
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v3 7/8] tests: acpi: aarch64/virt: add a test for hmat nodes with no initiators
2022-10-27 10:00 [PATCH v3 0/8] AArch64/HMAT support and tests Hesham Almatary via
` (5 preceding siblings ...)
2022-10-27 10:00 ` [PATCH v3 6/8] hw/arm/virt: Enable HMAT on arm virt machine Hesham Almatary via
@ 2022-10-27 10:00 ` Hesham Almatary via
2022-10-27 10:00 ` [PATCH v3 8/8] tests: virt: Update expected *.acpihmatvirt tables Hesham Almatary via
` (2 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Hesham Almatary via @ 2022-10-27 10:00 UTC (permalink / raw)
To: jonathan.cameron, qemu-devel
Cc: yangyicong, chenxiang66, linuxarm, qemu-arm, peter.maydell,
imammedo, wangyanan55, marcel.apfelbaum, eduardo, Brice.Goglin,
mst
This patch imitates the "tests: acpi: q35: add test for hmat nodes
without initiators" commit to test numa nodes with different HMAT
attributes, but on AArch64/virt.
Tested with:
qemu-system-aarch64 -accel tcg \
-machine virt,hmat=on,gic-version=3 -cpu cortex-a57 \
-bios qemu-efi-aarch64/QEMU_EFI.fd \
-kernel Image -append "root=/dev/vda2 console=ttyAMA0" \
-drive if=virtio,file=aarch64.qcow2,format=qcow2,id=hd \
-device virtio-rng-pci \
-net user,hostfwd=tcp::10022-:22 -net nic \
-device intel-hda -device hda-duplex -nographic \
-smp 4 \
-m 3G \
-object memory-backend-ram,size=1G,id=ram0 \
-object memory-backend-ram,size=1G,id=ram1 \
-object memory-backend-ram,size=1G,id=ram2 \
-numa node,nodeid=0,memdev=ram0,cpus=0-1 \
-numa node,nodeid=1,memdev=ram1,cpus=2-3 \
-numa node,nodeid=2,memdev=ram2 \
-numa
hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-latency,latency=10 \
-numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=10485760 \
-numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-latency,latency=20 \
-numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=5242880 \
-numa hmat-lb,initiator=0,target=2,hierarchy=memory,data-type=access-latency,latency=30 \
-numa hmat-lb,initiator=0,target=2,hierarchy=memory,data-type=access-bandwidth,bandwidth=1048576 \
-numa hmat-lb,initiator=1,target=0,hierarchy=memory,data-type=access-latency,latency=20 \
-numa hmat-lb,initiator=1,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=5242880 \
-numa hmat-lb,initiator=1,target=1,hierarchy=memory,data-type=access-latency,latency=10 \
-numa hmat-lb,initiator=1,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=10485760 \
-numa hmat-lb,initiator=1,target=2,hierarchy=memory,data-type=access-latency,latency=30 \
-numa hmat-lb,initiator=1,target=2,hierarchy=memory,data-type=access-bandwidth,bandwidth=1048576
Signed-off-by: Hesham Almatary <hesham.almatary@huawei.com>
---
tests/qtest/bios-tables-test.c | 59 ++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 02fe59fbf8..e805b3efec 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1461,6 +1461,63 @@ static void test_acpi_piix4_tcg_acpi_hmat(void)
test_acpi_tcg_acpi_hmat(MACHINE_PC);
}
+static void test_acpi_virt_tcg_acpi_hmat(void)
+{
+ test_data data = {
+ .machine = "virt",
+ .tcg_only = true,
+ .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
+ .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
+ .ram_start = 0x40000000ULL,
+ .scan_len = 128ULL * 1024 * 1024,
+ };
+
+ data.variant = ".acpihmatvirt";
+
+ test_acpi_one(" -machine hmat=on"
+ " -cpu cortex-a57"
+ " -smp 4,sockets=2"
+ " -m 256M"
+ " -object memory-backend-ram,size=64M,id=ram0"
+ " -object memory-backend-ram,size=64M,id=ram1"
+ " -object memory-backend-ram,size=128M,id=ram2"
+ " -numa node,nodeid=0,memdev=ram0"
+ " -numa node,nodeid=1,memdev=ram1"
+ " -numa node,nodeid=2,memdev=ram2"
+ " -numa cpu,node-id=0,socket-id=0"
+ " -numa cpu,node-id=0,socket-id=0"
+ " -numa cpu,node-id=1,socket-id=1"
+ " -numa cpu,node-id=1,socket-id=1"
+ " -numa hmat-lb,initiator=0,target=0,hierarchy=memory,"
+ "data-type=access-latency,latency=10"
+ " -numa hmat-lb,initiator=0,target=0,hierarchy=memory,"
+ "data-type=access-bandwidth,bandwidth=10485760"
+ " -numa hmat-lb,initiator=0,target=1,hierarchy=memory,"
+ "data-type=access-latency,latency=20"
+ " -numa hmat-lb,initiator=0,target=1,hierarchy=memory,"
+ "data-type=access-bandwidth,bandwidth=5242880"
+ " -numa hmat-lb,initiator=0,target=2,hierarchy=memory,"
+ "data-type=access-latency,latency=30"
+ " -numa hmat-lb,initiator=0,target=2,hierarchy=memory,"
+ "data-type=access-bandwidth,bandwidth=1048576"
+ " -numa hmat-lb,initiator=1,target=0,hierarchy=memory,"
+ "data-type=access-latency,latency=20"
+ " -numa hmat-lb,initiator=1,target=0,hierarchy=memory,"
+ "data-type=access-bandwidth,bandwidth=5242880"
+ " -numa hmat-lb,initiator=1,target=1,hierarchy=memory,"
+ "data-type=access-latency,latency=10"
+ " -numa hmat-lb,initiator=1,target=1,hierarchy=memory,"
+ "data-type=access-bandwidth,bandwidth=10485760"
+ " -numa hmat-lb,initiator=1,target=2,hierarchy=memory,"
+ "data-type=access-latency,latency=30"
+ " -numa hmat-lb,initiator=1,target=2,hierarchy=memory,"
+ "data-type=access-bandwidth,bandwidth=1048576",
+ &data);
+
+ free_test_data(&data);
+}
+
static void test_acpi_q35_tcg_acpi_hmat_noinitiator(void)
{
test_data data;
@@ -1914,6 +1971,8 @@ int main(int argc, char *argv[])
} else if (strcmp(arch, "aarch64") == 0) {
if (has_tcg) {
qtest_add_func("acpi/virt", test_acpi_virt_tcg);
+ qtest_add_func("acpi/virt/acpihmatvirt",
+ test_acpi_virt_tcg_acpi_hmat);
qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem);
qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp);
qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb);
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v3 8/8] tests: virt: Update expected *.acpihmatvirt tables
2022-10-27 10:00 [PATCH v3 0/8] AArch64/HMAT support and tests Hesham Almatary via
` (6 preceding siblings ...)
2022-10-27 10:00 ` [PATCH v3 7/8] tests: acpi: aarch64/virt: add a test for hmat nodes with no initiators Hesham Almatary via
@ 2022-10-27 10:00 ` Hesham Almatary via
2022-10-28 9:53 ` [PATCH v3 0/8] AArch64/HMAT support and tests Yicong Yang via
2022-11-01 10:34 ` Michael S. Tsirkin
9 siblings, 0 replies; 14+ messages in thread
From: Hesham Almatary via @ 2022-10-27 10:00 UTC (permalink / raw)
To: jonathan.cameron, qemu-devel
Cc: yangyicong, chenxiang66, linuxarm, qemu-arm, peter.maydell,
imammedo, wangyanan55, marcel.apfelbaum, eduardo, Brice.Goglin,
mst
* Expected ACPI Data Table [HMAT]
[000h 0000 4] Signature : "HMAT" [Heterogeneous
Memory Attributes Table]
[004h 0004 4] Table Length : 00000120
[008h 0008 1] Revision : 02
[009h 0009 1] Checksum : 4F
[00Ah 0010 6] Oem ID : "BOCHS "
[010h 0016 8] Oem Table ID : "BXPC "
[018h 0024 4] Oem Revision : 00000001
[01Ch 0028 4] Asl Compiler ID : "BXPC"
[020h 0032 4] Asl Compiler Revision : 00000001
[024h 0036 4] Reserved : 00000000
[028h 0040 2] Structure Type : 0000 [Memory Proximity
Domain Attributes]
[02Ah 0042 2] Reserved : 0000
[02Ch 0044 4] Length : 00000028
[030h 0048 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[032h 0050 2] Reserved1 : 0000
[034h 0052 4] Processor Proximity Domain : 00000000
[038h 0056 4] Memory Proximity Domain : 00000000
[03Ch 0060 4] Reserved2 : 00000000
[040h 0064 8] Reserved3 : 0000000000000000
[048h 0072 8] Reserved4 : 0000000000000000
[050h 0080 2] Structure Type : 0000 [Memory Proximity
Domain Attributes]
[052h 0082 2] Reserved : 0000
[054h 0084 4] Length : 00000028
[058h 0088 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[05Ah 0090 2] Reserved1 : 0000
[05Ch 0092 4] Processor Proximity Domain : 00000001
[060h 0096 4] Memory Proximity Domain : 00000001
[064h 0100 4] Reserved2 : 00000000
[068h 0104 8] Reserved3 : 0000000000000000
[070h 0112 8] Reserved4 : 0000000000000000
[078h 0120 2] Structure Type : 0000 [Memory Proximity
Domain Attributes]
[07Ah 0122 2] Reserved : 0000
[07Ch 0124 4] Length : 00000028
[080h 0128 2] Flags (decoded below) : 0000
Processor Proximity Domain Valid : 0
[082h 0130 2] Reserved1 : 0000
[084h 0132 4] Processor Proximity Domain : 00000080
[088h 0136 4] Memory Proximity Domain : 00000002
[08Ch 0140 4] Reserved2 : 00000000
[040h 0064 8] Reserved3 : 0000000000000000
[048h 0072 8] Reserved4 : 0000000000000000
[050h 0080 2] Structure Type : 0000 [Memory Proximity
Domain Attributes]
[052h 0082 2] Reserved : 0000
[054h 0084 4] Length : 00000028
[058h 0088 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[05Ah 0090 2] Reserved1 : 0000
[05Ch 0092 4] Processor Proximity Domain : 00000001
[060h 0096 4] Memory Proximity Domain : 00000001
[064h 0100 4] Reserved2 : 00000000
[068h 0104 8] Reserved3 : 0000000000000000
[070h 0112 8] Reserved4 : 0000000000000000
[078h 0120 2] Structure Type : 0000 [Memory Proximity
Domain Attributes]
[07Ah 0122 2] Reserved : 0000
[07Ch 0124 4] Length : 00000028
[080h 0128 2] Flags (decoded below) : 0000
Processor Proximity Domain Valid : 0
[082h 0130 2] Reserved1 : 0000
[084h 0132 4] Processor Proximity Domain : 00000080
[088h 0136 4] Memory Proximity Domain : 00000002
[08Ch 0140 4] Reserved2 : 00000000
[090h 0144 8] Reserved3 : 0000000000000000
[098h 0152 8] Reserved4 : 0000000000000000
[0A0h 0160 2] Structure Type : 0001 [System Locality
Latency and Bandwidth Information]
[0A2h 0162 2] Reserved : 0000
[0A4h 0164 4] Length : 00000040
[0A8h 0168 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0A9h 0169 1] Data Type : 00
[0AAh 0170 2] Reserved1 : 0000
[0ACh 0172 4] Initiator Proximity Domains # : 00000002
[0B0h 0176 4] Target Proximity Domains # : 00000003
[0B4h 0180 4] Reserved2 : 00000000
[0B8h 0184 8] Entry Base Unit : 0000000000002710
[0C0h 0192 4] Initiator Proximity Domain List : 00000000
[0C4h 0196 4] Initiator Proximity Domain List : 00000001
[0C8h 0200 4] Target Proximity Domain List : 00000000
[0CCh 0204 4] Target Proximity Domain List : 00000001
[0D0h 0208 4] Target Proximity Domain List : 00000002
[0D4h 0212 2] Entry : 0001
[0D6h 0214 2] Entry : 0002
[0D8h 0216 2] Entry : 0003
[0DAh 0218 2] Entry : 0002
[0DCh 0220 2] Entry : 0001
[0DEh 0222 2] Entry : 0003
[0E0h 0224 2] Structure Type : 0001 [System Locality
Latency and Bandwidth Information]
[0E2h 0226 2] Reserved : 0000
[0E4h 0228 4] Length : 00000040
[0E8h 0232 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0E9h 0233 1] Data Type : 03
[0EAh 0234 2] Reserved1 : 0000
[0ECh 0236 4] Initiator Proximity Domains # : 00000002
[0F0h 0240 4] Target Proximity Domains # : 00000003
[0F4h 0244 4] Reserved2 : 00000000
[0F8h 0248 8] Entry Base Unit : 0000000000000001
[100h 0256 4] Initiator Proximity Domain List : 00000000
[104h 0260 4] Initiator Proximity Domain List : 00000001
[108h 0264 4] Target Proximity Domain List : 00000000
[10Ch 0268 4] Target Proximity Domain List : 00000001
[110h 0272 4] Target Proximity Domain List : 00000002
[114h 0276 2] Entry : 000A
[116h 0278 2] Entry : 0005
[118h 0280 2] Entry : 0001
[11Ah 0282 2] Entry : 0005
[11Ch 0284 2] Entry : 000A
[11Eh 0286 2] Entry : 0001
Raw Table Data: Length 288 (0x120)
0000: 48 4D 41 54 20 01 00 00 02 4F 42 4F 43 48 53 20 // HMAT
....OBOCHS
0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC
....BXPC
0020: 01 00 00 00 00 00 00 00 00 00 00 00 28 00 00 00 //
............(...
0030: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 //
................
0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 //
................
0050: 00 00 00 00 28 00 00 00 01 00 00 00 01 00 00 00 //
....(...........
0060: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 //
................
0070: 00 00 00 00 00 00 00 00 00 00 00 00 28 00 00 00 //
............(...
0080: 00 00 00 00 80 00 00 00 02 00 00 00 00 00 00 00 //
................
0090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 //
................
00A0: 01 00 00 00 40 00 00 00 00 00 00 00 02 00 00 00 //
....@...........
00B0: 03 00 00 00 00 00 00 00 10 27 00 00 00 00 00 00 //
.........'......
00C0: 00 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 //
................
00D0: 02 00 00 00 01 00 02 00 03 00 02 00 01 00 03 00 //
................
00E0: 01 00 00 00 40 00 00 00 00 03 00 00 02 00 00 00 //
....@...........
00F0: 03 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 //
................
0100: 00 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 //
................
0110: 02 00 00 00 0A 00 05 00 01 00 05 00 0A 00 01 00 //
................
Signed-off-by: Hesham Almatary <hesham.almatary@huawei.com>
---
tests/data/acpi/virt/APIC.acpihmatvirt | Bin 0 -> 396 bytes
tests/data/acpi/virt/DSDT.acpihmatvirt | Bin 0 -> 5282 bytes
tests/data/acpi/virt/HMAT.acpihmatvirt | Bin 0 -> 288 bytes
tests/data/acpi/virt/PPTT.acpihmatvirt | Bin 0 -> 196 bytes
tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 0 -> 240 bytes
tests/qtest/bios-tables-test-allowed-diff.h | 5 -----
6 files changed, 5 deletions(-)
diff --git a/tests/data/acpi/virt/APIC.acpihmatvirt b/tests/data/acpi/virt/APIC.acpihmatvirt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..873e12f67c3838351a3ab4b7a43ee76e7730849a 100644
GIT binary patch
literal 396
zcmZ<^@O18BWME)k<K*w`5v<@85#X!<1VAAM5F13p0FMNW#lQh$F##FeJ}@2w15CX*
zLI}uWgsNwO(#&xED9V5wkXaxzU>GD%s#!2MfXo894}@W2q?!fN3j!dsn1M71lWP`8
TF9`6$!;uLb4j}U!7y=joChH0T
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/DSDT.acpihmatvirt b/tests/data/acpi/virt/DSDT.acpihmatvirt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..aee6ba017cd730948bfa93e91551eb10a6809293 100644
GIT binary patch
literal 5282
zcmZvg%WoT16o>EFlh__VVmr?J;S@^6vl`n?la{u`9y^IkoET5iAUTpNArK{-N>oUt
zLJC<FsKkOsVjWN<{tYBn?AWnj&4zz~9p>D*Gs*9?XQYhh%)RHE`;Cv|<7xWM-JeTJ
z#SR)f-lo6Q_^|6O(Pk;7^s#=;f4^ZJ4E)BRe?05CuA3Zewwu|y*KJd<qLPEXc2k+L
ziZo{RkLM__DvdcYGguP`<Nf2C-cBdFVz0C5x|K?J#pJ;2`Gr|$>S;>pWu{bKsqaRW
zWnH4^F|BBIecxL*;161zJz8y*a{b-9lcr>^ZW%<u$r(f}H63Qw?R&jQbZfh}L#fLb
zmp#wCxVWQY;l*7<g!h9Z^krW{#MA|%5+WLU72$2;2qz{nY+zK85#HSw7;%X)3XB>u
zu9+M80>hRVNnl(<#<Iv5kr)mzmXUE?WQ<CT3^1-EV?|^nBt{MxE67+C8A*we2gWKg
zZitMO#3%ye1~4k&hvS9!#gP~#VBAE8Sf>0#5|#QSFy2LmT&Edn9n-+Lg$%h)vl3$#
z7`Krj*J(~-%md>NGUPfPlNgJ@cn=wJo#rLR5-`?~A=ha^V!Q&3Ix^%sElP~bz-S;t
zuG4XeaRnG2FsgE$mL$gOz-S^vuG0yL@g^`@$dK!FQewOfjCEwlbvh+6t^#8N8FHOY
zOAHqno5+ysbVg!Sfzd{WT&J@V;~FsTB15jzIf-!{81ExPuG4vmu?mbWWXN^8ATe$N
zqXUeZT&If?;}$Tsks;S<Sz_D)#!krC{-x`+!*z7GyKdcGrRKw<rprV%-Nm#vXy0gT
zpSLCcZm&>w=DW&MZS}EQQZD^9>F5jfKz&57N<)IiqubjZ-}>A+DyHr9aHux?wyVss
zMaLCY%;@t@jDl(u#3`t$V%E+KhnCVgG%t*F7ER2Vu^^A8Mxo9melVB1Br`XRbY?V_
zS|EKzni^zMs57Ih#DmOe1#zV_qp5L|NmGMN3Uwx}D7cCpWJW8ngUo0uwM?O9kVzqW
zjxf)WAT#nDF`3cgDMZgv=1EN{ttXmFEf#uGh@J`NnP8p??nxnfCYfiFc~VP;o)n^I
zig{8yZSG!hOH$mELiBW)r^7s{g+osY(KF3F)66r?Jt;)b4D-w|PipzllS1^&GS4jY
z%yLf((KE+9bIg-kMD(N(J;#{m81o$Co)n@d{hTp19#nCjc~VP>o)n^Ifq52~XMuZC
zh@M5}S!ABnf}$sd=sC_j$C>9i_oNU#>E|bSmY65CtmsK0dQLFU3FbM$Jt;)bN#;4p
zJgLP+PYTg<ig`{k&nfOnA$rn}OYod#p41YfCxz%a!#ro0=M49x5Itv^=PdK278*S%
zM9(?qImbNbxF?0^InO-jnJ2Z}=t&`ZE-=pp=DEN<DMZgj=DEl`sYORm3emI7Jj=|p
z%snYIp8eytt=~%X^G$y#d+z%A7jc&!OXQq%@F?Qd;47WJcV9YJ8XfpOpPr2bsIX&T
zD0)tSsLKM%oI6L|)vF2{T!zxm3y}4iz%u7JD{OQ*i=G=G>x#fK=R#H~KkyoLbw>X~
zRep_j=5}l*oJZegRgC_f(>ByQ>l^xXWvIIdw)}ATpZ-}!+wdxlSQ+X8%tlQMZ9^Kh
z)U&rBCm24`V|ojsi=96ISS9_vZdWC}-QJcet)~V%zGpu>R9<txa=Mu~`Lr<Z<olh!
zYX6q!*M8i8RR8t%pPxKCbZnYXrPn0A)*k9WbM!$?qn_xUQ`Y;_{PU9s)>kxA31(ML
zC!e20^UUeI9(<@L>+@%aKjqAMeUZx9Vd<Sg)9=`)m&|JZSo!^LfBDPK4^#hiW`6TJ
zr>T?A)L9{JS$angx;l2R<+Ezk54v>C)g1Sw`xCqeba%>Y7q><q(f5scZq`T~T-DF}
zHd@VrDRJ|#uc8}Idf1nxfsk+NJZ`;VQjc0a>PzVzO{N^X|8-i2UdwN7EtM7qt$Vwv
hhdQ`_nm>7R-_iZv)9!w+;T-jkXY>Jno;-6c^*?7DCOrTE
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/HMAT.acpihmatvirt b/tests/data/acpi/virt/HMAT.acpihmatvirt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6494d11b9fff54f8c403ec9e4893fdff72bde9c9 100644
GIT binary patch
literal 288
zcmaJ)F%Ezr5IZ0&Og@24pP{g@7)*5VIX>Ms;S4dxCU-4Odz5uKq7kt*)m-+N&Mij(
zmQa%w6GZ=3|IM0X_Ak#IabYaQ2iTvR&x~t&7@Gj;A7o|>w!;|gr;lRa*AB0!)_xEV
I&r86*0dKzu0RR91
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/PPTT.acpihmatvirt b/tests/data/acpi/virt/PPTT.acpihmatvirt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..710dba5e793cf36df94087666db58af5f8d03684 100644
GIT binary patch
literal 196
zcmWFt2njjDz`(#X&&l7}BUr&HBEVSz2pEB4AU23*5Mf{d(;zks0L4H+1wuhcpcogB
gWr0HsZU&Nh$YLOEC0O)!0L7SK;!rz4V$4u60KkX}0RR91
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/SRAT.acpihmatvirt b/tests/data/acpi/virt/SRAT.acpihmatvirt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..691ef56e34bc84509270db316d908f5979c209bb 100644
GIT binary patch
literal 240
zcmWFzat!&vz`($~%E{l^BUr&HBEVSz2pEB4AU22wVHjW*g0Wzt5D{c`%t9a@6A&ZR
rfLP2(B8(b94g@$rX%;9A*9GD;YQW53aKWz*WFHuKKxqyrjba`E3*rd@
literal 0
HcmV?d00001
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 4f849715bd..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,6 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/virt/APIC.acpihmatvirt",
-"tests/data/acpi/virt/DSDT.acpihmatvirt",
-"tests/data/acpi/virt/HMAT.acpihmatvirt",
-"tests/data/acpi/virt/PPTT.acpihmatvirt",
-"tests/data/acpi/virt/SRAT.acpihmatvirt",
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v3 0/8] AArch64/HMAT support and tests
2022-10-27 10:00 [PATCH v3 0/8] AArch64/HMAT support and tests Hesham Almatary via
` (7 preceding siblings ...)
2022-10-27 10:00 ` [PATCH v3 8/8] tests: virt: Update expected *.acpihmatvirt tables Hesham Almatary via
@ 2022-10-28 9:53 ` Yicong Yang via
2022-10-31 13:17 ` Jonathan Cameron via
2022-11-01 10:34 ` Michael S. Tsirkin
9 siblings, 1 reply; 14+ messages in thread
From: Yicong Yang via @ 2022-10-28 9:53 UTC (permalink / raw)
To: Hesham Almatary, qemu-devel
Cc: yangyicong, chenxiang66, jonathan.cameron, linuxarm, qemu-arm,
peter.maydell, imammedo, wangyanan55, marcel.apfelbaum, eduardo,
Brice.Goglin, mst
Hi Hesham,
On 2022/10/27 18:00, Hesham Almatary wrote:
> This patchset adds support for AArch64/HMAT including a test.
> It relies on other two patch sets from:
>
> Brice Goglin: to support -numa without initiators on q35/x86.
> https://lore.kernel.org/all/ed23accb-2c8b-90f4-a7a3-f81cc57bf678@inria.fr/
> Xiang Chen: to enable/support HMAT on AArch64.
> https://lore.kernel.org/all/1643102134-15506-1-git-send-email-chenxiang66@hisilicon.com/
>
> I further add a test with ACPI/HMAT tables that uses the two
> patch sets.
>
You seems to forget my tag :)
Anyway tested again for this series on master of commit 052924548886, still works well and all tests passed
for qemu-system-aarch64.
Tested-by: Yicong Yang <yangyicong@hisilicon.com>
> Changes from v2:
> - Rebased and fixed a merge conflict
>
> Changes from v1:
> - Generate APIC and PPTT ACPI tables for AArch64/virt
> - Avoid using legacy syntax in numa/bios tests
> - Delete unchanged FACP tables
>
> Brice Goglin (4):
> hmat acpi: Don't require initiator value in -numa
> tests: acpi: add and whitelist *.hmat-noinitiator expected blobs
> tests: acpi: q35: add test for hmat nodes without initiators
> tests: acpi: q35: update expected blobs *.hmat-noinitiators expected
> HMAT:
>
> Hesham Almatary (3):
> tests: Add HMAT AArch64/virt empty table files
> tests: acpi: aarch64/virt: add a test for hmat nodes with no
> initiators
> tests: virt: Update expected *.acpihmatvirt tables
>
> Xiang Chen (1):
> hw/arm/virt: Enable HMAT on arm virt machine
>
> hw/arm/Kconfig | 1 +
> hw/arm/virt-acpi-build.c | 7 ++
> hw/core/machine.c | 4 +-
> tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 0 -> 144 bytes
> tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 0 -> 8553 bytes
> tests/data/acpi/q35/HMAT.acpihmat-noinitiator | Bin 0 -> 288 bytes
> tests/data/acpi/q35/SRAT.acpihmat-noinitiator | Bin 0 -> 312 bytes
> tests/data/acpi/virt/APIC.acpihmatvirt | Bin 0 -> 396 bytes
> tests/data/acpi/virt/DSDT.acpihmatvirt | Bin 0 -> 5282 bytes
> tests/data/acpi/virt/HMAT.acpihmatvirt | Bin 0 -> 288 bytes
> tests/data/acpi/virt/PPTT.acpihmatvirt | Bin 0 -> 196 bytes
> tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 0 -> 240 bytes
> tests/qtest/bios-tables-test.c | 109 ++++++++++++++++++
> 13 files changed, 118 insertions(+), 3 deletions(-)
> create mode 100644 tests/data/acpi/q35/APIC.acpihmat-noinitiator
> create mode 100644 tests/data/acpi/q35/DSDT.acpihmat-noinitiator
> create mode 100644 tests/data/acpi/q35/HMAT.acpihmat-noinitiator
> create mode 100644 tests/data/acpi/q35/SRAT.acpihmat-noinitiator
> create mode 100644 tests/data/acpi/virt/APIC.acpihmatvirt
> create mode 100644 tests/data/acpi/virt/DSDT.acpihmatvirt
> create mode 100644 tests/data/acpi/virt/HMAT.acpihmatvirt
> create mode 100644 tests/data/acpi/virt/PPTT.acpihmatvirt
> create mode 100644 tests/data/acpi/virt/SRAT.acpihmatvirt
>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v3 0/8] AArch64/HMAT support and tests
2022-10-28 9:53 ` [PATCH v3 0/8] AArch64/HMAT support and tests Yicong Yang via
@ 2022-10-31 13:17 ` Jonathan Cameron via
2022-10-31 13:20 ` Jonathan Cameron via
2022-10-31 14:58 ` Michael S. Tsirkin
0 siblings, 2 replies; 14+ messages in thread
From: Jonathan Cameron via @ 2022-10-31 13:17 UTC (permalink / raw)
To: Yicong Yang, mst
Cc: Hesham Almatary, qemu-devel, yangyicong, chenxiang66, linuxarm,
qemu-arm, peter.maydell, imammedo, wangyanan55, marcel.apfelbaum,
eduardo, Brice.Goglin
On Fri, 28 Oct 2022 17:53:40 +0800
Yicong Yang <yangyicong@huawei.com> wrote:
> Hi Hesham,
>
> On 2022/10/27 18:00, Hesham Almatary wrote:
> > This patchset adds support for AArch64/HMAT including a test.
> > It relies on other two patch sets from:
> >
> > Brice Goglin: to support -numa without initiators on q35/x86.
> > https://lore.kernel.org/all/ed23accb-2c8b-90f4-a7a3-f81cc57bf678@inria.fr/
> > Xiang Chen: to enable/support HMAT on AArch64.
> > https://lore.kernel.org/all/1643102134-15506-1-git-send-email-chenxiang66@hisilicon.com/
> >
> > I further add a test with ACPI/HMAT tables that uses the two
> > patch sets.
> >
>
> You seems to forget my tag :)
>
> Anyway tested again for this series on master of commit 052924548886,
> still works well and all tests passed for qemu-system-aarch64.
>
> Tested-by: Yicong Yang <yangyicong@hisilicon.com>
Hi,
Michael, I think you said you'd pick this one up? (it hit during last freeze)
Just want to confirm in case everyone was assuming this was someone else's problem ;)
I want to add a bunch of stuff on top of this next cycle (Generic Ports in particular)
so good to get this in place if we can.
Jonathan
>
> > Changes from v2:
> > - Rebased and fixed a merge conflict
> >
> > Changes from v1:
> > - Generate APIC and PPTT ACPI tables for AArch64/virt
> > - Avoid using legacy syntax in numa/bios tests
> > - Delete unchanged FACP tables
> >
> > Brice Goglin (4):
> > hmat acpi: Don't require initiator value in -numa
> > tests: acpi: add and whitelist *.hmat-noinitiator expected blobs
> > tests: acpi: q35: add test for hmat nodes without initiators
> > tests: acpi: q35: update expected blobs *.hmat-noinitiators
> > expected HMAT:
> >
> > Hesham Almatary (3):
> > tests: Add HMAT AArch64/virt empty table files
> > tests: acpi: aarch64/virt: add a test for hmat nodes with no
> > initiators
> > tests: virt: Update expected *.acpihmatvirt tables
> >
> > Xiang Chen (1):
> > hw/arm/virt: Enable HMAT on arm virt machine
> >
> > hw/arm/Kconfig | 1 +
> > hw/arm/virt-acpi-build.c | 7 ++
> > hw/core/machine.c | 4 +-
> > tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 0 -> 144 bytes
> > tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 0 -> 8553 bytes
> > tests/data/acpi/q35/HMAT.acpihmat-noinitiator | Bin 0 -> 288 bytes
> > tests/data/acpi/q35/SRAT.acpihmat-noinitiator | Bin 0 -> 312 bytes
> > tests/data/acpi/virt/APIC.acpihmatvirt | Bin 0 -> 396 bytes
> > tests/data/acpi/virt/DSDT.acpihmatvirt | Bin 0 -> 5282 bytes
> > tests/data/acpi/virt/HMAT.acpihmatvirt | Bin 0 -> 288 bytes
> > tests/data/acpi/virt/PPTT.acpihmatvirt | Bin 0 -> 196 bytes
> > tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 0 -> 240 bytes
> > tests/qtest/bios-tables-test.c | 109
> > ++++++++++++++++++ 13 files changed, 118 insertions(+), 3
> > deletions(-) create mode 100644
> > tests/data/acpi/q35/APIC.acpihmat-noinitiator create mode 100644
> > tests/data/acpi/q35/DSDT.acpihmat-noinitiator create mode 100644
> > tests/data/acpi/q35/HMAT.acpihmat-noinitiator create mode 100644
> > tests/data/acpi/q35/SRAT.acpihmat-noinitiator create mode 100644
> > tests/data/acpi/virt/APIC.acpihmatvirt create mode 100644
> > tests/data/acpi/virt/DSDT.acpihmatvirt create mode 100644
> > tests/data/acpi/virt/HMAT.acpihmatvirt create mode 100644
> > tests/data/acpi/virt/PPTT.acpihmatvirt create mode 100644
> > tests/data/acpi/virt/SRAT.acpihmatvirt
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v3 0/8] AArch64/HMAT support and tests
2022-10-31 13:17 ` Jonathan Cameron via
@ 2022-10-31 13:20 ` Jonathan Cameron via
2022-10-31 14:58 ` Michael S. Tsirkin
1 sibling, 0 replies; 14+ messages in thread
From: Jonathan Cameron via @ 2022-10-31 13:20 UTC (permalink / raw)
To: Yicong Yang, mst
Cc: Hesham Almatary, qemu-devel, yangyicong, chenxiang66, linuxarm,
qemu-arm, peter.maydell, imammedo, wangyanan55, marcel.apfelbaum,
eduardo, Brice.Goglin
On Mon, 31 Oct 2022 13:17:17 +0000
Jonathan Cameron <Jonathan.Cameron@Huawei.com> wrote:
> On Fri, 28 Oct 2022 17:53:40 +0800
> Yicong Yang <yangyicong@huawei.com> wrote:
>
> > Hi Hesham,
> >
> > On 2022/10/27 18:00, Hesham Almatary wrote:
> > > This patchset adds support for AArch64/HMAT including a test.
> > > It relies on other two patch sets from:
> > >
> > > Brice Goglin: to support -numa without initiators on q35/x86.
> > > https://lore.kernel.org/all/ed23accb-2c8b-90f4-a7a3-f81cc57bf678@inria.fr/
> > > Xiang Chen: to enable/support HMAT on AArch64.
> > > https://lore.kernel.org/all/1643102134-15506-1-git-send-email-chenxiang66@hisilicon.com/
> > >
> > > I further add a test with ACPI/HMAT tables that uses the two
> > > patch sets.
> > >
> >
> > You seems to forget my tag :)
> >
> > Anyway tested again for this series on master of commit
> > 052924548886, still works well and all tests passed for
> > qemu-system-aarch64.
> >
> > Tested-by: Yicong Yang <yangyicong@hisilicon.com>
>
> Hi,
>
> Michael, I think you said you'd pick this one up? (it hit during last
> freeze) Just want to confirm in case everyone was assuming this was
> someone else's problem ;) I want to add a bunch of stuff on top of
> this next cycle (Generic Ports in particular) so good to get this in
> place if we can.
Doh. Failed to spot your pull request due to my local email filtering house of cards.
Ignore me ;)
Jonathan
>
> Jonathan
>
> >
> > > Changes from v2:
> > > - Rebased and fixed a merge conflict
> > >
> > > Changes from v1:
> > > - Generate APIC and PPTT ACPI tables for AArch64/virt
> > > - Avoid using legacy syntax in numa/bios tests
> > > - Delete unchanged FACP tables
> > >
> > > Brice Goglin (4):
> > > hmat acpi: Don't require initiator value in -numa
> > > tests: acpi: add and whitelist *.hmat-noinitiator expected blobs
> > > tests: acpi: q35: add test for hmat nodes without initiators
> > > tests: acpi: q35: update expected blobs *.hmat-noinitiators
> > > expected HMAT:
> > >
> > > Hesham Almatary (3):
> > > tests: Add HMAT AArch64/virt empty table files
> > > tests: acpi: aarch64/virt: add a test for hmat nodes with no
> > > initiators
> > > tests: virt: Update expected *.acpihmatvirt tables
> > >
> > > Xiang Chen (1):
> > > hw/arm/virt: Enable HMAT on arm virt machine
> > >
> > > hw/arm/Kconfig | 1 +
> > > hw/arm/virt-acpi-build.c | 7 ++
> > > hw/core/machine.c | 4 +-
> > > tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 0 -> 144
> > > bytes tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 0 ->
> > > 8553 bytes tests/data/acpi/q35/HMAT.acpihmat-noinitiator | Bin 0
> > > -> 288 bytes tests/data/acpi/q35/SRAT.acpihmat-noinitiator | Bin
> > > 0 -> 312 bytes tests/data/acpi/virt/APIC.acpihmatvirt |
> > > Bin 0 -> 396 bytes tests/data/acpi/virt/DSDT.acpihmatvirt
> > > | Bin 0 -> 5282 bytes tests/data/acpi/virt/HMAT.acpihmatvirt
> > > | Bin 0 -> 288 bytes tests/data/acpi/virt/PPTT.acpihmatvirt
> > > | Bin 0 -> 196 bytes tests/data/acpi/virt/SRAT.acpihmatvirt
> > > | Bin 0 -> 240 bytes tests/qtest/bios-tables-test.c
> > > | 109 ++++++++++++++++++ 13 files changed, 118
> > > insertions(+), 3 deletions(-) create mode 100644
> > > tests/data/acpi/q35/APIC.acpihmat-noinitiator create mode 100644
> > > tests/data/acpi/q35/DSDT.acpihmat-noinitiator create mode 100644
> > > tests/data/acpi/q35/HMAT.acpihmat-noinitiator create mode 100644
> > > tests/data/acpi/q35/SRAT.acpihmat-noinitiator create mode 100644
> > > tests/data/acpi/virt/APIC.acpihmatvirt create mode 100644
> > > tests/data/acpi/virt/DSDT.acpihmatvirt create mode 100644
> > > tests/data/acpi/virt/HMAT.acpihmatvirt create mode 100644
> > > tests/data/acpi/virt/PPTT.acpihmatvirt create mode 100644
> > > tests/data/acpi/virt/SRAT.acpihmatvirt
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v3 0/8] AArch64/HMAT support and tests
2022-10-31 13:17 ` Jonathan Cameron via
2022-10-31 13:20 ` Jonathan Cameron via
@ 2022-10-31 14:58 ` Michael S. Tsirkin
1 sibling, 0 replies; 14+ messages in thread
From: Michael S. Tsirkin @ 2022-10-31 14:58 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Yicong Yang, Hesham Almatary, qemu-devel, yangyicong,
chenxiang66, linuxarm, qemu-arm, peter.maydell, imammedo,
wangyanan55, marcel.apfelbaum, eduardo, Brice.Goglin
On Mon, Oct 31, 2022 at 01:17:17PM +0000, Jonathan Cameron wrote:
> On Fri, 28 Oct 2022 17:53:40 +0800
> Yicong Yang <yangyicong@huawei.com> wrote:
>
> > Hi Hesham,
> >
> > On 2022/10/27 18:00, Hesham Almatary wrote:
> > > This patchset adds support for AArch64/HMAT including a test.
> > > It relies on other two patch sets from:
> > >
> > > Brice Goglin: to support -numa without initiators on q35/x86.
> > > https://lore.kernel.org/all/ed23accb-2c8b-90f4-a7a3-f81cc57bf678@inria.fr/
> > > Xiang Chen: to enable/support HMAT on AArch64.
> > > https://lore.kernel.org/all/1643102134-15506-1-git-send-email-chenxiang66@hisilicon.com/
> > >
> > > I further add a test with ACPI/HMAT tables that uses the two
> > > patch sets.
> > >
> >
> > You seems to forget my tag :)
> >
> > Anyway tested again for this series on master of commit 052924548886,
> > still works well and all tests passed for qemu-system-aarch64.
> >
> > Tested-by: Yicong Yang <yangyicong@hisilicon.com>
>
> Hi,
>
> Michael, I think you said you'd pick this one up? (it hit during last freeze)
> Just want to confirm in case everyone was assuming this was someone else's problem ;)
> I want to add a bunch of stuff on top of this next cycle (Generic Ports in particular)
> so good to get this in place if we can.
>
> Jonathan
Yes it's in my pull req isn't it?
> >
> > > Changes from v2:
> > > - Rebased and fixed a merge conflict
> > >
> > > Changes from v1:
> > > - Generate APIC and PPTT ACPI tables for AArch64/virt
> > > - Avoid using legacy syntax in numa/bios tests
> > > - Delete unchanged FACP tables
> > >
> > > Brice Goglin (4):
> > > hmat acpi: Don't require initiator value in -numa
> > > tests: acpi: add and whitelist *.hmat-noinitiator expected blobs
> > > tests: acpi: q35: add test for hmat nodes without initiators
> > > tests: acpi: q35: update expected blobs *.hmat-noinitiators
> > > expected HMAT:
> > >
> > > Hesham Almatary (3):
> > > tests: Add HMAT AArch64/virt empty table files
> > > tests: acpi: aarch64/virt: add a test for hmat nodes with no
> > > initiators
> > > tests: virt: Update expected *.acpihmatvirt tables
> > >
> > > Xiang Chen (1):
> > > hw/arm/virt: Enable HMAT on arm virt machine
> > >
> > > hw/arm/Kconfig | 1 +
> > > hw/arm/virt-acpi-build.c | 7 ++
> > > hw/core/machine.c | 4 +-
> > > tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 0 -> 144 bytes
> > > tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 0 -> 8553 bytes
> > > tests/data/acpi/q35/HMAT.acpihmat-noinitiator | Bin 0 -> 288 bytes
> > > tests/data/acpi/q35/SRAT.acpihmat-noinitiator | Bin 0 -> 312 bytes
> > > tests/data/acpi/virt/APIC.acpihmatvirt | Bin 0 -> 396 bytes
> > > tests/data/acpi/virt/DSDT.acpihmatvirt | Bin 0 -> 5282 bytes
> > > tests/data/acpi/virt/HMAT.acpihmatvirt | Bin 0 -> 288 bytes
> > > tests/data/acpi/virt/PPTT.acpihmatvirt | Bin 0 -> 196 bytes
> > > tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 0 -> 240 bytes
> > > tests/qtest/bios-tables-test.c | 109
> > > ++++++++++++++++++ 13 files changed, 118 insertions(+), 3
> > > deletions(-) create mode 100644
> > > tests/data/acpi/q35/APIC.acpihmat-noinitiator create mode 100644
> > > tests/data/acpi/q35/DSDT.acpihmat-noinitiator create mode 100644
> > > tests/data/acpi/q35/HMAT.acpihmat-noinitiator create mode 100644
> > > tests/data/acpi/q35/SRAT.acpihmat-noinitiator create mode 100644
> > > tests/data/acpi/virt/APIC.acpihmatvirt create mode 100644
> > > tests/data/acpi/virt/DSDT.acpihmatvirt create mode 100644
> > > tests/data/acpi/virt/HMAT.acpihmatvirt create mode 100644
> > > tests/data/acpi/virt/PPTT.acpihmatvirt create mode 100644
> > > tests/data/acpi/virt/SRAT.acpihmatvirt
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v3 0/8] AArch64/HMAT support and tests
2022-10-27 10:00 [PATCH v3 0/8] AArch64/HMAT support and tests Hesham Almatary via
` (8 preceding siblings ...)
2022-10-28 9:53 ` [PATCH v3 0/8] AArch64/HMAT support and tests Yicong Yang via
@ 2022-11-01 10:34 ` Michael S. Tsirkin
9 siblings, 0 replies; 14+ messages in thread
From: Michael S. Tsirkin @ 2022-11-01 10:34 UTC (permalink / raw)
To: Hesham Almatary
Cc: jonathan.cameron, qemu-devel, yangyicong, chenxiang66, linuxarm,
qemu-arm, peter.maydell, imammedo, wangyanan55, marcel.apfelbaum,
eduardo, Brice.Goglin
On Thu, Oct 27, 2022 at 11:00:29AM +0100, Hesham Almatary wrote:
> This patchset adds support for AArch64/HMAT including a test.
> It relies on other two patch sets from:
>
> Brice Goglin: to support -numa without initiators on q35/x86.
> https://lore.kernel.org/all/ed23accb-2c8b-90f4-a7a3-f81cc57bf678@inria.fr/
> Xiang Chen: to enable/support HMAT on AArch64.
> https://lore.kernel.org/all/1643102134-15506-1-git-send-email-chenxiang66@hisilicon.com/
>
> I further add a test with ACPI/HMAT tables that uses the two
> patch sets.
pipeline failures:
https://gitlab.com/qemu-project/qemu/-/jobs/3253817453
this looks like a 32 bit host.
> Changes from v2:
> - Rebased and fixed a merge conflict
>
> Changes from v1:
> - Generate APIC and PPTT ACPI tables for AArch64/virt
> - Avoid using legacy syntax in numa/bios tests
> - Delete unchanged FACP tables
>
> Brice Goglin (4):
> hmat acpi: Don't require initiator value in -numa
> tests: acpi: add and whitelist *.hmat-noinitiator expected blobs
> tests: acpi: q35: add test for hmat nodes without initiators
> tests: acpi: q35: update expected blobs *.hmat-noinitiators expected
> HMAT:
>
> Hesham Almatary (3):
> tests: Add HMAT AArch64/virt empty table files
> tests: acpi: aarch64/virt: add a test for hmat nodes with no
> initiators
> tests: virt: Update expected *.acpihmatvirt tables
>
> Xiang Chen (1):
> hw/arm/virt: Enable HMAT on arm virt machine
>
> hw/arm/Kconfig | 1 +
> hw/arm/virt-acpi-build.c | 7 ++
> hw/core/machine.c | 4 +-
> tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 0 -> 144 bytes
> tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 0 -> 8553 bytes
> tests/data/acpi/q35/HMAT.acpihmat-noinitiator | Bin 0 -> 288 bytes
> tests/data/acpi/q35/SRAT.acpihmat-noinitiator | Bin 0 -> 312 bytes
> tests/data/acpi/virt/APIC.acpihmatvirt | Bin 0 -> 396 bytes
> tests/data/acpi/virt/DSDT.acpihmatvirt | Bin 0 -> 5282 bytes
> tests/data/acpi/virt/HMAT.acpihmatvirt | Bin 0 -> 288 bytes
> tests/data/acpi/virt/PPTT.acpihmatvirt | Bin 0 -> 196 bytes
> tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 0 -> 240 bytes
> tests/qtest/bios-tables-test.c | 109 ++++++++++++++++++
> 13 files changed, 118 insertions(+), 3 deletions(-)
> create mode 100644 tests/data/acpi/q35/APIC.acpihmat-noinitiator
> create mode 100644 tests/data/acpi/q35/DSDT.acpihmat-noinitiator
> create mode 100644 tests/data/acpi/q35/HMAT.acpihmat-noinitiator
> create mode 100644 tests/data/acpi/q35/SRAT.acpihmat-noinitiator
> create mode 100644 tests/data/acpi/virt/APIC.acpihmatvirt
> create mode 100644 tests/data/acpi/virt/DSDT.acpihmatvirt
> create mode 100644 tests/data/acpi/virt/HMAT.acpihmatvirt
> create mode 100644 tests/data/acpi/virt/PPTT.acpihmatvirt
> create mode 100644 tests/data/acpi/virt/SRAT.acpihmatvirt
>
> --
> 2.25.1
^ permalink raw reply [flat|nested] 14+ messages in thread