Skip to content

Commit dddcdde

Browse files
Zqiangurezki
Zqiang
authored and
urezki
committed
rcutorture: Make rcutorture support print rcu-tasks gp state
This commit make rcu-tasks related rcutorture test support rcu-tasks gp state printing when the writer stall occurs or the at the end of rcutorture test, and generate rcu_ops->get_gp_data() operation to simplify the acquisition of gp state for different types of rcutorture tests. Signed-off-by: Zqiang <qiang.zhang1211@gmail.com> Signed-off-by: Paul E. McKenney <paulmck@kernel.org> Signed-off-by: Uladzislau Rezki (Sony) <urezki@gmail.com>
1 parent e38bf06 commit dddcdde

File tree

5 files changed

+53
-32
lines changed

5 files changed

+53
-32
lines changed

‎kernel/rcu/rcu.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -522,12 +522,18 @@ static inline void show_rcu_tasks_gp_kthreads(void) {}
522522

523523
#ifdef CONFIG_TASKS_RCU
524524
struct task_struct *get_rcu_tasks_gp_kthread(void);
525+
void rcu_tasks_get_gp_data(int *flags, unsigned long *gp_seq);
525526
#endif // # ifdef CONFIG_TASKS_RCU
526527

527528
#ifdef CONFIG_TASKS_RUDE_RCU
528529
struct task_struct *get_rcu_tasks_rude_gp_kthread(void);
530+
void rcu_tasks_rude_get_gp_data(int *flags, unsigned long *gp_seq);
529531
#endif // # ifdef CONFIG_TASKS_RUDE_RCU
530532

533+
#ifdef CONFIG_TASKS_TRACE_RCU
534+
void rcu_tasks_trace_get_gp_data(int *flags, unsigned long *gp_seq);
535+
#endif
536+
531537
#ifdef CONFIG_TASKS_RCU_GENERIC
532538
void tasks_cblist_init_generic(void);
533539
#else /* #ifdef CONFIG_TASKS_RCU_GENERIC */
@@ -557,17 +563,15 @@ static inline void rcu_set_jiffies_lazy_flush(unsigned long j) { }
557563
#endif
558564

