mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-05-18 23:12:36 +00:00
2c92ca849f
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: Steven Rostedt (Google) <rostedt@goodmis.org>
Acked-by: Jani 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: Takashi Iwai <tiwai@suse.de>
Acked-by: Darrick J. Wong <djwong@kernel.org> # xfs
Tested-by: Guenter Roeck <linux@roeck-us.net>
|
||
|---|---|---|
| .. | ||
| dpaa2-eth-dcb.c | ||
| dpaa2-eth-debugfs.c | ||
| dpaa2-eth-debugfs.h | ||
| dpaa2-eth-devlink.c | ||
| dpaa2-eth-trace.h | ||
| dpaa2-eth.c | ||
| dpaa2-eth.h | ||
| dpaa2-ethtool.c | ||
| dpaa2-mac.c | ||
| dpaa2-mac.h | ||
| dpaa2-ptp.c | ||
| dpaa2-ptp.h | ||
| dpaa2-switch-ethtool.c | ||
| dpaa2-switch-flower.c | ||
| dpaa2-switch.c | ||
| dpaa2-switch.h | ||
| dpaa2-xsk.c | ||
| dpkg.h | ||
| dpmac-cmd.h | ||
| dpmac.c | ||
| dpmac.h | ||
| dpni-cmd.h | ||
| dpni.c | ||
| dpni.h | ||
| dprtc-cmd.h | ||
| dprtc.c | ||
| dprtc.h | ||
| dpsw-cmd.h | ||
| dpsw.c | ||
| dpsw.h | ||
| Kconfig | ||
| Makefile | ||