This provides valuable information for tracing performance problems. Since this change alters the interface for the python scripts, also adjust the script generation and the provided scripts.
Showing the changes to tools/perf/scripts/python (10 of 11 files). Show all
Unified · Split
| @@ -107,12 +107,13 @@ def taskState(state): · 106 unmodified lines | ||
| 107 | 107 | |
| 108 | 108 | class EventHeaders: |
| 109 | 109 | def __init__(self, common_cpu, common_secs, common_nsecs, |
| 110 | − common_pid, common_comm): | |
| 110 | + common_pid, common_comm, common_callchain): | |
| 111 | 111 | self.cpu = common_cpu |
| 112 | 112 | self.secs = common_secs |
| 113 | 113 | self.nsecs = common_nsecs |
| 114 | 114 | self.pid = common_pid |
| 115 | 115 | self.comm = common_comm |
| 116 | + self.callchain = common_callchain | |
| 116 | 117 | |
| 117 | 118 | def ts(self): |
| 118 | 119 | return (self.secs * (10 ** 9)) + self.nsecs |
| @@ -27,7 +27,7 @@ def trace_end(): · 26 unmodified lines | ||
| 27 | 27 | |
| 28 | 28 | def irq__softirq_entry(event_name, context, common_cpu, |
| 29 | 29 | common_secs, common_nsecs, common_pid, common_comm, |
| 30 | − vec): | |
| 30 | + common_callchain, vec): | |
| 31 | 31 | print_header(event_name, common_cpu, common_secs, common_nsecs, |
| 32 | 32 | common_pid, common_comm) |
| 33 | 33 | |
| @@ -38,7 +38,7 @@ def irq__softirq_entry(event_name, context, common_cpu, · 4 unmodified lines | ||
| 38 | 38 | |
| 39 | 39 | def kmem__kmalloc(event_name, context, common_cpu, |
| 40 | 40 | common_secs, common_nsecs, common_pid, common_comm, |
| 41 | − call_site, ptr, bytes_req, bytes_alloc, | |
| 41 | + common_callchain, call_site, ptr, bytes_req, bytes_alloc, | |
| 42 | 42 | gfp_flags): |
| 43 | 43 | print_header(event_name, common_cpu, common_secs, common_nsecs, |
| 44 | 44 | common_pid, common_comm) |
| @@ -39,7 +39,7 @@ def trace_end(): · 38 unmodified lines | ||
| 39 | 39 | |
| 40 | 40 | def raw_syscalls__sys_exit(event_name, context, common_cpu, |
| 41 | 41 | common_secs, common_nsecs, common_pid, common_comm, |
| 42 | − id, ret): | |
| 42 | + common_callchain, id, ret): | |
| 43 | 43 | if (for_comm and common_comm != for_comm) or \ |
| 44 | 44 | (for_pid and common_pid != for_pid ): |
| 45 | 45 | return |
| @@ -21,7 +21,7 @@ thread_blocktime = {} · 20 unmodified lines | ||
| 21 | 21 | lock_waits = {} # long-lived stats on (tid,lock) blockage elapsed time |
| 22 | 22 | process_names = {} # long-lived pid-to-execname mapping |
| 23 | 23 | |
| 24 | −def syscalls__sys_enter_futex(event, ctxt, cpu, s, ns, tid, comm, | |
| 24 | +def syscalls__sys_enter_futex(event, ctxt, cpu, s, ns, tid, comm, callchain, | |
| 25 | 25 | nr, uaddr, op, val, utime, uaddr2, val3): |
| 26 | 26 | cmd = op & FUTEX_CMD_MASK |
| 27 | 27 | if cmd != FUTEX_WAIT: |
| @@ -31,7 +31,7 @@ def syscalls__sys_enter_futex(event, ctxt, cpu, s, ns, tid, comm, · 3 unmodified lines | ||
| 31 | 31 | thread_thislock[tid] = uaddr |
| 32 | 32 | thread_blocktime[tid] = nsecs(s, ns) |
| 33 | 33 | |
| 34 | −def syscalls__sys_exit_futex(event, ctxt, cpu, s, ns, tid, comm, | |
| 34 | +def syscalls__sys_exit_futex(event, ctxt, cpu, s, ns, tid, comm, callchain, | |
| 35 | 35 | nr, ret): |
| 36 | 36 | if thread_blocktime.has_key(tid): |
| 37 | 37 | elapsed = nsecs(s, ns) - thread_blocktime[tid] |
| @@ -66,7 +66,7 @@ def trace_end(): · 65 unmodified lines | ||
| 66 | 66 | print_drop_table() |
| 67 | 67 | |
| 68 | 68 | # called from perf, when it finds a correspoinding event |
| 69 | −def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm, | |
| 69 | +def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm, callchain, | |
| 70 | 70 | skbaddr, location, protocol): |
| 71 | 71 | slocation = str(location) |
| 72 | 72 | try: |
| @@ -224,75 +224,75 @@ def trace_end(): · 223 unmodified lines | ||
| 224 | 224 | (len(rx_skb_list), of_count_rx_skb_list) |
| 225 | 225 | |
| 226 | 226 | # called from perf, when it finds a correspoinding event |
| 227 | −def irq__softirq_entry(name, context, cpu, sec, nsec, pid, comm, vec): | |
| 227 | +def irq__softirq_entry(name, context, cpu, sec, nsec, pid, comm, callchain, vec): | |
| 228 | 228 | if symbol_str("irq__softirq_entry", "vec", vec) != "NET_RX": |
| 229 | 229 | return |
| 230 | 230 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, vec) |
| 231 | 231 | all_event_list.append(event_info) |
| 232 | 232 | |
| 233 | −def irq__softirq_exit(name, context, cpu, sec, nsec, pid, comm, vec): | |
| 233 | +def irq__softirq_exit(name, context, cpu, sec, nsec, pid, comm, callchain, vec): | |
| 234 | 234 | if symbol_str("irq__softirq_entry", "vec", vec) != "NET_RX": |
| 235 | 235 | return |
| 236 | 236 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, vec) |
| 237 | 237 | all_event_list.append(event_info) |
| 238 | 238 | |
| 239 | −def irq__softirq_raise(name, context, cpu, sec, nsec, pid, comm, vec): | |
| 239 | +def irq__softirq_raise(name, context, cpu, sec, nsec, pid, comm, callchain, vec): | |
| 240 | 240 | if symbol_str("irq__softirq_entry", "vec", vec) != "NET_RX": |
| 241 | 241 | return |
| 242 | 242 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, vec) |
| 243 | 243 | all_event_list.append(event_info) |
| 244 | 244 | |
| 245 | 245 | def irq__irq_handler_entry(name, context, cpu, sec, nsec, pid, comm, |
| 246 | − irq, irq_name): | |
| 246 | + callchain, irq, irq_name): | |
| 247 | 247 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, |
| 248 | 248 | irq, irq_name) |
| 249 | 249 | all_event_list.append(event_info) |
| 250 | 250 | |
| 251 | −def irq__irq_handler_exit(name, context, cpu, sec, nsec, pid, comm, irq, ret): | |
| 251 | +def irq__irq_handler_exit(name, context, cpu, sec, nsec, pid, comm, callchain, irq, ret): | |
| 252 | 252 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, irq, ret) |
| 253 | 253 | all_event_list.append(event_info) |
| 254 | 254 | |
| 255 | −def napi__napi_poll(name, context, cpu, sec, nsec, pid, comm, napi, dev_name): | |
| 255 | +def napi__napi_poll(name, context, cpu, sec, nsec, pid, comm, callchain, napi, dev_name): | |
| 256 | 256 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, |
| 257 | 257 | napi, dev_name) |
| 258 | 258 | all_event_list.append(event_info) |
| 259 | 259 | |
| 260 | −def net__netif_receive_skb(name, context, cpu, sec, nsec, pid, comm, skbaddr, | |
| 260 | +def net__netif_receive_skb(name, context, cpu, sec, nsec, pid, comm, callchain, skbaddr, | |
| 261 | 261 | skblen, dev_name): |
| 262 | 262 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, |
| 263 | 263 | skbaddr, skblen, dev_name) |
| 264 | 264 | all_event_list.append(event_info) |
| 265 | 265 | |
| 266 | −def net__netif_rx(name, context, cpu, sec, nsec, pid, comm, skbaddr, | |
| 266 | +def net__netif_rx(name, context, cpu, sec, nsec, pid, comm, callchain, skbaddr, | |
| 267 | 267 | skblen, dev_name): |
| 268 | 268 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, |
| 269 | 269 | skbaddr, skblen, dev_name) |
| 270 | 270 | all_event_list.append(event_info) |
| 271 | 271 | |
| 272 | −def net__net_dev_queue(name, context, cpu, sec, nsec, pid, comm, | |
| 272 | +def net__net_dev_queue(name, context, cpu, sec, nsec, pid, comm, callchain, | |
| 273 | 273 | skbaddr, skblen, dev_name): |
| 274 | 274 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, |
| 275 | 275 | skbaddr, skblen, dev_name) |
| 276 | 276 | all_event_list.append(event_info) |
| 277 | 277 | |
| 278 | −def net__net_dev_xmit(name, context, cpu, sec, nsec, pid, comm, | |
| 278 | +def net__net_dev_xmit(name, context, cpu, sec, nsec, pid, comm, callchain, | |
| 279 | 279 | skbaddr, skblen, rc, dev_name): |
| 280 | 280 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, |
| 281 | 281 | skbaddr, skblen, rc ,dev_name) |
| 282 | 282 | all_event_list.append(event_info) |
| 283 | 283 | |
| 284 | −def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm, | |
| 284 | +def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm, callchain, | |
| 285 | 285 | skbaddr, protocol, location): |
| 286 | 286 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, |
| 287 | 287 | skbaddr, protocol, location) |
| 288 | 288 | all_event_list.append(event_info) |
| 289 | 289 | |
| 290 | −def skb__consume_skb(name, context, cpu, sec, nsec, pid, comm, skbaddr): | |
| 290 | +def skb__consume_skb(name, context, cpu, sec, nsec, pid, comm, callchain, skbaddr): | |
| 291 | 291 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, |
| 292 | 292 | skbaddr) |
| 293 | 293 | all_event_list.append(event_info) |
| 294 | 294 | |
| 295 | −def skb__skb_copy_datagram_iovec(name, context, cpu, sec, nsec, pid, comm, | |
| 295 | +def skb__skb_copy_datagram_iovec(name, context, cpu, sec, nsec, pid, comm, callchain, | |
| 296 | 296 | skbaddr, skblen): |
| 297 | 297 | event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, |
| 298 | 298 | skbaddr, skblen) |
| @@ -369,93 +369,92 @@ def trace_end(): · 368 unmodified lines | ||
| 369 | 369 | |
| 370 | 370 | def sched__sched_stat_runtime(event_name, context, common_cpu, |
| 371 | 371 | common_secs, common_nsecs, common_pid, common_comm, |
| 372 | − comm, pid, runtime, vruntime): | |
| 372 | + common_callchain, comm, pid, runtime, vruntime): | |
| 373 | 373 | pass |
| 374 | 374 | |
| 375 | 375 | def sched__sched_stat_iowait(event_name, context, common_cpu, |
| 376 | 376 | common_secs, common_nsecs, common_pid, common_comm, |
| 377 | − comm, pid, delay): | |
| 377 | + common_callchain, comm, pid, delay): | |
| 378 | 378 | pass |
| 379 | 379 | |
| 380 | 380 | def sched__sched_stat_sleep(event_name, context, common_cpu, |
| 381 | 381 | common_secs, common_nsecs, common_pid, common_comm, |
| 382 | − comm, pid, delay): | |
| 382 | + common_callchain, comm, pid, delay): | |
| 383 | 383 | pass |
| 384 | 384 | |
| 385 | 385 | def sched__sched_stat_wait(event_name, context, common_cpu, |
| 386 | 386 | common_secs, common_nsecs, common_pid, common_comm, |
| 387 | − comm, pid, delay): | |
| 387 | + common_callchain, comm, pid, delay): | |
| 388 | 388 | pass |
| 389 | 389 | |
| 390 | 390 | def sched__sched_process_fork(event_name, context, common_cpu, |
| 391 | 391 | common_secs, common_nsecs, common_pid, common_comm, |
| 392 | − parent_comm, parent_pid, child_comm, child_pid): | |
| 392 | + common_callchain, parent_comm, parent_pid, child_comm, child_pid): | |
| 393 | 393 | pass |
| 394 | 394 | |
| 395 | 395 | def sched__sched_process_wait(event_name, context, common_cpu, |
| 396 | 396 | common_secs, common_nsecs, common_pid, common_comm, |
| 397 | − comm, pid, prio): | |
| 397 | + common_callchain, comm, pid, prio): | |
| 398 | 398 | pass |
| 399 | 399 | |
| 400 | 400 | def sched__sched_process_exit(event_name, context, common_cpu, |
| 401 | 401 | common_secs, common_nsecs, common_pid, common_comm, |
| 402 | − comm, pid, prio): | |
| 402 | + common_callchain, comm, pid, prio): | |
| 403 | 403 | pass |
| 404 | 404 | |
| 405 | 405 | def sched__sched_process_free(event_name, context, common_cpu, |
| 406 | 406 | common_secs, common_nsecs, common_pid, common_comm, |
| 407 | − comm, pid, prio): | |
| 407 | + common_callchain, comm, pid, prio): | |
| 408 | 408 | pass |
| 409 | 409 | |
| 410 | 410 | def sched__sched_migrate_task(event_name, context, common_cpu, |
| 411 | 411 | common_secs, common_nsecs, common_pid, common_comm, |
| 412 | − comm, pid, prio, orig_cpu, | |
| 412 | + common_callchain, comm, pid, prio, orig_cpu, | |
| 413 | 413 | dest_cpu): |
| 414 | 414 | headers = EventHeaders(common_cpu, common_secs, common_nsecs, |
| 415 | − common_pid, common_comm) | |
| 415 | + common_pid, common_comm, common_callchain) | |
| 416 | 416 | parser.migrate(headers, pid, prio, orig_cpu, dest_cpu) |
| 417 | 417 | |
| 418 | 418 | def sched__sched_switch(event_name, context, common_cpu, |
| 419 | − common_secs, common_nsecs, common_pid, common_comm, | |
| 419 | + common_secs, common_nsecs, common_pid, common_comm, common_callchain, | |
| 420 | 420 | prev_comm, prev_pid, prev_prio, prev_state, |
| 421 | 421 | next_comm, next_pid, next_prio): |
| 422 | 422 | |
| 423 | 423 | headers = EventHeaders(common_cpu, common_secs, common_nsecs, |
| 424 | − common_pid, common_comm) | |
| 424 | + common_pid, common_comm, common_callchain) | |
| 425 | 425 | parser.sched_switch(headers, prev_comm, prev_pid, prev_prio, prev_state, |
| 426 | 426 | next_comm, next_pid, next_prio) |
| 427 | 427 | |
| 428 | 428 | def sched__sched_wakeup_new(event_name, context, common_cpu, |
| 429 | 429 | common_secs, common_nsecs, common_pid, common_comm, |
| 430 | − comm, pid, prio, success, | |
| 430 | + common_callchain, comm, pid, prio, success, | |
| 431 | 431 | target_cpu): |
| 432 | 432 | headers = EventHeaders(common_cpu, common_secs, common_nsecs, |
| 433 | − common_pid, common_comm) | |
| 433 | + common_pid, common_comm, common_callchain) | |
| 434 | 434 | parser.wake_up(headers, comm, pid, success, target_cpu, 1) |
| 435 | 435 | |
| 436 | 436 | def sched__sched_wakeup(event_name, context, common_cpu, |
| 437 | 437 | common_secs, common_nsecs, common_pid, common_comm, |
| 438 | − comm, pid, prio, success, | |
| 438 | + common_callchain, comm, pid, prio, success, | |
| 439 | 439 | target_cpu): |
| 440 | 440 | headers = EventHeaders(common_cpu, common_secs, common_nsecs, |
| 441 | − common_pid, common_comm) | |
| 441 | + common_pid, common_comm, common_callchain) | |
| 442 | 442 | parser.wake_up(headers, comm, pid, success, target_cpu, 0) |
| 443 | 443 | |
| 444 | 444 | def sched__sched_wait_task(event_name, context, common_cpu, |
| 445 | 445 | common_secs, common_nsecs, common_pid, common_comm, |
| 446 | − comm, pid, prio): | |
| 446 | + common_callchain, comm, pid, prio): | |
| 447 | 447 | pass |
| 448 | 448 | |
| 449 | 449 | def sched__sched_kthread_stop_ret(event_name, context, common_cpu, |
| 450 | 450 | common_secs, common_nsecs, common_pid, common_comm, |
| 451 | − ret): | |
| 451 | + common_callchain, ret): | |
| 452 | 452 | pass |
| 453 | 453 | |
| 454 | 454 | def sched__sched_kthread_stop(event_name, context, common_cpu, |
| 455 | 455 | common_secs, common_nsecs, common_pid, common_comm, |
| 456 | − comm, pid): | |
| 456 | + common_callchain, comm, pid): | |
| 457 | 457 | pass |
| 458 | 458 | |
| 459 | −def trace_unhandled(event_name, context, common_cpu, common_secs, common_nsecs, | |
| 460 | − common_pid, common_comm): | |
| 459 | +def trace_unhandled(event_name, context, event_fields_dict): | |
| 461 | 460 | pass |
| @@ -44,7 +44,7 @@ def trace_begin(): · 43 unmodified lines | ||
| 44 | 44 | |
| 45 | 45 | def raw_syscalls__sys_enter(event_name, context, common_cpu, |
| 46 | 46 | common_secs, common_nsecs, common_pid, common_comm, |
| 47 | − id, args): | |
| 47 | + common_callchain, id, args): | |
| 48 | 48 | if for_comm is not None: |
| 49 | 49 | if common_comm != for_comm: |
| 50 | 50 | return |
| @@ -38,7 +38,7 @@ def trace_end(): · 37 unmodified lines | ||
| 38 | 38 | |
| 39 | 39 | def raw_syscalls__sys_enter(event_name, context, common_cpu, |
| 40 | 40 | common_secs, common_nsecs, common_pid, common_comm, |
| 41 | − id, args): | |
| 41 | + common_callchain, id, args): | |
| 42 | 42 | |
| 43 | 43 | if (for_comm and common_comm != for_comm) or \ |
| 44 | 44 | (for_pid and common_pid != for_pid ): |
| @@ -35,7 +35,7 @@ def trace_end(): · 34 unmodified lines | ||
| 35 | 35 | |
| 36 | 36 | def raw_syscalls__sys_enter(event_name, context, common_cpu, |
| 37 | 37 | common_secs, common_nsecs, common_pid, common_comm, |
| 38 | − id, args): | |
| 38 | + common_callchain, id, args): | |
| 39 | 39 | if for_comm is not None: |
| 40 | 40 | if common_comm != for_comm: |
| 41 | 41 | return |