Repository : ssh://git@diktynna/batman-adv On branches: main,main
commit 77cf0f97275923189cc5cf6d5cc8ef148186fcc4 Author: Steven Rostedt (Google) rostedt@goodmis.org Date: Thu May 16 13:34:54 2024 -0400
batman-adv: 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....
Link: https://lore.kernel.org/linux-trace-kernel/20240516133454.681ba6a0@rorschach...
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 Signed-off-by: Sven Eckelmann sven@narfation.org
77cf0f97275923189cc5cf6d5cc8ef148186fcc4 net/batman-adv/trace.h | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index 5dd52bc5..2fa3457c 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -40,8 +40,13 @@ TRACE_EVENT(batadv_dbg, ),
TP_fast_assign( +#if LINUX_VERSION_IS_GEQ(6, 10, 0) // UGLY_HACK_NEW + __assign_str(device); + __assign_str(driver); +#else // UGLY_HACK_OLD __assign_str(device, bat_priv->soft_iface->name); __assign_str(driver, KBUILD_MODNAME); +#endif // UGLY_HACK_STOP __assign_vstr(msg, vaf->fmt, vaf->va); ),