Skip to contentSkip to conversation

S390x: CPU Topology Information

PATCH Superseded Pierre Morel 2 participants 11 messages Apr 26, 2023 – May 3, 2023

Subsystems (2)

v8 of 21 Superseded Latest is v21 →

lore
Share & tools
lore
#0 lore raw

v8 cover S390x: CPU Topology Information

Hi,

new version of the kvm-unit-test s390x CPU topology series.

0. what is new in this new spin
-------------------------------

- Checking different entitlement for vertical polarization

1. what is done
---------------

- First part is checking PTF errors, for KVM and LPAR

- Second part is checking PTF polarization change and STSI with the cpu topology including drawers and books. This tests are run for KVM only.

To run these tests under KVM successfully you need Linux 6.0 and the latest QEMU patches you find at:

https://lists.gnu.org/archive/html/qemu-devel/2023-04/msg04568.html

Note that Fedora-35 already has the CPU Topology backport for Linux.

To start the test in KVM just do:

# ./run_tests.sh topology

or something like:

# ./s390x-run s390x/topology.elf \
	-smp 5,drawers=3,books=3,sockets=4,cores=4,maxcpus=144 \
	-append '-drawers 3 -books 3 -sockets 4 -cores 4'

Of course the declaration of the number of drawers, books, socket and core must be coherent between -smp and -append arguments.

- Running the test on LPAR has been getestet on a46lp21

Regards,
Pierre

Pierre Morel (2):
s390x: topology: Check the Perform Topology Function
s390x: topology: Checking Configuration Topology Information

 lib/s390x/sclp.c    |   6 +
 lib/s390x/sclp.h    |   4 +-
 lib/s390x/stsi.h    |  36 ++++
 s390x/Makefile      |   1 +
 s390x/topology.c    | 516 ++++++++++++++++++++++++++++++++++++++++++++
 s390x/unittests.cfg |   6 +
 6 files changed, 568 insertions(+), 1 deletion(-)
 create mode 100644 s390x/topology.c
Signature · 44 lines
2.31.1

new in v8:

- define PTF_INVALID_FUNCTION
  (Claudio)

- test every single bits for specification in the ptf instruction
  (Claudio)

- test vertical polarization twice
  (Claudio)

- add an assert(read_info)
  (Nico)

- changed skips
  (Nico)


new in v7:

- better checks using device attributes on commandline
  (Pierre)
- use builtin to get the number of CPU in the TLE mask
  (Thomas)
- use Elvis (not dead)
  (Thomas)
- reset before tests
  (Nina)
- splitting test_ptf in small functions
  (Thomas)
- check every ptf function code for program check
  (Nina)
- Test made on LPAR
  (Janosch)
- use a single page for SYSIB
  (Thomas)
- abort on wrong parameter
  (Thomas)
- implement SYSIB check with a recursive funtion
  (Nina)
