tracing: A few more fixes before sending to 5.14
Subsystems (22)
Steven Rostedt
maintainercover tracing: A few more fixes before sending to 5.14
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: 78c14b385c195d4f25ab7c19186b8897a5b9ae3f
Austin Kim (1):
tracing: Change variable type as bool for clean-up
Daniel Bristot de Oliveira (2):
trace/osnoise: Make 'noise' variable s64 in run_osnoise() trace/timerlat: Fix indentation on timerlat_main()
Joe Perches (1):
treewide: Add missing semicolons to __assign_str uses
Steven Rostedt (VMware) (1):
tracepoint: Add tracepoint_probe_register_may_exist() for BPF tracing
----
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 14 ++++---- drivers/gpu/drm/lima/lima_trace.h | 2 +- drivers/infiniband/hw/hfi1/trace_misc.h | 4 +-- drivers/infiniband/hw/hfi1/trace_rc.h | 4 +-- drivers/infiniband/hw/hfi1/trace_tid.h | 6 ++-- drivers/infiniband/hw/hfi1/trace_tx.h | 8 ++--- drivers/infiniband/sw/rdmavt/trace_cq.h | 4 +-- drivers/infiniband/sw/rdmavt/trace_mr.h | 2 +- drivers/infiniband/sw/rdmavt/trace_qp.h | 4 +-- drivers/infiniband/sw/rdmavt/trace_rc.h | 2 +- drivers/infiniband/sw/rdmavt/trace_tx.h | 4 +-- drivers/misc/mei/mei-trace.h | 6 ++-- .../net/ethernet/marvell/octeontx2/af/rvu_trace.h | 12 +++---- drivers/net/fjes/fjes_trace.h | 4 +-- drivers/usb/cdns3/cdnsp-trace.h | 2 +- fs/nfs/nfs4trace.h | 6 ++-- fs/nfs/nfstrace.h | 4 +-- include/linux/tracepoint.h | 10 ++++++ include/trace/events/btrfs.h | 2 +- include/trace/events/dma_fence.h | 4 +-- include/trace/events/rpcgss.h | 4 +-- include/trace/events/sunrpc.h | 40 +++++++++++----------- kernel/trace/bpf_trace.c | 3 +- kernel/trace/trace_osnoise.c | 11 +++--- kernel/trace/trace_sched_wakeup.c | 24 ++++++------- kernel/tracepoint.c | 33 ++++++++++++++++-- 26 files changed, 129 insertions(+), 90 deletions(-)
Steven Rostedt
maintainerPATCH 1/5 tracepoint: Add tracepoint_probe_register_may_exist() for BPF tracing
From: "Steven Rostedt (VMware)" <[email protected]>
All internal use cases for tracepoint_probe_register() is set to not ever be called with the same function and data. If it is, it is considered a bug, as that means the accounting of handling tracepoints is corrupted. If the function and data for a tracepoint is already registered when tracepoint_probe_register() is called, it will call WARN_ON_ONCE() and return with EEXISTS.
The BPF system call can end up calling tracepoint_probe_register() with the same data, which now means that this can trigger the warning because of a user space process. As WARN_ON_ONCE() should not be called because user space called a system call with bad data, there needs to be a way to register a tracepoint without triggering a warning.
Enter tracepoint_probe_register_may_exist(), which can be called, but will not cause a WARN_ON() if the probe already exists. It will still error out with EEXIST, which will then be sent to the user space that performed the BPF system call.
This keeps the previous testing for issues with other users of the tracepoint code, while letting BPF call it with duplicated data and not warn about it.
--- include/linux/tracepoint.h | 10 ++++++++++ kernel/trace/bpf_trace.c | 3 ++- kernel/tracepoint.c | 33 ++++++++++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 4 deletions(-)
include/linux/tracepoint.h +10 -0
@@ -41,7 +41,17 @@ extern int tracepoint_probe_register_prio(struct tracepoint *tp, void *probe, void *data, int prio);extern int +tracepoint_probe_register_prio_may_exist (struct tracepoint *tp,void *probe,void *data, +int prio); +extern int tracepoint_probe_unregister (struct tracepoint *tp,void *probe,void *data); +static inline int +tracepoint_probe_register_may_exist (struct tracepoint *tp,void *probe, +void *data) +{ +return tracepoint_probe_register_prio_may_exist (tp, probe, data, +TRACEPOINT_DEFAULT_PRIO ); +}extern void for_each_kernel_tracepoint (void (*fct)(struct tracepoint *tp,void *priv),void *priv);
kernel/trace/bpf_trace.c +2 -1
@@ -1840,7 +1840,8 @@ static int __bpf_probe_register(struct bpf_raw_event_map *btp, struct bpf_prog *if (prog->aux->max_tp_access > btp->writable_size)return -EINVAL ; -return tracepoint_probe_register (tp, (void *)btp->bpf_func, prog); +return tracepoint_probe_register_may_exist (tp, (void *)btp->bpf_func, + prog); }int bpf_probe_register (struct bpf_raw_event_map *btp,struct bpf_prog *prog)
kernel/tracepoint.c +30 -3
@@ -273,7 +273,8 @@ static void tracepoint_update_call(struct tracepoint *tp, struct tracepoint_func* Add the probe function to a tracepoint. */ static int tracepoint_add_func (struct tracepoint *tp, -struct tracepoint_func *func,int prio) +struct tracepoint_func *func,int prio, +bool warn) {struct tracepoint_func *old, *tp_funcs;int ret;
@@ -288,7 +289,7 @@ static int tracepoint_add_func(struct tracepoint *tp, lockdep_is_held(&tracepoints_mutex)); old =func_add (&tp_funcs, func, prio);if (IS_ERR (old)) { -WARN_ON_ONCE (PTR_ERR (old) != -ENOMEM ); +WARN_ON_ONCE (warn &&PTR_ERR (old) != -ENOMEM );return PTR_ERR (old); }
@@ -343,6 +344,32 @@ static int tracepoint_remove_func(struct tracepoint *tp,return 0 ; } +/** +* tracepoint_probe_register_prio_may_exist - Connect a probe to a tracepoint with priority +* @tp: tracepoint +* @probe: probe handler +* @data: tracepoint data +* @prio: priority of this function over other registered functions +* +* Same as tracepoint_probe_register_prio() except that it will not warn +* if the tracepoint is already registered. +*/ +int tracepoint_probe_register_prio_may_exist (struct tracepoint *tp,void *probe, +void *data,int prio) +{ +struct tracepoint_func tp_func; +int ret; + +mutex_lock (&tracepoints_mutex); + tp_func.func = probe; + tp_func.data = data; + tp_func.prio = prio; + ret =tracepoint_add_func (tp, &tp_func, prio, false); +mutex_unlock (&tracepoints_mutex); +return ret; +} +EXPORT_SYMBOL_GPL (tracepoint_probe_register_prio_may_exist); +/** * tracepoint_probe_register_prio - Connect a probe to a tracepoint with priority * @tp: tracepoint
@@ -366,7 +393,7 @@ int tracepoint_probe_register_prio(struct tracepoint *tp, void *probe, tp_func.func = probe; tp_func.data = data; tp_func.prio = prio; - ret =tracepoint_add_func (tp, &tp_func, prio); + ret =tracepoint_add_func (tp, &tp_func, prio, true);mutex_unlock (&tracepoints_mutex);return ret; }
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 2/5 trace/osnoise: Make noise variable s64 in run_osnoise()
In reply to Steven RostedtFrom: Daniel Bristot de Oliveira <[email protected]>
Dab Carpenter reported that:
The patch bce29ac9ce0b: "trace: Add osnoise tracer" from Jun 22, 2021, leads to the following static checker warning:
kernel/trace/trace_osnoise.c:1103 run_osnoise() warn: unsigned 'noise' is never less than zero.
In this part of the code:
1100 /*
1101 * This shouldn't happen.
1102 */
1103 if (noise < 0) {
^^^^^^^^^
1104 osnoise_taint("negative noise!");
1105 goto out;
1106 }
1107And the static checker is right because 'noise' is u64.
Make noise s64 and keep the check. It is important to check if the time read is behaving correctly - so we can trust the results.
I also re-arranged some variable declarations.
--- kernel/trace/trace_osnoise.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/trace/trace_osnoise.c +3 -2
@@ -1042,15 +1042,16 @@ static void osnoise_stop_tracing(void)static int run_osnoise (void ) {struct osnoise_variables *osn_var =this_cpu_osn_var (); -u64 noise =0 , sum_noise =0 , max_noise =0 ;struct trace_array *tr = osnoise_trace;u64 start, sample, last_sample;u64 last_int_count, int_count; +s64 noise =0 , max_noise =0 ;s64 total, last_total =0 ;struct osnoise_sample s;unsigned int threshold; -int hw_count =0 ;u64 runtime, stop_in; +u64 sum_noise =0 ; +int hw_count =0 ;int ret =-1 ;/*
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 3/5 trace/timerlat: Fix indentation on timerlat_main()
In reply to Steven RostedtFrom: Daniel Bristot de Oliveira <[email protected]>
Dan Carpenter reported that:
The patch a955d7eac177: "trace: Add timerlat tracer" from Jun 22, 2021, leads to the following static checker warning:
kernel/trace/trace_osnoise.c:1400 timerlat_main()
warn: inconsistent indenting
here:
1389 while (!kthread_should_stop()) {
1390 now = ktime_to_ns(hrtimer_cb_get_time(&tlat->timer));
1391 diff = now - tlat->abs_period;
1392
1393 s.seqnum = tlat->count; 1394 s.timer_latency = diff; 1395 s.context = THREAD_CONTEXT;
1396
1397 trace_timerlat_sample(&s);
1398
1399 #ifdef CONFIG_STACKTRACE
1400 if (osnoise_data.print_stack)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This should be indented another tab?
1401 if (osnoise_data.print_stack <= time_to_us(diff)) 1402 timerlat_dump_stack(); 1403 #endif /* CONFIG_STACKTRACE */ 1404 1405 tlat->tracing_thread = false; 1406 if (osnoise_data.stop_tracing_total) 1407 if (time_to_us(diff) >= osnoise_data.stop_tracing_total) 1408 osnoise_stop_tracing(); 1409 1410 wait_next_period(tlat); 1411 }
And the static checker is right. Fix the indentation.
--- kernel/trace/trace_osnoise.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/trace/trace_osnoise.c +3 -3
@@ -1403,9 +1403,9 @@ static int timerlat_main(void *data)trace_timerlat_sample (&s);#ifdef CONFIG_STACKTRACE -if (osnoise_data.print_stack) -if (osnoise_data.print_stack <=time_to_us (diff)) -timerlat_dump_stack (); +if (osnoise_data.print_stack) +if (osnoise_data.print_stack <=time_to_us (diff)) +timerlat_dump_stack ();#endif /* CONFIG_STACKTRACE */ tlat->tracing_thread = false;
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 4/5 tracing: Change variable type as bool for clean-up
In reply to Steven RostedtFrom: Austin Kim <[email protected]>
The wakeup_rt wakeup_dl, tracing_dl is only set to 0, 1. So changing type of wakeup_rt wakeup_dl, tracing_dl as bool makes relevant routine be more readable.
--- kernel/trace/trace_sched_wakeup.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
kernel/trace/trace_sched_wakeup.c +12 -12
@@ -26,9 +26,9 @@ static struct task_struct *wakeup_task;static int wakeup_cpu;static int wakeup_current_cpu;static unsigned wakeup_prio =-1 ; -static int wakeup_rt; -static int wakeup_dl; -static int tracing_dl =0 ; +static bool wakeup_rt; +static bool wakeup_dl; +static bool tracing_dl;static arch_spinlock_t wakeup_lock = (arch_spinlock_t )__ARCH_SPIN_LOCK_UNLOCKED;
@@ -498,7 +498,7 @@ static void __wakeup_reset(struct trace_array *tr) { wakeup_cpu =-1 ; wakeup_prio =-1 ; - tracing_dl =0 ; + tracing_dl = false;if (wakeup_task)put_task_struct (wakeup_task);
@@ -572,9 +572,9 @@ probe_wakeup(void *ignore, struct task_struct *p)* another task until the first one wakes up. */ if (dl_task (p)) - tracing_dl =1 ; + tracing_dl = true;else - tracing_dl =0 ; + tracing_dl = false; wakeup_task =get_task_struct (p);
@@ -685,8 +685,8 @@ static int wakeup_tracer_init(struct trace_array *tr)if (wakeup_busy)return -EBUSY ; - wakeup_dl =0 ; - wakeup_rt =0 ; + wakeup_dl = false; + wakeup_rt = false;return __wakeup_tracer_init (tr); }
@@ -695,8 +695,8 @@ static int wakeup_rt_tracer_init(struct trace_array *tr)if (wakeup_busy)return -EBUSY ; - wakeup_dl =0 ; - wakeup_rt =1 ; + wakeup_dl = false; + wakeup_rt = true;return __wakeup_tracer_init (tr); }
@@ -705,8 +705,8 @@ static int wakeup_dl_tracer_init(struct trace_array *tr)if (wakeup_busy)return -EBUSY ; - wakeup_dl =1 ; - wakeup_rt =0 ; + wakeup_dl = true; + wakeup_rt = false;return __wakeup_tracer_init (tr); }
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 5/5 treewide: Add missing semicolons to __assign_str uses
In reply to Steven RostedtFrom: Joe Perches <[email protected]>
The __assign_str macro has an unusual ending semicolon but the vast majority of uses of the macro already have semicolon termination.
$ git grep -P '\b__assign_str\b' | wc -l 551 $ git grep -P '\b__assign_str\b.*;' | wc -l 480
Add semicolons to the __assign_str() uses without semicolon termination and all the other uses without semicolon termination via additional defines that are equivalent to __assign_str() with the eventual goal of removing the semicolon from the __assign_str() macro definition.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 14 +++---- drivers/gpu/drm/lima/lima_trace.h | 2 +- drivers/infiniband/hw/hfi1/trace_misc.h | 4 +- drivers/infiniband/hw/hfi1/trace_rc.h | 4 +- drivers/infiniband/hw/hfi1/trace_tid.h | 6 +-- drivers/infiniband/hw/hfi1/trace_tx.h | 8 ++-- drivers/infiniband/sw/rdmavt/trace_cq.h | 4 +- drivers/infiniband/sw/rdmavt/trace_mr.h | 2 +- drivers/infiniband/sw/rdmavt/trace_qp.h | 4 +- drivers/infiniband/sw/rdmavt/trace_rc.h | 2 +- drivers/infiniband/sw/rdmavt/trace_tx.h | 4 +- drivers/misc/mei/mei-trace.h | 6 +-- .../ethernet/marvell/octeontx2/af/rvu_trace.h | 12 +++--- drivers/net/fjes/fjes_trace.h | 4 +- drivers/usb/cdns3/cdnsp-trace.h | 2 +- fs/nfs/nfs4trace.h | 6 +-- fs/nfs/nfstrace.h | 4 +- include/trace/events/btrfs.h | 2 +- include/trace/events/dma_fence.h | 4 +- include/trace/events/rpcgss.h | 4 +- include/trace/events/sunrpc.h | 40 +++++++++---------- 21 files changed, 69 insertions(+), 69 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +7 -7
@@ -176,10 +176,10 @@ TRACE_EVENT(amdgpu_cs_ioctl,TP_fast_assign ( __entry->sched_job_id = job->base.id; -__assign_str (timeline,AMDGPU_JOB_GET_TIMELINE_NAME (job)) +__assign_str (timeline,AMDGPU_JOB_GET_TIMELINE_NAME (job)); __entry->context = job->base.s_fence->finished.context; __entry->seqno = job->base.s_fence->finished.seqno; -__assign_str (ring,to_amdgpu_ring (job->base.sched)->name) +__assign_str (ring,to_amdgpu_ring (job->base.sched)->name); __entry->num_ibs = job->num_ibs; ), TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u",
@@ -201,10 +201,10 @@ TRACE_EVENT(amdgpu_sched_run_job,TP_fast_assign ( __entry->sched_job_id = job->base.id; -__assign_str (timeline,AMDGPU_JOB_GET_TIMELINE_NAME (job)) +__assign_str (timeline,AMDGPU_JOB_GET_TIMELINE_NAME (job)); __entry->context = job->base.s_fence->finished.context; __entry->seqno = job->base.s_fence->finished.seqno; -__assign_str (ring,to_amdgpu_ring (job->base.sched)->name) +__assign_str (ring,to_amdgpu_ring (job->base.sched)->name); __entry->num_ibs = job->num_ibs; ), TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u",
@@ -229,7 +229,7 @@ TRACE_EVENT(amdgpu_vm_grab_id,TP_fast_assign ( __entry->pasid = vm->pasid; -__assign_str (ring, ring->name) +__assign_str (ring, ring->name); __entry->vmid = job->vmid; __entry->vm_hub = ring->funcs->vmhub, __entry->pd_addr = job->vm_pd_addr;
@@ -424,7 +424,7 @@ TRACE_EVENT(amdgpu_vm_flush, ), TP_fast_assign( -__assign_str (ring, ring->name) + __assign_str(ring, ring->name); __entry->vmid = vmid; __entry->vm_hub = ring->funcs->vmhub; __entry->pd_addr = pd_addr;
@@ -525,7 +525,7 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, ),TP_fast_assign ( -__assign_str (ring, sched_job->base.sched->name) + __assign_str(ring, sched_job->base.sched->name); __entry->id = sched_job->base.id; __entry->fence = fence; __entry->ctx = fence->context;
drivers/gpu/drm/lima/lima_trace.h +1 -1
@@ -24,7 +24,7 @@ DECLARE_EVENT_CLASS(lima_task, __entry->task_id = task->base.id; __entry->context = task->base.s_fence->finished.context; __entry->seqno = task->base.s_fence->finished.seqno; -__assign_str (pipe, task->base.sched->name) +__assign_str (pipe, task->base.sched->name); ), TP_printk("task=%llu, context=%u seqno=%u pipe=%s",
drivers/infiniband/hw/hfi1/trace_misc.h +2 -2
@@ -63,7 +63,7 @@ TRACE_EVENT(hfi1_interrupt, __array(char, buf, 64)__field (int, src) ), -TP_fast_assign (DD_DEV_ASSIGN (dd) + TP_fast_assign(DD_DEV_ASSIGN(dd); is_entry->is_name (__entry->buf,64 , src - is_entry->start); __entry->src = src;
@@ -100,7 +100,7 @@ TRACE_EVENT(hfi1_fault_opcode, __field(u32, qpn)__field (u8, opcode) ), -TP_fast_assign (DD_DEV_ASSIGN (dd_from_ibdev (qp->ibqp.device)) + TP_fast_assign(DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); __entry->qpn = qp->ibqp.qp_num; __entry->opcode = opcode; ),
drivers/infiniband/hw/hfi1/trace_rc.h +2 -2
@@ -70,7 +70,7 @@ DECLARE_EVENT_CLASS(hfi1_rc_template,__field (u32, r_psn) ),TP_fast_assign ( -DD_DEV_ASSIGN (dd_from_ibdev (qp->ibqp.device)) + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); __entry->qpn = qp->ibqp.qp_num; __entry->s_flags = qp->s_flags; __entry->psn = psn;
@@ -130,7 +130,7 @@ DECLARE_EVENT_CLASS(/* rc_ack */__field (u32, lpsn) ),TP_fast_assign (/* assign */ -DD_DEV_ASSIGN (dd_from_ibdev (qp->ibqp.device)) + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); __entry->qpn = qp->ibqp.qp_num; __entry->aeth = aeth; __entry->psn = psn;
drivers/infiniband/hw/hfi1/trace_tid.h +3 -3
@@ -886,7 +886,7 @@ DECLARE_EVENT_CLASS(/* sender_info */__field (u8, s_retry) ),TP_fast_assign (/* assign */ -DD_DEV_ASSIGN (dd_from_ibdev (qp->ibqp.device)) + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); __entry->qpn = qp->ibqp.qp_num; __entry->state = qp->state; __entry->s_cur = qp->s_cur;
@@ -1285,7 +1285,7 @@ DECLARE_EVENT_CLASS(/* rc_rcv_err */__field (int, diff) ),TP_fast_assign (/* assign */ -DD_DEV_ASSIGN (dd_from_ibdev (qp->ibqp.device)) + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); __entry->qpn = qp->ibqp.qp_num; __entry->s_flags = qp->s_flags; __entry->state = qp->state;
@@ -1574,7 +1574,7 @@ DECLARE_EVENT_CLASS(/* tid_ack */__field (u32, resync_psn) ),TP_fast_assign (/* assign */ -DD_DEV_ASSIGN (dd_from_ibdev (qp->ibqp.device)) + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); __entry->qpn = qp->ibqp.qp_num; __entry->aeth = aeth; __entry->psn = psn;
drivers/infiniband/hw/hfi1/trace_tx.h +4 -4
@@ -120,7 +120,7 @@ DECLARE_EVENT_CLASS(hfi1_qpsleepwakeup_template, __field(unsigned long, iow_flags) ),TP_fast_assign ( - DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)) + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); __entry->flags = flags; __entry->qpn = qp->ibqp.qp_num; __entry->s_flags = qp->s_flags;
@@ -868,7 +868,7 @@ TRACE_EVENT(__field (int, send_flags) ),TP_fast_assign ( -DD_DEV_ASSIGN (dd_from_ibdev (qp->ibqp.device)) + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); __entry->wqe = wqe; __entry->wr_id = wqe->wr.wr_id; __entry->qpn = qp->ibqp.qp_num;
@@ -904,7 +904,7 @@ DECLARE_EVENT_CLASS(__field (bool, flag) ),TP_fast_assign ( -DD_DEV_ASSIGN (dd_from_ibdev (qp->ibqp.device)) + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); __entry->qpn = qp->ibqp.qp_num; __entry->flag = flag; ),
@@ -952,7 +952,7 @@ DECLARE_EVENT_CLASS(/* AIP */__field (u8, stopped) ),TP_fast_assign (/* assign */ -DD_DEV_ASSIGN (txq->priv->dd) + DD_DEV_ASSIGN(txq->priv->dd); __entry->txq = txq; __entry->sde = txq->sde; __entry->head = txq->tx_ring.head;
drivers/infiniband/sw/rdmavt/trace_cq.h +2 -2
@@ -85,7 +85,7 @@ DECLARE_EVENT_CLASS(rvt_cq_template, __field(int, comp_vector_cpu)__field (u32, flags) ), -TP_fast_assign (RDI_DEV_ASSIGN (cq->rdi) + TP_fast_assign(RDI_DEV_ASSIGN(cq->rdi); __entry->ip = cq->ip; __entry->cqe = attr->cqe; __entry->comp_vector = attr->comp_vector;
@@ -123,7 +123,7 @@ DECLARE_EVENT_CLASS(__field (u32, imm) ),TP_fast_assign ( -RDI_DEV_ASSIGN (cq->rdi) + RDI_DEV_ASSIGN(cq->rdi); __entry->wr_id = wc->wr_id; __entry->status = wc->status; __entry->opcode = wc->opcode;
drivers/infiniband/sw/rdmavt/trace_mr.h +1 -1
@@ -195,7 +195,7 @@ TRACE_EVENT(__field (uint, sg_offset) ),TP_fast_assign ( -RDI_DEV_ASSIGN (ib_to_rvt (to_imr (ibmr)->mr.pd->device)) + RDI_DEV_ASSIGN(ib_to_rvt(to_imr(ibmr)->mr.pd->device)); __entry->ibmr_iova = ibmr->iova; __entry->iova =to_imr (ibmr)->mr.iova; __entry->user_base =to_imr (ibmr)->mr.user_base;
drivers/infiniband/sw/rdmavt/trace_qp.h +2 -2
@@ -65,7 +65,7 @@ DECLARE_EVENT_CLASS(rvt_qphash_template,__field (u32, bucket) ),TP_fast_assign ( -RDI_DEV_ASSIGN (ib_to_rvt (qp->ibqp.device)) + RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)); __entry->qpn = qp->ibqp.qp_num; __entry->bucket = bucket; ),
@@ -97,7 +97,7 @@ DECLARE_EVENT_CLASS(__field (u32, to) ),TP_fast_assign ( -RDI_DEV_ASSIGN (ib_to_rvt (qp->ibqp.device)) + RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)); __entry->qpn = qp->ibqp.qp_num; __entry->hrtimer = &qp->s_rnr_timer; __entry->s_flags = qp->s_flags;
drivers/infiniband/sw/rdmavt/trace_rc.h +1 -1
@@ -71,7 +71,7 @@ DECLARE_EVENT_CLASS(rvt_rc_template,__field (u32, r_psn) ),TP_fast_assign ( -RDI_DEV_ASSIGN (ib_to_rvt (qp->ibqp.device)) + RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)); __entry->qpn = qp->ibqp.qp_num; __entry->s_flags = qp->s_flags; __entry->psn = psn;
drivers/infiniband/sw/rdmavt/trace_tx.h +2 -2
@@ -111,7 +111,7 @@ TRACE_EVENT(__field (int, wr_num_sge) ),TP_fast_assign ( -RDI_DEV_ASSIGN (ib_to_rvt (qp->ibqp.device)) + RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)); __entry->wqe = wqe; __entry->wr_id = wqe->wr.wr_id; __entry->qpn = qp->ibqp.qp_num;
@@ -170,7 +170,7 @@ TRACE_EVENT(__field (int, send_flags) ),TP_fast_assign ( -RDI_DEV_ASSIGN (ib_to_rvt (qp->ibqp.device)) + RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)); __entry->wqe = wqe; __entry->wr_id = wqe->wr.wr_id; __entry->qpn = qp->ibqp.qp_num;
drivers/misc/mei/mei-trace.h +3 -3
@@ -26,7 +26,7 @@ TRACE_EVENT(mei_reg_read,__field (u32, val) ),TP_fast_assign ( -__assign_str (dev,dev_name (dev)) + __assign_str(dev, dev_name(dev)); __entry->reg = reg; __entry->offs = offs; __entry->val = val;
@@ -45,7 +45,7 @@ TRACE_EVENT(mei_reg_write,__field (u32, val) ),TP_fast_assign ( -__assign_str (dev,dev_name (dev)) + __assign_str(dev, dev_name(dev)); __entry->reg = reg; __entry->offs = offs; __entry->val = val;
@@ -64,7 +64,7 @@ TRACE_EVENT(mei_pci_cfg_read,__field (u32, val) ),TP_fast_assign ( -__assign_str (dev,dev_name (dev)) + __assign_str(dev, dev_name(dev)); __entry->reg = reg; __entry->offs = offs; __entry->val = val;
drivers/net/ethernet/marvell/octeontx2/af/rvu_trace.h +6 -6
@@ -21,7 +21,7 @@ TRACE_EVENT(otx2_msg_alloc, __field(u16, id)__field (u64, size) ), -TP_fast_assign (__assign_str (dev,pci_name (pdev)) + TP_fast_assign(__assign_str(dev, pci_name(pdev)); __entry->id = id; __entry->size = size; ),
@@ -36,7 +36,7 @@ TRACE_EVENT(otx2_msg_send, __field(u16, num_msgs)__field (u64, msg_size) ), -TP_fast_assign (__assign_str (dev,pci_name (pdev)) + TP_fast_assign(__assign_str(dev, pci_name(pdev)); __entry->num_msgs = num_msgs; __entry->msg_size = msg_size; ),
@@ -52,7 +52,7 @@ TRACE_EVENT(otx2_msg_check, __field(u16, rspid)__field (int, rc) ), -TP_fast_assign (__assign_str (dev,pci_name (pdev)) + TP_fast_assign(__assign_str(dev, pci_name(pdev)); __entry->reqid = reqid; __entry->rspid = rspid; __entry->rc = rc;
@@ -69,8 +69,8 @@ TRACE_EVENT(otx2_msg_interrupt, __string(str, msg)__field (u64, intr) ), - TP_fast_assign(__assign_str(dev, pci_name(pdev)) - __assign_str(str, msg) + TP_fast_assign(__assign_str(dev, pci_name(pdev)); +__assign_str (str, msg); __entry->intr = intr; ), TP_printk("[%s] mbox interrupt %s (0x%llx)\n", __get_str(dev),
@@ -84,7 +84,7 @@ TRACE_EVENT(otx2_msg_process, __field(u16, id)__field (int, err) ), -TP_fast_assign (__assign_str (dev,pci_name (pdev)) + TP_fast_assign(__assign_str(dev, pci_name(pdev)); __entry->id = id; __entry->err = err; ),
drivers/net/fjes/fjes_trace.h +2 -2
@@ -232,7 +232,7 @@ TRACE_EVENT(fjes_hw_start_debug_err,__string (err, err) ),TP_fast_assign ( -__assign_str (err, err) + __assign_str(err, err); ),TP_printk ("%s" ,__get_str (err)) );
@@ -258,7 +258,7 @@ TRACE_EVENT(fjes_hw_stop_debug_err,__string (err, err) ),TP_fast_assign ( -__assign_str (err, err) + __assign_str(err, err); ),TP_printk ("%s" ,__get_str (err)) );
drivers/usb/cdns3/cdnsp-trace.h +1 -1
@@ -138,7 +138,7 @@ DECLARE_EVENT_CLASS(cdnsp_log_simple,__string (text, msg) ),TP_fast_assign ( -__assign_str (text, msg) + __assign_str(text, msg); ),TP_printk ("%s" ,__get_str (text)) );
fs/nfs/nfs4trace.h +3 -3
@@ -625,7 +625,7 @@ TRACE_EVENT(nfs4_state_mgr,TP_fast_assign ( __entry->state = clp->cl_state; -__assign_str (hostname, clp->cl_hostname) +__assign_str (hostname, clp->cl_hostname); ), TP_printk(
@@ -1637,7 +1637,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_callback_event, __entry->fileid =0 ; __entry->dev =0 ; } -__assign_str (dstaddr, clp ? clp->cl_hostname :"unknown" ) +__assign_str (dstaddr, clp ? clp->cl_hostname :"unknown" ); ), TP_printk(
@@ -1694,7 +1694,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_callback_event, __entry->fileid =0 ; __entry->dev =0 ; } -__assign_str (dstaddr, clp ? clp->cl_hostname :"unknown" ) +__assign_str (dstaddr, clp ? clp->cl_hostname :"unknown" ); __entry->stateid_seq =be32_to_cpu (stateid->seqid); __entry->stateid_hash =
fs/nfs/nfstrace.h +2 -2
@@ -1431,8 +1431,8 @@ DECLARE_EVENT_CLASS(nfs_xdr_event, __entry->version = task->tk_client->cl_vers; __entry->error = error;__assign_str (program, - task->tk_client->cl_program->name) -__assign_str (procedure, task->tk_msg.rpc_proc->p_name) + task->tk_client->cl_program->name); +__assign_str (procedure, task->tk_msg.rpc_proc->p_name); ), TP_printk(
include/trace/events/btrfs.h +1 -1
@@ -1097,7 +1097,7 @@ TRACE_EVENT(btrfs_trigger_flush, __entry->flags = flags; __entry->bytes = bytes; __entry->flush = flush; -__assign_str (reason, reason) +__assign_str (reason, reason); ), TP_printk_btrfs("%s: flush=%d(%s) flags=%llu(%s) bytes=%llu",
include/trace/events/dma_fence.h +2 -2
@@ -23,8 +23,8 @@ DECLARE_EVENT_CLASS(dma_fence, ),TP_fast_assign ( - __assign_str(driver, fence->ops->get_driver_name(fence)) - __assign_str(timeline, fence->ops->get_timeline_name(fence)) + __assign_str(driver, fence->ops->get_driver_name(fence)); +__assign_str (timeline, fence->ops->get_timeline_name (fence)); __entry->context = fence->context; __entry->seqno = fence->seqno; ),
include/trace/events/rpcgss.h +2 -2
@@ -152,7 +152,7 @@ DECLARE_EVENT_CLASS(rpcgss_ctx_class,TP_fast_assign ( __entry->cred = gc; __entry->service = gc->gc_service; -__assign_str (principal, gc->gc_principal) +__assign_str (principal, gc->gc_principal); ), TP_printk("cred=%p service=%s principal='%s'",
@@ -535,7 +535,7 @@ TRACE_EVENT(rpcgss_upcall_msg, ),TP_fast_assign ( -__assign_str (msg, buf) + __assign_str(msg, buf); ),TP_printk ("msg='%s'" ,__get_str (msg))
include/trace/events/sunrpc.h +20 -20
@@ -154,8 +154,8 @@ TRACE_EVENT(rpc_clnt_new, __entry->client_id = clnt->cl_clid;__assign_str (addr, xprt->address_strings[RPC_DISPLAY_ADDR ]);__assign_str (port, xprt->address_strings[RPC_DISPLAY_PORT ]); - __assign_str(program, program) -__assign_str (server, server) +__assign_str (program, program); +__assign_str (server, server); ), TP_printk("client=%u peer=[%s]:%s program=%s server=%s",
@@ -180,8 +180,8 @@ TRACE_EVENT(rpc_clnt_new_err,TP_fast_assign ( __entry->error = error; - __assign_str(program, program) -__assign_str (server, server) +__assign_str (program, program); +__assign_str (server, server); ), TP_printk("program=%s server=%s error=%d",
@@ -284,8 +284,8 @@ TRACE_EVENT(rpc_request, __entry->client_id = task->tk_client->cl_clid; __entry->version = task->tk_client->cl_vers; __entry->async =RPC_IS_ASYNC (task); - __assign_str(progname, task->tk_client->cl_program->name) -__assign_str (procname,rpc_proc_name (task)) +__assign_str (progname, task->tk_client->cl_program->name); +__assign_str (procname,rpc_proc_name (task)); ), TP_printk("task:%u@%u %sv%d %s (%ssync)",
@@ -494,10 +494,10 @@ DECLARE_EVENT_CLASS(rpc_reply_event, __entry->task_id = task->tk_pid; __entry->client_id = task->tk_client->cl_clid; __entry->xid =be32_to_cpu (task->tk_rqstp->rq_xid); -__assign_str (progname, task->tk_client->cl_program->name) +__assign_str (progname, task->tk_client->cl_program->name); __entry->version = task->tk_client->cl_vers; - __assign_str(procname, rpc_proc_name(task)) -__assign_str (servername, task->tk_xprt->servername) +__assign_str (procname,rpc_proc_name (task)); +__assign_str (servername, task->tk_xprt->servername); ), TP_printk("task:%u@%d server=%s xid=0x%08x %sv%d %s",
@@ -622,8 +622,8 @@ TRACE_EVENT(rpc_stats_latency, __entry->task_id = task->tk_pid; __entry->xid =be32_to_cpu (task->tk_rqstp->rq_xid); __entry->version = task->tk_client->cl_vers; - __assign_str(progname, task->tk_client->cl_program->name) -__assign_str (procname,rpc_proc_name (task)) +__assign_str (progname, task->tk_client->cl_program->name); +__assign_str (procname,rpc_proc_name (task)); __entry->backlog =ktime_to_us (backlog); __entry->rtt =ktime_to_us (rtt); __entry->execute =ktime_to_us (execute);
@@ -669,15 +669,15 @@ TRACE_EVENT(rpc_xdr_overflow, __entry->task_id = task->tk_pid; __entry->client_id = task->tk_client->cl_clid;__assign_str (progname, - task->tk_client->cl_program->name) + task->tk_client->cl_program->name); __entry->version = task->tk_client->cl_vers; - __assign_str(procedure, task->tk_msg.rpc_proc->p_name) +__assign_str (procedure, task->tk_msg.rpc_proc->p_name); }else { __entry->task_id =0 ; __entry->client_id =0 ; -__assign_str (progname,"unknown" ) +__assign_str (progname,"unknown" ); __entry->version =0 ; - __assign_str(procedure, "unknown") +__assign_str (procedure,"unknown" ); } __entry->requested = requested; __entry->end = xdr->end;
@@ -735,9 +735,9 @@ TRACE_EVENT(rpc_xdr_alignment, __entry->task_id = task->tk_pid; __entry->client_id = task->tk_client->cl_clid;__assign_str (progname, - task->tk_client->cl_program->name) + task->tk_client->cl_program->name); __entry->version = task->tk_client->cl_vers; -__assign_str (procedure, task->tk_msg.rpc_proc->p_name) +__assign_str (procedure, task->tk_msg.rpc_proc->p_name); __entry->offset = offset; __entry->copied = copied;
@@ -1107,9 +1107,9 @@ TRACE_EVENT(xprt_retransmit, __entry->xid =be32_to_cpu (rqst->rq_xid); __entry->ntrans = rqst->rq_ntrans;__assign_str (progname, - task->tk_client->cl_program->name) + task->tk_client->cl_program->name); __entry->version = task->tk_client->cl_vers; -__assign_str (procedure, task->tk_msg.rpc_proc->p_name) +__assign_str (procedure, task->tk_msg.rpc_proc->p_name); ), TP_printk(
@@ -1842,7 +1842,7 @@ TRACE_EVENT(svc_xprt_accept,TP_fast_assign ( __assign_str(addr, xprt->xpt_remotebuf); - __assign_str(protocol, xprt->xpt_class->xcl_name) +__assign_str (protocol, xprt->xpt_class->xcl_name);__assign_str (service, service); ),
Signature · 1 line
2.30.2