Skip to contentSkip to conversation

s390x: topology: Fixes and extension

PATCH In review Nina Schoetterl-Glausch 3 participants 33 messages Oct 11, 2023 – Oct 19, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover s390x: topology: Fixes and extension

Fix a number of issues as well as rewrite and extend the topology list checking.
Add a test case with a complex topology configuration.
In order to keep the unittests.cfg file readable, implement multiline strings for extra_params.

Nina Schoetterl-Glausch (9):
s390x: topology: Fix report message
s390x: topology: Use parameter in stsi_get_sysib
s390x: topology: Fix parsing loop
s390x: topology: Don't use non unique message
s390x: topology: Refine stsi header test
s390x: topology: Rename topology_core to topology_cpu
s390x: topology: Rewrite topology list test
scripts: Implement multiline strings for extra_params
s390x: topology: Add complex topology test

 scripts/common.bash  |  11 +++
 scripts/runtime.bash |   4 +-
 lib/s390x/stsi.h     |  36 ++++---
 s390x/topology.c     | 228 ++++++++++++++++++++++++++-----------------
 s390x/unittests.cfg  | 133 +++++++++++++++++++++++++
 5 files changed, 303 insertions(+), 109 deletions(-)

base-commit: 09e8c119b4cd7b615ea0ece16c92c79054dfb38d

Signature · 1 line
2.41.0
#1 lore raw

PATCH 1/9 s390x: topology: Fix report message

A polarization value of 0 means horizontal polarization.

---
 s390x/topology.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
index 69558236..53838ed1 100644
@@ -275,7 +275,7 @@ static uint8_t *check_tle(void *tc)
 	if (!cpus->d)
 		report_skip("Not dedicated");
 	else
-		report(cpus->pp == 3 || cpus->pp == 0, "Dedicated CPUs are either vertically polarized or have high entitlement");
+		report(cpus->pp == 3 || cpus->pp == 0, "Dedicated CPUs are either horizontally polarized or have high entitlement");
 
 	return tc + sizeof(*cpus);
 }
Signature · 1 line
2.41.0
#2 lore raw

Re: [kvm-unit-tests PATCH 1/9] s390x: topology: Fix report message

Quoted 3 lines · Nina Schoetterl-Glausch

A polarization value of 0 means horizontal polarization.

Don't we need to remove the entitlement part? Entitlement is defined as the degree of vertical polarization.

Quoted 17 lines
---
  s390x/topology.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
index 69558236..53838ed1 100644
@@ -275,7 +275,7 @@ static uint8_t *check_tle(void *tc)
  	if (!cpus->d)
  		report_skip("Not dedicated");
  	else
-		report(cpus->pp == 3 || cpus->pp == 0, "Dedicated CPUs are either vertically polarized or have high entitlement");
+		report(cpus->pp == 3 || cpus->pp == 0, "Dedicated CPUs are either horizontally polarized or have high entitlement");
 
  	return tc + sizeof(*cpus);
  }
#3 lore raw

Re: [kvm-unit-tests PATCH 1/9] s390x: topology: Fix report message

Quoted 7 lines · Janosch Frank
Quoted 3 lines · Nina Schoetterl-Glausch

A polarization value of 0 means horizontal polarization.

Don't we need to remove the entitlement part? Entitlement is defined as the degree of vertical polarization.

I don't follow.
We're checking this from the PoP:
A dedicated CPU is either horizontally or vertically polarized. When a dedicated CPU is vertically polar- ized, entitlement is always high. Thus, when D is one, PP is either 00 binary or 11 binary.

Quoted 18 lines
Quoted 17 lines
---
  s390x/topology.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
index 69558236..53838ed1 100644
@@ -275,7 +275,7 @@ static uint8_t *check_tle(void *tc)
  	if (!cpus->d)
  		report_skip("Not dedicated");
  	else
-		report(cpus->pp == 3 || cpus->pp == 0, "Dedicated CPUs are either vertically polarized or have high entitlement");
+		report(cpus->pp == 3 || cpus->pp == 0, "Dedicated CPUs are either horizontally polarized or have high entitlement");
 
  	return tc + sizeof(*cpus);
  }
#4 lore raw

Re: [kvm-unit-tests PATCH 1/9] s390x: topology: Fix report message

Quoted 9 lines · Nina Schoetterl-Glausch
Quoted 7 lines · Janosch Frank
Quoted 3 lines · Nina Schoetterl-Glausch

A polarization value of 0 means horizontal polarization.

Don't we need to remove the entitlement part? Entitlement is defined as the degree of vertical polarization.

Quoted 6 lines

I don't follow.
We're checking this from the PoP:
A dedicated CPU is either horizontally or vertically polarized. When a dedicated CPU is vertically polar- ized, entitlement is always high. Thus, when D is one, PP is either 00 binary or 11 binary.

Ahhhh, I see what's the issue for my brain: Magic values

Could you please add a patch that introduces an enum for the pp values so the report below doesn't need a look into the POP to understand it?

Quoted 20 lines
Quoted 19 lines
Quoted 18 lines
---
   s390x/topology.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
index 69558236..53838ed1 100644
@@ -275,7 +275,7 @@ static uint8_t *check_tle(void *tc)
   	if (!cpus->d)
   		report_skip("Not dedicated");
   	else
-		report(cpus->pp == 3 || cpus->pp == 0, "Dedicated CPUs are either vertically polarized or have high entitlement");
+		report(cpus->pp == 3 || cpus->pp == 0, "Dedicated CPUs are either horizontally polarized or have high entitlement");
 
   	return tc + sizeof(*cpus);
   }
#5 lore raw

Re: [kvm-unit-tests PATCH 1/9] s390x: topology: Fix report message

Quoted 17 lines · Janosch Frank
Quoted 9 lines · Nina Schoetterl-Glausch
Quoted 7 lines · Janosch Frank
Quoted 3 lines · Nina Schoetterl-Glausch

A polarization value of 0 means horizontal polarization.

Don't we need to remove the entitlement part? Entitlement is defined as the degree of vertical polarization.

Quoted 6 lines

I don't follow.
We're checking this from the PoP:
A dedicated CPU is either horizontally or vertically polarized. When a dedicated CPU is vertically polar- ized, entitlement is always high. Thus, when D is one, PP is either 00 binary or 11 binary.

Quoted 4 lines

Ahhhh, I see what's the issue for my brain: Magic values

Could you please add a patch that introduces an enum for the pp values so the report below doesn't need a look into the POP to understand it?

Sure can do, probably should also add an enum for type, even if it will only have the one value (IFL) we check for.

Quoted 22 lines
Quoted 21 lines
Quoted 20 lines
Quoted 19 lines

---
   s390x/topology.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
index 69558236..53838ed1 100644
@@ -275,7 +275,7 @@ static uint8_t *check_tle(void *tc)
   	if (!cpus->d)
   		report_skip("Not dedicated");
   	else
-		report(cpus->pp == 3 || cpus->pp == 0, "Dedicated CPUs are either vertically polarized or have high entitlement");
+		report(cpus->pp == 3 || cpus->pp == 0, "Dedicated CPUs are either horizontally polarized or have high entitlement");
 
   	return tc + sizeof(*cpus);
   }
#7 lore raw

PATCH 2/9 s390x: topology: Use parameter in stsi_get_sysib

In reply to Nina Schoetterl-Glausch

Instead of accessing global pagebuf.

---
 s390x/topology.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
index 53838ed1..e1bb6014 100644
@@ -322,7 +322,7 @@ static int stsi_get_sysib(struct sysinfo_15_1_x *info, int sel2)
 
 	report_prefix_pushf("SYSIB");
 
