@@ -1639,6 +1639,7 @@ F: include/hw/boards.h
F: include/hw/core/cpu.h
F: include/hw/cpu/cluster.h
F: include/sysemu/numa.h
+F: tests/unit/test-smp-parse.c
T: git https://gitlab.com/ehabkost/qemu.git machine-next
Xtensa Machines
@@ -45,6 +45,7 @@ tests = {
'test-uuid': [],
'ptimer-test': ['ptimer-test-stubs.c', meson.source_root() / 'hw/core/ptimer.c'],
'test-qapi-util': [],
+ 'test-smp-parse': [qom, meson.source_root() / 'hw/core/machine-smp.c'],
}
if have_system or have_tools
new file mode 100644
@@ -0,0 +1,866 @@
+/*
+ * SMP parsing unit-tests
+ *
+ * Copyright (c) 2021 Huawei Technologies Co., Ltd
+ *
+ * Authors:
+ * Yanan Wang <wangyanan55@huawei.com>
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
+ * See the COPYING.LIB file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "qom/object.h"
+#include "qemu/module.h"
+#include "qapi/error.h"
+
+#include "hw/boards.h"
+
+#define T true
+#define F false
+
+#define MIN_CPUS 1
+#define MAX_CPUS 512
+
+/* define a CPU topology hierarchy of sockets/cores/threads */
+#define SMP_CONFIG_GENERIC(ha, a, hb, b, hc, c, hd, d, he, e) \
+ { \
+ .has_cpus = ha, .cpus = a, \
+ .has_sockets = hb, .sockets = b, \
+ .has_cores = hc, .cores = c, \
+ .has_threads = hd, .threads = d, \
+ .has_maxcpus = he, .maxcpus = e, \
+ }
+
+#define CPU_TOPOLOGY_GENERIC(a, b, c, d, e) \
+ { \
+ .cpus = a, \
+ .sockets = b, \
+ .cores = c, \
+ .threads = d, \
+ .max_cpus = e, \
+ }
+
+/* define a CPU topology hierarchy of sockets/dies/cores/threads */
+#define SMP_CONFIG_WITH_DIES(ha, a, hb, b, hc, c, hd, d, he, e, hf, f) \
+ { \
+ .has_cpus = ha, .cpus = a, \
+ .has_sockets = hb, .sockets = b, \
+ .has_dies = hc, .dies = c, \
+ .has_cores = hd, .cores = d, \
+ .has_threads = he, .threads = e, \
+ .has_maxcpus = hf, .maxcpus = f, \
+ }
+
+#define CPU_TOPOLOGY_WITH_DIES(a, b, c, d, e, f) \
+ { \
+ .cpus = a, \
+ .sockets = b, \
+ .dies = c, \
+ .cores = d, \
+ .threads = e, \
+ .max_cpus = f, \
+ }
+
+/**
+ * SMPTestData:
+ * @config - the given SMP configuration
+ * @expect_prefer_sockets - expected topology result for the valid
+ * configuration, when sockets are preferred over cores in parsing
+ * @expect_prefer_cores - expected topology result for the valid
+ * configuration, when cores are preferred over sockets in parsing
+ * @expect_error - expected error report for the invalid configuration
+ */
+typedef struct SMPTestData {
+ SMPConfiguration config;
+ CpuTopology expect_prefer_sockets;
+ CpuTopology expect_prefer_cores;
+ const char *expect_error;
+} SMPTestData;
+
+/* specific machine type info for testing */
+static const TypeInfo smp_machine_info = {
+ .name = TYPE_MACHINE,
+ .parent = TYPE_OBJECT,
+ .class_size = sizeof(MachineClass),
+ .instance_size = sizeof(MachineState),
+};
+
+/*
+ * all possible valid collections of generic topology parameters
+ * and the corresponding expected outputs are listed.
+ */
+static struct SMPTestData data_generic[] = {
+ {
+ /* config: no configuration provided
+ * expect: cpus=1,sockets=1,cores=1,threads=1,maxcpus=1 */
+ .config = SMP_CONFIG_GENERIC(F, 0, F, 0, F, 0, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(1, 1, 1, 1, 1),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(1, 1, 1, 1, 1),
+ }, {
+ /* config: -smp 8
+ * prefer_sockets: cpus=8,sockets=8,cores=1,threads=1,maxcpus=8
+ * prefer_cores: cpus=8,sockets=1,cores=8,threads=1,maxcpus=8 */
+ .config = SMP_CONFIG_GENERIC(T, 8, F, 0, F, 0, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 8, 1, 1, 8),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 1, 8, 1, 8),
+ }, {
+ /* config: -smp sockets=2
+ * expect: cpus=2,sockets=2,cores=1,threads=1,maxcpus=2 */
+ .config = SMP_CONFIG_GENERIC(F, 0, T, 2, F, 0, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(2, 2, 1, 1, 2),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(2, 2, 1, 1, 2),
+ }, {
+ /* config: -smp cores=4
+ * expect: cpus=4,sockets=1,cores=4,threads=1,maxcpus=4 */
+ .config = SMP_CONFIG_GENERIC(F, 0, F, 0, T, 4, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(4, 1, 4, 1, 4),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(4, 1, 4, 1, 4),
+ }, {
+ /* config: -smp threads=2
+ * expect: cpus=2,sockets=1,cores=1,threads=2,maxcpus=2 */
+ .config = SMP_CONFIG_GENERIC(F, 0, F, 0, F, 0, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(2, 1, 1, 2, 2),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(2, 1, 1, 2, 2),
+ }, {
+ /* config: -smp maxcpus=16
+ * prefer_sockets: cpus=16,sockets=16,cores=1,threads=1,maxcpus=16
+ * prefer_cores: cpus=16,sockets=1,cores=16,threads=1,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(F, 0, F, 0, F, 0, F, 0, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 16, 1, 1, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(16, 1, 16, 1, 16),
+ }, {
+ /* config: -smp 8,sockets=2
+ * expect: cpus=8,sockets=2,cores=4,threads=1,maxcpus=8 */
+ .config = SMP_CONFIG_GENERIC(T, 8, T, 2, F, 0, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
+ }, {
+ /* config: -smp 8,cores=4
+ * expect: cpus=8,sockets=2,cores=4,threads=1,maxcpus=8 */
+ .config = SMP_CONFIG_GENERIC(T, 8, F, 0, T, 4, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
+ }, {
+ /* config: -smp 8,threads=2
+ * prefer_sockets: cpus=8,sockets=4,cores=1,threads=2,maxcpus=8
+ * prefer_cores: cpus=8,sockets=1,cores=4,threads=2,maxcpus=8 */
+ .config = SMP_CONFIG_GENERIC(T, 8, F, 0, F, 0, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 4, 1, 2, 8),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 1, 4, 2, 8),
+ }, {
+ /* config: -smp 8,maxcpus=16
+ * prefer_sockets: cpus=8,sockets=16,cores=1,threads=1,maxcpus=16
+ * prefer_cores: cpus=8,sockets=1,cores=16,threads=1,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(T, 8, F, 0, F, 0, F, 0, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 16, 1, 1, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 1, 16, 1, 16),
+ }, {
+ /* config: -smp sockets=2,cores=4
+ * expect: cpus=8,sockets=2,cores=4,threads=1,maxcpus=8 */
+ .config = SMP_CONFIG_GENERIC(F, 0, T, 2, T, 4, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
+ }, {
+ /* config: -smp sockets=2,threads=2
+ * expect: cpus=4,sockets=2,cores=1,threads=2,maxcpus=4 */
+ .config = SMP_CONFIG_GENERIC(F, 0, T, 2, F, 0, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(4, 2, 1, 2, 4),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(4, 2, 1, 2, 4),
+ }, {
+ /* config: -smp sockets=2,maxcpus=16
+ * expect: cpus=16,sockets=2,cores=8,threads=1,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(F, 0, T, 2, F, 0, F, 0, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 2, 8, 1, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(16, 2, 8, 1, 16),
+ }, {
+ /* config: -smp cores=4,threads=2
+ * expect: cpus=8,sockets=1,cores=4,threads=2,maxcpus=8 */
+ .config = SMP_CONFIG_GENERIC(F, 0, F, 0, T, 4, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 1, 4, 2, 8),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 1, 4, 2, 8),
+ }, {
+ /* config: -smp cores=4,maxcpus=16
+ * expect: cpus=16,sockets=4,cores=4,threads=1,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(F, 0, F, 0, T, 4, F, 0, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 4, 4, 1, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(16, 4, 4, 1, 16),
+ }, {
+ /* config: -smp threads=2,maxcpus=16
+ * prefer_sockets: cpus=16,sockets=8,cores=1,threads=2,maxcpus=16
+ * prefer_cores: cpus=16,sockets=1,cores=8,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(F, 0, F, 0, F, 0, T, 2, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 8, 1, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(16, 1, 8, 2, 16),
+ }, {
+ /* config: -smp 8,sockets=2,cores=4
+ * expect: cpus=8,sockets=2,cores=4,threads=1,maxcpus=8 */
+ .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
+ }, {
+ /* config: -smp 8,sockets=2,threads=2
+ * expect: cpus=8,sockets=2,cores=2,threads=2,maxcpus=8 */
+ .config = SMP_CONFIG_GENERIC(T, 8, T, 2, F, 0, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8),
+ }, {
+ /* config: -smp 8,sockets=2,maxcpus=16
+ * expect: cpus=8,sockets=2,cores=8,threads=1,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(T, 8, T, 2, F, 0, F, 0, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 8, 1, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 8, 1, 16),
+ }, {
+ /* config: -smp 8,cores=4,threads=2
+ * expect: cpus=8,sockets=1,cores=4,threads=2,maxcpus=8 */
+ .config = SMP_CONFIG_GENERIC(T, 8, F, 0, T, 4, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 1, 4, 2, 8),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 1, 4, 2, 8),
+ }, {
+ /* config: -smp 8,cores=4,maxcpus=16
+ * expect: cpus=8,sockets=4,cores=4,threads=1,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(T, 8, F, 0, T, 4, F, 0, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 4, 4, 1, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 4, 4, 1, 16),
+ }, {
+ /* config: -smp 8,threads=2,maxcpus=16
+ * prefer_sockets: cpus=8,sockets=8,cores=1,threads=2,maxcpus=16
+ * prefer_cores: cpus=8,sockets=1,cores=8,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(T, 8, F, 0, F, 0, T, 2, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 8, 1, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 1, 8, 2, 16),
+ }, {
+ /* config: -smp sockets=2,cores=4,threads=2
+ * expect: cpus=16,sockets=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(F, 0, T, 2, T, 4, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
+ }, {
+ /* config: -smp sockets=2,cores=4,maxcpus=16
+ * expect: cpus=16,sockets=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(F, 0, T, 2, T, 4, F, 0, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
+ }, {
+ /* config: -smp sockets=2,threads=2,maxcpus=16
+ * expect: cpus=16,sockets=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(F, 0, T, 2, F, 0, T, 2, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
+ }, {
+ /* config: -smp cores=4,threads=2,maxcpus=16
+ * expect: cpus=16,sockets=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(F, 0, F, 0, T, 4, T, 2, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
+ }, {
+ /* config: -smp 8,sockets=2,cores=4,threads=1
+ * expect: cpus=8,sockets=2,cores=4,threads=1,maxcpus=8 */
+ .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 1, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 4, 1, 8),
+ }, {
+ /* config: -smp 8,sockets=2,cores=4,maxcpus=16
+ * expect: cpus=8,sockets=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, F, 0, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
+ }, {
+ /* config: -smp 8,sockets=2,threads=2,maxcpus=16
+ * expect: cpus=8,sockets=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(T, 8, T, 2, F, 0, T, 2, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
+ }, {
+ /* config: -smp 8,cores=4,threads=2,maxcpus=16
+ * expect: cpus=8,sockets=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(T, 8, F, 0, T, 4, T, 2, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
+ }, {
+ /* config: -smp sockets=2,cores=4,threads=2,maxcpus=16
+ * expect: cpus=16,sockets=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(F, 0, T, 2, T, 4, T, 2, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(16, 2, 4, 2, 16),
+ }, {
+ /* config: -smp 8,sockets=2,cores=4,threads=2,maxcpus=16
+ * expect: cpus=8,sockets=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 2, T, 16),
+ .expect_prefer_sockets = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_GENERIC(8, 2, 4, 2, 16),
+ },
+};
+
+/*
+ * all possible valid collections of topology parameters (with dies)
+ * and the corresponding expected outputs are listed.
+ */
+static SMPTestData data_with_dies[] = {
+ {
+ /* config: -smp dies=2
+ * expect: cpus=2,sockets=1,dies=2,cores=1,threads=1,maxcpus=2 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, F, 0, T, 2, F, 0, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(2, 1, 2, 1, 1, 2),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(2, 1, 2, 1, 1, 2),
+ }, {
+ /* config: -smp 16,dies=2
+ * prefer_sockets: cpus=16,sockets=8,dies=2,cores=1,threads=1,maxcpus=16
+ * prefer_cores: cpus=16,sockets=1,dies=2,cores=8,threads=1,maxcpus=16 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, F, 0, T, 2, F, 0, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 8, 2, 1, 1, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 1, 2, 8, 1, 16),
+ }, {
+ /* config: -smp sockets=2,dies=2
+ * expect: cpus=4,sockets=2,dies=2,cores=1,threads=1,maxcpus=4 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, T, 2, T, 2, F, 0, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(4, 2, 2, 1, 1, 4),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(4, 2, 2, 1, 1, 4),
+ }, {
+ /* config: -smp dies=2,cores=4
+ * expect: cpus=8,sockets=1,dies=2,cores=4,threads=1,maxcpus=8 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, F, 0, T, 2, T, 4, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(8, 1, 2, 4, 1, 8),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(8, 1, 2, 4, 1, 8),
+ }, {
+ /* config: -smp dies=2,threads=2
+ * expect: cpus=4,sockets=1,dies=2,cores=1,threads=2,maxcpus=4 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, F, 0, T, 2, F, 0, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(4, 1, 2, 1, 2, 4),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(4, 1, 2, 1, 2, 4),
+ }, {
+ /* config: -smp dies=2,maxcpus=32
+ * prefer_sockets: cpus=32,sockets=16,dies=2,cores=1,threads=1,maxcpus=32
+ * prefer_cores: cpus=32,sockets=1,dies=2,cores=16,threads=1,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, F, 0, T, 2, F, 0, F, 0, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(32, 16, 2, 1, 1, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(32, 1, 2, 16, 1, 32),
+ }, {
+ /* config: -smp 16,sockets=2,dies=2
+ * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, F, 0, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 1, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 1, 16),
+ }, {
+ /* config: -smp 16,dies=2,cores=4
+ * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, F, 0, T, 2, T, 4, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 1, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 1, 16),
+ }, {
+ /* config: -smp 16,dies=2,threads=2
+ * prefer_sockets: cpus=16,sockets=4,dies=2,cores=1,threads=2,maxcpus=16
+ * prefer_cores: cpus=16,sockets=1,dies=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, F, 0, T, 2, F, 0, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 4, 2, 1, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 1, 2, 4, 2, 16),
+ }, {
+ /* config: -smp 16,dies=2,maxcpus=32
+ * prefer_sockets: cpus=16,sockets=16,dies=2,cores=1,threads=1,maxcpus=32
+ * prefer_cores: cpus=16,sockets=1,dies=2,cores=16,threads=1,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, F, 0, T, 2, F, 0, F, 0, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 16, 2, 1, 1, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 1, 2, 16, 1, 32),
+ }, {
+ /* config: -smp sockets=2,dies=2,cores=4
+ * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, T, 2, T, 2, T, 4, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 1, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 1, 16),
+ }, {
+ /* config: -smp sockets=2,dies=2,threads=2
+ * expect: cpus=8,sockets=2,dies=2,cores=1,threads=2,maxcpus=8 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, T, 2, T, 2, F, 0, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(8, 2, 2, 1, 2, 8),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(8, 2, 2, 1, 2, 8),
+ }, {
+ /* config: -smp sockets=2,dies=2,maxcpus=32
+ * expect: cpus=32,sockets=2,dies=2,cores=8,threads=1,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, T, 2, T, 2, F, 0, F, 0, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(32, 2, 2, 8, 1, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(32, 2, 2, 8, 1, 32),
+ }, {
+ /* config: -smp dies=2,cores=4,threads=2
+ * expect: cpus=16,sockets=1,dies=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, F, 0, T, 2, T, 4, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 1, 2, 4, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 1, 2, 4, 2, 16),
+ }, {
+ /* config: -smp dies=2,cores=4,maxcpus=32
+ * expect: cpus=32,sockets=4,dies=2,cores=4,threads=1,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, F, 0, T, 2, T, 4, F, 0, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(32, 4, 2, 4, 1, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(32, 4, 2, 4, 1, 32),
+ }, {
+ /* config: -smp dies=2,threads=2,maxcpus=32
+ * prefer_sockets: cpus=32,sockets=8,dies=2,cores=1,threads=2,maxcpus=32
+ * prefer_cores: cpus=32,sockets=1,dies=2,cores=8,threads=2,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, F, 0, T, 2, F, 0, T, 2, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(32, 8, 2, 1, 2, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(32, 1, 2, 8, 2, 32),
+ }, {
+ /* config: -smp 16,sockets=2,dies=2,cores=4
+ * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, T, 4, F, 0, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 1, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 1, 16),
+ }, {
+ /* config: -smp 16,sockets=2,dies=2,threads=2
+ * expect: cpus=16,sockets=2,dies=2,cores=2,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, F, 0, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 2, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 2, 2, 16),
+ }, {
+ /* config: -smp 16,sockets=2,dies=2,maxcpus=32
+ * expect: cpus=16,sockets=2,dies=2,cores=8,threads=1,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, F, 0, F, 0, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 8, 1, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 8, 1, 32),
+ }, {
+ /* config: -smp 16,dies=2,cores=4,threads=2
+ * expect: cpus=16,sockets=1,dies=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, F, 0, T, 2, T, 4, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 1, 2, 4, 2, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 1, 2, 4, 2, 16),
+ }, {
+ /* config: -smp 16,dies=2,cores=4,maxcpus=32
+ * expect: cpus=16,sockets=4,dies=2,cores=4,threads=1,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, F, 0, T, 2, T, 4, F, 0, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 4, 2, 4, 1, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 4, 2, 4, 1, 32),
+ }, {
+ /* config: -smp 16,dies=2,threads=2,maxcpus=32
+ * prefer_sockets: cpus=16,sockets=8,dies=2,cores=1,threads=2,maxcpus=32
+ * prefer_cores: cpus=16,sockets=1,dies=2,cores=8,threads=2,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, F, 0, T, 2, F, 0, T, 2, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 8, 2, 1, 2, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 1, 2, 8, 2, 32),
+ }, {
+ /* config: -smp sockets=2,dies=2,cores=4,threads=2
+ * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, T, 2, T, 2, T, 4, T, 2, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(32, 2, 2, 4, 2, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(32, 2, 2, 4, 2, 32),
+ }, {
+ /* config: -smp sockets=2,dies=2,cores=4,maxcpus=32
+ * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, T, 2, T, 2, T, 4, F, 0, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(32, 2, 2, 4, 2, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(32, 2, 2, 4, 2, 32),
+ }, {
+ /* config: -smp sockets=2,dies=2,threads=2,maxcpus=32
+ * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, T, 2, T, 2, F, 0, T, 2, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(32, 2, 2, 4, 2, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(32, 2, 2, 4, 2, 32),
+ }, {
+ /* config: -smp dies=2,cores=4,threads=2,maxcpus=32
+ * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, F, 0, T, 2, T, 4, T, 2, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(32, 2, 2, 4, 2, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(32, 2, 2, 4, 2, 32),
+ }, {
+ /* config: -smp 16,sockets=2,dies=2,cores=4,threads=1
+ * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, T, 4, T, 1, F, 0),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 1, 16),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 1, 16),
+ }, {
+ /* config: -smp 16,sockets=2,dies=2,cores=4,maxcpus=32
+ * expect: cpus=16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, T, 4, F, 0, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 2, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 2, 32),
+ }, {
+ /* config: -smp 16,sockets=2,dies=2,threads=2,maxcpus=32
+ * expect: cpus=16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, F, 0, T, 2, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 2, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 2, 32),
+ }, {
+ /* config: -smp 16,dies=2,cores=4,threads=2,maxcpus=32
+ * expect: cpus=16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, F, 0, T, 2, T, 4, T, 2, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 2, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 2, 32),
+ }, {
+ /* config: -smp sockets=2,dies=2,cores=4,threads=2,maxcpus=32
+ * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(F, 0, T, 2, T, 2, T, 4, T, 2, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(32, 2, 2, 4, 2, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(32, 2, 2, 4, 2, 32),
+ }, {
+ /* config: -smp 16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32
+ * expect: cpus=16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, T, 4, T, 2, T, 32),
+ .expect_prefer_sockets = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 2, 32),
+ .expect_prefer_cores = CPU_TOPOLOGY_WITH_DIES(16, 2, 2, 4, 2, 32),
+ },
+};
+
+/*
+ * generic invalid configurations
+ * specified smp CPUs can't be less than supported min CPUs.
+ * specified max CPUs can't be more than supported max CPUs.
+ */
+
+static SMPTestData data_generic_invalid[] = {
+ {
+ /* config: -smp MIN_CPUS
+ * reset the machine supported min CPUs to "MIN_CPUS + 1" */
+ .config = SMP_CONFIG_GENERIC(T, MIN_CPUS, F, 0, F, 0, F, 0, F, 0),
+ .expect_error = "Invalid SMP CPUs 1. The min CPUs supported "
+ "by machine '(null)' is 2",
+ }, {
+ /* config: -smp MAX_CPUS
+ * reset the machine supported max CPUs to "MAX_CPUS - 1" */
+ .config = SMP_CONFIG_GENERIC(T, MAX_CPUS, F, 0, F, 0, F, 0, F, 0),
+ .expect_error = "Invalid SMP CPUs 512. The max CPUs supported "
+ "by machine '(null)' is 511",
+ },
+};
+
+static char *get_config_info(SMPConfiguration *config)
+{
+ return g_strdup_printf(
+ "(SMPConfiguration) {\n"
+ " .has_cpus = %5s, cpus = %ld,\n"
+ " .has_sockets = %5s, sockets = %ld,\n"
+ " .has_dies = %5s, dies = %ld,\n"
+ " .has_cores = %5s, cores = %ld,\n"
+ " .has_threads = %5s, threads = %ld,\n"
+ " .has_maxcpus = %5s, maxcpus = %ld,\n"
+ "}",
+ config->has_cpus ? "true" : "false", config->cpus,
+ config->has_sockets ? "true" : "false", config->sockets,
+ config->has_dies ? "true" : "false", config->dies,
+ config->has_cores ? "true" : "false", config->cores,
+ config->has_threads ? "true" : "false", config->threads,
+ config->has_maxcpus ? "true" : "false", config->maxcpus);
+}
+
+static char *get_topo_info(CpuTopology *topo)
+{
+ return g_strdup_printf(
+ "(CpuTopology) {\n"
+ " .cpus = %u,\n"
+ " .sockets = %u,\n"
+ " .dies = %u,\n"
+ " .cores = %u,\n"
+ " .threads = %u,\n"
+ " .max_cpus = %u,\n"
+ "}",
+ topo->cpus, topo->sockets, topo->dies,
+ topo->cores, topo->threads, topo->max_cpus);
+}
+
+static void check_smp_parse(MachineState *ms, SMPConfiguration *config,
+ CpuTopology *expect_topo, const char *expect_err,
+ bool valid)
+{
+ g_autofree char *config_info = NULL;
+ g_autofree char *expect_topo_info = NULL;
+ g_autofree char *result_topo_info = NULL;
+ const char *result_err;
+ Error *err = NULL;
+
+ /* call the generic parser smp_parse() in hw/core/machine-smp.c */
+ smp_parse(ms, config, &err);
+
+ if (valid) {
+ if ((err == NULL) &&
+ (ms->smp.cpus == expect_topo->cpus) &&
+ (ms->smp.sockets == expect_topo->sockets) &&
+ (ms->smp.dies == expect_topo->dies) &&
+ (ms->smp.cores == expect_topo->cores) &&
+ (ms->smp.threads == expect_topo->threads) &&
+ (ms->smp.max_cpus == expect_topo->max_cpus)) {
+ return;
+ }
+
+ config_info = get_config_info(config);
+ expect_topo_info = get_topo_info(expect_topo);
+
+ if (err != NULL) {
+ g_printerr("Check smp_parse failed:\n"
+ "config: %s\n"
+ "expect_topo: %s\n"
+ "should_be_valid: yes\n\n"
+ "result_is_valid: no\n"
+ "result_error: %s\n",
+ config_info, expect_topo_info,
+ error_get_pretty(err));
+ error_free(err);
+ } else {
+ result_topo_info = get_topo_info(&ms->smp);
+ g_printerr("Check smp_parse failed:\n"
+ "config: %s\n"
+ "expect_topo: %s\n"
+ "should_be_valid: yes\n\n"
+ "result_is_valid: yes\n"
+ "result_topo: %s\n",
+ config_info, expect_topo_info,
+ result_topo_info);
+ }
+ } else {
+ if (err != NULL) {
+ result_err = error_get_pretty(err);
+
+ if (expect_err == NULL || (expect_err != NULL &&
+ g_str_equal(expect_err, result_err))) {
+ error_free(err);
+ return;
+ }
+
+ config_info = get_config_info(config);
+ g_printerr("Check smp_parse failed:\n"
+ "config: %s\n"
+ "expect_error: %s\n"
+ "should_be_valid: no\n\n"
+ "result_is_valid: no\n"
+ "result_error: %s\n",
+ config_info, expect_err, result_err);
+ error_free(err);
+ } else {
+ config_info = get_config_info(config);
+ result_topo_info = get_topo_info(&ms->smp);
+
+ g_printerr("Check smp_parse failed:\n"
+ "config: %s\n"
+ "should_be_valid: no\n\n"
+ "result_is_valid: yes\n"
+ "result_topo: %s\n",
+ config_info, result_topo_info);
+ }
+ }
+
+ abort();
+}
+
+static void smp_test_data_init(SMPTestData *targ, SMPTestData *src)
+{
+ targ->config = src->config;
+ targ->expect_prefer_sockets = src->expect_prefer_sockets;
+ targ->expect_prefer_cores = src->expect_prefer_cores;
+ targ->expect_error = src->expect_error;
+}
+
+static void smp_machine_class_reinit(MachineClass *mc)
+{
+ mc->min_cpus = MIN_CPUS;
+ mc->max_cpus = MAX_CPUS;
+
+ mc->smp_props.prefer_sockets = true;
+ mc->smp_props.dies_supported = false;
+}
+
+static void smp_generic_test(void)
+{
+ Object *obj = object_new(TYPE_MACHINE);
+ MachineState *ms = MACHINE(obj);
+ MachineClass *mc = MACHINE_GET_CLASS(obj);
+ SMPTestData data;
+ int i;
+
+ /* make sure that we have created the object */
+ g_assert_nonnull(ms);
+ g_assert_nonnull(mc);
+
+ /* reinitialize related machine properties before each subtest */
+ smp_machine_class_reinit(mc);
+
+ for (i = 0; i < ARRAY_SIZE(data_generic); i++) {
+ smp_test_data_init(&data, &data_generic[i]);
+
+ /* parsed values of unsupported parameters should be 1 */
+ data.expect_prefer_sockets.dies = 1;
+ data.expect_prefer_cores.dies = 1;
+
+ mc->smp_props.prefer_sockets = true;
+ check_smp_parse(ms, &data.config,
+ &data.expect_prefer_sockets, NULL, true);
+
+ mc->smp_props.prefer_sockets = false;
+ check_smp_parse(ms, &data.config,
+ &data.expect_prefer_cores, NULL, true);
+
+ /*
+ * it's now allowed that unsupported dies can be set equal to 1
+ * in the SMP configuration.
+ */
+ data.config.has_dies = true;
+ data.config.dies = 1;
+
+ mc->smp_props.prefer_sockets = true;
+ check_smp_parse(ms, &data.config,
+ &data.expect_prefer_sockets, NULL, true);
+
+ mc->smp_props.prefer_sockets = false;
+ check_smp_parse(ms, &data.config,
+ &data.expect_prefer_cores, NULL, true);
+ }
+
+ object_unref(obj);
+}
+
+static void smp_with_dies_test(void)
+{
+ Object *obj = object_new(TYPE_MACHINE);
+ MachineState *ms = MACHINE(obj);
+ MachineClass *mc = MACHINE_GET_CLASS(obj);
+ SMPTestData data;
+ int i;
+
+ /* make sure that we have created the object */
+ g_assert_nonnull(ms);
+ g_assert_nonnull(mc);
+
+ /* reinitialize related machine properties before each subtest */
+ smp_machine_class_reinit(mc);
+
+ mc->smp_props.dies_supported = true;
+
+ for (i = 0; i < ARRAY_SIZE(data_generic); i++) {
+ smp_test_data_init(&data, &data_generic[i]);
+
+ /* omitted arch-specific dies should directly default to 1 */
+ data.expect_prefer_sockets.dies = 1;
+ data.expect_prefer_cores.dies = 1;
+
+ mc->smp_props.prefer_sockets = true;
+ check_smp_parse(ms, &data.config,
+ &data.expect_prefer_sockets, NULL, true);
+
+ mc->smp_props.prefer_sockets = false;
+ check_smp_parse(ms, &data.config,
+ &data.expect_prefer_cores, NULL, true);
+ }
+
+ /* when dies is provided in the configuration */
+ for (i = 0; i < ARRAY_SIZE(data_with_dies); i++) {
+ smp_test_data_init(&data, &data_with_dies[i]);
+
+ mc->smp_props.prefer_sockets = true;
+ check_smp_parse(ms, &data.config,
+ &data.expect_prefer_sockets, NULL, true);
+
+ mc->smp_props.prefer_sockets = false;
+ check_smp_parse(ms, &data.config,
+ &data.expect_prefer_cores, NULL, true);
+ }
+
+ object_unref(obj);
+}
+
+static void acceptance_generic_test(void)
+{
+ Object *obj = object_new(TYPE_MACHINE);
+ MachineState *ms = MACHINE(obj);
+ MachineClass *mc = MACHINE_GET_CLASS(obj);
+ SMPTestData *datap;
+ int i;
+
+ /* make sure that we have created the object */
+ g_assert_nonnull(ms);
+ g_assert_nonnull(mc);
+
+ /* reinitialize related machine properties before each subtest */
+ smp_machine_class_reinit(mc);
+
+ /* reset the machine supported min CPUs and max CPUs */
+ mc->min_cpus = MIN_CPUS + 1;
+ mc->max_cpus = MAX_CPUS - 1;
+
+ for (i = 0; i < ARRAY_SIZE(data_generic_invalid); i++) {
+ datap = &data_generic_invalid[i];
+ check_smp_parse(ms, &datap->config, NULL, datap->expect_error, false);
+ }
+
+ /* config: -smp 8,sockets=2,cores=4,threads=2,maxcpus=8 */
+ datap = &(SMPTestData){
+ .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 2, T, 8),
+ .expect_error = "Invalid CPU topology: "
+ "product of the hierarchy must match maxcpus: "
+ "sockets (2) * cores (4) * threads (2) "
+ "!= maxcpus (8)",
+ };
+ check_smp_parse(ms, &datap->config, NULL, datap->expect_error, false);
+
+ /* config: -smp 18,sockets=2,cores=4,threads=2,maxcpus=16 */
+ datap = &(SMPTestData){
+ .config = SMP_CONFIG_GENERIC(T, 18, T, 2, T, 4, T, 2, T, 16),
+ .expect_error = "Invalid CPU topology: "
+ "maxcpus must be equal to or greater than smp: "
+ "sockets (2) * cores (4) * threads (2) "
+ "== maxcpus (16) < smp_cpus (18)",
+ };
+ check_smp_parse(ms, &datap->config, NULL, datap->expect_error, false);
+
+ /* config: -smp 8,dies=2 */
+ datap = &(SMPTestData){
+ .config = SMP_CONFIG_WITH_DIES(T, 8, F, 0, T, 2, F, 0, F, 0, F, 0),
+ .expect_error = "dies not supported by this machine's CPU topology",
+ };
+ check_smp_parse(ms, &datap->config, NULL, datap->expect_error, false);
+
+ object_unref(obj);
+}
+
+static void acceptance_with_dies_test(void)
+{
+ Object *obj = object_new(TYPE_MACHINE);
+ MachineState *ms = MACHINE(obj);
+ MachineClass *mc = MACHINE_GET_CLASS(obj);
+ SMPTestData *datap;
+
+ /* make sure that we have created the object */
+ g_assert_nonnull(ms);
+ g_assert_nonnull(mc);
+
+ /* reinitialize related machine properties before each subtest */
+ smp_machine_class_reinit(mc);
+
+ mc->smp_props.dies_supported = true;
+
+ /* config: -smp 16,sockets=2,dies=2,cores=4,threads=2,maxcpus=16 */
+ datap = &(SMPTestData){
+ .config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, T, 4, T, 2, T, 16),
+ .expect_error = "Invalid CPU topology: "
+ "product of the hierarchy must match maxcpus: "
+ "sockets (2) * dies (2) * cores (4) * threads (2) "
+ "!= maxcpus (16)",
+ };
+ check_smp_parse(ms, &datap->config, NULL, datap->expect_error, false);
+
+ /* config: -smp 34,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */
+ datap = &(SMPTestData){
+ .config = SMP_CONFIG_WITH_DIES(T, 34, T, 2, T, 2, T, 4, T, 2, T, 32),
+ .expect_error = "Invalid CPU topology: "
+ "maxcpus must be equal to or greater than smp: "
+ "sockets (2) * dies (2) * cores (4) * threads (2) "
+ "== maxcpus (32) < smp_cpus (34)",
+ };
+ check_smp_parse(ms, &datap->config, NULL, datap->expect_error, false);
+
+ object_unref(obj);
+}
+
+int main(int argc, char *argv[])
+{
+ g_test_init(&argc, &argv, NULL);
+
+ module_call_init(MODULE_INIT_QOM);
+ type_register_static(&smp_machine_info);
+
+ g_test_add_func("/test-smp-parse/smp-generic", smp_generic_test);
+ g_test_add_func("/test-smp-parse/smp-with-dies", smp_with_dies_test);
+ g_test_add_func("/test-smp-parse/acceptance-generic",
+ acceptance_generic_test);
+ g_test_add_func("/test-smp-parse/acceptance-with-dies",
+ acceptance_with_dies_test);
+
+ g_test_run();
+
+ return 0;
+}