tracing: Updates for 5.14
Subsystems (22)
Steven Rostedt
maintainercover tracing: Updates for 5.14
Chunguang Xu (1):
trace: replace WB_REASON_FOREIGN_FLUSH with a string
Colin Ian King (1):
tracing: Remove redundant initialization of variable ret
Ed Tsai (1):
sched/tracing: Remove the redundant 'success' in the sched tracepoint
Hyeonggon Yoo (1):
tracing: Add WARN_ON_ONCE when returned value is negative
Jiapeng Chong (1):
tracing: Remove redundant assignment to event_var
Joe Perches (1):
treewide: Add missing semicolons to __assign_str uses
Masami Hiramatsu (2):
tracing/boot: Add per-group/all events enablement
Documentation: tracing: Add per-group/all events enablement desciption
Qiujun Huang (1):
tracing: Fix set_named_trigger_data() kernel-doc comment
Wei Ming Chen (1):
ring-buffer: Use fallthrough pseudo-keyword
zuoqilin (1):
tools/bootconfig: Simplify expression
----
Documentation/trace/boottime-trace.rst | 6 ++++ 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/trace/events/btrfs.h | 2 +- include/trace/events/dma_fence.h | 4 +-- include/trace/events/rpcgss.h | 4 +-- include/trace/events/sched.h | 2 -- include/trace/events/sunrpc.h | 40 +++++++++++----------- include/trace/events/writeback.h | 3 +- kernel/trace/ring_buffer.c | 2 +- kernel/trace/trace.c | 2 +- kernel/trace/trace_boot.c | 27 +++++++++++++-- kernel/trace/trace_events_hist.c | 3 +- kernel/trace/trace_events_trigger.c | 3 +- net/mac80211/trace.h | 2 +- tools/bootconfig/main.c | 4 +-- 31 files changed, 110 insertions(+), 82 deletions(-)
Steven Rostedt
maintainerPATCH 1/11 tools/bootconfig: Simplify expression
From: zuoqilin <[email protected]>
It is not necessary to define the variable ret to receive the return value of the xbc_node_compose_key() method.
--- tools/bootconfig/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
tools/bootconfig/main.c +1 -3
@@ -84,11 +84,9 @@ static void xbc_show_list(void)char key[XBC_KEYLEN_MAX ];struct xbc_node *leaf;const char *val; -int ret =0 ;xbc_for_each_key_value (leaf, val) { - ret =xbc_node_compose_key (leaf, key,XBC_KEYLEN_MAX ); -if (ret <0 ) +if (xbc_node_compose_key (leaf, key,XBC_KEYLEN_MAX ) <0 )break ;printf ("%s = " , key);if (!val || val[0 ] =='\0' ) {
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 2/11 sched/tracing: Remove the redundant success in the sched tracepoint
In reply to Steven RostedtFrom: Ed Tsai <[email protected]>
'success' is left here for a long time and also it is meaningless for the upper user. Just remove it.
[ There were some tools expecting this, and this may break them. But
hopefully they've been fixed in the mean time. Otherwise this may be likely reverted - SDR ]
--- include/trace/events/sched.h | 2 -- 1 file changed, 2 deletions(-)
include/trace/events/sched.h +0 -2
@@ -148,7 +148,6 @@ DECLARE_EVENT_CLASS(sched_wakeup_template, __array( char, comm, TASK_COMM_LEN ) __field( pid_t, pid ) __field( int, prio ) - __field( int, success )__field ( int, target_cpu ) ),
@@ -156,7 +155,6 @@ DECLARE_EVENT_CLASS(sched_wakeup_template,memcpy (__entry->comm, p->comm,TASK_COMM_LEN ); __entry->pid = p->pid; __entry->prio = p->prio;/* XXX SCHED_DEADLINE */ - __entry->success =1 ;/* rudiment, kill when possible */ __entry->target_cpu =task_cpu (p); ),
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 3/11 tracing: Remove redundant assignment to event_var
In reply to Steven RostedtFrom: Jiapeng Chong <[email protected]>
Variable event_var is set to 'ERR_PTR(-EINVAL)', but this value is never read as it is overwritten or not used later on, hence it is a redundant assignment and can be removed.
Clean up the following clang-analyzer warning:
kernel/trace/trace_events_hist.c:2437:21: warning: Value stored to 'event_var' during its initialization is never read [clang-analyzer-deadcode.DeadStores].
--- kernel/trace/trace_events_hist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace_events_hist.c +1 -1
@@ -2434,12 +2434,12 @@ create_field_var_hist(struct hist_trigger_data *target_hist_data, char *subsys_name, char *event_name, char *field_name) { struct trace_array *tr = target_hist_data->event_file->tr; -struct hist_field *event_var =ERR_PTR (-EINVAL );struct hist_trigger_data *hist_data;unsigned int i, n, first = true;struct field_var_hist *var_hist;struct trace_event_file *file;struct hist_field *key_field; +struct hist_field *event_var;char *saved_filter;char *cmd;int ret;
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 4/11 ring-buffer: Use fallthrough pseudo-keyword
In reply to Steven RostedtFrom: Wei Ming Chen <[email protected]>
Replace /* fall through */ comment with pseudo-keyword macro fallthrough[1]
--- kernel/trace/ring_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/ring_buffer.c +1 -1
@@ -3391,7 +3391,7 @@ static void check_buffer(struct ring_buffer_per_cpu *cpu_buffer,case RINGBUF_TYPE_PADDING :if (event->time_delta ==1 )break ; -/* fall through */ + fallthrough;case RINGBUF_TYPE_DATA : ts += event->time_delta;break ;
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 5/11 trace: replace WB_REASON_FOREIGN_FLUSH with a string
In reply to Steven RostedtFrom: Chunguang Xu <[email protected]>
Now WB_REASON_FOREIGN_FLUSH is displayed as a number, maybe a string is better.
v2: replace some space with tab.
--- include/trace/events/writeback.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/trace/events/writeback.h +2 -1
@@ -36,7 +36,8 @@ EM( WB_REASON_PERIODIC, "periodic") \ EM( WB_REASON_LAPTOP_TIMER, "laptop_timer") \ EM( WB_REASON_FS_FREE_SPACE, "fs_free_space") \ - EMe(WB_REASON_FORKER_THREAD, "forker_thread") + EM( WB_REASON_FORKER_THREAD, "forker_thread") \ + EMe(WB_REASON_FOREIGN_FLUSH, "foreign_flush")WB_WORK_REASON
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 6/11 tracing: Remove redundant initialization of variable ret
In reply to Steven RostedtFrom: Colin Ian King <[email protected]>
The variable ret is being initialized with a value that is never read, it is being updated later on. The assignment is redundant and can be removed.
Addresses-Coverity: ("Unused value")
--- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace.c +1 -1
@@ -6145,7 +6145,7 @@ static int __tracing_resize_ring_buffer(struct trace_array *tr,ssize_t tracing_resize_ring_buffer (struct trace_array *tr,unsigned long size,int cpu_id) { -int ret = size; +int ret;mutex_lock (&trace_types_lock);
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 7/11 tracing: Fix set_named_trigger_data() kernel-doc comment
In reply to Steven RostedtFrom: Qiujun Huang <[email protected]>
Fix the description of the parameters.
--- kernel/trace/trace_events_trigger.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/trace_events_trigger.c +2 -1
@@ -916,7 +916,8 @@ void unpause_named_trigger(struct event_trigger_data *data)/** * set_named_trigger_data - Associate common named trigger data -* @data: The trigger data of a named trigger to unpause +* @data: The trigger data to associate +* @named_data: The common named trigger to be associated * * Named triggers are sets of triggers that share a common set of * trigger data. The first named trigger registered with a given name
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 8/11 tracing: Add WARN_ON_ONCE when returned value is negative
In reply to Steven RostedtFrom: Hyeonggon Yoo <[email protected]>
ret is assigned return value of event_hist_trigger_func, but the value is unused. It is better to warn when returned value is negative, rather than just ignoring it.
--- kernel/trace/trace_events_hist.c | 1 + 1 file changed, 1 insertion(+)
kernel/trace/trace_events_hist.c +1 -0
@@ -5232,6 +5232,7 @@ static void unregister_field_var_hists(struct hist_trigger_data *hist_data) cmd = hist_data->field_var_hists[i]->cmd; ret =event_hist_trigger_func (&trigger_hist_cmd, file,"!hist" ,"hist" , cmd); +WARN_ON_ONCE (ret <0 ); } }
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 9/11 tracing/boot: Add per-group/all events enablement
In reply to Steven RostedtFrom: Masami Hiramatsu <[email protected]>
Add ftrace.event.<GROUP>.enable and ftrace.event.enable boot-time tracing, which enables all events under given GROUP and all events respectivly.
--- kernel/trace/trace_boot.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)
kernel/trace/trace_boot.c +25 -2
@@ -225,14 +225,37 @@ static void __init trace_boot_init_events(struct trace_array *tr, struct xbc_node *node) { struct xbc_node *gnode, *enode; +bool enable, enable_all = false; +const char *data; node =xbc_node_find_child (node,"event" );if (!node)return ;/* per-event key starts with "event.GROUP.EVENT" */ -xbc_node_for_each_child (node, gnode) -xbc_node_for_each_child (gnode, enode) +xbc_node_for_each_child (node, gnode) { + data =xbc_node_get_data (gnode); +if (!strcmp (data,"enable" )) { + enable_all = true; +continue ; + } + enable = false; +xbc_node_for_each_child (gnode, enode) { + data =xbc_node_get_data (enode); +if (!strcmp (data,"enable" )) { + enable = true; +continue ; + }trace_boot_init_one_event (tr, gnode, enode); + } +/* Event enablement must be done after event settings */ +if (enable) { + data =xbc_node_get_data (gnode); +trace_array_set_clr_event (tr, data,NULL , true); + } + } +/* Ditto */ +if (enable_all) +trace_array_set_clr_event (tr,NULL ,NULL , true); }#else #define trace_boot_enable_events (tr, node) do {} while (0)
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 10/11 Documentation: tracing: Add per-group/all events enablement desciption
In reply to Steven RostedtFrom: Masami Hiramatsu <[email protected]>
Add ftrace.event.<GROUP>.enable and ftrace.event.enable bootconfig description in the boot-time tracing document.
--- Documentation/trace/boottime-trace.rst | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/trace/boottime-trace.rst +6 -0
@@ -99,6 +99,12 @@ These options are setting per-event options. ftrace.[instance.INSTANCE.]event.GROUP.EVENT.enable Enable GROUP:EVENT tracing. +ftrace.[instance.INSTANCE.]event.GROUP.enable + Enable all event tracing within GROUP. + +ftrace.[instance.INSTANCE.]event.enable + Enable all event tracing. + ftrace.[instance.INSTANCE.]event.GROUP.EVENT.filter = FILTER Set FILTER rule to the GROUP:EVENT.
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 11/11 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 +++++++++---------- net/mac80211/trace.h | 2 +- 22 files changed, 70 insertions(+), 70 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); ),
net/mac80211/trace.h +1 -1
@@ -33,7 +33,7 @@ __string(vif_name, sdata->name)#define VIF_ASSIGN __entry->vif_type = sdata->vif.type; __entry->sdata = sdata; \ __entry->p2p = sdata->vif.p2p; \ - __assign_str(vif_name, sdata->name) + __assign_str(vif_name, sdata->name);#define VIF_PR_FMT " vif:%s(%d%s)"#define VIF_PR_ARG __get_str(vif_name), __entry->vif_type, __entry->p2p ? "/p2p" : ""
Signature · 1 line
2.30.2
Re: [for-next][PATCH 11/11] treewide: Add missing semicolons to __assign_str uses
Quoted 10 lines · Steven Rostedt
From: Joe Perches <[email protected]>
The
__assign_strmacro 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
Quoted 4 lines
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.
[]
Quoted 1 line
net/mac80211/trace.h | 2 +-
[]
net/mac80211/trace.h
Quoted 1 line
net/mac80211/trace.h +0
-0
[]
net/mac80211/trace.h line 36
Quoted 6 lines
net/mac80211/trace.h +1
-1@@ -33,7 +33,7 @@ __string(vif_name, sdata->name) #define VIF_ASSIGN __entry->vif_type = sdata->vif.type; __entry->sdata = sdata; \ __entry->p2p = sdata->vif.p2p; \ - __assign_str(vif_name, sdata->name) + __assign_str(vif_name, sdata->name);
This one is unnecessary as every use of VIF_ASSIGN already has a semicolon termination.
Steven Rostedt
maintainerRe: [for-next][PATCH 11/11] treewide: Add missing semicolons to __assign_str uses
Quoted 12 lines · On Wed, 09 Jun 2021 19:46:16 -0700 Joe Perches <[email protected]> wrote:
net/mac80211/trace.h
Quoted 1 line
net/mac80211/trace.h +0
-0[]
net/mac80211/trace.h line 36
Quoted 6 lines
net/mac80211/trace.h +1
-1@@ -33,7 +33,7 @@ __string(vif_name, sdata->name) #define VIF_ASSIGN __entry->vif_type = sdata->vif.type; __entry->sdata = sdata; \ __entry->p2p = sdata->vif.p2p; \ - __assign_str(vif_name, sdata->name) + __assign_str(vif_name, sdata->name);This one is unnecessary as every use of
VIF_ASSIGNalready has a semicolon termination.
Care to send me a v2 of your patch then?
-- Steve