s390x: topology: Fixes and extension
v3 cover s390x: topology: Fixes and extension
v2 -> v3 (range-diff below):
* pick up tags (thanks Janosch, thanks Nico, thanks Thomas)
* fix ordering test
* get rid of duplicate reports
v1 -> v2:
* patch 1, introducing enums (Janosch)
* add comment explaining 8 alignment of stsi block length
* unsigned cpu_in_masks, iteration (Nico)
* fix copy paste error when checking ordering (thanks Nina)
* don't escape newline when \\ at end of line in multiline string
* change commit messages (thanks Janosch, thanks Nico)
* pick up tags (thanks Janosch, thanks Nico)
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 (10):
s390x: topology: Introduce enums for polarization & cpu type
s390x: topology: Fix report message
s390x: topology: Use function parameter in stsi_get_sysib
s390x: topology: Fix parsing loop
s390x: topology: Make some report messages unique
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 | 16 +++ scripts/runtime.bash | 4 +- lib/s390x/stsi.h | 47 ++++++--- s390x/topology.c | 244 +++++++++++++++++++++++++++---------------- s390x/unittests.cfg | 133 +++++++++++++++++++++++ 5 files changed, 335 insertions(+), 109 deletions(-)
Range-diff against v2:
1: 334fec11 ! 1: c9bf5572 s390x: topology: Introduce enums for polarization & cpu type
@@ Commit message
Thereby get rid of magic values.
+ Reviewed-by: Nico Boehr <[email protected]>
+ Reviewed-by: Janosch Frank <[email protected]>
## lib/s390x/stsi.h ##
2: e3fabae5 ! 2: 038330af s390x: topology: Fix report message
@@ Commit message
A polarization value of 0 means horizontal polarization.
+ Reviewed-by: Janosch Frank <[email protected]>
## s390x/topology.c ##
3: 95c652d4 = 3: 37cc2bb5 s390x: topology: Use function parameter in stsi_get_sysib 4: c3d2eabb ! 4: d4fcb174 s390x: topology: Fix parsing loop
@@ Commit message
Without a comparison the loop is infinite.
+ Reviewed-by: Janosch Frank <[email protected]>
## s390x/topology.c ##
5: 3bab8b7a = 5: ac883c6c s390x: topology: Make some report messages unique 6: 3aac2b2d ! 6: 744a15b7 s390x: topology: Refine stsi header test
@@ Commit message
Also minor refactor.
+ Reviewed-by: Janosch Frank <[email protected]>
## s390x/topology.c ##
7: c2cdd5ff = 7: f6eea5d1 s390x: topology: Rename topology_core to topology_cpu
8: 95e9a32f ! 8: 55eb47bf s390x: topology: Rewrite topology list test
@@ Commit message
This improves comprehension and allows for more tests.
We now also test for ordering of CPU TLEs and number of child entries.
+ Acked-by: Janosch Frank <[email protected]>
Signed-off-by: Nina Schoetterl-Glausch <[email protected]>
## lib/s390x/stsi.h ##
@@ s390x/topology.c: static int stsi_get_sysib(struct sysinfo_15_1_x *info, int sel
+{
+ void *last = ((void *)info) + info->length;
+ union topology_cpu *prev_cpu = NULL;
++ bool correct_ordering = true;
+ unsigned int cpus = 0;
+ int i;
+
-+ for (i = 0; (void *)&child[i] < last && child[i].nl == 0; i++) {
++ for (i = 0; (void *)&child[i] < last && child[i].nl == 0; prev_cpu = &child[i++]) {
+ cpus += check_cpu(&child[i], cont);
+ if (prev_cpu) {
-+ report(prev_cpu->type <= child[i].type, "Correct ordering wrt type");
++ if (prev_cpu->type > child[i].type) {
++ report_info("Incorrect ordering wrt type for child %d", i);
++ correct_ordering = false;
++ }
+ if (prev_cpu->type < child[i].type)
+ continue;
-+ report(prev_cpu->pp >= child[i].pp, "Correct ordering wrt polarization");
++ if (prev_cpu->pp < child[i].pp) {
++ report_info("Incorrect ordering wrt polarization for child %d", i);
++ correct_ordering = false;
++ }
+ if (prev_cpu->pp > child[i].pp)
+ continue;
-+ report(prev_cpu->d || !child[i].d, "Correct ordering wrt dedication");
++ if (!prev_cpu->d && child[i].d) {
++ report_info("Incorrect ordering wrt dedication for child %d", i);
++ correct_ordering = false;
++ }
+ if (prev_cpu->d && !child[i].d)
+ continue;
-+ report(prev_cpu->origin <= child[i].origin, "Correct ordering wrt origin");
++ if (prev_cpu->origin > child[i].origin) {
++ report_info("Incorrect ordering wrt origin for child %d", i);
++ correct_ordering = false;
++ }
+ }
-+ prev_cpu = &child[i];
+ }
++ report(correct_ordering, "children correctly ordered");
+ report(cpus <= expected_topo_lvl[0], "%d children <= max of %d",
+ cpus, expected_topo_lvl[0]);
+ *cpus_in_masks += cpus; 9: d7317d8b ! 9: 8099ad07 scripts: Implement multiline strings for extra_params
@@ Commit message
The command string built with extra_params is eval'ed by the runtime script, so the newlines need to be escaped with \.
+ Reviewed-by: Thomas Huth <[email protected]>
## scripts/common.bash ##
10: fe527ddb = 10: 5e667461 s390x: topology: Add complex topology test
base-commit: bfe5d7d0e14c8199d134df84d6ae8487a9772c48
Signature · 1 line
2.41.0
PATCH v3 1/10 s390x: topology: Introduce enums for polarization & cpu type
Thereby get rid of magic values.
--- lib/s390x/stsi.h | 11 +++++++++++ s390x/topology.c | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-)
lib/s390x/stsi.h +11 -0
@@ -41,6 +41,17 @@ struct topology_core {uint64_t mask; }; +enum topology_polarization { +POLARIZATION_HORIZONTAL =0 , +POLARIZATION_VERTICAL_LOW =1 , +POLARIZATION_VERTICAL_MEDIUM =2 , +POLARIZATION_VERTICAL_HIGH =3 , +}; + +enum cpu_type { +CPU_TYPE_IFL =3 , +}; +#define CONTAINER_TLE_RES_BITS 0x00ffffffffffff00ULstruct topology_container {uint8_t nl;
s390x/topology.c +4 -2
@@ -261,7 +261,7 @@ static uint8_t *check_tle(void *tc)report (!(*(uint64_t *)tc &CPUS_TLE_RES_BITS ),"reserved bits %016lx" , *(uint64_t *)tc &CPUS_TLE_RES_BITS ); -report (cpus->type ==0x03 ,"type IFL" ); +report (cpus->type ==CPU_TYPE_IFL ,"type IFL" );report_info ("origin: %d" , cpus->origin);report_info ("mask: %016lx" , cpus->mask);
@@ -275,7 +275,9 @@ 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 ==POLARIZATION_VERTICAL_HIGH || + cpus->pp ==POLARIZATION_HORIZONTAL , +"Dedicated CPUs are either vertically polarized or have high entitlement" );return tc +sizeof (*cpus); }
Signature · 1 line
2.41.0
PATCH v3 2/10 s390x: topology: Fix report message
In reply to Nina Schoetterl-GlauschA polarization value of 0 means horizontal polarization.
--- s390x/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
@@ -277,7 +277,7 @@ static uint8_t *check_tle(void *tc)else report (cpus->pp ==POLARIZATION_VERTICAL_HIGH || cpus->pp ==POLARIZATION_HORIZONTAL , -"Dedicated CPUs are either vertically polarized or have high entitlement" ); +"Dedicated CPUs are either horizontally polarized or have high entitlement" );return tc +sizeof (*cpus); }
Signature · 1 line
2.41.0
PATCH v3 3/10 s390x: topology: Use function parameter in stsi_get_sysib
In reply to Nina Schoetterl-GlauschActually use the function parameter we're give instead of a hardcoded access to the static variable pagebuf.
--- s390x/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
@@ -324,7 +324,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
PATCH v3 4/10 s390x: topology: Fix parsing loop
In reply to Nina Schoetterl-GlauschWithout a comparison the loop is infinite.
--- s390x/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/topology.c +1 -1
@@ -468,7 +468,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
PATCH v3 5/10 s390x: topology: Make some report messages unique
In reply to Nina Schoetterl-GlauschWhen 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
@@ -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
PATCH v3 6/10 s390x: topology: Refine stsi header test
In reply to Nina Schoetterl-GlauschAdd checks for length field.
Also minor refactor.
--- s390x/topology.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
s390x/topology.c +10 -6
@@ -187,18 +187,23 @@ 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" ); +/* Header is 16 bytes, each TLE 8 or 16, therefore alignment must be 8 at least */ +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);/*
@@ -328,7 +333,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" ); }
@@ -367,7 +371,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:
@@ -380,7 +384,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
PATCH v3 7/10 s390x: topology: Rename topology_core to topology_cpu
In reply to Nina Schoetterl-GlauschThis 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
@@ -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 ;
@@ -61,7 +61,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
@@ -247,7 +247,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
PATCH v3 8/10 s390x: topology: Rewrite topology list test
In reply to Nina Schoetterl-GlauschRewrite 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 | 214 +++++++++++++++++++++++++++++------------------ 2 files changed, 155 insertions(+), 95 deletions(-)
lib/s390x/stsi.h +21 -15
@@ -30,15 +30,18 @@ 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; + }; };enum topology_polarization {
@@ -53,16 +56,19 @@ enum cpu_type { };#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 +134 -80
250 lines not on this page · raw message
Signature · 1 line
2.41.0
PATCH v3 9/10 scripts: Implement multiline strings for extra_params
In reply to Nina Schoetterl-GlauschImplement 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 \.
--- scripts/common.bash | 16 ++++++++++++++++ scripts/runtime.bash | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-)
scripts/common.bash +16 -0
@@ -36,6 +36,22 @@ 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 + #escape backslash newline, but not double backslash + if [[ $opts =~ [^\\]*(\\*)$'\n'$ ]]; then + if (( ${#BASH_REMATCH[1]} % 2 == 1 )); then + opts=${opts%\\$'\n'} + fi + fi + 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
@@ -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
PATCH v3 10/10 s390x: topology: Add complex topology test
In reply to Nina Schoetterl-GlauschRun the topology test case with a complex topology configuration. Randomly generated with:
python -c 'import random
ds=bs=ss=2
cs=16
cids=list(range(1,ds*bs*ss*cs))random.shuffle(cids)
i = 0
for d in range(ds):
for b in range(bs):
for s in range(ss):
for c in range(cs):
if (d,b,s,c) != (0,0,0,0):
ded=["false","true"][random.randrange(0,2)]
ent="high" if ded == "true" else ["low", "medium", "high"][random.randrange(0,3)]
print(f"-device max-s390x-cpu,core-id={cids[i]},drawer-id={d},book-id={b},socket-id={s},entitlement={ent},dedicated={ded}")
i+=1'--- s390x/unittests.cfg | 133 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+)
s390x/unittests.cfg +133 -0
@@ -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
Quoting Nina Schoetterl-Glausch (2023-10-30 17:03:39)
Quoted 14 lines
v2 -> v3 (range-diff below):
* pick up tags (thanks Janosch, thanks Nico, thanks Thomas)
* fix ordering test
* get rid of duplicate reportsv1 -> v2:
* patch 1, introducing enums (Janosch)
* add comment explaining 8 alignment of stsi block length
* unsignedcpu_in_masks, iteration (Nico)
* fix copy paste error when checking ordering (thanks Nina)
* don't escape newline when \\ at end of line in multiline string
* change commit messages (thanks Janosch, thanks Nico)
* pick up tags (thanks Janosch, thanks Nico)
Quoted 5 lines
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 forextra_params.
Thanks, queued.