- diverse little changes (naming, clearer checks
  (Nina, Thomas)
#1 lore raw

PATCH v8 1/2 s390x: topology: Check the Perform Topology Function

We check that the PTF instruction is working correctly when the cpu topology facility is available.

For KVM only, we test changing of the polarity between horizontal and vertical and that a reset set the horizontal polarity.

---
 s390x/Makefile      |   1 +
 s390x/topology.c    | 191 ++++++++++++++++++++++++++++++++++++++++++++
 s390x/unittests.cfg |   3 +
 3 files changed, 195 insertions(+)
 create mode 100644 s390x/topology.c
s390x/Makefile +1 -0
index a80db53..fe77b07 100644
@@ -40,6 +40,7 @@ tests += $(TEST_DIR)/panic-loop-pgm.elf
 tests += $(TEST_DIR)/migration-sck.elf
 tests += $(TEST_DIR)/exittime.elf
 tests += $(TEST_DIR)/ex.elf
+tests += $(TEST_DIR)/topology.elf
 
 pv-tests += $(TEST_DIR)/pv-diags.elf
 
s390x/topology.c new file +191 -0

191 lines not on this page · raw message

s390x/unittests.cfg +3 -0
index b61faf0..fc3666b 100644
@@ -218,3 +218,6 @@ extra_params = -append '--parallel'
 
 [execute]
 file = ex.elf
+
+[topology]
+file = topology.elf
Signature · 1 line
2.31.1
#2 lore raw

Re: [kvm-unit-tests PATCH v8 1/2] s390x: topology: Check the Perform Topology Function

Quoting Pierre Morel (2023-04-26 10:34:25)
[...]

Quoted 6 lines
s390x/topology.c new file +0 -0
new file mode 100644
index 0000000..07f1650
@@ -0,0 +1,191 @@

[...]

Quoted 1 line

+#define PTF_INVALID_FUNCTION 0xff

No longer used?

[...]

Quoted 5 lines
s390x/topology.c new file +5 -0
+static void check_specifications(void)
+{
+       unsigned long wrong_bits = 0;
+       unsigned long ptf_bits;
+       unsigned long rc;

s390x/topology.c line 75

Quoted 10 lines
s390x/topology.c new file +10 -0
+       int i;
+
+       report_prefix_push("Specifications");
+
+       /* Function codes above 3 are undefined */
+       for (i = 4; i < 255; i++) {
+               expect_pgm_int();
+               ptf(i, &rc);
+               mb();
+               if (lowcore.pgm_int_code != PGM_INT_CODE_SPECIFICATION) {

Please use clear_pgm_int(), the return value will be the interruption code. You can also get rid of the barrier then.

Also, using wrong_bits is confusing here since it serves a completely different purpose below.

Maybe just:

if (clear_pgm_int() != PGM_INT_CODE_SPECIFICATION)

    report_fail("FC %d did not yield specification exception", i);

[...]

s390x/topology.c line 89

Quoted 7 lines
s390x/topology.c new file +7 -0
+       /* Reserved bits must be 0 */
+       for (i = 8, wrong_bits = 0; i < 64; i++) {
+               ptf_bits = 0x01UL << i;
+               expect_pgm_int();
+               ptf(ptf_bits, &rc);
+               mb();
+               if (lowcore.pgm_int_code != PGM_INT_CODE_SPECIFICATION)

Also use clear_pgm_int() here.

#3 lore raw

Re: [kvm-unit-tests PATCH v8 1/2] s390x: topology: Check the Perform Topology Function

Quoted 11 lines · Nico Boehr

Quoting Pierre Morel (2023-04-26 10:34:25)
[...]

Quoted 6 lines
s390x/topology.c new file +0 -0
new file mode 100644
index 0000000..07f1650
@@ -0,0 +1,191 @@

[...]

Quoted 1 line

+#define PTF_INVALID_FUNCTION 0xff

No longer used?

right

Quoted 19 lines

[...]

Quoted 5 lines
s390x/topology.c new file +5 -0
+static void check_specifications(void)
+{
+       unsigned long wrong_bits = 0;
+       unsigned long ptf_bits;
+       unsigned long rc;

s390x/topology.c line 75

Quoted 10 lines
s390x/topology.c new file +10 -0
+       int i;
+
+       report_prefix_push("Specifications");
+
+       /* Function codes above 3 are undefined */
+       for (i = 4; i < 255; i++) {
+               expect_pgm_int();
+               ptf(i, &rc);
+               mb();
+               if (lowcore.pgm_int_code != PGM_INT_CODE_SPECIFICATION) {

Please use clear_pgm_int(), the return value will be the interruption code. You can also get rid of the barrier then.

Quoted 6 lines

Also, using wrong_bits is confusing here since it serves a completely different purpose below.

Maybe just:

if (clear_pgm_int() != PGM_INT_CODE_SPECIFICATION)

     report_fail("FC %d did not yield specification exception", i);

OK, thanks,

Quoted 10 lines

[...]

s390x/topology.c line 89

Quoted 7 lines
s390x/topology.c new file +7 -0
+       /* Reserved bits must be 0 */
+       for (i = 8, wrong_bits = 0; i < 64; i++) {
+               ptf_bits = 0x01UL << i;
+               expect_pgm_int();
+               ptf(ptf_bits, &rc);
+               mb();
+               if (lowcore.pgm_int_code != PGM_INT_CODE_SPECIFICATION)

Also use clear_pgm_int() here.

OK, too, thanks

Regards,

Pierre

#4 lore raw

PATCH v8 2/2 s390x: topology: Checking Configuration Topology Information

In reply to Pierre Morel

STSI with function code 15 is used to store the CPU configuration topology.

We retrieve the maximum nested level with SCLP and use the topology tree provided by the drawers, books, sockets, cores arguments.

We check :
- if the topology stored is coherent between the QEMU -smp parameters and kernel parameters.
- the number of CPUs
- the maximum number of CPUs
- the number of containers of each levels for every STSI(15.1.x) instruction allowed by the machine.

---
 lib/s390x/sclp.c    |   6 +
 lib/s390x/sclp.h    |   4 +-
 lib/s390x/stsi.h    |  36 +++++
 s390x/topology.c    | 325 ++++++++++++++++++++++++++++++++++++++++++++
 s390x/unittests.cfg |   3 +
 5 files changed, 373 insertions(+), 1 deletion(-)
lib/s390x/sclp.c +6 -0
index 07523dc..c09360d 100644
@@ -239,3 +239,9 @@ uint64_t get_max_ram_size(void)
 {
 	return max_ram_size;
 }
+
+uint64_t sclp_get_stsi_mnest(void)
+{
+	assert(read_info);
+	return read_info->stsi_parm;
+}
lib/s390x/sclp.h +3 -1
index 853529b..6a611bc 100644
@@ -150,7 +150,8 @@ typedef struct ReadInfo {
 	SCCBHeader h;
 	uint16_t rnmax;
 	uint8_t rnsize;
-	uint8_t  _reserved1[16 - 11];       /* 11-15 */
+	uint8_t  _reserved1[15 - 11];       /* 11-14 */
+	uint8_t stsi_parm;                  /* 15-15 */
 	uint16_t entries_cpu;               /* 16-17 */
 	uint16_t offset_cpu;                /* 18-19 */
 	uint8_t  _reserved2[24 - 20];       /* 20-23 */
@@ -341,5 +342,6 @@ int sclp_service_call(unsigned int command, void *sccb);
 void sclp_memory_setup(void);
 uint64_t get_ram_size(void);
 uint64_t get_max_ram_size(void);
+uint64_t sclp_get_stsi_mnest(void);
 
 #endif /* _S390X_SCLP_H_ */
lib/s390x/stsi.h +36 -0
index bebc492..1351a6f 100644
@@ -29,4 +29,40 @@ struct sysinfo_3_2_2 {
 	uint8_t ext_names[8][256];
 };
 
+#define CPUS_TLE_RES_BITS 0x00fffffff8000000UL
+struct topology_core {
+	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_entry {
+	uint8_t nl;
+	struct topology_core cpu;
+	struct topology_container container;
+};
+
+#define CPU_TOPOLOGY_MAX_LEVEL 6
+struct sysinfo_15_1_x {
+	uint8_t reserved0[2];
+	uint16_t length;
+	uint8_t mag[CPU_TOPOLOGY_MAX_LEVEL];
+	uint8_t reserved0a;
+	uint8_t mnest;
+	uint8_t reserved0c[4];
+	union topology_entry tle[];
+};
+
 #endif  /* _S390X_STSI_H_ */
s390x/topology.c +325 -0

348 lines not on this page · raw message

s390x/unittests.cfg +3 -0
index fc3666b..375e6ce 100644
@@ -221,3 +221,6 @@ file = ex.elf
 
 [topology]
 file = topology.elf
+# 3 CPUs on socket 0 with different CPU TLE (standard, dedicated, origin)
+# 1 CPU on socket 2
+extra_params = -smp 1,drawers=3,books=3,sockets=4,cores=4,maxcpus=144 -cpu z14,ctop=on -device z14-s390x-cpu,core-id=1,entitlement=low -device z14-s390x-cpu,core-id=2,dedicated=on -device z14-s390x-cpu,core-id=10 -device z14-s390x-cpu,core-id=20 -device z14-s390x-cpu,core-id=130,socket-id=0,book-id=0,drawer-id=0 -append '-drawers 3 -books 3 -sockets 4 -cores 4'
Signature · 1 line
2.31.1
#5 lore raw

Re: [kvm-unit-tests PATCH v8 2/2] s390x: topology: Checking Configuration Topology Information

Quoting Pierre Morel (2023-04-26 10:34:26)

Quoted 5 lines
s390x/topology.c +0 -0
index 07f1650..42a9cc9 100644
@@ -17,6 +17,20 @@

[...]

Quoted 9 lines
s390x/topology.c +9 -0
+/**
+ * check_tle:
+ * @tc: pointer to first TLE
+ *
+ * Recursively check the containers TLEs until we
+ * find a CPU TLE.
+ */
+static uint8_t *check_tle(void *tc)
+{

[...]

s390x/topology.c static void test_ptf(void) · line 279

Quoted 3 lines
s390x/topology.c +3 -0
+
+       report(!cpus->d || (cpus->pp == 3 || cpus->pp == 0),
+              "Dedication versus entitlement");

Again, I would prefer something like this:

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")

No?

[...]

Quoted 16 lines
s390x/topology.c +16 -0
+/**
+ * check_sysinfo_15_1_x:
+ * @info: pointer to the STSI info structure
+ * @sel2: the selector giving the topology level to check
+ *
+ * Check if the validity of the STSI instruction and then
+ * calls specific checks on the information buffer.
+ */
+static void check_sysinfo_15_1_x(struct sysinfo_15_1_x *info, int sel2)
+{
+       int ret;
+       int cc;
+       unsigned long rc;
+
+       report_prefix_pushf("15_1_%d", sel2);
+

s390x/topology.c static void test_ptf(void) · line 366

Quoted 10 lines
s390x/topology.c +10 -0
+       ret = stsi_get_sysib(info, sel2);
+       if (ret) {
+               report_skip("Selector 2 not supported by architecture");
+               goto end;
+       }
+
+       report_prefix_pushf("H");
+       cc = ptf(PTF_REQ_HORIZONTAL, &rc);
+       if (cc != 0 && rc != PTF_ERR_ALRDY_POLARIZED) {
+               report(0, "Unable to set horizontal polarization");

report_fail() please

s390x/topology.c static void test_ptf(void) · line 379

Quoted 13 lines
s390x/topology.c +13 -0
+               goto vertical;
+       }
+
+       stsi_check_mag(info);
+       stsi_check_tle_coherency(info);
+
+vertical:
+       report_prefix_pop();
+       report_prefix_pushf("V");
+
+       cc = ptf(PTF_REQ_VERTICAL, &rc);
+       if (cc != 0 && rc != PTF_ERR_ALRDY_POLARIZED) {
+               report(0, "Unable to set vertical polarization");

report_fail() please

[...]

Quoted 1 line

+static int arch_max_cpus(void)

Does the name arch_max_cpus() make sense? Maybe expected_num_cpus()?

s390x/unittests.cfg file = ex.elf · line 226

Quoted 11 lines
s390x/unittests.cfg +3 -0
index fc3666b..375e6ce 100644
@@ -221,3 +221,6 @@ file = ex.elf
 
 [topology]
 file = topology.elf
+# 3 CPUs on socket 0 with different CPU TLE (standard, dedicated, origin)
+# 1 CPU on socket 2
+extra_params = -smp 1,drawers=3,books=3,sockets=4,cores=4,maxcpus=144 -cpu z14,ctop=on -device z14-s390x-cpu,core-id=1,entitlement=low -device z14-s390x-cpu,core-id=2,dedicated=on -device z14-s390x-cpu,core-id=10 -device z14-s390x-cpu,core-id=20 -device z14-s390x-cpu,core-id=130,socket-id=0,book-id=0,drawer-id=0 -append '-drawers 3 -books 3 -sockets 4 -cores 4'

If I got the command line right, all CPUs are on the same drawer with this command line, aren't they? If so, does it make sense to run with different combinations, i.e. CPUs on different drawers, books etc?

#6 lore raw

Re: [kvm-unit-tests PATCH v8 2/2] s390x: topology: Checking Configuration Topology Information

Quoted 22 lines · Nico Boehr

Quoting Pierre Morel (2023-04-26 10:34:26)

Quoted 5 lines
s390x/topology.c +0 -0
index 07f1650..42a9cc9 100644
@@ -17,6 +17,20 @@

[...]

Quoted 9 lines
s390x/topology.c +9 -0
+/**
+ * check_tle:
+ * @tc: pointer to first TLE
+ *
+ * Recursively check the containers TLEs until we
+ * find a CPU TLE.
+ */
+static uint8_t *check_tle(void *tc)
+{

[...]

s390x/topology.c static void test_ptf(void) · line 279

Quoted 3 lines
s390x/topology.c +3 -0
+
+       report(!cpus->d || (cpus->pp == 3 || cpus->pp == 0),
+              "Dedication versus entitlement");

Again, I would prefer something like this:

Quoted 8 lines

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")

No?

[...]

Yes looks better, thanks

Quoted 20 lines
Quoted 20 lines
s390x/topology.c +19 -0
+/**
+ * check_sysinfo_15_1_x:
+ * @info: pointer to the STSI info structure
+ * @sel2: the selector giving the topology level to check
+ *
+ * Check if the validity of the STSI instruction and then
+ * calls specific checks on the information buffer.
+ */
+static void check_sysinfo_15_1_x(struct sysinfo_15_1_x *info, int sel2)
+{
+       int ret;
+       int cc;
+       unsigned long rc;
+
+       report_prefix_pushf("15_1_%d", sel2);
+
+       ret = stsi_get_sysib(info, sel2);
+       if (ret) {
+               report_skip("Selector 2 not supported by architecture");
Quoted 8 lines

s390x/topology.c static void test_ptf(void) · line 366

Quoted 7 lines
s390x/topology.c +7 -0
+               goto end;
+       }
+
+       report_prefix_pushf("H");
+       cc = ptf(PTF_REQ_HORIZONTAL, &rc);
+       if (cc != 0 && rc != PTF_ERR_ALRDY_POLARIZED) {
+               report(0, "Unable to set horizontal polarization");

report_fail() please

OK

Quoted 15 lines
Quoted 4 lines
s390x/topology.c +3 -0
+               goto vertical;
+       }
+

s390x/topology.c static void test_ptf(void) · line 379

Quoted 10 lines
s390x/topology.c +10 -0
+       stsi_check_mag(info);
+       stsi_check_tle_coherency(info);
+
+vertical:
+       report_prefix_pop();
+       report_prefix_pushf("V");
+
+       cc = ptf(PTF_REQ_VERTICAL, &rc);
+       if (cc != 0 && rc != PTF_ERR_ALRDY_POLARIZED) {
+               report(0, "Unable to set vertical polarization");

report_fail() please

OK

Quoted 4 lines

[...]

Quoted 1 line

+static int arch_max_cpus(void)

Does the name arch_max_cpus() make sense? Maybe expected_num_cpus()?

Yes OK.

Quoted 7 lines
Quoted 7 lines
s390x/unittests.cfg +0 -0
index fc3666b..375e6ce 100644
@@ -221,3 +221,6 @@ file = ex.elf
 
Quoted 6 lines

s390x/unittests.cfg file = ex.elf · line 226

Quoted 5 lines
s390x/unittests.cfg +3 -0
  [topology]
  file = topology.elf
+# 3 CPUs on socket 0 with different CPU TLE (standard, dedicated, origin)
+# 1 CPU on socket 2
+extra_params = -smp 1,drawers=3,books=3,sockets=4,cores=4,maxcpus=144 -cpu z14,ctop=on -device z14-s390x-cpu,core-id=1,entitlement=low -device z14-s390x-cpu,core-id=2,dedicated=on -device z14-s390x-cpu,core-id=10 -device z14-s390x-cpu,core-id=20 -device z14-s390x-cpu,core-id=130,socket-id=0,book-id=0,drawer-id=0 -append '-drawers 3 -books 3 -sockets 4 -cores 4'

If I got the command line right, all CPUs are on the same drawer with this command line, aren't they? If so, does it make sense to run with different combinations, i.e. CPUs on different drawers, books etc?

OK, I will add some CPU on different drawers and books.

#7 lore raw

Re: [kvm-unit-tests PATCH v8 2/2] s390x: topology: Checking Configuration Topology Information

Quoting Pierre Morel (2023-04-27 16:50:16)
[...]

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
s390x/unittests.cfg +0 -0
index fc3666b..375e6ce 100644
@@ -221,3 +221,6 @@ file = ex.elf
 
Quoted 8 lines
Quoted 6 lines

s390x/unittests.cfg file = ex.elf · line 226

Quoted 5 lines
s390x/unittests.cfg +3 -0
  [topology]
  file = topology.elf
+# 3 CPUs on socket 0 with different CPU TLE (standard, dedicated, origin)
+# 1 CPU on socket 2
+extra_params = -smp 1,drawers=3,books=3,sockets=4,cores=4,maxcpus=144 -cpu z14,ctop=on -device z14-s390x-cpu,core-id=1,entitlement=low -device z14-s390x-cpu,core-id=2,dedicated=on -device z14-s390x-cpu,core-id=10 -device z14-s390x-cpu,core-id=20 -device z14-s390x-cpu,core-id=130,socket-id=0,book-id=0,drawer-id=0 -append '-drawers 3 -books 3 -sockets 4 -cores 4'

If I got the command line right, all CPUs are on the same drawer with this command line, aren't they? If so, does it make sense to run with different combinations, i.e. CPUs on different drawers, books etc?

OK, I will add some CPU on different drawers and books.

just to clarify: What I meant is adding an *additional* entry to unittests.cfg. Does it make sense in your opinion? I just want more coverage for different scenarios we may have.

#8 lore raw

Re: [kvm-unit-tests PATCH v8 2/2] s390x: topology: Checking Configuration Topology Information

Quoted 8 lines · Nico Boehr

Quoting Pierre Morel (2023-04-27 16:50:16)
[...]

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
s390x/unittests.cfg +0 -0
index fc3666b..375e6ce 100644
@@ -221,3 +221,6 @@ file = ex.elf
 
Quoted 8 lines
Quoted 7 lines
Quoted 6 lines

s390x/unittests.cfg file = ex.elf · line 226

Quoted 5 lines
s390x/unittests.cfg +3 -0
   [topology]
   file = topology.elf
+# 3 CPUs on socket 0 with different CPU TLE (standard, dedicated, origin)
+# 1 CPU on socket 2
+extra_params = -smp 1,drawers=3,books=3,sockets=4,cores=4,maxcpus=144 -cpu z14,ctop=on -device z14-s390x-cpu,core-id=1,entitlement=low -device z14-s390x-cpu,core-id=2,dedicated=on -device z14-s390x-cpu,core-id=10 -device z14-s390x-cpu,core-id=20 -device z14-s390x-cpu,core-id=130,socket-id=0,book-id=0,drawer-id=0 -append '-drawers 3 -books 3 -sockets 4 -cores 4'

If I got the command line right, all CPUs are on the same drawer with this command line, aren't they? If so, does it make sense to run with different combinations, i.e. CPUs on different drawers, books etc?

OK, I will add some CPU on different drawers and books.

just to clarify: What I meant is adding an *additional* entry to unittests.cfg. Does it make sense in your opinion? I just want more coverage for different scenarios we may have.

Ah OK, yes even better.

In this test I chose the values randomly, I can add 2 other tests like

- once with the maximum of CPUs like:

[topology-2]
file = topology.elf
extra_params = -smp drawers=3,books=4,sockets=5,cores=4,maxcpus=240  -append '-drawers 3 -books 4 -sockets 5 -cores 4'

or having 8 different TLE on the same socket

[topology-2]

file = topology.elf
extra_params = -smp 1,drawers=2,books=2,sockets=2,cores=30,maxcpus=240  -append '-drawers 2 -books 2 -sockets 2 -cores 30' -cpu z14,ctop=on -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=2,entitlement=low -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=3,entitlement=medium -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=4,entitlement=high -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=5,entitlement=high,dedicated=on -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=65,entitlement=low -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=66,entitlement=medium -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=67,entitlement=high -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=68,entitlement=high,dedicated=on

What do you think is the best ?

Regards,

Pierre

#9 lore raw

Re: [kvm-unit-tests PATCH v8 2/2] s390x: topology: Checking Configuration Topology Information

Quoting Pierre Morel (2023-04-28 15:10:07)

Quoted 56 lines · Nico Boehr
Quoted 8 lines

Quoting Pierre Morel (2023-04-27 16:50:16)
[...]

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
s390x/unittests.cfg +0 -0
index fc3666b..375e6ce 100644
@@ -221,3 +221,6 @@ file = ex.elf
 
Quoted 8 lines
Quoted 7 lines
Quoted 6 lines

s390x/unittests.cfg file = ex.elf · line 226

Quoted 5 lines
s390x/unittests.cfg +3 -0
   [topology]
   file = topology.elf
+# 3 CPUs on socket 0 with different CPU TLE (standard, dedicated, origin)
+# 1 CPU on socket 2
+extra_params = -smp 1,drawers=3,books=3,sockets=4,cores=4,maxcpus=144 -cpu z14,ctop=on -device z14-s390x-cpu,core-id=1,entitlement=low -device z14-s390x-cpu,core-id=2,dedicated=on -device z14-s390x-cpu,core-id=10 -device z14-s390x-cpu,core-id=20 -device z14-s390x-cpu,core-id=130,socket-id=0,book-id=0,drawer-id=0 -append '-drawers 3 -books 3 -sockets 4 -cores 4'

If I got the command line right, all CPUs are on the same drawer with this command line, aren't they? If so, does it make sense to run with different combinations, i.e. CPUs on different drawers, books etc?

OK, I will add some CPU on different drawers and books.

just to clarify: What I meant is adding an *additional* entry to unittests.cfg. Does it make sense in your opinion? I just want more coverage for different scenarios we may have.

Ah OK, yes even better.

In this test I chose the values randomly, I can add 2 other tests like

- once with the maximum of CPUs like:

[topology-2]
file = topology.elf
extra_params = -smp drawers=3,books=4,sockets=5,cores=4,maxcpus=240 -append '-drawers 3 -books 4 -sockets 5 -cores 4'

or having 8 different TLE on the same socket

[topology-2]

file = topology.elf
extra_params = -smp 1,drawers=2,books=2,sockets=2,cores=30,maxcpus=240

(quoted diff) +0 -2
-append '-drawers 2 -books 2 -sockets 2 -cores 30' -cpu z14,ctop=on 
-device 

z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=2,entitlement=low -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=3,entitlement=medium -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=4,entitlement=high -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=5,entitlement=high,dedicated=on -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=65,entitlement=low -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=66,entitlement=medium -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=67,entitlement=high -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=68,entitlement=high,dedicated=on

Quoted 1 line

What do you think is the best ?

I think both do make sense, since they cover differenct scenarios, don't they?

#10 lore raw

Re: [kvm-unit-tests PATCH v8 2/2] s390x: topology: Checking Configuration Topology Information

Quoted 55 lines · Nico Boehr

Quoting Pierre Morel (2023-04-28 15:10:07)

Quoted 54 lines · Nico Boehr
Quoted 8 lines

Quoting Pierre Morel (2023-04-27 16:50:16)
[...]

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
s390x/unittests.cfg +0 -0
index fc3666b..375e6ce 100644
@@ -221,3 +221,6 @@ file = ex.elf
 
Quoted 8 lines
Quoted 7 lines
Quoted 6 lines

s390x/unittests.cfg file = ex.elf · line 226

Quoted 5 lines
s390x/unittests.cfg +3 -0
    [topology]
    file = topology.elf
+# 3 CPUs on socket 0 with different CPU TLE (standard, dedicated, origin)
+# 1 CPU on socket 2
+extra_params = -smp 1,drawers=3,books=3,sockets=4,cores=4,maxcpus=144 -cpu z14,ctop=on -device z14-s390x-cpu,core-id=1,entitlement=low -device z14-s390x-cpu,core-id=2,dedicated=on -device z14-s390x-cpu,core-id=10 -device z14-s390x-cpu,core-id=20 -device z14-s390x-cpu,core-id=130,socket-id=0,book-id=0,drawer-id=0 -append '-drawers 3 -books 3 -sockets 4 -cores 4'

If I got the command line right, all CPUs are on the same drawer with this command line, aren't they? If so, does it make sense to run with different combinations, i.e. CPUs on different drawers, books etc?

OK, I will add some CPU on different drawers and books.

just to clarify: What I meant is adding an *additional* entry to unittests.cfg. Does it make sense in your opinion? I just want more coverage for different scenarios we may have.

Ah OK, yes even better.

In this test I chose the values randomly, I can add 2 other tests like

- once with the maximum of CPUs like:

[topology-2]
file = topology.elf
extra_params = -smp drawers=3,books=4,sockets=5,cores=4,maxcpus=240 -append '-drawers 3 -books 4 -sockets 5 -cores 4'

or having 8 different TLE on the same socket

[topology-2]

file = topology.elf
extra_params = -smp 1,drawers=2,books=2,sockets=2,cores=30,maxcpus=240

(quoted diff) +0 -2
-append '-drawers 2 -books 2 -sockets 2 -cores 30' -cpu z14,ctop=on
-device

z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=2,entitlement=low -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=3,entitlement=medium -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=4,entitlement=high -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=5,entitlement=high,dedicated=on -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=65,entitlement=low -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=66,entitlement=medium -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=67,entitlement=high -device z14-s390x-cpu,drawer-id=1,book-id=0,socket-id=0,core-id=68,entitlement=high,dedicated=on

Quoted 2 lines
Quoted 1 line

What do you think is the best ?

I think both do make sense, since they cover differenct scenarios, don't they?

Yes,

also

[topology-2]
file = topology.elf
extra_params = -smp books=2,sockets=31,cores=4,maxcpus=248 -append '-drawers 1 -books 2 -sockets 31 -cores 4'

Could make sense too, it is the way I found the sclp problem, but it will fail until sclp is fixed using facility 140.