selftest/cgroup: Update test_cpuset_prs.sh to match changes

Unlike the list of isolated CPUs, it is not easy to programamatically
determine what sched domains are being created by the scheduler just
by examinng the data in various kernfs filesystems. The easiest way
to get this information is by enabling /sys/kernel/debug/sched/verbose
file to make those information displayed in the console. This is also
what the test_cpuset_prs.sh script is doing when the -v flag is given.

It is rather hard to fetch the data from the console and compare it to
the expected result. An easier way is to dump the expected sched-domain
information out to the console so that they can be visually compared
with the actual sched domain data. However, this have to be done manually
by visual inspection and so will only be done once in a while.

Moreover the preceding cpuset commits also change the cpuset behavior
requiring corresponding chanages in some test cases as well as new test
cases to test the newly added functionality.

Signed-off-by: Waiman Long <longman@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/tools/testing/selftests/cgroup/test_cpuset_prs.sh b/tools/testing/selftests/cgroup/test_cpuset_prs.sh
index 96bf2b5c5eb6f6acc36ba0e044e037a527f937de..7c08cc153367c2de12123d487098e5eabecccd76 100755 (executable)
--- a/tools/testing/selftests/cgroup/test_cpuset_prs.sh
+++ b/tools/testing/selftests/cgroup/test_cpuset_prs.sh
@@ -169,6 +169,14 @@ test_add_proc()
 #  T    = put a task into cgroup
 #  O<c>=<v> = Write <v> to CPU online file of <c>
 #
