summaryrefslogtreecommitdiff
path: root/tests/unit/test-smp-parse.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/unit/test-smp-parse.c')
-rw-r--r--tests/unit/test-smp-parse.c281
1 files changed, 211 insertions, 70 deletions
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index b02450e25a..fdc39a846c 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -61,6 +61,20 @@
.has_maxcpus = hf, .maxcpus = f, \
}
+/*
+ * Currently a 4-level topology hierarchy is supported on ARM virt machines
+ * -sockets/clusters/cores/threads
+ */
+#define SMP_CONFIG_WITH_CLUSTERS(ha, a, hb, b, hc, c, hd, d, he, e, hf, f) \
+ { \
+ .has_cpus = ha, .cpus = a, \
+ .has_sockets = hb, .sockets = b, \
+ .has_clusters = hc, .clusters = c, \
+ .has_cores = hd, .cores = d, \
+ .has_threads = he, .threads = e, \
+ .has_maxcpus = hf, .maxcpus = f, \
+ }
+
/**
* @config - the given SMP configuration
* @expect_prefer_sockets - the expected parsing result for the
@@ -83,7 +97,7 @@ typedef struct SMPTestData {
* then test the automatic calculation algorithm of the missing
* values in the parser.
*/
-static struct SMPTestData data_generic_valid[] = {
+static const struct SMPTestData data_generic_valid[] = {
{
/* config: no configuration provided
* expect: cpus=1,sockets=1,cores=1,threads=1,maxcpus=1 */
@@ -285,12 +299,16 @@ static struct SMPTestData data_generic_valid[] = {
},
};
-static struct SMPTestData data_generic_invalid[] = {
+static const struct SMPTestData data_generic_invalid[] = {
{
/* config: -smp 2,dies=2 */
.config = SMP_CONFIG_WITH_DIES(T, 2, F, 0, T, 2, F, 0, F, 0, F, 0),
.expect_error = "dies not supported by this machine's CPU topology",
}, {
+ /* config: -smp 2,clusters=2 */
+ .config = SMP_CONFIG_WITH_CLUSTERS(T, 2, F, 0, T, 2, F, 0, F, 0, F, 0),
+ .expect_error = "clusters not supported by this machine's CPU topology",
+ }, {
/* config: -smp 8,sockets=2,cores=4,threads=2,maxcpus=8 */
.config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 2, T, 8),
.expect_error = "Invalid CPU topology: "
@@ -319,7 +337,7 @@ static struct SMPTestData data_generic_invalid[] = {
},
};
-static struct SMPTestData data_with_dies_invalid[] = {
+static const struct SMPTestData data_with_dies_invalid[] = {
{
/* config: -smp 16,sockets=2,dies=2,cores=4,threads=2,maxcpus=16 */
.config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, T, 4, T, 2, T, 16),
@@ -337,42 +355,63 @@ static struct SMPTestData data_with_dies_invalid[] = {
},
};
-static char *smp_config_to_string(SMPConfiguration *config)
+static const struct SMPTestData data_with_clusters_invalid[] = {
+ {
+ /* config: -smp 16,sockets=2,clusters=2,cores=4,threads=2,maxcpus=16 */
+ .config = SMP_CONFIG_WITH_CLUSTERS(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) * clusters (2) * cores (4) * threads (2) "
+ "!= maxcpus (16)",
+ }, {
+ /* config: -smp 34,sockets=2,clusters=2,cores=4,threads=2,maxcpus=32 */
+ .config = SMP_CONFIG_WITH_CLUSTERS(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) * clusters (2) * cores (4) * threads (2) "
+ "== maxcpus (32) < smp_cpus (34)",
+ },
+};
+
+static char *smp_config_to_string(const SMPConfiguration *config)
{
return g_strdup_printf(
"(SMPConfiguration) {\n"
- " .has_cpus = %5s, cpus = %" PRId64 ",\n"
- " .has_sockets = %5s, sockets = %" PRId64 ",\n"
- " .has_dies = %5s, dies = %" PRId64 ",\n"
- " .has_cores = %5s, cores = %" PRId64 ",\n"
- " .has_threads = %5s, threads = %" PRId64 ",\n"
- " .has_maxcpus = %5s, maxcpus = %" PRId64 ",\n"
+ " .has_cpus = %5s, cpus = %" PRId64 ",\n"
+ " .has_sockets = %5s, sockets = %" PRId64 ",\n"
+ " .has_dies = %5s, dies = %" PRId64 ",\n"
+ " .has_clusters = %5s, clusters = %" PRId64 ",\n"
+ " .has_cores = %5s, cores = %" PRId64 ",\n"
+ " .has_threads = %5s, threads = %" PRId64 ",\n"
+ " .has_maxcpus = %5s, maxcpus = %" PRId64 ",\n"
"}",
config->has_cpus ? "true" : "false", config->cpus,
config->has_sockets ? "true" : "false", config->sockets,
config->has_dies ? "true" : "false", config->dies,
+ config->has_clusters ? "true" : "false", config->clusters,
config->has_cores ? "true" : "false", config->cores,
config->has_threads ? "true" : "false", config->threads,
config->has_maxcpus ? "true" : "false", config->maxcpus);
}
-static char *cpu_topology_to_string(CpuTopology *topo)
+static char *cpu_topology_to_string(const CpuTopology *topo)
{
return g_strdup_printf(
"(CpuTopology) {\n"
" .cpus = %u,\n"
" .sockets = %u,\n"
" .dies = %u,\n"
+ " .clusters = %u,\n"
" .cores = %u,\n"
" .threads = %u,\n"
" .max_cpus = %u,\n"
"}",
- topo->cpus, topo->sockets, topo->dies,
+ topo->cpus, topo->sockets, topo->dies, topo->clusters,
topo->cores, topo->threads, topo->max_cpus);
}
-static void check_parse(MachineState *ms, SMPConfiguration *config,
- CpuTopology *expect_topo, const char *expect_err,
+static void check_parse(MachineState *ms, const SMPConfiguration *config,
+ const CpuTopology *expect_topo, const char *expect_err,
bool is_valid)
{
g_autofree char *config_str = smp_config_to_string(config);
@@ -380,8 +419,8 @@ static void check_parse(MachineState *ms, SMPConfiguration *config,
g_autofree char *output_topo_str = NULL;
Error *err = NULL;
- /* call the generic parser smp_parse() */
- smp_parse(ms, config, &err);
+ /* call the generic parser */
+ machine_parse_smp_config(ms, config, &err);
output_topo_str = cpu_topology_to_string(&ms->smp);
@@ -391,6 +430,7 @@ static void check_parse(MachineState *ms, SMPConfiguration *config,
(ms->smp.cpus == expect_topo->cpus) &&
(ms->smp.sockets == expect_topo->sockets) &&
(ms->smp.dies == expect_topo->dies) &&
+ (ms->smp.clusters == expect_topo->clusters) &&
(ms->smp.cores == expect_topo->cores) &&
(ms->smp.threads == expect_topo->threads) &&
(ms->smp.max_cpus == expect_topo->max_cpus)) {
@@ -466,12 +506,17 @@ static void smp_parse_test(MachineState *ms, SMPTestData *data, bool is_valid)
}
/* The parsed results of the unsupported parameters should be 1 */
-static void unsupported_params_init(MachineClass *mc, SMPTestData *data)
+static void unsupported_params_init(const MachineClass *mc, SMPTestData *data)
{
if (!mc->smp_props.dies_supported) {
data->expect_prefer_sockets.dies = 1;
data->expect_prefer_cores.dies = 1;
}
+
+ if (!mc->smp_props.clusters_supported) {
+ data->expect_prefer_sockets.clusters = 1;
+ data->expect_prefer_cores.clusters = 1;
+ }
}
static void machine_base_class_init(ObjectClass *oc, void *data)
@@ -481,101 +526,171 @@ static void machine_base_class_init(ObjectClass *oc, void *data)
mc->min_cpus = MIN_CPUS;
mc->max_cpus = MAX_CPUS;
- mc->smp_props.prefer_sockets = true;
- mc->smp_props.dies_supported = false;
-
mc->name = g_strdup(SMP_MACHINE_NAME);
}
-static void test_generic(void)
+static void machine_generic_invalid_class_init(ObjectClass *oc, void *data)
{
- Object *obj = object_new(TYPE_MACHINE);
+ MachineClass *mc = MACHINE_CLASS(oc);
+
+ /* Force invalid min CPUs and max CPUs */
+ mc->min_cpus = 2;
+ mc->max_cpus = 511;
+}
+
+static void machine_with_dies_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+
+ mc->smp_props.dies_supported = true;
+}
+
+static void machine_with_clusters_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+
+ mc->smp_props.clusters_supported = true;
+}
+
+static void test_generic_valid(const void *opaque)
+{
+ const char *machine_type = opaque;
+ Object *obj = object_new(machine_type);
MachineState *ms = MACHINE(obj);
MachineClass *mc = MACHINE_GET_CLASS(obj);
- SMPTestData *data = &(SMPTestData){{ }};
+ SMPTestData data = {};
int i;
for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
- *data = data_generic_valid[i];
- unsupported_params_init(mc, data);
+ data = data_generic_valid[i];
+ unsupported_params_init(mc, &data);
- smp_parse_test(ms, data, true);
+ smp_parse_test(ms, &data, true);
/* Unsupported parameters can be provided with their values as 1 */
- data->config.has_dies = true;
- data->config.dies = 1;
- smp_parse_test(ms, data, true);
+ data.config.has_dies = true;
+ data.config.dies = 1;
+ smp_parse_test(ms, &data, true);
}
- /* Force invalid min CPUs and max CPUs */
- mc->min_cpus = 2;
- mc->max_cpus = 511;
+ object_unref(obj);
+}
+
+static void test_generic_invalid(const void *opaque)
+{
+ const char *machine_type = opaque;
+ Object *obj = object_new(machine_type);
+ MachineState *ms = MACHINE(obj);
+ MachineClass *mc = MACHINE_GET_CLASS(obj);
+ SMPTestData data = {};
+ int i;
for (i = 0; i < ARRAY_SIZE(data_generic_invalid); i++) {
- *data = data_generic_invalid[i];
- unsupported_params_init(mc, data);
+ data = data_generic_invalid[i];
+ unsupported_params_init(mc, &data);
- smp_parse_test(ms, data, false);
+ smp_parse_test(ms, &data, false);
}
- /* Reset the supported min CPUs and max CPUs */
- mc->min_cpus = MIN_CPUS;
- mc->max_cpus = MAX_CPUS;
-
object_unref(obj);
}
-static void test_with_dies(void)
+static void test_with_dies(const void *opaque)
{
- Object *obj = object_new(TYPE_MACHINE);
+ const char *machine_type = opaque;
+ Object *obj = object_new(machine_type);
MachineState *ms = MACHINE(obj);
MachineClass *mc = MACHINE_GET_CLASS(obj);
- SMPTestData *data = &(SMPTestData){{ }};
+ SMPTestData data = {};
unsigned int num_dies = 2;
int i;
- /* Force the SMP compat properties */
- mc->smp_props.dies_supported = true;
-
for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
- *data = data_generic_valid[i];
- unsupported_params_init(mc, data);
+ data = data_generic_valid[i];
+ unsupported_params_init(mc, &data);
/* when dies parameter is omitted, it will be set as 1 */
- data->expect_prefer_sockets.dies = 1;
- data->expect_prefer_cores.dies = 1;
+ data.expect_prefer_sockets.dies = 1;
+ data.expect_prefer_cores.dies = 1;
- smp_parse_test(ms, data, true);
+ smp_parse_test(ms, &data, true);
/* when dies parameter is specified */
- data->config.has_dies = true;
- data->config.dies = num_dies;
- if (data->config.has_cpus) {
- data->config.cpus *= num_dies;
+ data.config.has_dies = true;
+ data.config.dies = num_dies;
+ if (data.config.has_cpus) {
+ data.config.cpus *= num_dies;
}
- if (data->config.has_maxcpus) {
- data->config.maxcpus *= num_dies;
+ if (data.config.has_maxcpus) {
+ data.config.maxcpus *= num_dies;
}
- data->expect_prefer_sockets.dies = num_dies;
- data->expect_prefer_sockets.cpus *= num_dies;
- data->expect_prefer_sockets.max_cpus *= num_dies;
- data->expect_prefer_cores.dies = num_dies;
- data->expect_prefer_cores.cpus *= num_dies;
- data->expect_prefer_cores.max_cpus *= num_dies;
+ data.expect_prefer_sockets.dies = num_dies;
+ data.expect_prefer_sockets.cpus *= num_dies;
+ data.expect_prefer_sockets.max_cpus *= num_dies;
+ data.expect_prefer_cores.dies = num_dies;
+ data.expect_prefer_cores.cpus *= num_dies;
+ data.expect_prefer_cores.max_cpus *= num_dies;
- smp_parse_test(ms, data, true);
+ smp_parse_test(ms, &data, true);
}
for (i = 0; i < ARRAY_SIZE(data_with_dies_invalid); i++) {
- *data = data_with_dies_invalid[i];
- unsupported_params_init(mc, data);
+ data = data_with_dies_invalid[i];
+ unsupported_params_init(mc, &data);
+
+ smp_parse_test(ms, &data, false);
+ }
+
+ object_unref(obj);
+}
+
+static void test_with_clusters(const void *opaque)
+{
+ const char *machine_type = opaque;
+ Object *obj = object_new(machine_type);
+ MachineState *ms = MACHINE(obj);
+ MachineClass *mc = MACHINE_GET_CLASS(obj);
+ SMPTestData data = {};
+ unsigned int num_clusters = 2;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
+ data = data_generic_valid[i];
+ unsupported_params_init(mc, &data);
+
+ /* when clusters parameter is omitted, it will be set as 1 */
+ data.expect_prefer_sockets.clusters = 1;
+ data.expect_prefer_cores.clusters = 1;
+
+ smp_parse_test(ms, &data, true);
- smp_parse_test(ms, data, false);
+ /* when clusters parameter is specified */
+ data.config.has_clusters = true;
+ data.config.clusters = num_clusters;
+ if (data.config.has_cpus) {
+ data.config.cpus *= num_clusters;
+ }
+ if (data.config.has_maxcpus) {
+ data.config.maxcpus *= num_clusters;
+ }
+
+ data.expect_prefer_sockets.clusters = num_clusters;
+ data.expect_prefer_sockets.cpus *= num_clusters;
+ data.expect_prefer_sockets.max_cpus *= num_clusters;
+ data.expect_prefer_cores.clusters = num_clusters;
+ data.expect_prefer_cores.cpus *= num_clusters;
+ data.expect_prefer_cores.max_cpus *= num_clusters;
+
+ smp_parse_test(ms, &data, true);
}
- /* Restore the SMP compat properties */
- mc->smp_props.dies_supported = false;
+ for (i = 0; i < ARRAY_SIZE(data_with_clusters_invalid); i++) {
+ data = data_with_clusters_invalid[i];
+ unsupported_params_init(mc, &data);
+
+ smp_parse_test(ms, &data, false);
+ }
object_unref(obj);
}
@@ -585,9 +700,25 @@ static const TypeInfo smp_machine_types[] = {
{
.name = TYPE_MACHINE,
.parent = TYPE_OBJECT,
+ .abstract = true,
.class_init = machine_base_class_init,
.class_size = sizeof(MachineClass),
.instance_size = sizeof(MachineState),
+ }, {
+ .name = MACHINE_TYPE_NAME("smp-generic-valid"),
+ .parent = TYPE_MACHINE,
+ }, {
+ .name = MACHINE_TYPE_NAME("smp-generic-invalid"),
+ .parent = TYPE_MACHINE,
+ .class_init = machine_generic_invalid_class_init,
+ }, {
+ .name = MACHINE_TYPE_NAME("smp-with-dies"),
+ .parent = TYPE_MACHINE,
+ .class_init = machine_with_dies_class_init,
+ }, {
+ .name = MACHINE_TYPE_NAME("smp-with-clusters"),
+ .parent = TYPE_MACHINE,
+ .class_init = machine_with_clusters_class_init,
}
};
@@ -599,8 +730,18 @@ int main(int argc, char *argv[])
g_test_init(&argc, &argv, NULL);
- g_test_add_func("/test-smp-parse/generic", test_generic);
- g_test_add_func("/test-smp-parse/with_dies", test_with_dies);
+ g_test_add_data_func("/test-smp-parse/generic/valid",
+ MACHINE_TYPE_NAME("smp-generic-valid"),
+ test_generic_valid);
+ g_test_add_data_func("/test-smp-parse/generic/invalid",
+ MACHINE_TYPE_NAME("smp-generic-invalid"),
+ test_generic_invalid);
+ g_test_add_data_func("/test-smp-parse/with_dies",
+ MACHINE_TYPE_NAME("smp-with-dies"),
+ test_with_dies);
+ g_test_add_data_func("/test-smp-parse/with_clusters",
+ MACHINE_TYPE_NAME("smp-with-clusters"),
+ test_with_clusters);
g_test_run();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 15:10:49 +0000