History

tracing: Have hwlat ts be first instance and record count of instances

The hwlat tracer runs a loop of width time during a given window. It then reports the max latency over a given threshold and records a timestamp. But this timestamp is the time after the width has finished, and not the time it actually triggered. Record the actual time when the latency was greater than the threshold as well as the number of times it was greater in a given width per window.

Steven Rostedt (VMware) committed 6 years ago

Commit b396bfd1 parent 98d54f84 files · +44 −20Browse files

Showing the changes to kernel (3 of 4 files). Show all

Unified · Split

3 files
  1. kernel/trace/trace_entries.h +3 −1
  2. kernel/trace/trace_hwlat.c +17 −7
  3. kernel/trace/trace_output.c +2 −2
kernel/trace/trace_entries.h+3−1
@@ -325,14 +325,16 @@ FTRACE_ENTRY(hwlat, hwlat_entry, · 324 unmodified lines
325325 __field_desc( long, timestamp, tv_nsec )
326326 __field( unsigned int, nmi_count )
327327 __field( unsigned int, seqnum )
328+ __field( unsigned int, count )
328329 ),
329330
330− F_printk("cnt:%u\tts:%010llu.%010lu\tinner:%llu\touter:%llu\tnmi-ts:%llu\tnmi-count:%u\n",
331+ F_printk("cnt:%u\tts:%010llu.%010lu\tinner:%llu\touter:%llu\tcount:%d\tnmi-ts:%llu\tnmi-count:%u\n",
331332 __entry->seqnum,
332333 __entry->tv_sec,
333334 __entry->tv_nsec,
334335 __entry->duration,
335336 __entry->outer_duration,
337+ __entry->count,
336338 __entry->nmi_total_ts,
337339 __entry->nmi_count)
338340 );
kernel/trace/trace_hwlat.c+17−7
@@ -83,6 +83,7 @@ struct hwlat_sample { · 82 unmodified lines
8383 u64 nmi_total_ts; /* Total time spent in NMIs */
8484 struct timespec64 timestamp; /* wall time */
8585 int nmi_count; /* # NMIs during this sample */
86+ int count; /* # of iteratons over threash */
8687 };
8788
8889 /* keep the global state somewhere. */
@@ -124,6 +125,7 @@ static void trace_hwlat_sample(struct hwlat_sample *sample) · 35 unmodified lines
124125 entry->timestamp = sample->timestamp;
125126 entry->nmi_total_ts = sample->nmi_total_ts;
126127 entry->nmi_count = sample->nmi_count;
128+ entry->count = sample->count;
127129
128130 if (!call_filter_check_discard(call, entry, buffer, event))
129131 trace_buffer_unlock_commit_nostack(buffer, event);
@@ -167,12 +169,14 @@ void trace_hwlat_callback(bool enter) · 37 unmodified lines
167169 static int get_sample(void)
168170 {
169171 struct trace_array *tr = hwlat_trace;
172+ struct hwlat_sample s;
170173 time_type start, t1, t2, last_t2;
171− s64 diff, total, last_total = 0;
174+ s64 diff, outer_diff, total, last_total = 0;
172175 u64 sample = 0;
173176 u64 thresh = tracing_thresh;
174177 u64 outer_sample = 0;
175178 int ret = -1;
179+ unsigned int count = 0;
176180
177181 do_div(thresh, NSEC_PER_USEC); /* modifies interval value */
178182
@@ -186,6 +190,7 @@ static int get_sample(void) · 7 unmodified lines
186190
187191 init_time(last_t2, 0);
188192 start = time_get(); /* start timestamp */
193+ outer_diff = 0;
189194
190195 do {
191196
@@ -194,14 +199,14 @@ static int get_sample(void) · 2 unmodified lines
194199
195200 if (time_u64(last_t2)) {
196201 /* Check the delta from outer loop (t2 to next t1) */
197− diff = time_to_us(time_sub(t1, last_t2));
202+ outer_diff = time_to_us(time_sub(t1, last_t2));
198203 /* This shouldn't happen */
199− if (diff < 0) {
204+ if (outer_diff < 0) {
200205 pr_err(BANNER "time running backwards\n");
201206 goto out;
202207 }
203− if (diff > outer_sample)
204− outer_sample = diff;
208+ if (outer_diff > outer_sample)
209+ outer_sample = outer_diff;
205210 }
206211 last_t2 = t2;
207212
@@ -217,6 +222,12 @@ static int get_sample(void) · 9 unmodified lines
217222 /* This checks the inner loop (t1 to t2) */
218223 diff = time_to_us(time_sub(t2, t1)); /* current diff */
219224
225+ if (diff > thresh || outer_diff > thresh) {
226+ if (!count)
227+ ktime_get_real_ts64(&s.timestamp);
228+ count++;
229+ }
230+
220231 /* This shouldn't happen */
221232 if (diff < 0) {
222233 pr_err(BANNER "time running backwards\n");
@@ -236,7 +247,6 @@ static int get_sample(void) · 13 unmodified lines
236247
237248 /* If we exceed the threshold value, we have found a hardware latency */
238249 if (sample > thresh || outer_sample > thresh) {
239− struct hwlat_sample s;
240250 u64 latency;
241251
242252 ret = 1;
@@ -249,9 +259,9 @@ static int get_sample(void) · 6 unmodified lines
249259 s.seqnum = hwlat_data.count;
250260 s.duration = sample;
251261 s.outer_duration = outer_sample;
252− ktime_get_real_ts64(&s.timestamp);
253262 s.nmi_total_ts = nmi_total_ts;
254263 s.nmi_count = nmi_count;
264+ s.count = count;
255265 trace_hwlat_sample(&s);
256266
257267 latency = max(sample, outer_sample);
kernel/trace/trace_output.c+2−2
@@ -1158,12 +1158,12 @@ trace_hwlat_print(struct trace_iterator *iter, int flags, · 1157 unmodified lines
11581158
11591159 trace_assign_type(field, entry);
11601160
1161− trace_seq_printf(s, "#%-5u inner/outer(us): %4llu/%-5llu ts:%lld.%09ld",
1161+ trace_seq_printf(s, "#%-5u inner/outer(us): %4llu/%-5llu ts:%lld.%09ld count:%d",
11621162 field->seqnum,
11631163 field->duration,
11641164 field->outer_duration,
11651165 (long long)field->timestamp.tv_sec,
1166− field->timestamp.tv_nsec);
1166+ field->timestamp.tv_nsec, field->count);
11671167
11681168 if (field->nmi_count) {
11691169 /*

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