From patchwork Sun Jul 24 23:16:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 18503 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id C17A283EA7; Mon, 25 Jul 2022 01:16:58 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by diktynna.open-mesh.org (Postfix) with ESMTPS id 0722B80728 for ; Mon, 25 Jul 2022 01:16:55 +0200 (CEST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8B59AB80DCC; Sun, 24 Jul 2022 23:16:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA9ABC341C0; Sun, 24 Jul 2022 23:16:51 +0000 (UTC) Date: Sun, 24 Jul 2022 19:16:50 -0400 From: Steven Rostedt To: LKML Subject: [PATCH v2] batman-adv: tracing: Use the new __vstring() helper Message-ID: <20220724191650.236b1355@rorschach.local.home> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=none; dmarc=none; spf=pass (diktynna.open-mesh.org: domain of "SRS0=0Aet=X5=goodmis.org=rostedt@kernel.org" designates 145.40.68.75 as permitted sender) smtp.mailfrom="SRS0=0Aet=X5=goodmis.org=rostedt@kernel.org" ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1658704615; a=rsa-sha256; cv=none; b=eNWxJtnFopjrocBfFDtABwdM+9nRJdqFw52bok8oLGWJAw5rsBzKO4tQ2s2r3oyQjdQD09 s/qLBjlqPobgO/wnIPjFiA5X7ua0oFt92w046o8BdyT/wWI1/A33jSOsHe9NyYPXQUZ24V 0idIeIvnmf7sPiRMufsUh3D/yTSymhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1658704615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OsH5Iq2AVdc1EIe19MiGqEU5mAHkaGgVzb1wYZ5et1w=; b=3fZKHeHzHYdt83klEPTWVDTrGVSIQpsYsTvN24kfTH/zngRGqF1VWZAfVcjULT6uCiPo5R POgNoBNfq+qgdK1zVNZSUJHHiA0YcDxnun7JVYgRDJytzxdhKpXr9O4C00UG3xSUMLlyiM trrlkVOSeRdqRPCmzFeiLpQWPNrV2ec= Message-ID-Hash: P5DEX6CVM67XEOFQENKLQK7AJA34ZEBM X-Message-ID-Hash: P5DEX6CVM67XEOFQENKLQK7AJA34ZEBM X-MailFrom: SRS0=0Aet=X5=goodmis.org=rostedt@kernel.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1 CC: Ingo Molnar , Andrew Morton , Marek Lindner , Antonio Quartulli , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org X-Mailman-Version: 3.2.1 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: "Steven Rostedt (Google)" 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. Cc: Marek Lindner Cc: Ingo Molnar Cc: Andrew Morton Cc: Simon Wunderlich Cc: Antonio Quartulli Cc: Sven Eckelmann Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: netdev@vger.kernel.org Signed-off-by: Steven Rostedt (Google) Acked-by: Sven Eckelmann --- Changes since v1: https://lkml.kernel.org/r/20220705224751.080390002@goodmis.org - Removed no longer used BATADV_MAX_MSG_LEN net/batman-adv/trace.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index d673ebdd0426..31c8f922651d 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -28,8 +28,6 @@ #endif /* CONFIG_BATMAN_ADV_TRACING */ -#define BATADV_MAX_MSG_LEN 256 - TRACE_EVENT(batadv_dbg, TP_PROTO(struct batadv_priv *bat_priv, @@ -40,16 +38,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(