From 61010e74d76ca51dd452290d6c340c681df498ce Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Fri, 7 Feb 2014 10:29:49 -0800 Subject: [PATCH] rcutorture: Introduce "rcu" directory level underneath configs This commit uses the standard software ploy of introducing another level of indirection below the configs directory. This allows each torture-test suite to have its own set of Kconfig files, boot parameters, and version-specific scripts. Initially, we have only rcu, but lock will follow soonish. Signed-off-by: Paul E. McKenney Reviewed-by: Josh Triplett --- .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +- tools/testing/selftests/rcutorture/bin/kvm.sh | 17 ++++++++++++++--- .../rcutorture/configs/{ => rcu}/BUSTED | 0 .../rcutorture/configs/{ => rcu}/BUSTED.boot | 0 .../rcutorture/configs/{ => rcu}/CFLIST | 0 .../rcutorture/configs/{ => rcu}/CFcommon | 0 .../rcutorture/configs/{ => rcu}/SRCU-N | 0 .../rcutorture/configs/{ => rcu}/SRCU-N.boot | 0 .../rcutorture/configs/{ => rcu}/SRCU-P | 0 .../rcutorture/configs/{ => rcu}/SRCU-P.boot | 0 .../rcutorture/configs/{ => rcu}/TINY01 | 0 .../rcutorture/configs/{ => rcu}/TINY02 | 0 .../rcutorture/configs/{ => rcu}/TREE01 | 0 .../rcutorture/configs/{ => rcu}/TREE01.boot | 0 .../rcutorture/configs/{ => rcu}/TREE02 | 2 +- .../rcutorture/configs/{ => rcu}/TREE03 | 0 .../rcutorture/configs/{ => rcu}/TREE04 | 0 .../rcutorture/configs/{ => rcu}/TREE04.boot | 0 .../rcutorture/configs/{ => rcu}/TREE05 | 0 .../rcutorture/configs/{ => rcu}/TREE05.boot | 0 .../rcutorture/configs/{ => rcu}/TREE06 | 0 .../rcutorture/configs/{ => rcu}/TREE07 | 0 .../rcutorture/configs/{ => rcu}/TREE08 | 0 .../rcutorture/configs/{ => rcu}/TREE08-T | 0 .../rcutorture/configs/{ => rcu}/TREE09 | 0 .../rcutorture/configs/{ => rcu}/v0.0/CFLIST | 0 .../configs/{ => rcu}/v0.0/N1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v0.0/N2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v0.0/N3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v0.0/N4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v0.0/N5-U-T-NH-sd-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v0.0/NT1-nh | 0 .../rcutorture/configs/{ => rcu}/v0.0/NT3-NH | 0 .../configs/{ => rcu}/v0.0/P1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v0.0/P2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v0.0/P3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v0.0/P4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v0.0/P5-U-T-NH-sd-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v0.0/PT1-nh | 0 .../rcutorture/configs/{ => rcu}/v0.0/PT2-NH | 0 .../configs/{ => rcu}/v0.0/ver_functions.sh | 0 .../rcutorture/configs/{ => rcu}/v3.12/CFLIST | 0 .../configs/{ => rcu}/v3.12/N1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.12/N2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.12/N3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v3.12/N4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v3.12/N5-U-T-NH-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.12/N6---t-nh-SD-smp-hp | 0 .../configs/{ => rcu}/v3.12/N7-4-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.12/N8-2-T-NH-SD-SMP-HP | 0 .../rcutorture/configs/{ => rcu}/v3.12/NT1-nh | 0 .../rcutorture/configs/{ => rcu}/v3.12/NT3-NH | 0 .../configs/{ => rcu}/v3.12/P1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.12/P2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.12/P3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v3.12/P4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v3.12/P5-U-T-NH-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.12/P6---t-nh-SD-smp-hp | 0 .../configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP | 0 .../{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-all | 0 .../{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-none | 0 .../configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v3.12/PT1-nh | 0 .../rcutorture/configs/{ => rcu}/v3.12/PT2-NH | 0 .../rcutorture/configs/{ => rcu}/v3.3/CFLIST | 0 .../configs/{ => rcu}/v3.3/N1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.3/N2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.3/N3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v3.3/N4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v3.3/N5-U-T-NH-sd-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v3.3/NT1-nh | 0 .../rcutorture/configs/{ => rcu}/v3.3/NT3-NH | 0 .../configs/{ => rcu}/v3.3/P1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.3/P2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.3/P3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v3.3/P4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v3.3/P5-U-T-NH-sd-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v3.3/PT1-nh | 0 .../rcutorture/configs/{ => rcu}/v3.3/PT2-NH | 0 .../configs/{ => rcu}/v3.3/ver_functions.sh | 0 .../rcutorture/configs/{ => rcu}/v3.5/CFLIST | 0 .../configs/{ => rcu}/v3.5/N1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.5/N2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.5/N3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v3.5/N4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v3.5/N5-U-T-NH-sd-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v3.5/NT1-nh | 0 .../rcutorture/configs/{ => rcu}/v3.5/NT3-NH | 0 .../configs/{ => rcu}/v3.5/P1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.5/P2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.5/P3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v3.5/P4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v3.5/P5-U-T-NH-sd-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v3.5/PT1-nh | 0 .../rcutorture/configs/{ => rcu}/v3.5/PT2-NH | 0 .../configs/{ => rcu}/v3.5/ver_functions.sh | 0 .../configs/{ => rcu}/ver_functions.sh | 0 97 files changed, 16 insertions(+), 5 deletions(-) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/BUSTED (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/BUSTED.boot (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/CFLIST (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/CFcommon (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-N (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-N.boot (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-P (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-P.boot (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TINY01 (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TINY02 (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE01 (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE01.boot (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE02 (95%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE03 (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE04 (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE04.boot (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE05 (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE05.boot (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE06 (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE07 (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE08 (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE08-T (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE09 (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/CFLIST (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/NT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/NT3-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/PT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/PT2-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/ver_functions.sh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/CFLIST (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N6---t-nh-SD-smp-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N7-4-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N8-2-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/NT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/NT3-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P6---t-nh-SD-smp-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-all (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-none (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/PT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/PT2-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/CFLIST (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/NT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/NT3-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/PT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/PT2-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/ver_functions.sh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/CFLIST (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/NT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/NT3-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/PT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/PT2-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/ver_functions.sh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/ver_functions.sh (100%) diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh index 015d35bc43cb..94b28bb37d36 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh @@ -199,5 +199,5 @@ then fi cp $builddir/console.log $resdir -parse-rcutorture.sh $resdir/console.log $title +parse-${TORTURE_SUITE}torture.sh $resdir/console.log $title parse-console.sh $resdir/console.log $title diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh index 767097e2a293..c24092ce981c 100644 --- a/tools/testing/selftests/rcutorture/bin/kvm.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh @@ -41,6 +41,7 @@ PATH=${KVM}/bin:$PATH; export PATH builddir="${KVM}/b1" RCU_INITRD="$KVM/initrd"; export RCU_INITRD RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG +TORTURE_SUITE=rcu resdir="" configs="" cpus=0 @@ -66,8 +67,9 @@ usage () { echo " --no-initrd" echo " --qemu-args qemu-system-..." echo " --qemu-cmd qemu-system-..." - echo " --results absolute-pathname" echo " --relbuilddir relative-pathname" + echo " --results absolute-pathname" + echo " --torture rcu" exit 1 } @@ -156,6 +158,11 @@ do resdir=$2 shift ;; + --torture) + checkarg --torture "(suite name)" "$#" "$2" '^rcu$' '^--' + TORTURE_SUITE=$2 + shift + ;; *) echo Unknown argument $1 usage @@ -164,7 +171,7 @@ do shift done -CONFIGFRAG=${KVM}/configs; export CONFIGFRAG +CONFIGFRAG=${KVM}/configs/${TORTURE_SUITE}; export CONFIGFRAG KVPATH=${CONFIGFRAG}/$kversion; export KVPATH if test -z "$configs" @@ -191,6 +198,7 @@ then touch $resdir/$ds/log echo $scriptname $args >> $resdir/$ds/log + echo ${TORTURE_SUITE} > $resdir/$ds/TORTURE_SUITE pwd > $resdir/$ds/testid.txt if test -d .git @@ -265,6 +273,9 @@ END { }' # Generate a script to execute the tests in appropriate batches. +cat << ___EOF___ > $T/script +TORTURE_SUITE="$TORTURE_SUITE"; export TORTURE_SUITE +___EOF___ awk < $T/cfgcpu.pack \ -v CONFIGDIR="$CONFIGFRAG/$kversion/" \ -v KVM="$KVM" \ @@ -353,7 +364,7 @@ END { # Dump the last batch. if (ncpus != 0) dump(first, i); -}' > $T/script +}' >> $T/script if test "$dryrun" = script then diff --git a/tools/testing/selftests/rcutorture/configs/BUSTED b/tools/testing/selftests/rcutorture/configs/rcu/BUSTED similarity index 100% rename from tools/testing/selftests/rcutorture/configs/BUSTED rename to tools/testing/selftests/rcutorture/configs/rcu/BUSTED diff --git a/tools/testing/selftests/rcutorture/configs/BUSTED.boot b/tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot similarity index 100% rename from tools/testing/selftests/rcutorture/configs/BUSTED.boot rename to tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot diff --git a/tools/testing/selftests/rcutorture/configs/CFLIST b/tools/testing/selftests/rcutorture/configs/rcu/CFLIST similarity index 100% rename from tools/testing/selftests/rcutorture/configs/CFLIST rename to tools/testing/selftests/rcutorture/configs/rcu/CFLIST diff --git a/tools/testing/selftests/rcutorture/configs/CFcommon b/tools/testing/selftests/rcutorture/configs/rcu/CFcommon similarity index 100% rename from tools/testing/selftests/rcutorture/configs/CFcommon rename to tools/testing/selftests/rcutorture/configs/rcu/CFcommon diff --git a/tools/testing/selftests/rcutorture/configs/SRCU-N b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-N similarity index 100% rename from tools/testing/selftests/rcutorture/configs/SRCU-N rename to tools/testing/selftests/rcutorture/configs/rcu/SRCU-N diff --git a/tools/testing/selftests/rcutorture/configs/SRCU-N.boot b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-N.boot similarity index 100% rename from tools/testing/selftests/rcutorture/configs/SRCU-N.boot rename to tools/testing/selftests/rcutorture/configs/rcu/SRCU-N.boot diff --git a/tools/testing/selftests/rcutorture/configs/SRCU-P b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-P similarity index 100% rename from tools/testing/selftests/rcutorture/configs/SRCU-P rename to tools/testing/selftests/rcutorture/configs/rcu/SRCU-P diff --git a/tools/testing/selftests/rcutorture/configs/SRCU-P.boot b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-P.boot similarity index 100% rename from tools/testing/selftests/rcutorture/configs/SRCU-P.boot rename to tools/testing/selftests/rcutorture/configs/rcu/SRCU-P.boot diff --git a/tools/testing/selftests/rcutorture/configs/TINY01 b/tools/testing/selftests/rcutorture/configs/rcu/TINY01 similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TINY01 rename to tools/testing/selftests/rcutorture/configs/rcu/TINY01 diff --git a/tools/testing/selftests/rcutorture/configs/TINY02 b/tools/testing/selftests/rcutorture/configs/rcu/TINY02 similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TINY02 rename to tools/testing/selftests/rcutorture/configs/rcu/TINY02 diff --git a/tools/testing/selftests/rcutorture/configs/TREE01 b/tools/testing/selftests/rcutorture/configs/rcu/TREE01 similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TREE01 rename to tools/testing/selftests/rcutorture/configs/rcu/TREE01 diff --git a/tools/testing/selftests/rcutorture/configs/TREE01.boot b/tools/testing/selftests/rcutorture/configs/rcu/TREE01.boot similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TREE01.boot rename to tools/testing/selftests/rcutorture/configs/rcu/TREE01.boot diff --git a/tools/testing/selftests/rcutorture/configs/TREE02 b/tools/testing/selftests/rcutorture/configs/rcu/TREE02 similarity index 95% rename from tools/testing/selftests/rcutorture/configs/TREE02 rename to tools/testing/selftests/rcutorture/configs/rcu/TREE02 index bca03f6b3046..1a777b5f68b5 100644 --- a/tools/testing/selftests/rcutorture/configs/TREE02 +++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE02 @@ -7,7 +7,7 @@ CONFIG_PREEMPT=y CONFIG_HZ_PERIODIC=n CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ_FULL=n -CONFIG_RCU_FAST_NO_HZ=n +CONFIG_RCU_FAST_NO_HZ=n CONFIG_RCU_TRACE=n CONFIG_HOTPLUG_CPU=n CONFIG_SUSPEND=n diff --git a/tools/testing/selftests/rcutorture/configs/TREE03 b/tools/testing/selftests/rcutorture/configs/rcu/TREE03 similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TREE03 rename to tools/testing/selftests/rcutorture/configs/rcu/TREE03 diff --git a/tools/testing/selftests/rcutorture/configs/TREE04 b/tools/testing/selftests/rcutorture/configs/rcu/TREE04 similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TREE04 rename to tools/testing/selftests/rcutorture/configs/rcu/TREE04 diff --git a/tools/testing/selftests/rcutorture/configs/TREE04.boot b/tools/testing/selftests/rcutorture/configs/rcu/TREE04.boot similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TREE04.boot rename to tools/testing/selftests/rcutorture/configs/rcu/TREE04.boot diff --git a/tools/testing/selftests/rcutorture/configs/TREE05 b/tools/testing/selftests/rcutorture/configs/rcu/TREE05 similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TREE05 rename to tools/testing/selftests/rcutorture/configs/rcu/TREE05 diff --git a/tools/testing/selftests/rcutorture/configs/TREE05.boot b/tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TREE05.boot rename to tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot diff --git a/tools/testing/selftests/rcutorture/configs/TREE06 b/tools/testing/selftests/rcutorture/configs/rcu/TREE06 similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TREE06 rename to tools/testing/selftests/rcutorture/configs/rcu/TREE06 diff --git a/tools/testing/selftests/rcutorture/configs/TREE07 b/tools/testing/selftests/rcutorture/configs/rcu/TREE07 similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TREE07 rename to tools/testing/selftests/rcutorture/configs/rcu/TREE07 diff --git a/tools/testing/selftests/rcutorture/configs/TREE08 b/tools/testing/selftests/rcutorture/configs/rcu/TREE08 similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TREE08 rename to tools/testing/selftests/rcutorture/configs/rcu/TREE08 diff --git a/tools/testing/selftests/rcutorture/configs/TREE08-T b/tools/testing/selftests/rcutorture/configs/rcu/TREE08-T similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TREE08-T rename to tools/testing/selftests/rcutorture/configs/rcu/TREE08-T diff --git a/tools/testing/selftests/rcutorture/configs/TREE09 b/tools/testing/selftests/rcutorture/configs/rcu/TREE09 similarity index 100% rename from tools/testing/selftests/rcutorture/configs/TREE09 rename to tools/testing/selftests/rcutorture/configs/rcu/TREE09 diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/CFLIST b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/CFLIST similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/CFLIST rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/CFLIST diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/NT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT1-nh similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/NT1-nh rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT1-nh diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/NT3-NH b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT3-NH similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/NT3-NH rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT3-NH diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/PT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT1-nh similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/PT1-nh rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT1-nh diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/PT2-NH b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT2-NH similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/PT2-NH rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT2-NH diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh rename to tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/CFLIST b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/CFLIST similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/CFLIST rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/CFLIST diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/NT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT1-nh similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/NT1-nh rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT1-nh diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/NT3-NH b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT3-NH similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/NT3-NH rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT3-NH diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/PT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT1-nh similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/PT1-nh rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT1-nh diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/PT2-NH b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT2-NH similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.12/PT2-NH rename to tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT2-NH diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/CFLIST b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/CFLIST similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/CFLIST rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/CFLIST diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/NT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT1-nh similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/NT1-nh rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT1-nh diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/NT3-NH b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT3-NH similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/NT3-NH rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT3-NH diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/PT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT1-nh similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/PT1-nh rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT1-nh diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/PT2-NH b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT2-NH similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/PT2-NH rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT2-NH diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh rename to tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/CFLIST b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/CFLIST similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/CFLIST rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/CFLIST diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/NT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT1-nh similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/NT1-nh rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT1-nh diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/NT3-NH b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT3-NH similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/NT3-NH rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT3-NH diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/PT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT1-nh similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/PT1-nh rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT1-nh diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/PT2-NH b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT2-NH similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/PT2-NH rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT2-NH diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh similarity index 100% rename from tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh rename to tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh diff --git a/tools/testing/selftests/rcutorture/configs/ver_functions.sh b/tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh similarity index 100% rename from tools/testing/selftests/rcutorture/configs/ver_functions.sh rename to tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh -- 2.30.2