[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240223154532.76475d82@gandalf.local.home>
Date: Fri, 23 Feb 2024 15:45:32 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: Jeff Johnson <quic_jjohnson@...cinc.com>
Cc: LKML <linux-kernel@...r.kernel.org>, Linux Trace Kernel
<linux-trace-kernel@...r.kernel.org>, Masami Hiramatsu
<mhiramat@...nel.org>, Mathieu Desnoyers <mathieu.desnoyers@...icios.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
<linuxppc-dev@...ts.ozlabs.org>, <kvm@...r.kernel.org>,
<linux-block@...r.kernel.org>, <linux-cxl@...r.kernel.org>,
<linux-media@...r.kernel.org>, <dri-devel@...ts.freedesktop.org>,
<amd-gfx@...ts.freedesktop.org>, <intel-gfx@...ts.freedesktop.org>,
<intel-xe@...ts.freedesktop.org>, <linux-arm-msm@...r.kernel.org>,
<freedreno@...ts.freedesktop.org>, <virtualization@...ts.linux.dev>,
<linux-rdma@...r.kernel.org>, <linux-pm@...r.kernel.org>,
<iommu@...ts.linux.dev>, <linux-tegra@...r.kernel.org>,
<netdev@...r.kernel.org>, <linux-hyperv@...r.kernel.org>,
<ath10k@...ts.infradead.org>, <linux-wireless@...r.kernel.org>,
<ath11k@...ts.infradead.org>, <ath12k@...ts.infradead.org>,
<brcm80211@...ts.linux.dev>, <brcm80211-dev-list.pdl@...adcom.com>,
<linux-usb@...r.kernel.org>, <linux-bcachefs@...r.kernel.org>,
<linux-nfs@...r.kernel.org>, <ocfs2-devel@...ts.linux.dev>,
<linux-cifs@...r.kernel.org>, <linux-xfs@...r.kernel.org>,
<linux-edac@...r.kernel.org>, <selinux@...r.kernel.org>,
<linux-btrfs@...r.kernel.org>, <linux-erofs@...ts.ozlabs.org>,
<linux-f2fs-devel@...ts.sourceforge.net>, <linux-hwmon@...r.kernel.org>,
<io-uring@...r.kernel.org>, <linux-sound@...r.kernel.org>,
<bpf@...r.kernel.org>, <linux-wpan@...r.kernel.org>, <dev@...nvswitch.org>,
<linux-s390@...r.kernel.org>, <tipc-discussion@...ts.sourceforge.net>,
Julia Lawall <Julia.Lawall@...ia.fr>
Subject: Re: [FYI][PATCH] tracing/treewide: Remove second parameter of
__assign_str()
On Fri, 23 Feb 2024 13:46:53 -0500
Steven Rostedt <rostedt@...dmis.org> wrote:
> Now one thing I could do is to not remove the parameter, but just add:
>
> WARN_ON_ONCE((src) != __data_offsets->item##_ptr_);
>
> in the __assign_str() macro to make sure that it's still the same that is
> assigned. But I'm not sure how useful that is, and still causes burden to
> have it. I never really liked the passing of the string in two places to
> begin with.
Hmm, maybe I'll just add this patch for 6.9 and then in 6.10 do the
parameter removal.
-- Steve
diff --git a/include/trace/stages/stage6_event_callback.h b/include/trace/stages/stage6_event_callback.h
index 0c0f50bcdc56..7372e2c2a0c4 100644
--- a/include/trace/stages/stage6_event_callback.h
+++ b/include/trace/stages/stage6_event_callback.h
@@ -35,6 +35,7 @@ #define __assign_str(dst, src)
do { \
char *__str__ = __get_str(dst); \
int __len__ = __get_dynamic_array_len(dst) - 1; \
+ WARN_ON_ONCE((src) != __data_offsets.dst##_ptr_); \
memcpy(__str__, __data_offsets.dst##_ptr_ ? : \
EVENT_NULL_STR, __len__); \
__str__[__len__] = '\0'; \
Powered by blists - more mailing lists