559565
#if defined(CONFIG_TREE_RCU)
560-
void rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags,
561-
unsigned long *gp_seq);
566+
void rcutorture_get_gp_data(int *flags, unsigned long *gp_seq);
562567
void do_trace_rcu_torture_read(const char *rcutorturename,
563568
struct rcu_head *rhp,
564569
unsigned long secs,
565570
unsigned long c_old,
566571
unsigned long c);
567572
void rcu_gp_set_torture_wait(int duration);
568573
#else
569-
static inline void rcutorture_get_gp_data(enum rcutorture_type test_type,
570-
int *flags, unsigned long *gp_seq)
574+
static inline void rcutorture_get_gp_data(int *flags, unsigned long *gp_seq)
571575
{
572576
*flags = 0;
573577
*gp_seq = 0;
@@ -587,20 +591,16 @@ static inline void rcu_gp_set_torture_wait(int duration) { }
587591

588592
#ifdef CONFIG_TINY_SRCU
589593

590-
static inline void srcutorture_get_gp_data(enum rcutorture_type test_type,
591-
struct srcu_struct *sp, int *flags,
594+
static inline void srcutorture_get_gp_data(struct srcu_struct *sp, int *flags,
592595
unsigned long *gp_seq)
593596
{
594-
if (test_type != SRCU_FLAVOR)
595-
return;
596597
*flags = 0;
597598
*gp_seq = sp->srcu_idx;
598599
}
599600

600601
#elif defined(CONFIG_TREE_SRCU)
601602

602-
void srcutorture_get_gp_data(enum rcutorture_type test_type,
603-
struct srcu_struct *sp, int *flags,
603+
void srcutorture_get_gp_data(struct srcu_struct *sp, int *flags,
604604
unsigned long *gp_seq);
605605

606606
#endif

‎kernel/rcu/rcutorture.c‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ struct rcu_torture_ops {
381381
void (*gp_kthread_dbg)(void);
382382
bool (*check_boost_failed)(unsigned long gp_state, int *cpup);
383383
int (*stall_dur)(void);
384+
void (*get_gp_data)(int *flags, unsigned long *gp_seq);
384385
long cbflood_max;
385386
int irq_capable;
386387
int can_boost;
@@ -569,6 +570,7 @@ static struct rcu_torture_ops rcu_ops = {
569570
.gp_kthread_dbg = show_rcu_gp_kthreads,
570571
.check_boost_failed = rcu_check_boost_fail,
571572
.stall_dur = rcu_jiffies_till_stall_check,
573+
.get_gp_data = rcutorture_get_gp_data,
572574
.irq_capable = 1,
573575
.can_boost = IS_ENABLED(CONFIG_RCU_BOOST),
574576
.extendables = RCUTORTURE_MAX_EXTEND,
@@ -628,6 +630,11 @@ static struct srcu_struct srcu_ctld;
628630
static struct srcu_struct *srcu_ctlp = &srcu_ctl;
629631
static struct rcu_torture_ops srcud_ops;
630632

633+
static void srcu_get_gp_data(int *flags, unsigned long *gp_seq)
634+
{
635+
srcutorture_get_gp_data(srcu_ctlp, flags, gp_seq);
636+
}
637+
631638
static int srcu_torture_read_lock(void)
632639
{
633640
if (cur_ops == &srcud_ops)
@@ -736,6 +743,7 @@ static struct rcu_torture_ops srcu_ops = {
736743
.call = srcu_torture_call,
737744
.cb_barrier = srcu_torture_barrier,
738745
.stats = srcu_torture_stats,
746+
.get_gp_data = srcu_get_gp_data,
739747
.cbflood_max = 50000,
740748
.irq_capable = 1,
741749
.no_pi_lock = IS_ENABLED(CONFIG_TINY_SRCU),
@@ -774,6 +782,7 @@ static struct rcu_torture_ops srcud_ops = {
774782
.call = srcu_torture_call,
775783
.cb_barrier = srcu_torture_barrier,
776784
.stats = srcu_torture_stats,
785+
.get_gp_data = srcu_get_gp_data,
777786
.cbflood_max = 50000,
778787
.irq_capable = 1,
779788
.no_pi_lock = IS_ENABLED(CONFIG_TINY_SRCU),
@@ -882,6 +891,7 @@ static struct rcu_torture_ops tasks_ops = {
882891
.call = call_rcu_tasks,
883892
.cb_barrier = rcu_barrier_tasks,
884893
.gp_kthread_dbg = show_rcu_tasks_classic_gp_kthread,
894+
.get_gp_data = rcu_tasks_get_gp_data,
885895
.fqs = NULL,
886896
.stats = NULL,
887897
.irq_capable = 1,
@@ -922,6 +932,7 @@ static struct rcu_torture_ops tasks_rude_ops = {
922932
.call = call_rcu_tasks_rude,
923933
.cb_barrier = rcu_barrier_tasks_rude,
924934
.gp_kthread_dbg = show_rcu_tasks_rude_gp_kthread,
935+
.get_gp_data = rcu_tasks_rude_get_gp_data,
925936
.cbflood_max = 50000,
926937
.fqs = NULL,
927938
.stats = NULL,
@@ -974,6 +985,7 @@ static struct rcu_torture_ops tasks_tracing_ops = {
974985
.call = call_rcu_tasks_trace,
975986
.cb_barrier = rcu_barrier_tasks_trace,
976987
.gp_kthread_dbg = show_rcu_tasks_trace_gp_kthread,
988+
.get_gp_data = rcu_tasks_trace_get_gp_data,
977989
.cbflood_max = 50000,
978990
.fqs = NULL,
979991
.stats = NULL,
@@ -2264,10 +2276,8 @@ rcu_torture_stats_print(void)
22642276
int __maybe_unused flags = 0;
22652277
unsigned long __maybe_unused gp_seq = 0;
22662278

2267-
rcutorture_get_gp_data(cur_ops->ttype,
2268-
&flags, &gp_seq);
2269-
srcutorture_get_gp_data(cur_ops->ttype, srcu_ctlp,
2270-
&flags, &gp_seq);
2279+
if (cur_ops->get_gp_data)
2280+
cur_ops->get_gp_data(&flags, &gp_seq);
22712281
wtp = READ_ONCE(writer_task);
22722282
pr_alert("??? Writer stall state %s(%d) g%lu f%#x ->state %#x cpu %d\n",
22732283
rcu_torture_writer_state_getname(),
@@ -3390,8 +3400,8 @@ rcu_torture_cleanup(void)
33903400
fakewriter_tasks = NULL;
33913401
}
33923402

3393-
rcutorture_get_gp_data(cur_ops->ttype, &flags, &gp_seq);
3394-
srcutorture_get_gp_data(cur_ops->ttype, srcu_ctlp, &flags, &gp_seq);
3403+
if (cur_ops->get_gp_data)
3404+
cur_ops->get_gp_data(&flags, &gp_seq);
33953405
pr_alert("%s: End-test grace-period state: g%ld f%#x total-gps=%ld\n",
33963406
cur_ops->name, (long)gp_seq, flags,
33973407
rcutorture_seq_diff(gp_seq, start_gp_seq));
@@ -3762,8 +3772,8 @@ rcu_torture_init(void)
37623772
nrealreaders = 1;
37633773
}
37643774
rcu_torture_print_module_parms(cur_ops, "Start of test");
3765-
rcutorture_get_gp_data(cur_ops->ttype, &flags, &gp_seq);
3766-
srcutorture_get_gp_data(cur_ops->ttype, srcu_ctlp, &flags, &gp_seq);
3775+
if (cur_ops->get_gp_data)
3776+
cur_ops->get_gp_data(&flags, &gp_seq);
37673777
start_gp_seq = gp_seq;
37683778
pr_alert("%s: Start-test grace-period state: g%ld f%#x\n",
37693779
cur_ops->name, (long)gp_seq, flags);

‎kernel/rcu/srcutree.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1826,12 +1826,9 @@ static void process_srcu(struct work_struct *work)
18261826
srcu_reschedule(ssp, curdelay);
18271827
}
18281828

1829-
void srcutorture_get_gp_data(enum rcutorture_type test_type,
1830-
struct srcu_struct *ssp, int *flags,
1829+
void srcutorture_get_gp_data(struct srcu_struct *ssp, int *flags,
18311830
unsigned long *gp_seq)
18321831
{
1833-
if (test_type != SRCU_FLAVOR)
1834-
return;
18351832
*flags = 0;
18361833
*gp_seq = rcu_seq_current(&ssp->srcu_sup->srcu_gp_seq);
18371834
}

‎kernel/rcu/tasks.h‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,6 +1178,13 @@ struct task_struct *get_rcu_tasks_gp_kthread(void)
11781178
}
11791179
EXPORT_SYMBOL_GPL(get_rcu_tasks_gp_kthread);
11801180

1181+
void rcu_tasks_get_gp_data(int *flags, unsigned long *gp_seq)
1182+
{
1183+
*flags = 0;
1184+
*gp_seq = rcu_seq_current(&rcu_tasks.tasks_gp_seq);
1185+
}
1186+
EXPORT_SYMBOL_GPL(rcu_tasks_get_gp_data);
1187+
11811188
/*
11821189
* Protect against tasklist scan blind spot while the task is exiting and
11831190
* may be removed from the tasklist. Do this by adding the task to yet
@@ -1358,6 +1365,13 @@ struct task_struct *get_rcu_tasks_rude_gp_kthread(void)
13581365
}
13591366
EXPORT_SYMBOL_GPL(get_rcu_tasks_rude_gp_kthread);
13601367

1368+
void rcu_tasks_rude_get_gp_data(int *flags, unsigned long *gp_seq)
1369+
{
1370+
*flags = 0;
1371+
*gp_seq = rcu_seq_current(&rcu_tasks_rude.tasks_gp_seq);
1372+
}
1373+
EXPORT_SYMBOL_GPL(rcu_tasks_rude_get_gp_data);
1374+
13611375
#endif /* #ifdef CONFIG_TASKS_RUDE_RCU */
13621376

13631377
////////////////////////////////////////////////////////////////////////
@@ -2010,6 +2024,13 @@ struct task_struct *get_rcu_tasks_trace_gp_kthread(void)
20102024
}
20112025
EXPORT_SYMBOL_GPL(get_rcu_tasks_trace_gp_kthread);
20122026

2027+
void rcu_tasks_trace_get_gp_data(int *flags, unsigned long *gp_seq)
2028+
{
2029+
*flags = 0;
2030+
*gp_seq = rcu_seq_current(&rcu_tasks_trace.tasks_gp_seq);
2031+
}
2032+
EXPORT_SYMBOL_GPL(rcu_tasks_trace_get_gp_data);
2033+
20132034
#else /* #ifdef CONFIG_TASKS_TRACE_RCU */
20142035
static void exit_tasks_rcu_finish_trace(struct task_struct *t) { }
20152036
#endif /* #else #ifdef CONFIG_TASKS_TRACE_RCU */

‎kernel/rcu/tree.c‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -508,17 +508,10 @@ static struct rcu_node *rcu_get_root(void)
508508
/*
509509
* Send along grace-period-related data for rcutorture diagnostics.
510510
*/
511-
void rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags,
512-
unsigned long *gp_seq)
511+
void rcutorture_get_gp_data(int *flags, unsigned long *gp_seq)
513512
{
514-
switch (test_type) {
515-
case RCU_FLAVOR:
516-
*flags = READ_ONCE(rcu_state.gp_flags);
517-
*gp_seq = rcu_seq_current(&rcu_state.gp_seq);
518-
break;
519-
default:
520-
break;
521-
}
513+
*flags = READ_ONCE(rcu_state.gp_flags);
514+
*gp_seq = rcu_seq_current(&rcu_state.gp_seq);
522515
}
523516
EXPORT_SYMBOL_GPL(rcutorture_get_gp_data);
524517

0 commit comments

Comments
 (0)