History

rcu-tasks: Make rcutorture writer stall output include GP state

This commit adds grace-period state and time to the rcutorture writer stall output.

Paul E. McKenney committed 6 years ago

Commit af051ca1 parent e21408c1 file · +72 −5Browse files

Unified · Split

kernel/rcu/tasks.h+72−5
@@ -17,7 +17,7 @@ typedef void (*pregp_func_t)(void); · 16 unmodified lines
1717 typedef void (*pertask_func_t)(struct task_struct *t, struct list_head *hop);
1818 typedef void (*postscan_func_t)(void);
1919 typedef void (*holdouts_func_t)(struct list_head *hop, bool ndrpt, bool *frptp);
20−typedef void (*postgp_func_t)(void);
20+typedef void (*postgp_func_t)(struct rcu_tasks *rtp);
2121
2222 /**
2323 * Definition for a Tasks-RCU-like mechanism.
@@ -27,6 +27,9 @@ typedef void (*postgp_func_t)(void); · 3 unmodified lines
2727 * @cbs_lock: Lock protecting callback list.
2828 * @kthread_ptr: This flavor's grace-period/callback-invocation kthread.
2929 * @gp_func: This flavor's grace-period-wait function.
30+ * @gp_state: Grace period's most recent state transition (debugging).
31+ * @gp_jiffies: Time of last @gp_state transition.
32+ * @gp_start: Most recent grace-period start in jiffies.
3033 * @pregp_func: This flavor's pre-grace-period function (optional).
3134 * @pertask_func: This flavor's per-task scan function (optional).
3235 * @postscan_func: This flavor's post-task scan function (optional).
@@ -41,6 +44,8 @@ struct rcu_tasks { · 8 unmodified lines
4144 struct rcu_head **cbs_tail;
4245 struct wait_queue_head cbs_wq;
4346 raw_spinlock_t cbs_lock;
47+ int gp_state;
48+ unsigned long gp_jiffies;
4449 struct task_struct *kthread_ptr;
4550 rcu_tasks_gp_func_t gp_func;
4651 pregp_func_t pregp_func;
@@ -73,10 +78,56 @@ DEFINE_STATIC_SRCU(tasks_rcu_exit_srcu); · 26 unmodified lines
7378 static int rcu_task_stall_timeout __read_mostly = RCU_TASK_STALL_TIMEOUT;
7479 module_param(rcu_task_stall_timeout, int, 0644);
7580
81+/* RCU tasks grace-period state for debugging. */
82+#define RTGS_INIT 0
83+#define RTGS_WAIT_WAIT_CBS 1
84+#define RTGS_WAIT_GP 2
85+#define RTGS_PRE_WAIT_GP 3
86+#define RTGS_SCAN_TASKLIST 4
87+#define RTGS_POST_SCAN_TASKLIST 5
88+#define RTGS_WAIT_SCAN_HOLDOUTS 6
89+#define RTGS_SCAN_HOLDOUTS 7
90+#define RTGS_POST_GP 8
91+#define RTGS_WAIT_READERS 9
92+#define RTGS_INVOKE_CBS 10
93+#define RTGS_WAIT_CBS 11
94+static const char * const rcu_tasks_gp_state_names[] = {
95+ "RTGS_INIT",
96+ "RTGS_WAIT_WAIT_CBS",
97+ "RTGS_WAIT_GP",
98+ "RTGS_PRE_WAIT_GP",
99+ "RTGS_SCAN_TASKLIST",
100+ "RTGS_POST_SCAN_TASKLIST",
101+ "RTGS_WAIT_SCAN_HOLDOUTS",
102+ "RTGS_SCAN_HOLDOUTS",
103+ "RTGS_POST_GP",
104+ "RTGS_WAIT_READERS",
105+ "RTGS_INVOKE_CBS",
106+ "RTGS_WAIT_CBS",
107+};
108+
76109 ////////////////////////////////////////////////////////////////////////
77110 //
78111 // Generic code.
79112
113+/* Record grace-period phase and time. */
114+static void set_tasks_gp_state(struct rcu_tasks *rtp, int newstate)
115+{
116+ rtp->gp_state = newstate;
117+ rtp->gp_jiffies = jiffies;
118+}
119+
120+/* Return state name. */
121+static const char *tasks_gp_state_getname(struct rcu_tasks *rtp)
122+{
123+ int i = data_race(rtp->gp_state); // Let KCSAN detect update races
124+ int j = READ_ONCE(i); // Prevent the compiler from reading twice
125+
126+ if (j >= ARRAY_SIZE(rcu_tasks_gp_state_names))
127+ return "???";
128+ return rcu_tasks_gp_state_names[j];
129+}
130+
80131 // Enqueue a callback for the specified flavor of Tasks RCU.
81132 static void call_rcu_tasks_generic(struct rcu_head *rhp, rcu_callback_t func,
82133 struct rcu_tasks *rtp)
@@ -141,15 +192,18 @@ static int __noreturn rcu_tasks_kthread(void *arg) · 58 unmodified lines
141192 READ_ONCE(rtp->cbs_head));
142193 if (!rtp->cbs_head) {
143194 WARN_ON(signal_pending(current));
195+ set_tasks_gp_state(rtp, RTGS_WAIT_WAIT_CBS);
144196 schedule_timeout_interruptible(HZ/10);
145197 }
146198 continue;
147199 }
148200
149201 // Wait for one grace period.
202+ set_tasks_gp_state(rtp, RTGS_WAIT_GP);
150203 rtp->gp_func(rtp);
151204
152205 /* Invoke the callbacks. */
206+ set_tasks_gp_state(rtp, RTGS_INVOKE_CBS);
153207 while (list) {
154208 next = list->next;
155209 local_bh_disable();
@@ -160,6 +214,8 @@ static int __noreturn rcu_tasks_kthread(void *arg) · 4 unmodified lines
160214 }
161215 /* Paranoid sleep to keep this from entering a tight loop */
162216 schedule_timeout_uninterruptible(HZ/10);
217+
218+ set_tasks_gp_state(rtp, RTGS_WAIT_CBS);
163219 }
164220 }
165221
@@ -222,8 +278,11 @@ static void __init rcu_tasks_bootup_oddness(void) · 56 unmodified lines
222278 /* Dump out rcutorture-relevant state common to all RCU-tasks flavors. */
223279 static void show_rcu_tasks_generic_gp_kthread(struct rcu_tasks *rtp, char *s)
224280 {
225− pr_info("%s %c%c %s\n",
281+ pr_info("%s: %s(%d) since %lu %c%c %s\n",
226282 rtp->kname,
283+ tasks_gp_state_getname(rtp),
284+ data_race(rtp->gp_state),
285+ jiffies - data_race(rtp->gp_jiffies),
227286 ".k"[!!data_race(rtp->kthread_ptr)],
228287 ".C"[!!data_race(rtp->cbs_head)],
229288 s);
@@ -243,6 +302,7 @@ static void rcu_tasks_wait_gp(struct rcu_tasks *rtp) · 13 unmodified lines
243302 LIST_HEAD(holdouts);
244303 int fract;
245304
305+ set_tasks_gp_state(rtp, RTGS_PRE_WAIT_GP);
246306 rtp->pregp_func();
247307
248308 /*
@@ -251,11 +311,13 @@ static void rcu_tasks_wait_gp(struct rcu_tasks *rtp) · 2 unmodified lines
251311 * that are not already voluntarily blocked. Mark these tasks
252312 * and make a list of them in holdouts.
253313 */
314+ set_tasks_gp_state(rtp, RTGS_SCAN_TASKLIST);
254315 rcu_read_lock();
255316 for_each_process_thread(g, t)
256317 rtp->pertask_func(t, &holdouts);
257318 rcu_read_unlock();
258319
320+ set_tasks_gp_state(rtp, RTGS_POST_SCAN_TASKLIST);
259321 rtp->postscan_func();
260322
261323 /*
@@ -277,6 +339,7 @@ static void rcu_tasks_wait_gp(struct rcu_tasks *rtp) · 15 unmodified lines
277339 break;
278340
279341 /* Slowly back off waiting for holdouts */
342+ set_tasks_gp_state(rtp, RTGS_WAIT_SCAN_HOLDOUTS);
280343 schedule_timeout_interruptible(HZ/fract);
281344
282345 if (fract > 1)
@@ -288,10 +351,12 @@ static void rcu_tasks_wait_gp(struct rcu_tasks *rtp) · 5 unmodified lines
288351 lastreport = jiffies;
289352 firstreport = true;
290353 WARN_ON(signal_pending(current));
354+ set_tasks_gp_state(rtp, RTGS_SCAN_HOLDOUTS);
291355 rtp->holdouts_func(&holdouts, needreport, &firstreport);
292356 }
293357
294− rtp->postgp_func();
358+ set_tasks_gp_state(rtp, RTGS_POST_GP);
359+ rtp->postgp_func(rtp);
295360 }
296361
297362 ////////////////////////////////////////////////////////////////////////
@@ -394,7 +459,7 @@ static void check_all_holdout_tasks(struct list_head *hop, · 96 unmodified lines
394459 }
395460
396461 /* Finish off the Tasks-RCU grace period. */
397−static void rcu_tasks_postgp(void)
462+static void rcu_tasks_postgp(struct rcu_tasks *rtp)
398463 {
399464 /*
400465 * Because ->on_rq and ->nvcsw are not guaranteed to have a full
@@ -881,7 +946,7 @@ static void check_all_holdout_tasks_trace(struct list_head *hop, · 480 unmodified lines
881946 }
882947
883948 /* Wait for grace period to complete and provide ordering. */
884−static void rcu_tasks_trace_postgp(void)
949+static void rcu_tasks_trace_postgp(struct rcu_tasks *rtp)
885950 {
886951 bool firstreport;
887952 struct task_struct *g, *t;
@@ -894,6 +959,7 @@ static void rcu_tasks_trace_postgp(void) · 6 unmodified lines
894959 smp_mb__after_atomic(); // Order vs. later atomics
895960
896961 // Wait for readers.
962+ set_tasks_gp_state(rtp, RTGS_WAIT_READERS);
897963 for (;;) {
898964 ret = wait_event_idle_exclusive_timeout(
899965 trc_wait,
@@ -901,6 +967,7 @@ static void rcu_tasks_trace_postgp(void) · 1 unmodified line
901967 READ_ONCE(rcu_task_stall_timeout));
902968 if (ret)
903969 break; // Count reached zero.
970+ // Stall warning time, so make a list of the offenders.
904971 for_each_process_thread(g, t)
905972 if (READ_ONCE(t->trc_reader_need_end))
906973 trc_add_holdout(t, &holdouts);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t