From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10B5F2F290E for ; Sat, 2 May 2026 07:56:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777708582; cv=none; b=plGcRBRDkr2hIhDZf9UEEkRtSdWtdXdvgAI5phhz/FwCJ6qjALmkOwNc1PQysO1UnS+fisyI2LTsLVNs6fjjUgrnmdKCy2yBB7PjeypIFXymnpFWUF39WJqUkiUO0U6sI4jAfwE6lcY16hv5JJXNTY44pc3TW4UhzeONzWjDqzY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777708582; c=relaxed/simple; bh=GoffBHbQYFrw6Z0Wmn9y4jK2vvEUyta7lPGW0p12fcM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gkbpEPsVcxmpmQ24mlaF9uYsXSAHjg1/X7alNYWsGafKR3lCjONMrO0quwTtM8bEXqLGsZZwJi7GRzFW3OtsAfrz2AjjLR8VI6yTavmYy7HY3RTrYYMJq+WKyWUNQYiqfjp4o8EEhAC84qgoLEtuFnMxog52A1QZq1mTl4NSxrQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Eh70oteK; arc=none smtp.client-ip=209.85.210.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Eh70oteK" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-834da62e52dso1269975b3a.3 for ; Sat, 02 May 2026 00:56:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777708579; x=1778313379; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ibf/edoeh3l105s3NNDXpaKtoD450DpqiDhI9gwuPoU=; b=Eh70oteKs4yTgEwkW6nhm+HmIHNEjkXwESmwrGWi5/jKjO1oNw09fqyJ3uOxzc6W/7 MWrBaVljHnQy3tojqagpjAFAVxuBzRYxbrIzoseLOEXl4z234xrtJnwgp5fDnS0GSO27 dYm3zzkXrAeTBpbL1LEQPIoEOQn8XpeWDrXZhvZkzsaol5pDX4fB6fI7KmogbHhHwzfN jU5mdTiTZ4HygQ63XuHo8ijfcDnQNoyFxUNMaMTNonOcVyGgLZJAL7quzh2iwsb5tYJb 7y6PBW/253c1366Exoax2hp6ObgBQxUrcICRVU0hY7fNCHTssoFP6elIy1jFPWmtdpjI DTuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777708579; x=1778313379; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ibf/edoeh3l105s3NNDXpaKtoD450DpqiDhI9gwuPoU=; b=loKvJjt52R8gq9p7X6cKYXV5pBdbnLKi3jeBw5R+sxA6I0WDlHYWKA8zPqZBuhrLnw GwbiGmf0HqRh3/MD7ZY8I/sA8OCmipZzC9y07vQo3B6u/qIz82IHhCgJ18nC7EL1kPz6 4Lzr83pJ5UK+DeZ23QKgSymW1Xt4DMzPDXMfOAzuEtunGY8kMHuyJtXcFjgE99xgLnxp BnbSC6+5rxogThcVqCHbmn4EAQviZ8kkNiu70Fr10/N16Q7IIG4dSj+e+rLS0Rs/Ba0v URv4cemm7M2eG69lvv6wgZuxEgGhzMx8+CPkQ+BqvavwFJNJzLNWCqJcke48jJ+OfJ/c ncbA== X-Forwarded-Encrypted: i=1; AFNElJ8RMXu8zHO0uwGuYG5qsUUKMNCXpI14BQpQupEqwRCbvSPcpwyqa+ZotuzAq8bKaNa9mDkBJOXEcopjYVs=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/K4eKfEG1A4twhS8eSKDdbPmC4+RPFEVw/5b56hFDJARScdDv XmOXhZMMQu53rFth10AL924nMwTrdV7w29xN8f0tc36b9DW/Vdcjzkvx X-Gm-Gg: AeBDievvBeZCJmXd26gJzLxYpjPSLGUurpVCyOgwsx0kN1g/Voyq7o3puZDnQKjDcqc vlsXfnM+DEXHFBP4Ru4wV2F0BsLFH9kGoddILL5RYS8jK/ZGBzEy1kSmDijaHUwAWc/RaFH2R5s VOseL2AAdQrxLz/wtAYum/6EqVYrhP2Cem89kotd85YVhMzAioLbkvDQYSXU1c87gzXRL+r4Pqv t6HQ+J0CcUhdnHXNgbky7tb5suFmKiNCBPwNgaUMnOt8GSI7J9eSwtuYRrltLjpT+beaBNCTcZI sitSnyOUDa2lZaMWA/DRjplpbuXsp/oqsutOZk5Zgjae36MTzD/OWAxuBtiTDRi7U1EdVzcOmXo 2mFFImPLDwAy9SEWY/J3MC7ihv+/ccx3rixyMVl4T2HHLrxCanydL73016DWu1Li4H+Z0FnWEcZ Ra/jZcL9HbN8qHDiGc5Yy0MWJYidttlcu6 X-Received: by 2002:a05:6a00:14ca:b0:82c:e5d0:5249 with SMTP id d2e1a72fcca58-8352d1c59e5mr2386858b3a.8.1777708579315; Sat, 02 May 2026 00:56:19 -0700 (PDT) Received: from nova.. ([134.208.63.146]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-835158312c5sm5247062b3a.8.2026.05.02.00.56.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2026 00:56:19 -0700 (PDT) From: Qian-Yu Lin To: rostedt@goodmis.org Cc: mhiramat@kernel.org, david.laight.linux@gmail.com, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Qian-Yu Lin Subject: [PATCH v3] trace_printk: remove local variable for argument detection Date: Sat, 2 May 2026 15:55:34 +0800 Message-ID: <20260502075535.34997-1-tiffany019230@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260429165707.7020-1-tiffany019230@gmail.com> References: <20260429165707.7020-1-tiffany019230@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The trace_printk() macro uses a local variable _______STR to detect whether variadic arguments are present. This name can shadow outer variables. Replace the local variable with sizeof applied directly to the stringified arguments: if (sizeof __stringify((__VA_ARGS__)) > 3) This eliminates the shadowing risk entirely without introducing any additional includes or local variables. Verified with objdump on samples/trace_printk that all four cases branch correctly: __trace_bputs, __trace_puts, __trace_bprintk, and __trace_printk. Suggested-by: David Laight Signed-off-by: Qian-Yu Lin --- include/linux/trace_printk.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/linux/trace_printk.h b/include/linux/trace_printk.h index 2670ec7f4262..3d54f440dccf 100644 --- a/include/linux/trace_printk.h +++ b/include/linux/trace_printk.h @@ -86,8 +86,7 @@ do { \ #define trace_printk(fmt, ...) \ do { \ - char _______STR[] = __stringify((__VA_ARGS__)); \ - if (sizeof(_______STR) > 3) \ + if (sizeof __stringify((__VA_ARGS__)) > 3) \ do_trace_printk(fmt, ##__VA_ARGS__); \ else \ trace_puts(fmt); \ -- 2.43.0