-	ret = stsi(pagebuf, 15, 1, sel2);
+	ret = stsi(info, 15, 1, sel2);
 
 	if (max_nested_lvl >= sel2) {
 		report(!ret, "Valid instruction");
Signature · 1 line
2.41.0
Reviewed-by on v1 2/9
#8 lore raw

Re: [kvm-unit-tests PATCH 2/9] s390x: topology: Use parameter in stsi_get_sysib

Quoted 1 line · Nina Schoetterl-Glausch

Instead of accessing global pagebuf.

The fact that you mentioned global pagebuf made me look for a exported pagebuf variable in the lib.

Maybe this might be better:

s390x: topology: replace static address with function parameter in stsi_get_sysib

If we're given a parameter we should actually use it and not use hardcoded values. Let's replace the static pagebuf variable with the info function parameter.

Otherwise:

Quoted 19 lines
---
  s390x/topology.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
index 53838ed1..e1bb6014 100644
@@ -322,7 +322,7 @@ static int stsi_get_sysib(struct sysinfo_15_1_x *info, int sel2)
 
  	report_prefix_pushf("SYSIB");
 
-	ret = stsi(pagebuf, 15, 1, sel2);
+	ret = stsi(info, 15, 1, sel2);
 
  	if (max_nested_lvl >= sel2) {
  		report(!ret, "Valid instruction");
#10 lore raw

PATCH 3/9 s390x: topology: Fix parsing loop

In reply to Nina Schoetterl-Glausch

Without a comparison the loop is infinite.

---
 s390x/topology.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
index e1bb6014..49d6dfeb 100644
@@ -466,7 +466,7 @@ static void parse_topology_args(int argc, char **argv)
 		if (flag[0] != '-')
 			report_abort("Argument is expected to begin with '-'");
 		flag++;
-		for (level = 0; ARRAY_SIZE(levels); level++) {
+		for (level = 0; level < ARRAY_SIZE(levels); level++) {
 			if (!strcmp(levels[level], flag))
 				break;
 		}
Signature · 1 line
2.41.0
#11 lore raw

Re: [kvm-unit-tests PATCH 3/9] s390x: topology: Fix parsing loop

Quoted 3 lines · Nina Schoetterl-Glausch

Without a comparison the loop is infinite.

Wait, how did this work before this change?
Did the strcmp effectively end the loop?

Quoted 17 lines
---
  s390x/topology.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
index e1bb6014..49d6dfeb 100644
@@ -466,7 +466,7 @@ static void parse_topology_args(int argc, char **argv)
  		if (flag[0] != '-')
  			report_abort("Argument is expected to begin with '-'");
  		flag++;
-		for (level = 0; ARRAY_SIZE(levels); level++) {
+		for (level = 0; level < ARRAY_SIZE(levels); level++) {
  			if (!strcmp(levels[level], flag))
  				break;
  		}
#12 lore raw

Re: [kvm-unit-tests PATCH 3/9] s390x: topology: Fix parsing loop

Quoted 7 lines · Janosch Frank
Quoted 3 lines · Nina Schoetterl-Glausch

Without a comparison the loop is infinite.

Wait, how did this work before this change?
Did the strcmp effectively end the loop?

Yes, it only worked because the test was passed correct arguments.

Quoted 19 lines
Quoted 18 lines
---
  s390x/topology.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
index e1bb6014..49d6dfeb 100644
@@ -466,7 +466,7 @@ static void parse_topology_args(int argc, char **argv)
  		if (flag[0] != '-')
  			report_abort("Argument is expected to begin with '-'");
  		flag++;
-		for (level = 0; ARRAY_SIZE(levels); level++) {
+		for (level = 0; level < ARRAY_SIZE(levels); level++) {
  			if (!strcmp(levels[level], flag))
  				break;
  		}
#14 lore raw

PATCH 4/9 s390x: topology: Don't use non unique message

In reply to Nina Schoetterl-Glausch

When we test something, i.e. do a report() we want unique messages, otherwise, from the test output, it will appear as if the same test was run multiple times, possible with different PASS/FAIL values.

Convert some reports that don't actually test anything topology specific into asserts.
Refine the report message for others.

---
 s390x/topology.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
s390x/topology.c +6 -6
index 49d6dfeb..5374582f 100644
@@ -114,7 +114,7 @@ static void check_polarization_change(void)
 	report_prefix_push("Polarization change");
 
 	/* We expect a clean state through reset */
-	report(diag308_load_reset(1), "load normal reset done");
+	assert(diag308_load_reset(1));
 
 	/*
 	 * Set vertical polarization to verify that RESET sets
@@ -123,7 +123,7 @@ static void check_polarization_change(void)
 	cc = ptf(PTF_REQ_VERTICAL, &rc);
 	report(cc == 0, "Set vertical polarization.");
 
-	report(diag308_load_reset(1), "load normal reset done");
+	assert(diag308_load_reset(1));
 
 	cc = ptf(PTF_CHECK, &rc);
 	report(cc == 0, "Reset should clear topology report");
@@ -137,25 +137,25 @@ static void check_polarization_change(void)
 	report(cc == 0, "Change to vertical");
 
 	cc = ptf(PTF_CHECK, &rc);
-	report(cc == 1, "Should report");
+	report(cc == 1, "Should report change after horizontal -> vertical");
 
 	cc = ptf(PTF_REQ_VERTICAL, &rc);
 	report(cc == 2 && rc == PTF_ERR_ALRDY_POLARIZED, "Double change to vertical");
 
 	cc = ptf(PTF_CHECK, &rc);
-	report(cc == 0, "Should not report");
+	report(cc == 0, "Should not report change after vertical -> vertical");
 
 	cc = ptf(PTF_REQ_HORIZONTAL, &rc);
 	report(cc == 0, "Change to horizontal");
 
 	cc = ptf(PTF_CHECK, &rc);
-	report(cc == 1, "Should Report");
+	report(cc == 1, "Should report change after vertical -> horizontal");
 
 	cc = ptf(PTF_REQ_HORIZONTAL, &rc);
 	report(cc == 2 && rc == PTF_ERR_ALRDY_POLARIZED, "Double change to horizontal");
 
 	cc = ptf(PTF_CHECK, &rc);
-	report(cc == 0, "Should not report");
+	report(cc == 0, "Should not report change after horizontal -> horizontal");
 
 	report_prefix_pop();
 }
Signature · 1 line
2.41.0
Reviewed-by on v1 4/9
#15 lore raw

Re: [kvm-unit-tests PATCH 4/9] s390x: topology: Don't use non unique message

Quoted 9 lines · Nina Schoetterl-Glausch

When we test something, i.e. do a report() we want unique messages, otherwise, from the test output, it will appear as if the same test was run multiple times, possible with different PASS/FAIL values.

Convert some reports that don't actually test anything topology specific into asserts.
Refine the report message for others.

Please change to:
s390x: topology: make report messages unique

Quoted 56 lines
---
  s390x/topology.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
s390x/topology.c +6 -6
index 49d6dfeb..5374582f 100644
@@ -114,7 +114,7 @@ static void check_polarization_change(void)
  	report_prefix_push("Polarization change");
 
  	/* We expect a clean state through reset */
-	report(diag308_load_reset(1), "load normal reset done");
+	assert(diag308_load_reset(1));
 
  	/*
  	 * Set vertical polarization to verify that RESET sets
@@ -123,7 +123,7 @@ static void check_polarization_change(void)
  	cc = ptf(PTF_REQ_VERTICAL, &rc);
  	report(cc == 0, "Set vertical polarization.");
 
-	report(diag308_load_reset(1), "load normal reset done");
+	assert(diag308_load_reset(1));
 
  	cc = ptf(PTF_CHECK, &rc);
  	report(cc == 0, "Reset should clear topology report");
@@ -137,25 +137,25 @@ static void check_polarization_change(void)
  	report(cc == 0, "Change to vertical");
 
  	cc = ptf(PTF_CHECK, &rc);
-	report(cc == 1, "Should report");
+	report(cc == 1, "Should report change after horizontal -> vertical");
 
  	cc = ptf(PTF_REQ_VERTICAL, &rc);
  	report(cc == 2 && rc == PTF_ERR_ALRDY_POLARIZED, "Double change to vertical");
 
  	cc = ptf(PTF_CHECK, &rc);
-	report(cc == 0, "Should not report");
+	report(cc == 0, "Should not report change after vertical -> vertical");
 
  	cc = ptf(PTF_REQ_HORIZONTAL, &rc);
  	report(cc == 0, "Change to horizontal");
 
  	cc = ptf(PTF_CHECK, &rc);
-	report(cc == 1, "Should Report");
+	report(cc == 1, "Should report change after vertical -> horizontal");
 
  	cc = ptf(PTF_REQ_HORIZONTAL, &rc);
  	report(cc == 2 && rc == PTF_ERR_ALRDY_POLARIZED, "Double change to horizontal");
 
  	cc = ptf(PTF_CHECK, &rc);
-	report(cc == 0, "Should not report");
+	report(cc == 0, "Should not report change after horizontal -> horizontal");
 
  	report_prefix_pop();
  }
Reviewed-by on v1 4/9
#16 lore raw

Re: [kvm-unit-tests PATCH 4/9] s390x: topology: Don't use non unique message

In reply to Nina Schoetterl-Glausch

Quoting Nina Schoetterl-Glausch (2023-10-11 10:56:27)

Quoted 9 lines

When we test something, i.e. do a report() we want unique messages, otherwise, from the test output, it will appear as if the same test was run multiple times, possible with different PASS/FAIL values.

Convert some reports that don't actually test anything topology specific into asserts.
Refine the report message for others.

There is still the "TLE: reserved bits 0000000000000000" message which may be duplicate, but I think you fix that in a later patch.

#17 lore raw

Re: [kvm-unit-tests PATCH 4/9] s390x: topology: Don't use non unique message

Quoted 9 lines · Nico Boehr

Quoting Nina Schoetterl-Glausch (2023-10-11 10:56:27)

Quoted 8 lines

When we test something, i.e. do a report() we want unique messages, otherwise, from the test output, it will appear as if the same test was run multiple times, possible with different PASS/FAIL values.

Convert some reports that don't actually test anything topology specific into asserts.
Refine the report message for others.

Quoted 6 lines
Quoted 1 line

There is still the "TLE: reserved bits 0000000000000000" message which may be duplicate, but I think you fix that in a later patch.

Yes, this isn't comprehensive, the rewrite takes care of the rest.

#18 lore raw

PATCH 5/9 s390x: topology: Refine stsi header test

In reply to Nina Schoetterl-Glausch

Add checks for length field.
Also minor refactor.

---
 s390x/topology.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
s390x/topology.c +9 -6
index 5374582f..0ba57986 100644
@@ -187,18 +187,22 @@ static void stsi_check_maxcpus(struct sysinfo_15_1_x *info)
 }
 
 /*
- * stsi_check_mag
+ * stsi_check_header
  * @info: Pointer to the stsi information
+ * @sel2: stsi selector 2 value
  *
  * MAG field should match the architecture defined containers
  * when MNEST as returned by SCLP matches MNEST of the SYSIB.
  */
-static void stsi_check_mag(struct sysinfo_15_1_x *info)
+static void stsi_check_header(struct sysinfo_15_1_x *info, int sel2)
 {
 	int i;
 
-	report_prefix_push("MAG");
+	report_prefix_push("Header");
 
+	report(IS_ALIGNED(info->length, 8), "Length %d multiple of 8", info->length);
+	report(info->length < PAGE_SIZE, "Length %d in bounds", info->length);
+	report(sel2 == info->mnest, "Valid mnest");
 	stsi_check_maxcpus(info);
 
 	/*
@@ -326,7 +330,6 @@ static int stsi_get_sysib(struct sysinfo_15_1_x *info, int sel2)
 
 	if (max_nested_lvl >= sel2) {
 		report(!ret, "Valid instruction");
-		report(sel2 == info->mnest, "Valid mnest");
 	} else {
 		report(ret, "Invalid instruction");
 	}
@@ -365,7 +368,7 @@ static void check_sysinfo_15_1_x(struct sysinfo_15_1_x *info, int sel2)
 		goto vertical;
 	}
 
-	stsi_check_mag(info);
+	stsi_check_header(info, sel2);
 	stsi_check_tle_coherency(info);
 
 vertical:
@@ -378,7 +381,7 @@ vertical:
 		goto end;
 	}
 
-	stsi_check_mag(info);
+	stsi_check_header(info, sel2);
 	stsi_check_tle_coherency(info);
 	report_prefix_pop();
 
Signature · 1 line
2.41.0
#19 lore raw

Re: [kvm-unit-tests PATCH 5/9] s390x: topology: Refine stsi header test

Quoted 23 lines · Nina Schoetterl-Glausch

Add checks for length field.
Also minor refactor.

---
  s390x/topology.c | 15 +++++++++------
  1 file changed, 9 insertions(+), 6 deletions(-)
s390x/topology.c +2 -1
index 5374582f..0ba57986 100644
@@ -187,18 +187,22 @@ static void stsi_check_maxcpus(struct sysinfo_15_1_x *info)
  }
 
  /*
- * stsi_check_mag
+ * stsi_check_header
   * @info: Pointer to the stsi information
+ * @sel2: stsi selector 2 value
   *
   * MAG field should match the architecture defined containers
   * when MNEST as returned by SCLP matches MNEST of the SYSIB.

s390x/topology.c static void stsi_check_maxcpus(struct sysinfo_15_1_x *info) · line 203

Quoted 10 lines
s390x/topology.c +3 -2
   */
-static void stsi_check_mag(struct sysinfo_15_1_x *info)
+static void stsi_check_header(struct sysinfo_15_1_x *info, int sel2)
  {
  	int i;
 
-	report_prefix_push("MAG");
+	report_prefix_push("Header");
 
+	report(IS_ALIGNED(info->length, 8), "Length %d multiple of 8", info->length);

STSI 15 works on Words, not DWords, no?
So we need to check length against 4, not 8.

Quoted 31 lines
s390x/topology.c +4 -3
+	report(info->length < PAGE_SIZE, "Length %d in bounds", info->length);
+	report(sel2 == info->mnest, "Valid mnest");
  	stsi_check_maxcpus(info);
 
  	/*
@@ -326,7 +330,6 @@ static int stsi_get_sysib(struct sysinfo_15_1_x *info, int sel2)
 
  	if (max_nested_lvl >= sel2) {
  		report(!ret, "Valid instruction");
-		report(sel2 == info->mnest, "Valid mnest");
  	} else {
  		report(ret, "Invalid instruction");
  	}
@@ -365,7 +368,7 @@ static void check_sysinfo_15_1_x(struct sysinfo_15_1_x *info, int sel2)
  		goto vertical;
  	}
 
-	stsi_check_mag(info);
+	stsi_check_header(info, sel2);
  	stsi_check_tle_coherency(info);
 
  vertical:
@@ -378,7 +381,7 @@ vertical:
  		goto end;
  	}
 
-	stsi_check_mag(info);
+	stsi_check_header(info, sel2);
  	stsi_check_tle_coherency(info);
  	report_prefix_pop();
 
#20 lore raw

Re: [kvm-unit-tests PATCH 5/9] s390x: topology: Refine stsi header test

Quoted 30 lines · Janosch Frank
Quoted 29 lines · Nina Schoetterl-Glausch

Add checks for length field.
Also minor refactor.

---
  s390x/topology.c | 15 +++++++++------
  1 file changed, 9 insertions(+), 6 deletions(-)
s390x/topology.c +3 -2
index 5374582f..0ba57986 100644
@@ -187,18 +187,22 @@ static void stsi_check_maxcpus(struct sysinfo_15_1_x *info)
  }
 
  /*
- * stsi_check_mag
+ * stsi_check_header
   * @info: Pointer to the stsi information
+ * @sel2: stsi selector 2 value
   *
   * MAG field should match the architecture defined containers
   * when MNEST as returned by SCLP matches MNEST of the SYSIB.
   */
-static void stsi_check_mag(struct sysinfo_15_1_x *info)
+static void stsi_check_header(struct sysinfo_15_1_x *info, int sel2)
  {
  	int i;
 
Quoted 7 lines

s390x/topology.c static void stsi_check_maxcpus(struct sysinfo_15_1_x *info) · line 203

Quoted 4 lines
s390x/topology.c +2 -1
-	report_prefix_push("MAG");
+	report_prefix_push("Header");
 
+	report(IS_ALIGNED(info->length, 8), "Length %d multiple of 8", info->length);

STSI 15 works on Words, not DWords, no?
So we need to check length against 4, not 8.

The header is 16 bytes.
Topology list entries are 8 or 16, so it must be a multiple of 8 at least.

Quoted 33 lines
Quoted 32 lines
s390x/topology.c +4 -3
+	report(info->length < PAGE_SIZE, "Length %d in bounds", info->length);
+	report(sel2 == info->mnest, "Valid mnest");
  	stsi_check_maxcpus(info);
 
  	/*
@@ -326,7 +330,6 @@ static int stsi_get_sysib(struct sysinfo_15_1_x *info, int sel2)
 
  	if (max_nested_lvl >= sel2) {
  		report(!ret, "Valid instruction");
-		report(sel2 == info->mnest, "Valid mnest");
  	} else {
  		report(ret, "Invalid instruction");
  	}
@@ -365,7 +368,7 @@ static void check_sysinfo_15_1_x(struct sysinfo_15_1_x *info, int sel2)
  		goto vertical;
  	}
 
-	stsi_check_mag(info);
+	stsi_check_header(info, sel2);
  	stsi_check_tle_coherency(info);
 
  vertical:
@@ -378,7 +381,7 @@ vertical:
  		goto end;
  	}
 
-	stsi_check_mag(info);
+	stsi_check_header(info, sel2);
  	stsi_check_tle_coherency(info);
  	report_prefix_pop();
 
#21 lore raw

Re: [kvm-unit-tests PATCH 5/9] s390x: topology: Refine stsi header test

Quoted 34 lines · Nina Schoetterl-Glausch
Quoted 33 lines · Janosch Frank
Quoted 32 lines · Nina Schoetterl-Glausch

Add checks for length field.
Also minor refactor.

---
   s390x/topology.c | 15 +++++++++------
   1 file changed, 9 insertions(+), 6 deletions(-)
s390x/topology.c +4 -3
index 5374582f..0ba57986 100644
@@ -187,18 +187,22 @@ static void stsi_check_maxcpus(struct sysinfo_15_1_x *info)
   }
 
   /*
- * stsi_check_mag
+ * stsi_check_header
    * @info: Pointer to the stsi information
+ * @sel2: stsi selector 2 value
    *
    * MAG field should match the architecture defined containers
    * when MNEST as returned by SCLP matches MNEST of the SYSIB.
    */
-static void stsi_check_mag(struct sysinfo_15_1_x *info)
+static void stsi_check_header(struct sysinfo_15_1_x *info, int sel2)
   {
   	int i;
 
-	report_prefix_push("MAG");
+	report_prefix_push("Header");
 
Quoted 7 lines
Quoted 4 lines

s390x/topology.c static void stsi_check_maxcpus(struct sysinfo_15_1_x *info) · line 203

Quoted 1 line
s390x/topology.c +1 -0
+	report(IS_ALIGNED(info->length, 8), "Length %d multiple of 8", info->length);

STSI 15 works on Words, not DWords, no?
So we need to check length against 4, not 8.

The header is 16 bytes.
Topology list entries are 8 or 16, so it must be a multiple of 8 at least.

Fair enough

Quoted 35 lines
Quoted 34 lines
Quoted 33 lines
s390x/topology.c +4 -3
+	report(info->length < PAGE_SIZE, "Length %d in bounds", info->length);
+	report(sel2 == info->mnest, "Valid mnest");
   	stsi_check_maxcpus(info);
 
   	/*
@@ -326,7 +330,6 @@ static int stsi_get_sysib(struct sysinfo_15_1_x *info, int sel2)
 
   	if (max_nested_lvl >= sel2) {
   		report(!ret, "Valid instruction");
-		report(sel2 == info->mnest, "Valid mnest");
   	} else {
   		report(ret, "Invalid instruction");
   	}
@@ -365,7 +368,7 @@ static void check_sysinfo_15_1_x(struct sysinfo_15_1_x *info, int sel2)
   		goto vertical;
   	}
 
-	stsi_check_mag(info);
+	stsi_check_header(info, sel2);
   	stsi_check_tle_coherency(info);
 
   vertical:
@@ -378,7 +381,7 @@ vertical:
   		goto end;
   	}
 
-	stsi_check_mag(info);
+	stsi_check_header(info, sel2);
   	stsi_check_tle_coherency(info);
   	report_prefix_pop();
 
Reviewed-by
#22 lore raw

Re: [kvm-unit-tests PATCH 5/9] s390x: topology: Refine stsi header test

Quoting Janosch Frank (2023-10-11 13:22:03)

Quoted 40 lines · Nina Schoetterl-Glausch
Quoted 39 lines · Janosch Frank
Quoted 37 lines · Nina Schoetterl-Glausch
Quoted 23 lines

Add checks for length field.
Also minor refactor.

---
   s390x/topology.c | 15 +++++++++------
   1 file changed, 9 insertions(+), 6 deletions(-)
s390x/topology.c +2 -1
index 5374582f..0ba57986 100644
@@ -187,18 +187,22 @@ static void stsi_check_maxcpus(struct sysinfo_15_1_x *info)
   }
 
   /*
- * stsi_check_mag
+ * stsi_check_header
    * @info: Pointer to the stsi information
+ * @sel2: stsi selector 2 value
    *
    * MAG field should match the architecture defined containers
    * when MNEST as returned by SCLP matches MNEST of the SYSIB.

s390x/topology.c static void stsi_check_maxcpus(struct sysinfo_15_1_x *info) · line 203

Quoted 10 lines
s390x/topology.c +3 -2
    */
-static void stsi_check_mag(struct sysinfo_15_1_x *info)
+static void stsi_check_header(struct sysinfo_15_1_x *info, int sel2)
   {
    int i;
 
-   report_prefix_push("MAG");
+   report_prefix_push("Header");
 
+   report(IS_ALIGNED(info->length, 8), "Length %d multiple of 8", info->length);

STSI 15 works on Words, not DWords, no?
So we need to check length against 4, not 8.

Quoted 4 lines
Quoted 2 lines

The header is 16 bytes.
Topology list entries are 8 or 16, so it must be a multiple of 8 at least.

Fair enough

Since I had the same question, can we have a comment here?

This isn't perfect but good enough IMO:

/* PoP mandates 4-byte alignment, but header is 16 bytes, TLEs are 8 or 16 bytes, so check for 8 byte align */

Otherwise:

#23 lore raw

PATCH 6/9 s390x: topology: Rename topology_core to topology_cpu

In reply to Nina Schoetterl-Glausch

This is more in line with the nomenclature in the PoP.

---
 lib/s390x/stsi.h | 4 ++--
 s390x/topology.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
lib/s390x/stsi.h +2 -2
index 1351a6f3..8a97f44e 100644
@@ -30,7 +30,7 @@ struct sysinfo_3_2_2 {
 };
 
 #define CPUS_TLE_RES_BITS 0x00fffffff8000000UL
-struct topology_core {
+struct topology_cpu {
 	uint8_t nl;
 	uint8_t reserved1[3];
 	uint8_t reserved4:5;
@@ -50,7 +50,7 @@ struct topology_container {
 
 union topology_entry {
 	uint8_t nl;
-	struct topology_core cpu;
+	struct topology_cpu cpu;
 	struct topology_container container;
 };
 
s390x/topology.c +1 -1
index 0ba57986..c1f6520f 100644
@@ -246,7 +246,7 @@ done:
 static uint8_t *check_tle(void *tc)
 {
 	struct topology_container *container = tc;
-	struct topology_core *cpus;
+	struct topology_cpu *cpus;
 	int n;
 
 	if (container->nl) {
Signature · 1 line
2.41.0
#26 lore raw

PATCH 7/9 s390x: topology: Rewrite topology list test

In reply to Nina Schoetterl-Glausch

Rewrite recursion with separate functions for checking containers, containers containing CPUs and CPUs.
This improves comprehension and allows for more tests.
We now also test for ordering of CPU TLEs and number of child entries.

---
 lib/s390x/stsi.h |  36 +++++----
 s390x/topology.c | 197 ++++++++++++++++++++++++++++-------------------
 2 files changed, 140 insertions(+), 93 deletions(-)
lib/s390x/stsi.h +21 -15
index 8a97f44e..fdb38e2c 100644
@@ -30,28 +30,34 @@ struct sysinfo_3_2_2 {
 };
 
 #define CPUS_TLE_RES_BITS 0x00fffffff8000000UL
-struct topology_cpu {
-	uint8_t nl;
-	uint8_t reserved1[3];
-	uint8_t reserved4:5;
-	uint8_t d:1;
-	uint8_t pp:2;
-	uint8_t type;
-	uint16_t origin;
-	uint64_t mask;
+union topology_cpu {
+	uint64_t raw[2];
+	struct {
+		uint8_t nl;
+		uint8_t reserved1[3];
+		uint8_t reserved4:5;
+		uint8_t d:1;
+		uint8_t pp:2;
+		uint8_t type;
+		uint16_t origin;
+		uint64_t mask;
+	};
 };
 
 #define CONTAINER_TLE_RES_BITS 0x00ffffffffffff00UL
-struct topology_container {
-	uint8_t nl;
-	uint8_t reserved[6];
-	uint8_t id;
+union topology_container {
+	uint64_t raw;
+	struct {
+		uint8_t nl;
+		uint8_t reserved[6];
+		uint8_t id;
+	};
 };
 
 union topology_entry {
 	uint8_t nl;
-	struct topology_cpu cpu;
-	struct topology_container container;
+	union topology_cpu cpu;
+	union topology_container container;
 };
 
 #define CPU_TOPOLOGY_MAX_LEVEL 6
s390x/topology.c +119 -78

233 lines not on this page · raw message

Signature · 1 line
2.41.0
#27 lore raw

Re: [kvm-unit-tests PATCH 7/9] s390x: topology: Rewrite topology list test

Quoting Nina Schoetterl-Glausch (2023-10-11 10:56:30)

Quoted 6 lines

Rewrite recursion with separate functions for checking containers, containers containing CPUs and CPUs.
This improves comprehension and allows for more tests.
We now also test for ordering of CPU TLEs and number of child entries.

[...]

Quoted 4 lines
s390x/topology.c +0 -0
index c1f6520f..9838434c 100644

[...]

s390x/topology.c static int stsi_get_sysib(struct sysinfo_15_1_x *info, int sel2) · line 295

Quoted 8 lines
s390x/topology.c +8 -0
+static union topology_container *check_child_cpus(struct sysinfo_15_1_x *info,
+                                                 union topology_container *cont,
+                                                 union topology_cpu *child,
+                                                 int *cpus_in_masks)
+{
+       void *last = ((void *)info) + info->length;
+       union topology_cpu *prev_cpu = NULL;
+       int cpus = 0;

I know __builtin_popcountl returns int, but maybe it makes sense to make this and cpus_in_masks an unsigned type?

Quoted 1 line

+ for (; (void *)child < last && child->nl == 0; child++) {

Personal preference, I prefer simply iterating over a counter, but its up to you.

#28 lore raw

PATCH 8/9 scripts: Implement multiline strings for extra_params

In reply to Nina Schoetterl-Glausch

Implement a rudimentary form only.
extra_params can get long when passing a lot of arguments to qemu. Multiline strings help with readability of the .cfg file. Multiline strings begin and end with """, which must occur on separate lines.

For example:
extra_params = """-cpu max,ctop=on -smp cpus=1,cores=16,maxcpus=128 \
-append '-drawers 2 -books 2 -sockets 2 -cores 16' \
-device max-s390x-cpu,core-id=31,drawer-id=0,book-id=0,socket-id=0"""

The command string built with extra_params is eval'ed by the runtime script, so the newlines need to be escaped with \.

---

This could certainly be done differently, suggestions welcome.

 scripts/common.bash  | 11 +++++++++++
 scripts/runtime.bash |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)
scripts/common.bash +11 -0
index 7b983f7d..738e64af 100644
@@ -36,6 +36,17 @@ function for_each_unittest()
 			kernel=$TEST_DIR/${BASH_REMATCH[1]}
 		elif [[ $line =~ ^smp\ *=\ *(.*)$ ]]; then
 			smp=${BASH_REMATCH[1]}
+		elif [[ $line =~ ^extra_params\ *=\ *'"""'(.*)$ ]]; then
+			opts=${BASH_REMATCH[1]}$'\n'
+			while read -r -u $fd; do
+				opts=${opts%\\$'\n'}
+				if [[ "$REPLY" =~ ^(.*)'"""'[:blank:]*$ ]]; then
+					opts+=${BASH_REMATCH[1]}
+					break
+				else
+					opts+=$REPLY$'\n'
+				fi
+			done
 		elif [[ $line =~ ^extra_params\ *=\ *(.*)$ ]]; then
 			opts=${BASH_REMATCH[1]}
 		elif [[ $line =~ ^groups\ *=\ *(.*)$ ]]; then
scripts/runtime.bash +2 -2
index ada8ffd7..fc156f2f 100644
@@ -15,7 +15,7 @@ extract_summary()
 # We assume that QEMU is going to work if it tried to load the kernel
 premature_failure()
 {
-    local log="$(eval $(get_cmdline _NO_FILE_4Uhere_) 2>&1)"
+    local log="$(eval "$(get_cmdline _NO_FILE_4Uhere_)" 2>&1)"
 
     echo "$log" | grep "_NO_FILE_4Uhere_" |
         grep -q -e "could not \(load\|open\) kernel" -e "error loading" &&
@@ -168,7 +168,7 @@ function run()
     # extra_params in the config file may contain backticks that need to be
     # expanded, so use eval to start qemu.  Use "> >(foo)" instead of a pipe to
     # preserve the exit status.
-    summary=$(eval $cmdline 2> >(RUNTIME_log_stderr $testname) \
+    summary=$(eval "$cmdline" 2> >(RUNTIME_log_stderr $testname) \
                              > >(tee >(RUNTIME_log_stdout $testname $kernel) | extract_summary))
     ret=$?
     [ "$KUT_STANDALONE" != "yes" ] && echo > >(RUNTIME_log_stdout $testname $kernel)
Signature · 1 line
2.41.0
#29 lore raw

Re: [kvm-unit-tests PATCH 8/9] scripts: Implement multiline strings for extra_params

Quoting Nina Schoetterl-Glausch (2023-10-11 10:56:31)

Quoted 11 lines

Implement a rudimentary form only.
extra_params can get long when passing a lot of arguments to qemu. Multiline strings help with readability of the .cfg file. Multiline strings begin and end with """, which must occur on separate lines.

For example:
extra_params = """-cpu max,ctop=on -smp cpus=1,cores=16,maxcpus=128 \

(quoted diff) +0 -2
-append '-drawers 2 -books 2 -sockets 2 -cores 16' \
-device max-s390x-cpu,core-id=31,drawer-id=0,book-id=0,socket-id=0"""
Quoted 8 lines

The command string built with extra_params is eval'ed by the runtime script, so the newlines need to be escaped with \.

---

This could certainly be done differently, suggestions welcome.

I honestly do not have a better idea. If someone has, please bring it up!

[...]

scripts/common.bash function for_each_unittest() · line 41

Quoted 11 lines
scripts/common.bash +3 -0
index 7b983f7d..738e64af 100644
@@ -36,6 +36,17 @@ function for_each_unittest()
                        kernel=$TEST_DIR/${BASH_REMATCH[1]}
                elif [[ $line =~ ^smp\ *=\ *(.*)$ ]]; then
                        smp=${BASH_REMATCH[1]}
+               elif [[ $line =~ ^extra_params\ *=\ *'"""'(.*)$ ]]; then
+                       opts=${BASH_REMATCH[1]}$'\n'
+                       while read -r -u $fd; do

I was actually unaware that read saves into REPLY by default and went looking for the REPLY variable to no avail. Can we make this more explicit like so:

while read -r -u $fd LINE; do

and replace REPLY with LINE below?

scripts/common.bash function for_each_unittest() · line 42

Quoted 1 line
scripts/common.bash +1 -0
+                               opts=${opts%\\$'\n'}

So we strip the \ at the end of the line, but if it's not there we preserve the line break? Is there a reason to do it this way? Why do we need the \
at all, as far as I can see """ terminates the multi line string, so what's the purpose?

Did you test this in standalone mode?

#30 lore raw

Re: [kvm-unit-tests PATCH 8/9] scripts: Implement multiline strings for extra_params

Quoted 40 lines · Nico Boehr

Quoting Nina Schoetterl-Glausch (2023-10-11 10:56:31)

Quoted 11 lines

Implement a rudimentary form only.
extra_params can get long when passing a lot of arguments to qemu. Multiline strings help with readability of the .cfg file. Multiline strings begin and end with """, which must occur on separate lines.

For example:
extra_params = """-cpu max,ctop=on -smp cpus=1,cores=16,maxcpus=128 \

(quoted diff) +0 -2
-append '-drawers 2 -books 2 -sockets 2 -cores 16' \
-device max-s390x-cpu,core-id=31,drawer-id=0,book-id=0,socket-id=0"""
Quoted 8 lines

The command string built with extra_params is eval'ed by the runtime script, so the newlines need to be escaped with \.

---

This could certainly be done differently, suggestions welcome.

I honestly do not have a better idea. If someone has, please bring it up!

[...]

scripts/common.bash function for_each_unittest() · line 41

Quoted 11 lines
scripts/common.bash +3 -0
index 7b983f7d..738e64af 100644
@@ -36,6 +36,17 @@ function for_each_unittest()
                        kernel=$TEST_DIR/${BASH_REMATCH[1]}
                elif [[ $line =~ ^smp\ *=\ *(.*)$ ]]; then
                        smp=${BASH_REMATCH[1]}
+               elif [[ $line =~ ^extra_params\ *=\ *'"""'(.*)$ ]]; then
+                       opts=${BASH_REMATCH[1]}$'\n'
+                       while read -r -u $fd; do

I was actually unaware that read saves into REPLY by default and went looking for the REPLY variable to no avail. Can we make this more explicit like so:

Quoted 3 lines

while read -r -u $fd LINE; do

and replace REPLY with LINE below?

No, at least it's not so simple. man bash says:
If no names are supplied, the line read, *without the ending delimiter but otherwise unmodified*, is assigned to the variable REPLY.
We don't want word splitting and white space being removed.

Quoted 4 lines

scripts/common.bash function for_each_unittest() · line 42

Quoted 2 lines
scripts/common.bash +1 -0
+                               opts=${opts%\\$'\n'}

So we strip the \ at the end of the line, but if it's not there we preserve

We strip backslash newline, yes.
This way it's up to you if you want newlines in the string or not. A bit of future proofing.
That is the only escaping I implemented, so right now you cannot have an actual backslash at the end of the line.
The string is later eval'ed by bash which also does escaping, but we cannot just rely on that, because by that time the last \n has been dropped. If you had a backslash before you'll run into trouble.

Quoted 5 lines

the line break? Is there a reason to do it this way? Why do we need the \
at all, as far as I can see """ terminates the multi line string, so what's the purpose?

Did you test this in standalone mode?

I did not.

#31 lore raw

PATCH 9/9 s390x: topology: Add complex topology test

In reply to Nina Schoetterl-Glausch

Run the topology test case with a complex topology configuration.

---

We could also embed a script that generates a random configuration (in fact this configuration is generated), but that seemed a bit too yucky.

 s390x/unittests.cfg | 133 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)
s390x/unittests.cfg +133 -0
index 68e119e4..b08b0fb1 100644
@@ -247,3 +247,136 @@ file = topology.elf
 [topology-2]
 file = topology.elf
 extra_params = -cpu max,ctop=on -smp sockets=31,cores=8,maxcpus=248  -append '-sockets 31 -cores 8'
+
+[topology-3]
+file = topology.elf
+extra_params = """-cpu max,ctop=on -smp cpus=1,drawers=2,books=2,sockets=2,cores=16,maxcpus=128 \
+-append '-drawers 2 -books 2 -sockets 2 -cores 16' \
+-device max-s390x-cpu,core-id=31,drawer-id=0,book-id=0,socket-id=0,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=11,drawer-id=0,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=95,drawer-id=0,book-id=0,socket-id=0,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=73,drawer-id=0,book-id=0,socket-id=0,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=78,drawer-id=0,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=13,drawer-id=0,book-id=0,socket-id=0,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=40,drawer-id=0,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=101,drawer-id=0,book-id=0,socket-id=0,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=29,drawer-id=0,book-id=0,socket-id=0,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=56,drawer-id=0,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=92,drawer-id=0,book-id=0,socket-id=0,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=30,drawer-id=0,book-id=0,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=118,drawer-id=0,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=71,drawer-id=0,book-id=0,socket-id=0,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=93,drawer-id=0,book-id=0,socket-id=0,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=16,drawer-id=0,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=5,drawer-id=0,book-id=0,socket-id=1,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=42,drawer-id=0,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=98,drawer-id=0,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=44,drawer-id=0,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=23,drawer-id=0,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=65,drawer-id=0,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=102,drawer-id=0,book-id=0,socket-id=1,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=57,drawer-id=0,book-id=0,socket-id=1,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=125,drawer-id=0,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=127,drawer-id=0,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=82,drawer-id=0,book-id=0,socket-id=1,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=14,drawer-id=0,book-id=0,socket-id=1,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=91,drawer-id=0,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=12,drawer-id=0,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=8,drawer-id=0,book-id=0,socket-id=1,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=112,drawer-id=0,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=109,drawer-id=0,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=19,drawer-id=0,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=96,drawer-id=0,book-id=1,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=67,drawer-id=0,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=80,drawer-id=0,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=108,drawer-id=0,book-id=1,socket-id=0,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=34,drawer-id=0,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=18,drawer-id=0,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=39,drawer-id=0,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=53,drawer-id=0,book-id=1,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=46,drawer-id=0,book-id=1,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=3,drawer-id=0,book-id=1,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=76,drawer-id=0,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=15,drawer-id=0,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=7,drawer-id=0,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=81,drawer-id=0,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=1,drawer-id=0,book-id=1,socket-id=1,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=113,drawer-id=0,book-id=1,socket-id=1,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=38,drawer-id=0,book-id=1,socket-id=1,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=90,drawer-id=0,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=117,drawer-id=0,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=62,drawer-id=0,book-id=1,socket-id=1,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=85,drawer-id=0,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=49,drawer-id=0,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=24,drawer-id=0,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=107,drawer-id=0,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=103,drawer-id=0,book-id=1,socket-id=1,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=33,drawer-id=0,book-id=1,socket-id=1,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=51,drawer-id=0,book-id=1,socket-id=1,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=21,drawer-id=0,book-id=1,socket-id=1,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=72,drawer-id=0,book-id=1,socket-id=1,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=63,drawer-id=1,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=105,drawer-id=1,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=74,drawer-id=1,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=50,drawer-id=1,book-id=0,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=60,drawer-id=1,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=22,drawer-id=1,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=43,drawer-id=1,book-id=0,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=48,drawer-id=1,book-id=0,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=35,drawer-id=1,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=58,drawer-id=1,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=106,drawer-id=1,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=123,drawer-id=1,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=122,drawer-id=1,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=9,drawer-id=1,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=10,drawer-id=1,book-id=0,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=25,drawer-id=1,book-id=0,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=116,drawer-id=1,book-id=0,socket-id=1,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=26,drawer-id=1,book-id=0,socket-id=1,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=17,drawer-id=1,book-id=0,socket-id=1,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=20,drawer-id=1,book-id=0,socket-id=1,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=59,drawer-id=1,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=54,drawer-id=1,book-id=0,socket-id=1,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=70,drawer-id=1,book-id=0,socket-id=1,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=88,drawer-id=1,book-id=0,socket-id=1,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=6,drawer-id=1,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=52,drawer-id=1,book-id=0,socket-id=1,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=55,drawer-id=1,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=124,drawer-id=1,book-id=0,socket-id=1,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=61,drawer-id=1,book-id=0,socket-id=1,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=84,drawer-id=1,book-id=0,socket-id=1,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=68,drawer-id=1,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=86,drawer-id=1,book-id=0,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=4,drawer-id=1,book-id=1,socket-id=0,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=75,drawer-id=1,book-id=1,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=115,drawer-id=1,book-id=1,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=28,drawer-id=1,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=120,drawer-id=1,book-id=1,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=41,drawer-id=1,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=87,drawer-id=1,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=119,drawer-id=1,book-id=1,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=114,drawer-id=1,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=104,drawer-id=1,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=27,drawer-id=1,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=121,drawer-id=1,book-id=1,socket-id=0,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=126,drawer-id=1,book-id=1,socket-id=0,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=37,drawer-id=1,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=32,drawer-id=1,book-id=1,socket-id=0,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=94,drawer-id=1,book-id=1,socket-id=0,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=110,drawer-id=1,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=77,drawer-id=1,book-id=1,socket-id=1,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=36,drawer-id=1,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=66,drawer-id=1,book-id=1,socket-id=1,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=83,drawer-id=1,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=47,drawer-id=1,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=99,drawer-id=1,book-id=1,socket-id=1,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=79,drawer-id=1,book-id=1,socket-id=1,entitlement=low,dedicated=false \
+-device max-s390x-cpu,core-id=100,drawer-id=1,book-id=1,socket-id=1,entitlement=medium,dedicated=false \
+-device max-s390x-cpu,core-id=89,drawer-id=1,book-id=1,socket-id=1,entitlement=high,dedicated=false \
+-device max-s390x-cpu,core-id=2,drawer-id=1,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=45,drawer-id=1,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=69,drawer-id=1,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=64,drawer-id=1,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=97,drawer-id=1,book-id=1,socket-id=1,entitlement=high,dedicated=true \
+-device max-s390x-cpu,core-id=111,drawer-id=1,book-id=1,socket-id=1,entitlement=medium,dedicated=false \
+"""
Signature · 1 line
2.41.0
#32 lore raw

Re: [kvm-unit-tests PATCH 9/9] s390x: topology: Add complex topology test

Quoting Nina Schoetterl-Glausch (2023-10-11 10:56:32)

Quoted 1 line

Run the topology test case with a complex topology configuration.

Can you add a TL;DR comment which summarizes the topology? And/or put the script you used to generate the config in the commit message.