Skip to content

Commit 609460a

Browse files
paulmckrcuFrederic Weisbecker
authored andcommitted
rcutorture: Make srcu{,d}_torture_init() announce the SRCU type
This commit causes rcutorture's srcu_torture_init() and srcud_torture_init() functions to announce on the console log which variant of SRCU is being tortured, for example: "torture: srcud_torture_init fast SRCU". [ paulmck: Apply feedback from kernel test robot. ] Signed-off-by: Paul E. McKenney <paulmck@kernel.org> Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
1 parent d3f52f5 commit 609460a

1 file changed

Lines changed: 23 additions & 6 deletions

File tree

kernel/rcu/rcutorture.c

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -701,10 +701,18 @@ static struct rcu_torture_ops srcud_ops;
701701
static void srcu_torture_init(void)
702702
{
703703
rcu_sync_torture_init();
704-
if (reader_flavor & SRCU_READ_FLAVOR_FAST)
704+
if (!reader_flavor || (reader_flavor & SRCU_READ_FLAVOR_NORMAL))
705+
VERBOSE_TOROUT_STRING("srcu_torture_init normal SRCU");
706+
if (reader_flavor & SRCU_READ_FLAVOR_NMI)
707+
VERBOSE_TOROUT_STRING("srcu_torture_init NMI-safe SRCU");
708+
if (reader_flavor & SRCU_READ_FLAVOR_FAST) {
705709
srcu_ctlp = &srcu_ctlf;
706-
if (reader_flavor & SRCU_READ_FLAVOR_FAST_UPDOWN)
710+
VERBOSE_TOROUT_STRING("srcu_torture_init fast SRCU");
711+
}
712+
if (reader_flavor & SRCU_READ_FLAVOR_FAST_UPDOWN) {
707713
srcu_ctlp = &srcu_ctlfud;
714+
VERBOSE_TOROUT_STRING("srcu_torture_init fast-up/down SRCU");
715+
}
708716
}
709717

710718
static void srcu_get_gp_data(int *flags, unsigned long *gp_seq)
@@ -920,12 +928,21 @@ static struct rcu_torture_ops srcu_ops = {
920928
static void srcud_torture_init(void)
921929
{
922930
rcu_sync_torture_init();
923-
if (reader_flavor & SRCU_READ_FLAVOR_FAST_UPDOWN)
924-
WARN_ON(init_srcu_struct_fast_updown(&srcu_ctld));
925-
else if (reader_flavor & SRCU_READ_FLAVOR_FAST)
931+
if (!reader_flavor || (reader_flavor & SRCU_READ_FLAVOR_NORMAL)) {
932+
WARN_ON(init_srcu_struct(&srcu_ctld));
933+
VERBOSE_TOROUT_STRING("srcud_torture_init normal SRCU");
934+
} else if (reader_flavor & SRCU_READ_FLAVOR_NMI) {
935+
WARN_ON(init_srcu_struct(&srcu_ctld));
936+
VERBOSE_TOROUT_STRING("srcud_torture_init NMI-safe SRCU");
937+
} else if (reader_flavor & SRCU_READ_FLAVOR_FAST) {
926938
WARN_ON(init_srcu_struct_fast(&srcu_ctld));
927-
else
939+
VERBOSE_TOROUT_STRING("srcud_torture_init fast SRCU");
940+
} else if (reader_flavor & SRCU_READ_FLAVOR_FAST_UPDOWN) {
941+
WARN_ON(init_srcu_struct_fast_updown(&srcu_ctld));
942+
VERBOSE_TOROUT_STRING("srcud_torture_init fast-up/down SRCU");
943+
} else {
928944
WARN_ON(init_srcu_struct(&srcu_ctld));
945+
}
929946
srcu_ctlp = &srcu_ctld;
930947
}
931948

0 commit comments

Comments
 (0)