Skip to content

Commit d6a326d

Browse files
torvaldstorvalds
committed
Merge tag 'trace-assign-str-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull tracing cleanup from Steven Rostedt: "Remove second argument of __assign_str() The __assign_str() macro logic of the TRACE_EVENT() macro was optimized so that it no longer needs the second argument. The __assign_str() is always matched with __string() field that takes a field name and the source for that field: __string(field, source) The TRACE_EVENT() macro logic will save off the source value and then use that value to copy into the ring buffer via the __assign_str(). Before commit c1fa617 ("tracing: Rework __assign_str() and __string() to not duplicate getting the string"), the __assign_str() needed the second argument which would perform the same logic as the __string() source parameter did. Not only would this add overhead, but it was error prone as if the __assign_str() source produced something different, it may not have allocated enough for the string in the ring buffer (as the __string() source was used to determine how much to allocate) Now that the __assign_str() just uses the same string that was used in __string() it no longer needs the source parameter. It can now be removed" * tag 'trace-assign-str-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: tracing/treewide: Remove second parameter of __assign_str()
2 parents bca2a25 + 2c92ca8 commit d6a326d

147 files changed

Lines changed: 794 additions & 808 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎arch/arm64/kernel/trace-events-emulation.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ TRACE_EVENT(instruction_emulation,
1818
),
1919

2020
TP_fast_assign(
21-
__assign_str(instr, instr);
21+
__assign_str(instr);
2222
__entry->addr = addr;
2323
),
2424

