Although rcutorture will occasionally do a 50-millisecond grace-period delay, these delays are quite rare. And rightly so, because otherwise the read rate would be quite low. Thie means that it can be important to identify whether or not a given run contained a long-delay read. This commit therefore inserts a trace_rcu_torture_read() event to flag runs containing long delays.
Unified · Split
| @@ -698,7 +698,10 @@ TRACE_EVENT(rcu_batch_end, · 697 unmodified lines | ||
| 698 | 698 | /* |
| 699 | 699 | * Tracepoint for rcutorture readers. The first argument is the name |
| 700 | 700 | * of the RCU flavor from rcutorture's viewpoint and the second argument |
| 701 | − * is the callback address. | |
| 701 | + * is the callback address. The third argument is the start time in | |
| 702 | + * seconds, and the last two arguments are the grace period numbers | |
| 703 | + * at the beginning and end of the read, respectively. Note that the | |
| 704 | + * callback address can be NULL. | |
| 702 | 705 | */ |
| 703 | 706 | TRACE_EVENT(rcu_torture_read, |
| 704 | 707 | |
| @@ -289,15 +289,24 @@ static int rcu_torture_read_lock(void) __acquires(RCU) · 288 unmodified lines | ||
| 289 | 289 | |
| 290 | 290 | static void rcu_read_delay(struct torture_random_state *rrsp) |
| 291 | 291 | { |
| 292 | + unsigned long started; | |
| 293 | + unsigned long completed; | |
| 292 | 294 | const unsigned long shortdelay_us = 200; |
| 293 | 295 | const unsigned long longdelay_ms = 50; |
| 296 | + unsigned long long ts; | |
| 294 | 297 | |
| 295 | 298 | /* We want a short delay sometimes to make a reader delay the grace |
| 296 | 299 | * period, and we want a long delay occasionally to trigger |
| 297 | 300 | * force_quiescent_state. */ |
| 298 | 301 | |
| 299 | − if (!(torture_random(rrsp) % (nrealreaders * 2000 * longdelay_ms))) | |
| 302 | + if (!(torture_random(rrsp) % (nrealreaders * 2000 * longdelay_ms))) { | |
| 303 | + started = cur_ops->completed(); | |
| 304 | + ts = rcu_trace_clock_local(); | |
| 300 | 305 | mdelay(longdelay_ms); |
| 306 | + completed = cur_ops->completed(); | |
| 307 | + do_trace_rcu_torture_read(cur_ops->name, NULL, ts, | |
| 308 | + started, completed); | |
| 309 | + } | |
| 301 | 310 | if (!(torture_random(rrsp) % (nrealreaders * 2 * shortdelay_us))) |
| 302 | 311 | udelay(shortdelay_us); |
| 303 | 312 | #ifdef CONFIG_PREEMPT |