From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1A8EFC04FFE for ; Fri, 17 May 2024 17:37:34 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=JYKmb3xW; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4VgvL43HtSz3cTq for ; Sat, 18 May 2024 03:37:32 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=JYKmb3xW; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::633; helo=mail-pl1-x633.google.com; envelope-from=groeck7@gmail.com; receiver=lists.ozlabs.org) Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4VgvKD3wQLz2xWS; Sat, 18 May 2024 03:36:46 +1000 (AEST) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1eeabda8590so15115195ad.0; Fri, 17 May 2024 10:36:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715967399; x=1716572199; darn=lists.ozlabs.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=rzMfxbAB8QJEcJdIySGROcUOqAKXWq8nqUdcExbi1Zk=; b=JYKmb3xWmtU1aAMhOenfYW0U6OIr9YXCfYPQhXxdjh2rzsNVfrY2affuaSQNZ2vTFw 9V49paFhXT93a7M7VHjmuv59ZWrEms5RPaIWnHbNzvo2y4Yk5ev9fOJ0dfktV4qP5ENA qS88+GIjn76DEGVFF03gWY5nDoseiC8GfLbPMdyjXPA9Y7n/UJ0ywcr2S+/z9fs6cA/b 4WLn6pukv9YEi4YkGFE8kpU9FmTfQckbzSe9yRfhUsPSYNVDQeV8AiUSQ038k+Oz8GX6 kGeS3nNJvMtdT2eLbFMU3kbS2XaEvkNPX1hL1y31SkPpZOVNBO6YdDynjDuE52B1PDPE zU7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715967399; x=1716572199; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rzMfxbAB8QJEcJdIySGROcUOqAKXWq8nqUdcExbi1Zk=; b=gqGICmiMYZ9Cy3o7dOS2sgvT7CD/5ed3/h4eFaaLK6Dy/WQo+rHL85m+odbeK1aUT4 SvKS3XFumYeTZqUEA6AM/1MA+ct+PFTEbmLgkmdxysSuMfXIsBiSvSoF5Wl8S76MmNgU h9rOmhZGowPdbwNu88qJRarCfVKA4da8E/kL1sn+2hSoA4sNL8kXxdMBpjfCQzNZlfF5 iQSkA+RNWtIU77zoCKvGdPZW4fOjenKLwz1zdNPpTDFLpavInmJcPBHVkrv3QR9T5/WJ gstKTP4yfVS2pPdH3PpHqBIXqcTbcbKgBB7GCYBBHeEF4u0NdCjPYdjt4ldiE69Zh3ky mPQg== X-Forwarded-Encrypted: i=1; AJvYcCWum3ywveRLpbZBjK3hq7lYOGQ6tArc8h5QcYkehTuQAp+vLUM+DhouHrwsICjL0ItmLW8tr1TizSgtS49x8zVQTyE7bguGSKH978B9otTmnhPrEm2NjCj3AGOKw8KkVN7wlVeLjaxOd39yEw== X-Gm-Message-State: AOJu0YzYW2PMVM35m5ChbYBZq55fqCvWMe8rTAdaVaIMD0htw4r0C4N0 rSLlE6f3qnDd+h8DurJY0uJT7wfKII+PaO9hZaIIdLKSAwmhpgxG X-Google-Smtp-Source: AGHT+IHJ9PZtASiLb9HJkYrHy1DRhdQlVEuKbRr0NYIRv4Tx+av91BIA0wx1gBcIQQlm9sd2COIQnQ== X-Received: by 2002:a17:90a:9606:b0:2b9:a299:928e with SMTP id 98e67ed59e1d1-2b9a29994c9mr10436893a91.24.1715967398710; Fri, 17 May 2024 10:36:38 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2b67105666csm15749258a91.8.2024.05.17.10.36.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 May 2024 10:36:38 -0700 (PDT) Date: Fri, 17 May 2024 10:36:37 -0700 From: Guenter Roeck To: Steven Rostedt Subject: Re: [PATCH] tracing/treewide: Remove second parameter of __assign_str() Message-ID: <5080f4c5-e0b3-4c2e-9732-f673d7e6ca66@roeck-us.net> References: <20240516133454.681ba6a0@rorschach.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240516133454.681ba6a0@rorschach.local.home> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-hyperv@vger.kernel.org, linux-usb@vger.kernel.org, kvm@vger.kernel.org, dri-devel@lists.freedesktop.org, brcm80211@lists.linux.dev, ath10k@lists.infradead.org, Julia Lawall , linux-s390@vger.kernel.org, dev@openvswitch.org, linux-cifs@vger.kernel.org, linux-rdma@vger.kernel.org, amd-gfx@lists.freedesktop.org, io-uring@vger.kernel.org, linux-bcachefs@vger.kernel.org, iommu@lists.linux.dev, ath11k@lists.infradead.org, linux-media@vger.kernel.org, linux-wpan@vger.kernel.org, linux-pm@vger.kernel.org, selinux@vger.kernel.org, linux-arm-msm@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-erofs@lists.ozlabs.org, virtualization@lists.linux.dev, linux-sound@vger.kernel.org, linux-block@vger.kernel.org, ocfs2-devel@lists.linux.dev, Mathieu Desnoyers , linux-cxl@vger.kernel.org, linux-tegra@vger.kernel.org, intel-xe@lists.freedesktop.org, linux-edac@vger.kernel.org, linux-hwmon@vger.kernel.org, brcm80211-dev-list.pdl@broa dcom.com, Linus Torvalds , linuxppc-dev@lists.ozlabs.org, linux-wireless@vger.kernel.org, LKML , linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, ath12k@lists.infradead.org, tipc-discussion@lists.sourceforge.net, Masami Hiramatsu , netdev@vger.kernel.org, bpf@vger.kernel.org, Linux trace kernel , freedreno@lists.freedesktop.org, linux-nfs@vger.kernel.org, linux-btrfs@vger.kernel.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Thu, May 16, 2024 at 01:34:54PM -0400, Steven Rostedt wrote: > From: "Steven Rostedt (Google)" > > [ > 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