+# ECPUs    - effective CPUs of cpusets
+# Pstate   - partition root state
+# ISOLCPUS - isolated CPUs (<icpus>[,<icpus2>])
+#
+# Note that if there are 2 fields in ISOLCPUS, the first one is for
+# sched-debug matching which includes offline CPUs and single-CPU partitions
+# while the second one is for matching cpuset.cpus.isolated.
+#
 SETUP_A123_PARTITIONS="C1-3:P1:S+ C2-3:P1:S+ C3:P1"
 TEST_MATRIX=(
        #  old-A1 old-A2 old-A3 old-B1 new-A1 new-A2 new-A3 new-B1 fail ECPUs Pstate ISOLCPUS
@@ -228,23 +236,29 @@ TEST_MATRIX=(
        " C0-3:S+ C1-3:S+ C2-3     .    X2-3  X2-3:P2   .      .     0 A1:0-1,A2:2-3,A3:2-3 A1:P0,A2:P2 2-3"
        " C0-3:S+ C1-3:S+ C2-3     .    X2-3   X3:P2    .      .     0 A1:0-2,A2:3,A3:3 A1:P0,A2:P2 3"
        " C0-3:S+ C1-3:S+ C2-3     .    X2-3   X2-3  X2-3:P2   .     0 A1:0-1,A2:1,A3:2-3 A1:P0,A3:P2 2-3"
-       " C0-3:S+ C1-3:S+ C2-3     .    X2-3   X2-3 X2-3:P2:C3 .     0 A1:0-2,A2:1-2,A3:3 A1:P0,A3:P2 3"
+       " C0-3:S+ C1-3:S+ C2-3     .    X2-3   X2-3 X2-3:P2:C3 .     0 A1:0-1,A2:1,A3:2-3 A1:P0,A3:P2 2-3"
        " C0-3:S+ C1-3:S+ C2-3   C2-3     .      .      .      P2    0 A1:0-3,A2:1-3,A3:2-3,B1:2-3 A1:P0,A3:P0,B1:P-2"
        " C0-3:S+ C1-3:S+ C2-3   C4-5     .      .      .      P2    0 B1:4-5 B1:P2 4-5"
        " C0-3:S+ C1-3:S+ C2-3    C4    X2-3   X2-3  X2-3:P2   P2    0 A3:2-3,B1:4 A3:P2,B1:P2 2-4"
        " C0-3:S+ C1-3:S+ C2-3    C4    X2-3   X2-3 X2-3:P2:C1-3 P2  0 A3:2-3,B1:4 A3:P2,B1:P2 2-4"
        " C0-3:S+ C1-3:S+ C2-3    C4    X1-3  X1-3:P2   P2     .     0 A2:1,A3:2-3 A2:P2,A3:P2 1-3"
        " C0-3:S+ C1-3:S+ C2-3    C4    X2-3   X2-3  X2-3:P2 P2:C4-5 0 A3:2-3,B1:4-5 A3:P2,B1:P2 2-5"
+       " C4:X0-3:S+ X1-3:S+ X2-3  .      .      P2     .      .     0 A1:4,A2:1-3,A3:1-3 A2:P2 1-3"
+       " C4:X0-3:S+ X1-3:S+ X2-3  .      .      .      P2     .     0 A1:4,A2:4,A3:2-3 A3:P2 2-3"
 
        # Nested remote/local partition tests
        " C0-3:S+ C1-3:S+ C2-3   C4-5   X2-3  X2-3:P1   P2     P1    0 A1:0-1,A2:,A3:2-3,B1:4-5 \
                                                                       A1:P0,A2:P1,A3:P2,B1:P1 2-3"
        " C0-3:S+ C1-3:S+ C2-3    C4    X2-3  X2-3:P1   P2     P1    0 A1:0-1,A2:,A3:2-3,B1:4 \
                                                                       A1:P0,A2:P1,A3:P2,B1:P1 2-4,2-3"
+       " C0-3:S+ C1-3:S+ C2-3    C4    X2-3  X2-3:P1    .     P1    0 A1:0-1,A2:2-3,A3:2-3,B1:4 \
+                                                                      A1:P0,A2:P1,A3:P0,B1:P1"
        " C0-3:S+ C1-3:S+  C3     C4    X2-3  X2-3:P1   P2     P1    0 A1:0-1,A2:2,A3:3,B1:4 \
                                                                       A1:P0,A2:P1,A3:P2,B1:P1 2-4,3"
        " C0-4:S+ C1-4:S+ C2-4     .    X2-4  X2-4:P2  X4:P1    .    0 A1:0-1,A2:2-3,A3:4 \
                                                                       A1:P0,A2:P2,A3:P1 2-4,2-3"
+       " C0-4:S+ C1-4:S+ C2-4     .    X2-4  X2-4:P2 X3-4:P1   .    0 A1:0-1,A2:2,A3:3-4 \
+                                                                      A1:P0,A2:P2,A3:P1 2"
        " C0-4:X2-4:S+ C1-4:X2-4:S+:P2 C2-4:X4:P1 \
                                   .      .      X5      .      .    0 A1:0-4,A2:1-4,A3:2-4 \
                                                                       A1:P0,A2:P-2,A3:P-1"
@@ -270,8 +284,8 @@ TEST_MATRIX=(
                            .      .    X2-3    P2      .      .     0 A1:0-2,A2:3,XA2:3 A2:P2 3"
 
        # Invalid to valid local partition direct transition tests
-       " C1-3:S+:P2 C2-3:X1:P2 .  .      .      .      .      .     0 A1:1-3,XA1:1-3,A2:2-3:XA2: A1:P2,A2:P-2 1-3"
-       " C1-3:S+:P2 C2-3:X1:P2 .  .      .    X3:P2    .      .     0 A1:1-2,XA1:1-3,A2:3:XA2:3 A1:P2,A2:P2 1-3"
+       " C1-3:S+:P2 X4:P2  .      .      .      .      .      .     0 A1:1-3,XA1:1-3,A2:1-3:XA2: A1:P2,A2:P-2 1-3"
+       " C1-3:S+:P2 X4:P2  .      .      .    X3:P2    .      .     0 A1:1-2,XA1:1-3,A2:3:XA2:3 A1:P2,A2:P2 1-3"
        "  C0-3:P2   .      .    C4-6   C0-4     .      .      .     0 A1:0-4,B1:4-6 A1:P-2,B1:P0"
        "  C0-3:P2   .      .    C4-6 C0-4:C0-3  .      .      .     0 A1:0-3,B1:4-6 A1:P2,B1:P0 0-3"
        "  C0-3:P2   .      .  C3-5:C4-5  .      .      .      .     0 A1:0-3,B1:4-5 A1:P2,B1:P0 0-3"
@@ -282,21 +296,18 @@ TEST_MATRIX=(
        " C0-3:X1-3:S+:P2 C1-3:X2-3:S+:P2 C2-3:X3:P2 \
                                   .      .     X4      .      .     0 A1:1-3,A2:1-3,A3:2-3,XA2:,XA3: A1:P2,A2:P-2,A3:P-2 1-3"
        " C0-3:X1-3:S+:P2 C1-3:X2-3:S+:P2 C2-3:X3:P2 \
-                                  .      .     C4      .      .     0 A1:1-3,A2:1-3,A3:2-3,XA2:,XA3: A1:P2,A2:P-2,A3:P-2 1-3"
+                                  .      .    C4:X     .      .     0 A1:1-3,A2:1-3,A3:2-3,XA2:,XA3: A1:P2,A2:P-2,A3:P-2 1-3"
        # Local partition CPU change tests
        " C0-5:S+:P2 C4-5:S+:P1 .  .      .    C3-5     .      .     0 A1:0-2,A2:3-5 A1:P2,A2:P1 0-2"
        " C0-5:S+:P2 C4-5:S+:P1 .  .    C1-5     .      .      .     0 A1:1-3,A2:4-5 A1:P2,A2:P1 1-3"
 
        # cpus_allowed/exclusive_cpus update tests
        " C0-3:X2-3:S+ C1-3:X2-3:S+ C2-3:X2-3 \
-                                  .     C4      .      P2     .     0 A1:4,A2:4,XA2:,XA3:,A3:4 \
+                                  .    X:C4     .      P2     .     0 A1:4,A2:4,XA2:,XA3:,A3:4 \
                                                                       A1:P0,A3:P-2"
        " C0-3:X2-3:S+ C1-3:X2-3:S+ C2-3:X2-3 \
                                   .     X1      .      P2     .     0 A1:0-3,A2:1-3,XA1:1,XA2:,XA3:,A3:2-3 \
                                                                       A1:P0,A3:P-2"
-       " C0-3:X2-3:S+ C1-3:X2-3:S+ C2-3:X2-3 \
-                                  .      .     C3      P2     .     0 A1:0-2,A2:0-2,XA2:3,XA3:3,A3:3 \
-                                                                      A1:P0,A3:P2 3"
        " C0-3:X2-3:S+ C1-3:X2-3:S+ C2-3:X2-3 \
                                   .      .     X3      P2     .     0 A1:0-2,A2:1-2,XA2:3,XA3:3,A3:3 \
                                                                       A1:P0,A3:P2 3"
@@ -304,10 +315,7 @@ TEST_MATRIX=(
                                   .      .     X3      .      .     0 A1:0-3,A2:1-3,XA2:3,XA3:3,A3:2-3 \
                                                                       A1:P0,A3:P-2"
        " C0-3:X2-3:S+ C1-3:X2-3:S+ C2-3:X2-3:P2 \
-                                  .      .     C3      .      .     0 A1:0-3,A2:3,XA2:3,XA3:3,A3:3 \
-                                                                      A1:P0,A3:P-2"
-       " C0-3:X2-3:S+ C1-3:X2-3:S+ C2-3:X2-3:P2 \
-                                  .     C4      .      .      .     0 A1:4,A2:4,A3:4,XA1:,XA2:,XA3 \
+                                  .     X4      .      .      .     0 A1:0-3,A2:1-3,A3:2-3,XA1:4,XA2:,XA3 \
                                                                       A1:P0,A3:P-2"
 
        #  old-A1 old-A2 old-A3 old-B1 new-A1 new-A2 new-A3 new-B1 fail ECPUs Pstate ISOLCPUS
@@ -354,6 +362,9 @@ TEST_MATRIX=(
        "  C0-1:P1   .      .  P1:C2-3  C0-2     .      .      .     0 A1:0-2,B1:2-3 A1:P-1,B1:P-1"
        "   C0-1     .      .  P1:C2-3  C0-2     .      .      .     0 A1:0-2,B1:2-3 A1:P0,B1:P-1"
 
+       # cpuset.cpus can overlap with sibling cpuset.cpus.exclusive but not subsumed by it
+       "   C0-3     .      .    C4-5     X5     .      .      .     0 A1:0-3,B1:4-5"
+
        #  old-A1 old-A2 old-A3 old-B1 new-A1 new-A2 new-A3 new-B1 fail ECPUs Pstate ISOLCPUS
        #  ------ ------ ------ ------ ------ ------ ------ ------ ---- ----- ------ --------
        # Failure cases:
@@ -363,6 +374,9 @@ TEST_MATRIX=(
 
        # Changes to cpuset.cpus.exclusive that violate exclusivity rule is rejected
        "   C0-3     .      .    C4-5   X0-3     .      .     X3-5   1 A1:0-3,B1:4-5"
+
+       # cpuset.cpus cannot be a subset of sibling cpuset.cpus.exclusive
+       "   C0-3     .      .    C4-5   X3-5     .      .      .     1 A1:0-3,B1:4-5"
 )
 
 #
@@ -564,14 +578,15 @@ check_cgroup_states()
        do
                set -- $(echo $CHK | sed -e "s/:/ /g")
                CGRP=$1
+               CGRP_DIR=$CGRP
                STATE=$2
                FILE=
                EVAL=$(expr substr $STATE 2 2)
-               [[ $CGRP = A2 ]] && CGRP=A1/A2
-               [[ $CGRP = A3 ]] && CGRP=A1/A2/A3
+               [[ $CGRP = A2 ]] && CGRP_DIR=A1/A2
+               [[ $CGRP = A3 ]] && CGRP_DIR=A1/A2/A3
 
                case $STATE in
-                       P*) FILE=$CGRP/cpuset.cpus.partition
+                       P*) FILE=$CGRP_DIR/cpuset.cpus.partition
                            ;;
                        *)  echo "Unknown state: $STATE!"
                            exit 1
@@ -595,6 +610,16 @@ check_cgroup_states()
                                ;;
                esac
                [[ $EVAL != $VAL ]] && return 1
+
+               #
+               # For root partition, dump sched-domains info to console if
+               # verbose mode set for manual comparison with sched debug info.
+               #
+               [[ $VAL -eq 1 && $VERBOSE -gt 0 ]] && {
+                       DOMS=$(cat $CGRP_DIR/cpuset.cpus.effective)
+                       [[ -n "$DOMS" ]] &&
+                               echo " [$CGRP] sched-domain: $DOMS" > $CONSOLE
+               }
        done
        return 0
 }