405ca57e69
- Include upstream patches targeted for the next stable release (bug fixes only) audio-oss-fix-buffer-pos-calculation.patch blkdebug-Allow-taking-unsharing-permissi.patch block-Add-bdrv_qapi_perm_to_blk_perm.patch block-backup-top-fix-failure-path.patch block-block-copy-fix-progress-calculatio.patch block-fix-crash-on-zero-length-unaligned.patch block-fix-memleaks-in-bdrv_refresh_filen.patch block-Fix-VM-size-field-width-in-snapsho.patch block-nbd-extract-the-common-cleanup-cod.patch block-nbd-fix-memory-leak-in-nbd_open.patch block-qcow2-threads-fix-qcow2_decompress.patch hw-arm-cubieboard-use-ARM-Cortex-A8-as-t.patch hw-intc-arm_gicv3_kvm-Stop-wrongly-progr.patch iotests-add-test-for-backup-top-failure-.patch iotests-Fix-nonportable-use-of-od-endian.patch job-refactor-progress-to-separate-object.patch target-arm-Correct-definition-of-PMCRDP.patch target-arm-fix-TCG-leak-for-fcvt-half-do.patch tpm-ppi-page-align-PPI-RAM.patch vhost-user-blk-delete-virtioqueues-in-un.patch virtio-add-ability-to-delete-vq-through-.patch virtio-crypto-do-delete-ctrl_vq-in-virti.patch virtio-pmem-do-delete-rq_vq-in-virtio_pm.patch - Add Obsoletes directive for qemu-audio-sdl and qemu-ui-sdl since for a qemu package upgrade from SLE12-SP5, support for SDL is dropped OBS-URL: https://build.opensuse.org/request/show/784401 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=534
253 lines
13 KiB
Diff
253 lines
13 KiB
Diff
From: Tao Xu <tao3.xu@intel.com>
|
|
Date: Fri, 13 Dec 2019 09:19:28 +0800
|
|
Subject: tests/numa: Add case for QMP build HMAT
|
|
|
|
Git-commit: d00817c944ed15fbe4a61d44fe7f9fe166c7df88
|
|
References: jsc#SLE-8897
|
|
|
|
Check configuring HMAT usecase
|
|
|
|
Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
Suggested-by: Igor Mammedov <imammedo@redhat.com>
|
|
Signed-off-by: Tao Xu <tao3.xu@intel.com>
|
|
Message-Id: <20191213011929.2520-8-tao3.xu@intel.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
tests/numa-test.c | 213 ++++++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 213 insertions(+)
|
|
|
|
diff --git a/tests/numa-test.c b/tests/numa-test.c
|
|
index 8de8581231dd3e3299bc61d40d8d..17dd807d2a4329aea2e96a845edd 100644
|
|
--- a/tests/numa-test.c
|
|
+++ b/tests/numa-test.c
|
|
@@ -327,6 +327,216 @@ static void pc_dynamic_cpu_cfg(const void *data)
|
|
qtest_quit(qs);
|
|
}
|
|
|
|
+static void pc_hmat_build_cfg(const void *data)
|
|
+{
|
|
+ QTestState *qs = qtest_initf("%s -nodefaults --preconfig -machine hmat=on "
|
|
+ "-smp 2,sockets=2 "
|
|
+ "-m 128M,slots=2,maxmem=1G "
|
|
+ "-object memory-backend-ram,size=64M,id=m0 "
|
|
+ "-object memory-backend-ram,size=64M,id=m1 "
|
|
+ "-numa node,nodeid=0,memdev=m0 "
|
|
+ "-numa node,nodeid=1,memdev=m1,initiator=0 "
|
|
+ "-numa cpu,node-id=0,socket-id=0 "
|
|
+ "-numa cpu,node-id=0,socket-id=1",
|
|
+ data ? (char *)data : "");
|
|
+
|
|
+ /* Fail: Initiator should be less than the number of nodes */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 2, 'target': 0,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-latency\" } }")));
|
|
+
|
|
+ /* Fail: Target should be less than the number of nodes */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 2,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-latency\" } }")));
|
|
+
|
|
+ /* Fail: Initiator should contain cpu */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 1, 'target': 0,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-latency\" } }")));
|
|
+
|
|
+ /* Fail: Data-type mismatch */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"write-latency\","
|
|
+ " 'bandwidth': 524288000 } }")));
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"read-bandwidth\","
|
|
+ " 'latency': 5 } }")));
|
|
+
|
|
+ /* Fail: Bandwidth should be 1MB (1048576) aligned */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\","
|
|
+ " 'bandwidth': 1048575 } }")));
|
|
+
|
|
+ /* Configuring HMAT bandwidth and latency details */
|
|
+ g_assert_false(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-latency\","
|
|
+ " 'latency': 1 } }"))); /* 1 ns */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-latency\","
|
|
+ " 'latency': 5 } }"))); /* Fail: Duplicate configuration */
|
|
+ g_assert_false(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\","
|
|
+ " 'bandwidth': 68717379584 } }"))); /* 65534 MB/s */
|
|
+ g_assert_false(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 1,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-latency\","
|
|
+ " 'latency': 65534 } }"))); /* 65534 ns */
|
|
+ g_assert_false(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 1,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\","
|
|
+ " 'bandwidth': 34358689792 } }"))); /* 32767 MB/s */
|
|
+
|
|
+ /* Fail: node_id should be less than the number of nodes */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-cache', 'node-id': 2, 'size': 10240,"
|
|
+ " 'level': 1, 'associativity': \"direct\", 'policy': \"write-back\","
|
|
+ " 'line': 8 } }")));
|
|
+
|
|
+ /* Fail: level should be less than HMAT_LB_LEVELS (4) */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240,"
|
|
+ " 'level': 4, 'associativity': \"direct\", 'policy': \"write-back\","
|
|
+ " 'line': 8 } }")));
|
|
+
|
|
+ /* Fail: associativity option should be 'none', if level is 0 */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240,"
|
|
+ " 'level': 0, 'associativity': \"direct\", 'policy': \"none\","
|
|
+ " 'line': 0 } }")));
|
|
+ /* Fail: policy option should be 'none', if level is 0 */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240,"
|
|
+ " 'level': 0, 'associativity': \"none\", 'policy': \"write-back\","
|
|
+ " 'line': 0 } }")));
|
|
+ /* Fail: line option should be 0, if level is 0 */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240,"
|
|
+ " 'level': 0, 'associativity': \"none\", 'policy': \"none\","
|
|
+ " 'line': 8 } }")));
|
|
+
|
|
+ /* Configuring HMAT memory side cache attributes */
|
|
+ g_assert_false(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240,"
|
|
+ " 'level': 1, 'associativity': \"direct\", 'policy': \"write-back\","
|
|
+ " 'line': 8 } }")));
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240,"
|
|
+ " 'level': 1, 'associativity': \"direct\", 'policy': \"write-back\","
|
|
+ " 'line': 8 } }"))); /* Fail: Duplicate configuration */
|
|
+ /* Fail: The size of level 2 size should be small than level 1 */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240,"
|
|
+ " 'level': 2, 'associativity': \"direct\", 'policy': \"write-back\","
|
|
+ " 'line': 8 } }")));
|
|
+ /* Fail: The size of level 0 size should be larger than level 1 */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240,"
|
|
+ " 'level': 0, 'associativity': \"direct\", 'policy': \"write-back\","
|
|
+ " 'line': 8 } }")));
|
|
+ g_assert_false(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-cache', 'node-id': 1, 'size': 10240,"
|
|
+ " 'level': 1, 'associativity': \"direct\", 'policy': \"write-back\","
|
|
+ " 'line': 8 } }")));
|
|
+
|
|
+ /* let machine initialization to complete and run */
|
|
+ g_assert_false(qmp_rsp_is_err(qtest_qmp(qs,
|
|
+ "{ 'execute': 'x-exit-preconfig' }")));
|
|
+ qtest_qmp_eventwait(qs, "RESUME");
|
|
+
|
|
+ qtest_quit(qs);
|
|
+}
|
|
+
|
|
+static void pc_hmat_off_cfg(const void *data)
|
|
+{
|
|
+ QTestState *qs = qtest_initf("%s -nodefaults --preconfig "
|
|
+ "-smp 2,sockets=2 "
|
|
+ "-m 128M,slots=2,maxmem=1G "
|
|
+ "-object memory-backend-ram,size=64M,id=m0 "
|
|
+ "-object memory-backend-ram,size=64M,id=m1 "
|
|
+ "-numa node,nodeid=0,memdev=m0",
|
|
+ data ? (char *)data : "");
|
|
+
|
|
+ /*
|
|
+ * Fail: Enable HMAT with -machine hmat=on
|
|
+ * before using any of hmat specific options
|
|
+ */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'node', 'nodeid': 1, 'memdev': \"m1\","
|
|
+ " 'initiator': 0 } }")));
|
|
+ g_assert_false(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'node', 'nodeid': 1, 'memdev': \"m1\" } }")));
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-latency\","
|
|
+ " 'latency': 1 } }")));
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240,"
|
|
+ " 'level': 1, 'associativity': \"direct\", 'policy': \"write-back\","
|
|
+ " 'line': 8 } }")));
|
|
+
|
|
+ /* let machine initialization to complete and run */
|
|
+ g_assert_false(qmp_rsp_is_err(qtest_qmp(qs,
|
|
+ "{ 'execute': 'x-exit-preconfig' }")));
|
|
+ qtest_qmp_eventwait(qs, "RESUME");
|
|
+
|
|
+ qtest_quit(qs);
|
|
+}
|
|
+
|
|
+static void pc_hmat_erange_cfg(const void *data)
|
|
+{
|
|
+ QTestState *qs = qtest_initf("%s -nodefaults --preconfig -machine hmat=on "
|
|
+ "-smp 2,sockets=2 "
|
|
+ "-m 128M,slots=2,maxmem=1G "
|
|
+ "-object memory-backend-ram,size=64M,id=m0 "
|
|
+ "-object memory-backend-ram,size=64M,id=m1 "
|
|
+ "-numa node,nodeid=0,memdev=m0 "
|
|
+ "-numa node,nodeid=1,memdev=m1,initiator=0 "
|
|
+ "-numa cpu,node-id=0,socket-id=0 "
|
|
+ "-numa cpu,node-id=0,socket-id=1",
|
|
+ data ? (char *)data : "");
|
|
+
|
|
+ /* Can't store the compressed latency */
|
|
+ g_assert_false(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-latency\","
|
|
+ " 'latency': 1 } }"))); /* 1 ns */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 1,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-latency\","
|
|
+ " 'latency': 65535 } }"))); /* 65535 ns */
|
|
+
|
|
+ /* Test the 0 input (bandwidth not provided) */
|
|
+ g_assert_false(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 0,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\","
|
|
+ " 'bandwidth': 0 } }"))); /* 0 MB/s */
|
|
+ /* Fail: bandwidth should be provided before memory side cache attributes */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-cache', 'node-id': 0, 'size': 10240,"
|
|
+ " 'level': 1, 'associativity': \"direct\", 'policy': \"write-back\","
|
|
+ " 'line': 8 } }")));
|
|
+
|
|
+ /* Can't store the compressed bandwidth */
|
|
+ g_assert_true(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
|
|
+ " 'arguments': { 'type': 'hmat-lb', 'initiator': 0, 'target': 1,"
|
|
+ " 'hierarchy': \"memory\", 'data-type': \"access-bandwidth\","
|
|
+ " 'bandwidth': 68718428160 } }"))); /* 65535 MB/s */
|
|
+
|
|
+ /* let machine initialization to complete and run */
|
|
+ g_assert_false(qmp_rsp_is_err(qtest_qmp(qs,
|
|
+ "{ 'execute': 'x-exit-preconfig' }")));
|
|
+ qtest_qmp_eventwait(qs, "RESUME");
|
|
+
|
|
+ qtest_quit(qs);
|
|
+}
|
|
+
|
|
int main(int argc, char **argv)
|
|
{
|
|
const char *args = NULL;
|
|
@@ -346,6 +556,9 @@ int main(int argc, char **argv)
|
|
if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64")) {
|
|
qtest_add_data_func("/numa/pc/cpu/explicit", args, pc_numa_cpu);
|
|
qtest_add_data_func("/numa/pc/dynamic/cpu", args, pc_dynamic_cpu_cfg);
|
|
+ qtest_add_data_func("/numa/pc/hmat/build", args, pc_hmat_build_cfg);
|
|
+ qtest_add_data_func("/numa/pc/hmat/off", args, pc_hmat_off_cfg);
|
|
+ qtest_add_data_func("/numa/pc/hmat/erange", args, pc_hmat_erange_cfg);
|
|
}
|
|
|
|
if (!strcmp(arch, "ppc64")) {
|