linux-kernel - Re: [PATCH] tracing/treewide: Remove second parameter of __assign

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <5080f4c5-e0b3-4c2e-9732-f673d7e6ca66@roeck-us.net>
Date: Fri, 17 May 2024 10:36:37 -0700
From: Guenter Roeck <linux@...ck-us.net>
To: Steven Rostedt <rostedt@...dmis.org>
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: [PATCH] tracing/treewide: Remove second parameter of
 __assign_str()

On Thu, May 16, 2024 at 01:34:54PM -0400, Steven Rostedt wrote:
> From: "Steven Rostedt (Google)" <rostedt@...dmis.org>
> 
> [
>    This is a treewide change. I will likely re-create this patch again in
>    the second week of the merge window of v6.10 and submit it then. Hoping
>    to keep the conflicts that it will cause to a minimum.
> ]
> 
> 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.
> 

Building csky:allmodconfig (and others) ... failed
--------------
Error log:
In file included from include/trace/trace_events.h:419,
                 from include/trace/define_trace.h:102,
                 from drivers/cxl/core/trace.h:737,
                 from drivers/cxl/core/trace.c:8:
drivers/cxl/core/./trace.h:383:1: error: macro "__assign_str" passed 2 arguments, but takes just 1

This is with the patch applied on top of v6.9-8410-gff2632d7d08e.
So far that seems to be the only build failure.
Introduced with commit 6aec00139d3a8 ("cxl/core: Add region info to
cxl_general_media and cxl_dram events"). Guess we'll see more of those
towards the end of the commit window.

Guenter