Commit 2c92ca84 authored by Steven Rostedt (Google)'s avatar Steven Rostedt (Google)
Browse files

tracing/treewide: Remove second parameter of __assign_str() 

With the rework of how the __string() handles dynamic strings where it
saves off the source string in field in the helper structure[1], the
assignment of that value to the trace event field is stored in the helper
value and does not need to be passed in again.

This means that with:

  __string(field, mystring)

Which use to be assigned with __assign_str(field, mystring), no longer
needs the second parameter and it is unused. With this, __assign_str()
will now only get a single parameter.

There's over 700 users of __assign_str() and because coccinelle does not
handle the TRACE_EVENT() macro I ended up using the following sed script:

  git grep -l __assign_str | while read a ; do
      sed -e 's/\(__assign_str([^,]*[^ ,]\) *,[^;]*/\1)/' $a > /tmp/test-file;
      mv /tmp/test-file $a;
  done

I then searched for __assign_str() that did not end with ';' as those
were multi line assignments that the sed script above would fail to catch.

Note, the same updates will need to be done for:

  __assign_str_len()
  __assign_rel_str()
  __assign_rel_str_len()

I tested this with both an allmodconfig and an allyesconfig (build only for both).

[1] https://lore.kernel.org/linux-trace-kernel/20240222211442.634192653@goodmis.org/

Link: https://lore.kernel.org/linux-trace-kernel/20240516133454.681ba6a0@rorschach.local.home



Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Julia Lawall <Julia.Lawall@inria.fr>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: Christian König <christian.koenig@amd.com> for the amdgpu parts.
Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> #for
Acked-by: Rafael J. Wysocki <rafael@kernel.org> # for thermal
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: Darrick J. Wong <djwong@kernel.org>	# xfs
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent de7e71ef

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ TRACE_EVENT(instruction_emulation, 
	),



	TP_fast_assign(

		__assign_str(instr, instr);

		__assign_str(instr);

		__entry->addr = addr;

	),

arch/powerpc/include/asm/trace.h

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ TRACE_EVENT(rtas_input, 


	TP_fast_assign(

		__entry->nargs = be32_to_cpu(rtas_args->nargs);

		__assign_str(name, name);

		__assign_str(name);

		be32_to_cpu_array(__get_dynamic_array(inputs), rtas_args->args, __entry->nargs);

	),
@@ -162,7 +162,7 @@ TRACE_EVENT(rtas_output, 
	TP_fast_assign(

		__entry->nr_other = be32_to_cpu(rtas_args->nret) - 1;

		__entry->status = be32_to_cpu(rtas_args->rets[0]);

		__assign_str(name, name);

		__assign_str(name);

		be32_to_cpu_array(__get_dynamic_array(other_outputs),

				  &rtas_args->rets[1], __entry->nr_other);

	),

arch/x86/kvm/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -1678,7 +1678,7 @@ TRACE_EVENT(kvm_nested_vmenter_failed, 
	),



	TP_fast_assign(

		__assign_str(msg, msg);

		__assign_str(msg);

		__entry->err = err;

	),

drivers/base/regmap/trace.h

+9 −9
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ DECLARE_EVENT_CLASS(regmap_reg, 
	),



	TP_fast_assign(

		__assign_str(name, regmap_name(map));

		__assign_str(name);

		__entry->reg = reg;

		__entry->val = val;

	),
@@ -74,7 +74,7 @@ DECLARE_EVENT_CLASS(regmap_bulk, 
	),



	TP_fast_assign(

		__assign_str(name, regmap_name(map));

		__assign_str(name);

		__entry->reg = reg;

		__entry->val_len = val_len;

		memcpy(__get_dynamic_array(buf), val, val_len);
@@ -113,7 +113,7 @@ DECLARE_EVENT_CLASS(regmap_block, 
	),



	TP_fast_assign(

		__assign_str(name, regmap_name(map));

		__assign_str(name);

		__entry->reg = reg;

		__entry->count = count;

	),
@@ -163,9 +163,9 @@ TRACE_EVENT(regcache_sync, 
	),



	TP_fast_assign(

		__assign_str(name, regmap_name(map));

		__assign_str(status, status);

		__assign_str(type, type);

		__assign_str(name);

		__assign_str(status);

		__assign_str(type);

	),



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



	TP_fast_assign(

		__assign_str(name, regmap_name(map));

		__assign_str(name);

		__entry->flag = flag;

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



	TP_fast_assign(

		__assign_str(name, regmap_name(map));

		__assign_str(name);

	),



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



	TP_fast_assign(

		__assign_str(name, regmap_name(map));

		__assign_str(name);

		__entry->from = from;

		__entry->to = to;

	),

drivers/base/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(devres, 
		__field(size_t, size)

	),

	TP_fast_assign(

		__assign_str(devname, dev_name(dev));

		__assign_str(devname);

		__entry->op = op;

		__entry->node = node;

		__entry->name = name;