‎arch/powerpc/include/asm/trace.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ TRACE_EVENT(rtas_input,
137137

138138
TP_fast_assign(
139139
__entry->nargs = be32_to_cpu(rtas_args->nargs);
140-
__assign_str(name, name);
140+
__assign_str(name);
141141
be32_to_cpu_array(__get_dynamic_array(inputs), rtas_args->args, __entry->nargs);
142142
),
143143

@@ -162,7 +162,7 @@ TRACE_EVENT(rtas_output,
162162
TP_fast_assign(
163163
__entry->nr_other = be32_to_cpu(rtas_args->nret) - 1;
164164
__entry->status = be32_to_cpu(rtas_args->rets[0]);
165-
__assign_str(name, name);
165+
__assign_str(name);
166166
be32_to_cpu_array(__get_dynamic_array(other_outputs),
167167
&rtas_args->rets[1], __entry->nr_other);
168168
),

‎arch/x86/kvm/trace.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1678,7 +1678,7 @@ TRACE_EVENT(kvm_nested_vmenter_failed,
16781678
),
16791679

16801680
TP_fast_assign(
1681-
__assign_str(msg, msg);
1681+
__assign_str(msg);
16821682
__entry->err = err;
16831683
),
16841684

‎drivers/base/regmap/trace.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ DECLARE_EVENT_CLASS(regmap_reg,
2727
),
2828

2929
TP_fast_assign(
30-
__assign_str(name, regmap_name(map));
30+
__assign_str(name);
3131
__entry->reg = reg;
3232
__entry->val = val;
3333
),
@@ -74,7 +74,7 @@ DECLARE_EVENT_CLASS(regmap_bulk,
7474
),
7575

7676
TP_fast_assign(
77-
__assign_str(name, regmap_name(map));
77+
__assign_str(name);
7878
__entry->reg = reg;
7979
__entry->val_len = val_len;
8080
memcpy(__get_dynamic_array(buf), val, val_len);
@@ -113,7 +113,7 @@ DECLARE_EVENT_CLASS(regmap_block,
113113
),
114114

115115
TP_fast_assign(
116-
__assign_str(name, regmap_name(map));
116+
__assign_str(name);
117117
__entry->reg = reg;
118118
__entry->count = count;
119119
),
@@ -163,9 +163,9 @@ TRACE_EVENT(regcache_sync,
163163
),
164164

165165
TP_fast_assign(
166-
__assign_str(name, regmap_name(map));
167-
__assign_str(status, status);
168-
__assign_str(type, type);
166+
__assign_str(name);
167+
__assign_str(status);
168+
__assign_str(type);
169169
),
170170

171171
TP_printk("%s type=%s status=%s", __get_str(name),
@@ -184,7 +184,7 @@ DECLARE_EVENT_CLASS(regmap_bool,
184184
),
185185

186186
TP_fast_assign(
187-
__assign_str(name, regmap_name(map));
187+
__assign_str(name);
188188
__entry->flag = flag;
189189
),
190190

@@ -216,7 +216,7 @@ DECLARE_EVENT_CLASS(regmap_async,
216216
),
217217

218218
TP_fast_assign(
219-
__assign_str(name, regmap_name(map));
219+
__assign_str(name);
220220
),
221221

222222
TP_printk("%s", __get_str(name))
@@ -264,7 +264,7 @@ TRACE_EVENT(regcache_drop_region,
264264
),
265265

266266
TP_fast_assign(
267-
__assign_str(name, regmap_name(map));
267+
__assign_str(name);
268268
__entry->from = from;
269269
__entry->to = to;
270270
),

‎drivers/base/trace.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(devres,
2828
__field(size_t, size)
2929
),
3030
TP_fast_assign(
31-
__assign_str(devname, dev_name(dev));
31+
__assign_str(devname);
3232
__entry->op = op;
3333
__entry->node = node;
3434
__entry->name = name;

‎drivers/block/rnbd/rnbd-srv-trace.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ DECLARE_EVENT_CLASS(rnbd_srv_link_class,
2727

2828
TP_fast_assign(
2929
__entry->qdepth = srv->queue_depth;
30-
__assign_str(sessname, srv->sessname);
30+
__assign_str(sessname);
3131
),
3232

3333
TP_printk("sessname: %s qdepth: %d",
@@ -85,7 +85,7 @@ TRACE_EVENT(process_rdma,
8585
),
8686

8787
TP_fast_assign(
88-
__assign_str(sessname, srv->sessname);
88+
__assign_str(sessname);
8989
__entry->dir = id->dir;
9090
__entry->ver = srv->ver;
9191
__entry->device_id = le32_to_cpu(msg->device_id);
@@ -130,7 +130,7 @@ TRACE_EVENT(process_msg_sess_info,
130130
__entry->proto_ver = srv->ver;
131131
__entry->clt_ver = msg->ver;
132132
__entry->srv_ver = RNBD_PROTO_VER_MAJOR;
133-
__assign_str(sessname, srv->sessname);
133+
__assign_str(sessname);
134134
),
135135

136136
TP_printk("Session %s using proto-ver %d (clt-ver: %d, srv-ver: %d)",
@@ -165,8 +165,8 @@ TRACE_EVENT(process_msg_open,
165165

166166
TP_fast_assign(
167167
__entry->access_mode = msg->access_mode;
168-
__assign_str(sessname, srv->sessname);
169-
__assign_str(dev_name, msg->dev_name);
168+
__assign_str(sessname);
169+
__assign_str(dev_name);
170170
),
171171

172172
TP_printk("Open message received: session='%s' path='%s' access_mode=%s",
@@ -189,7 +189,7 @@ TRACE_EVENT(process_msg_close,
189189

190190
TP_fast_assign(
191191
__entry->device_id = le32_to_cpu(msg->device_id);
192-
__assign_str(sessname, srv->sessname);
192+
__assign_str(sessname);
193193
),
194194

195195
TP_printk("Close message received: session='%s' device id='%d'",

‎drivers/bus/mhi/host/trace.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ TRACE_EVENT(mhi_gen_tre,
103103
),
104104

105105
TP_fast_assign(
106-
__assign_str(name, mhi_cntrl->mhi_dev->name);
106+
__assign_str(name);
107107
__entry->ch_num = mhi_chan->chan;
108108
__entry->wp = mhi_tre;
109109
__entry->tre_ptr = mhi_tre->ptr;
@@ -131,7 +131,7 @@ TRACE_EVENT(mhi_intvec_states,
131131
),
132132

133133
TP_fast_assign(
134-
__assign_str(name, mhi_cntrl->mhi_dev->name);
134+
__assign_str(name);
135135
__entry->local_ee = mhi_cntrl->ee;
136136
__entry->state = mhi_cntrl->dev_state;
137137
__entry->dev_ee = dev_ee;
@@ -158,7 +158,7 @@ TRACE_EVENT(mhi_tryset_pm_state,
158158
),
159159

160160
TP_fast_assign(
161-
__assign_str(name, mhi_cntrl->mhi_dev->name);
161+
__assign_str(name);
162162
if (pm_state)
163163
pm_state = __fls(pm_state);
164164
__entry->pm_state = pm_state;
@@ -184,7 +184,7 @@ DECLARE_EVENT_CLASS(mhi_process_event_ring,
184184
),
185185

186186
TP_fast_assign(
187-
__assign_str(name, mhi_cntrl->mhi_dev->name);
187+
__assign_str(name);
188188
__entry->rp = rp;
189189
__entry->ptr = rp->ptr;
190190
__entry->dword0 = rp->dword[0];
@@ -226,7 +226,7 @@ DECLARE_EVENT_CLASS(mhi_update_channel_state,
226226
),
227227

228228
TP_fast_assign(
229-
__assign_str(name, mhi_cntrl->mhi_dev->name);
229+
__assign_str(name);
230230
__entry->ch_num = mhi_chan->chan;
231231
__entry->state = state;
232232
__entry->reason = reason;
@@ -265,7 +265,7 @@ TRACE_EVENT(mhi_pm_st_transition,
265265
),
266266

267267
TP_fast_assign(
268-
__assign_str(name, mhi_cntrl->mhi_dev->name);
268+
__assign_str(name);
269269
__entry->state = state;
270270
),
271271

‎drivers/cxl/core/trace.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ TRACE_EVENT(cxl_aer_uncorrectable_error,
6060
__array(u32, header_log, CXL_HEADERLOG_SIZE_U32)
6161
),
6262
TP_fast_assign(
63-
__assign_str(memdev, dev_name(&cxlmd->dev));
64-
__assign_str(host, dev_name(cxlmd->dev.parent));
63+
__assign_str(memdev);
64+
__assign_str(host);
6565
__entry->serial = cxlmd->cxlds->serial;
6666
__entry->status = status;
6767
__entry->first_error = fe;
@@ -106,8 +106,8 @@ TRACE_EVENT(cxl_aer_correctable_error,
106106
__field(u32, status)
107107
),
108108
TP_fast_assign(
109-
__assign_str(memdev, dev_name(&cxlmd->dev));
110-
__assign_str(host, dev_name(cxlmd->dev.parent));
109+
__assign_str(memdev);
110+
__assign_str(host);
111111
__entry->serial = cxlmd->cxlds->serial;
112112
__entry->status = status;
113113
),
@@ -142,8 +142,8 @@ TRACE_EVENT(cxl_overflow,
142142
),
143143

144144
TP_fast_assign(
145-
__assign_str(memdev, dev_name(&cxlmd->dev));
146-
__assign_str(host, dev_name(cxlmd->dev.parent));
145+
__assign_str(memdev);
146+
__assign_str(host);
147147
__entry->serial = cxlmd->cxlds->serial;
148148
__entry->log = log;
149149
__entry->count = le16_to_cpu(payload->overflow_err_count);
@@ -200,8 +200,8 @@ TRACE_EVENT(cxl_overflow,
200200
__field(u8, hdr_maint_op_class)
201201

202202
#define CXL_EVT_TP_fast_assign(cxlmd, l, hdr) \
203-
__assign_str(memdev, dev_name(&(cxlmd)->dev)); \
204-
__assign_str(host, dev_name((cxlmd)->dev.parent)); \
203+
__assign_str(memdev); \
204+
__assign_str(host); \
205205
__entry->log = (l); \
206206
__entry->serial = (cxlmd)->cxlds->serial; \
207207
__entry->hdr_length = (hdr).length; \
@@ -359,10 +359,10 @@ TRACE_EVENT(cxl_general_media,
359359
__entry->validity_flags = get_unaligned_le16(&rec->validity_flags);
360360
__entry->hpa = hpa;
361361
if (cxlr) {
362-
__assign_str(region_name, dev_name(&cxlr->dev));
362+
__assign_str(region_name);
363363
uuid_copy(&__entry->region_uuid, &cxlr->params.uuid);
364364
} else {
365-
__assign_str(region_name, "");
365+
__assign_str(region_name);
366366
uuid_copy(&__entry->region_uuid, &uuid_null);
367367
}
368368
),
@@ -462,10 +462,10 @@ TRACE_EVENT(cxl_dram,
462462
CXL_EVENT_DER_CORRECTION_MASK_SIZE);
463463
__entry->hpa = hpa;
464464
if (cxlr) {
465-
__assign_str(region_name, dev_name(&cxlr->dev));
465+
__assign_str(region_name);
466466
uuid_copy(&__entry->region_uuid, &cxlr->params.uuid);
467467
} else {
468-
__assign_str(region_name, "");
468+
__assign_str(region_name);
469469
uuid_copy(&__entry->region_uuid, &uuid_null);
470470
}
471471
),
@@ -692,8 +692,8 @@ TRACE_EVENT(cxl_poison,
692692
),
693693

694694
TP_fast_assign(
695-
__assign_str(memdev, dev_name(&cxlmd->dev));
696-
__assign_str(host, dev_name(cxlmd->dev.parent));
695+
__assign_str(memdev);
696+
__assign_str(host);
697697
__entry->serial = cxlmd->cxlds->serial;
698698
__entry->overflow_ts = cxl_poison_overflow(flags, overflow_ts);
699699
__entry->dpa = cxl_poison_record_dpa(record);
@@ -702,12 +702,12 @@ TRACE_EVENT(cxl_poison,
702702
__entry->trace_type = trace_type;
703703
__entry->flags = flags;
704704
if (cxlr) {
705-
__assign_str(region, dev_name(&cxlr->dev));
705+
__assign_str(region);
706706
memcpy(__entry->uuid, &cxlr->params.uuid, 16);
707707
__entry->hpa = cxl_trace_hpa(cxlr, cxlmd,
708708
__entry->dpa);
709709
} else {
710-
__assign_str(region, "");
710+
__assign_str(region);
711711
memset(__entry->uuid, 0, 16);
712712
__entry->hpa = ULLONG_MAX;
713713
}

‎drivers/dma-buf/sync_trace.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ TRACE_EVENT(sync_timeline,
2020
),
2121

2222
TP_fast_assign(
23-
__assign_str(name, timeline->name);
23+
__assign_str(name);
2424
__entry->value = timeline->value;
2525
),
2626

‎drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ TRACE_EVENT(amdgpu_cs_ioctl,
178178

179179
TP_fast_assign(
180180
__entry->sched_job_id = job->base.id;
181-
__assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job));
181+
__assign_str(timeline);
182182
__entry->context = job->base.s_fence->finished.context;
183183
__entry->seqno = job->base.s_fence->finished.seqno;
184-
__assign_str(ring, to_amdgpu_ring(job->base.sched)->name);
184+
__assign_str(ring);
185185
__entry->num_ibs = job->num_ibs;
186186
),
187187
TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u",
@@ -203,10 +203,10 @@ TRACE_EVENT(amdgpu_sched_run_job,
203203

204204
TP_fast_assign(
205205
__entry->sched_job_id = job->base.id;
206-
__assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job));
206+
__assign_str(timeline);
207207
__entry->context = job->base.s_fence->finished.context;
208208
__entry->seqno = job->base.s_fence->finished.seqno;
209-
__assign_str(ring, to_amdgpu_ring(job->base.sched)->name);
209+
__assign_str(ring);
210210
__entry->num_ibs = job->num_ibs;
211211
),
212212
TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u",
@@ -231,7 +231,7 @@ TRACE_EVENT(amdgpu_vm_grab_id,
231231

232232
TP_fast_assign(
233233
__entry->pasid = vm->pasid;
234-
__assign_str(ring, ring->name);
234+
__assign_str(ring);
235235
__entry->vmid = job->vmid;
236236
__entry->vm_hub = ring->vm_hub,
237237
__entry->pd_addr = job->vm_pd_addr;
@@ -425,7 +425,7 @@ TRACE_EVENT(amdgpu_vm_flush,
425425
),
426426

427427
TP_fast_assign(
428-
__assign_str(ring, ring->name);
428+
__assign_str(ring);
429429
__entry->vmid = vmid;
430430
__entry->vm_hub = ring->vm_hub;
431431
__entry->pd_addr = pd_addr;
@@ -526,7 +526,7 @@ TRACE_EVENT(amdgpu_ib_pipe_sync,
526526
),
527527

528528
TP_fast_assign(
529-
__assign_str(ring, sched_job->base.sched->name);
529+
__assign_str(ring);
530530
__entry->id = sched_job->base.id;
531531
__entry->fence = fence;
532532
__entry->ctx = fence->context;
@@ -563,7 +563,7 @@ TRACE_EVENT(amdgpu_runpm_reference_dumps,
563563
),
564564
TP_fast_assign(
565565
__entry->index = index;
566-
__assign_str(func, func);
566+
__assign_str(func);
567567
),
568568
TP_printk("amdgpu runpm reference dump 0x%x: 0x%s\n",
569569
__entry->index,

0 commit comments

Comments
 (0)