From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Andrew Morton <akpm@linux-foundation.org>,
Jeff Layton <jlayton@kernel.org>, Neil Brown <neilb@suse.de>,
Olga Kornievskaia <kolga@netapp.com>,
Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>,
Chuck Lever <chuck.lever@oracle.com>
Subject: [for-next][PATCH 06/13] NFSD: Fix nfsd_clid_class use of __string_len() macro
Date: Fri, 23 Feb 2024 09:18:44 -0500 [thread overview]
Message-ID: <20240223141902.394601874@goodmis.org> (raw)
In-Reply-To: 20240223141838.985298316@goodmis.org
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
I'm working on restructuring the __string* macros so that it doesn't need
to recalculate the string twice. That is, it will save it off when
processing __string() and the __assign_str() will not need to do the work
again as it currently does.
Currently __string_len(item, src, len) doesn't actually use "src", but my
changes will require src to be correct as that is where the __assign_str()
will get its value from.
The event class nfsd_clid_class has:
__string_len(name, name, clp->cl_name.len)
But the second "name" does not exist and causes my changes to fail to
build. That second parameter should be: clp->cl_name.data.
Link: https://lore.kernel.org/linux-trace-kernel/20240222122828.3d8d213c@gandalf.local.home
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Neil Brown <neilb@suse.de>
Cc: Olga Kornievskaia <kolga@netapp.com>
Cc: Dai Ngo <Dai.Ngo@oracle.com>
Cc: Tom Talpey <tom@talpey.com>
Fixes: d27b74a8675ca ("NFSD: Use new __string_len C macros for nfsd_clid_class")
Acked-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
fs/nfsd/trace.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index d1e8cf079b0f..2cd57033791f 100644
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -843,7 +843,7 @@ DECLARE_EVENT_CLASS(nfsd_clid_class,
__array(unsigned char, addr, sizeof(struct sockaddr_in6))
__field(unsigned long, flavor)
__array(unsigned char, verifier, NFS4_VERIFIER_SIZE)
- __string_len(name, name, clp->cl_name.len)
+ __string_len(name, clp->cl_name.data, clp->cl_name.len)
),
TP_fast_assign(
__entry->cl_boot = clp->cl_clientid.cl_boot;
--
2.43.0
next prev parent reply other threads:[~2024-02-23 14:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-23 14:18 [for-next][PATCH 00/13] tracing: Updates for 6.9 Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 01/13] tracing/user_events: Prepare find/delete for same name events Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 02/13] tracing/user_events: Introduce multi-format events Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 03/13] selftests/user_events: Test " Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 04/13] tracing/user_events: Document multi-format flag Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 05/13] tracing: Use init_utsname()->release Steven Rostedt
2024-02-23 14:18 ` Steven Rostedt [this message]
2024-02-23 14:36 ` [for-next][PATCH 06/13] NFSD: Fix nfsd_clid_class use of __string_len() macro Jeff Layton
2024-02-23 15:14 ` Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 07/13] drm/i915: Add missing ; to __assign_str() macros in tracepoint code Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 08/13] tracing: Rework __assign_str() and __string() to not duplicate getting the string Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 09/13] tracing: Do not calculate strlen() twice for __string() fields Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 10/13] tracing: Use ? : shortcut in trace macros Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 11/13] tracing: Use EVENT_NULL_STR macro instead of open coding "(null)" Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 12/13] tracing: Fix snapshot counter going between two tracers that use it Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 13/13] tracing: Decrement the snapshot if the snapshot trigger fails to register Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240223141902.394601874@goodmis.org \
--to=rostedt@goodmis.org \
--cc=Dai.Ngo@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=chuck.lever@oracle.com \
--cc=jlayton@kernel.org \
--cc=kolga@netapp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=neilb@suse.de \
--cc=tom@talpey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox