batman-adv: tracing: Use the new __vstring() helper
Sven Eckelmann
maintainerPATCH 1/1 batman-adv: tracing: Use the new __vstring() helper
From: "Steven Rostedt (Google)" <[email protected]>
Instead of open coding a __dynamic_array() with a fixed length (which defeats the purpose of the dynamic array in the first place). Use the new __vstring() helper that will use a va_list and only write enough of the string into the ring buffer that is needed.
Signed-off-by Steven Rostedt (Google) <[email protected]>
[[email protected]: add compat code]
Signed-off-by Sven Eckelmann <[email protected]>
---
Already added to
https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git/commit/?h=for-next&id=013cfbccb0cb3bbac478666aed78e4f5f7e39dd6
compat-include/linux/tracepoint.h | 24 ++++++++++++++++++++++++ net/batman-adv/trace.h | 7 ++----- 2 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 compat-include/linux/tracepoint.h
compat-include/linux/tracepoint.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) B.A.T.M.A.N. contributors: +* +* Marek Lindner, Simon Wunderlich +* +* This file contains macros for maintaining compatibility with older versions +* of the Linux kernel. +*/ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_TRACEPOINT_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_TRACEPOINT_H_ + +#include <linux/version.h> +#include_next <linux/tracepoint.h> + +#if LINUX_VERSION_IS_LESS (5 ,19 ,0 ) + +#define __vstring (item, fmt, ap) __dynamic_array(char, item, 256) +#define __assign_vstr (dst, fmt, va) \ + WARN_ON_ONCE(vsnprintf(__get_dynamic_array(dst), 256, fmt, *va) >= 256) + +#endif /* LINUX_VERSION_IS_LESS(5, 19, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_TRACEPOINT_H_ */
net/batman-adv/trace.h +2 -5
@@ -40,16 +40,13 @@ TRACE_EVENT(batadv_dbg,TP_STRUCT__entry ( __string(device, bat_priv->soft_iface->name) __string(driver, KBUILD_MODNAME) -__dynamic_array (char, msg,BATADV_MAX_MSG_LEN ) +__vstring (msg, vaf->fmt, vaf->va) ),TP_fast_assign ( __assign_str(device, bat_priv->soft_iface->name);__assign_str (driver,KBUILD_MODNAME ); -WARN_ON_ONCE (vsnprintf (__get_dynamic_array (msg), -BATADV_MAX_MSG_LEN , - vaf->fmt, - *vaf->va) >=BATADV_MAX_MSG_LEN ); +__assign_vstr (msg, vaf->fmt, vaf->va); ), TP_printk(
Signature · 1 line
2.30.2