From nobody Mon Feb 9 11:29:48 2026 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (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 83ED6F50F for ; Thu, 25 Dec 2025 18:48:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766688526; cv=none; b=eZfTCLDkkQLG0UvXhWnbGA7NSc42AdqD/FSaL6YXjDayOWYv1nIKwfq964o6WIvAgnvbEN442giDEdIwprLnxb4kL4uR7eapEDuk623HErvSdrXoutj9BEkYUhuHc6OH0XFW2MdcCRi7pCSprE1S7pqXTbaPdXG0SsLJT7VURlU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766688526; c=relaxed/simple; bh=Sp3BBI7rqWS/x5u5n95rHXBvTYUWZEdDT2uy0cYwMU4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FmrlLJCm8s5E9OH597kzPVr904BR4MCH0MqJOjOMytAec8JKQRpsE2M0Kk4v192z7xnHY7QFJjOerKOIgnFf5EgQtCmGvfwETwYsjweB4g4dGja9apzpDLmVnoh0mKAjT5nFPNREOKatKeFn/V+YFlCd6WeV7pRLQ212e/ZZGTA= 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=UGGhnEr4; arc=none smtp.client-ip=209.85.222.170 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="UGGhnEr4" Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-8c0f15e8247so638389585a.3 for ; Thu, 25 Dec 2025 10:48:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766688523; x=1767293323; 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=hauBx7stO8fgVv7cwKU+lRmpmOfl414DpJwGxBenCpM=; b=UGGhnEr4i2Pmq5Yl9P7ukh855oZswexJeZdsIR9XLQhG/wWCn6iR8kzwNJ2BP0ZfyQ DBU16PD5+ZsBLP1VetyGXpGtSri21ZZYuzzHdP0msvTaDSbJuSleY5J5W0GjuA2KYLo0 6W79Wj8SlHSe57Gc0dr+Km8WnRlU03Ndq/8qAUklZynipIyxGKAxyxsv2kvonvzPfeQB vwXYZ8BjDdisppNEPbW4OsKtoQRmrYUm51ifY8Ea3QBD2mfbtrtP7+CJRohdgrMq8h7m nom7dVAvrPxj9iBCVVxs/Mr2Tr2MVu5sitta/Q1eNhEbEMC7cW/SgqBM+cuQnYVitQRw ErtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766688523; x=1767293323; 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=hauBx7stO8fgVv7cwKU+lRmpmOfl414DpJwGxBenCpM=; b=PLCexlG+L3/Qe7aYU9lbIXcnM5N1Y+uuZLU17HasWYwheFb+eLMbToYEys/ja34ecd PT7+yGo0jBEYzDKLnLuSzwLhJ+t/8fZJHzOtHNR+inaDnuH+4r3OYQIlVDQAla1IZtWx HEPmM07LmovkeMr9u5ojolbVLsBPbVhHIIU626L8APFAvIl/qsNtSHCBI+wjsUJQqbXn 0SYChUqNjOsZ2jQnaw7pB6SeYduoduMEuNRUvc0teHYkoXCGtQkoV3B8Q0LZz4t/ePpQ 8D/qBgTZaQbjaeXuf2N/q3kl5Sj3yyLWoVJUsUAIW3mjRLC7DQ7E8+FCgd/A6sRfgRnk h7Ww== X-Forwarded-Encrypted: i=1; AJvYcCWh3B18iszkuK2yA79lV24X9JJAiweZ3g27shtkGX80IwiBZ3dlcCuDlr6TzLQpuqx9Bi/Qq6LPEqsCojQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywlw6Yyk3t1xY6S2E/n1jRXtMXSQy+eiqsy4F7eU4nqGKFuewIw m+EVmNSD+scQN5SrPmEBHUvus2CLyXEG4A20LX9iwWsf5bVWm7QgtRSJa7kR3g== X-Gm-Gg: AY/fxX4UvDNncutunbWufh4YTv055L0Vy5oeijYI3r8CavtorKzfmmMlYfrtCKK7GgM wwAwFkeJ7uuR5gsv6uEvIvO71y9zUwLozGpWjziSIVzyxt8XPZ2LLivSfkqukroLkQjxmp7jKDm DKpP5Ppmr+a0d16M7pipzA6UeQYceOzsjWvljh/z6ibVv7eCDNMJGmWyun1Anci8mPqu59Rw02N F+MJeiULedyL0goACZDRwnhh/CKZEcvC+tE4O3zRqZSaf18Sd/59XFOkT2w1o8WFi2fqzRSDPpy pcTzL6Qto2ow/p4ZUfy/FtI/+l4PlPDcMCYT2HBiW9ARAmFjtZhc1ZiVLb4werD1Zcv+UQgNPwT sXXm2rCDfOZRkpXK2lb19E5N0dPsaC/JcHbKdNwtrIimFnWgVcBJdKBGopT6iU9317wpa98LnMV G3FmyxLYg= X-Google-Smtp-Source: AGHT+IFOC5KnXE7Y/86OXEfn0VfROKTdlo6cIy7sSNHG4HuRQ93qgtI5LmuQjuxLc/KbIiLosqGOQg== X-Received: by 2002:a53:8592:0:b0:63f:ad6d:cbd5 with SMTP id 956f58d0204a3-6466a900e02mr12636421d50.60.1766682577930; Thu, 25 Dec 2025 09:09:37 -0800 (PST) Received: from localhost ([2601:346:0:79bd:5a70:118b:3656:4527]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-6466a8bd6ffsm9803141d50.9.2025.12.25.09.09.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Dec 2025 09:09:37 -0800 (PST) From: "Yury Norov (NVIDIA)" To: Steven Rostedt , Andrew Morton , Masami Hiramatsu , Mathieu Desnoyers , Andy Shevchenko , Christophe Leroy , Randy Dunlap , Ingo Molnar , Jani Nikula , Joonas Lahtinen , David Laight , Petr Pavlu , Andi Shyti , Rodrigo Vivi , Tvrtko Ursulin , Daniel Gomez , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-modules@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: "Yury Norov (NVIDIA)" Subject: [PATCH v4 5/7] tracing: Remove size parameter in __trace_puts() Date: Thu, 25 Dec 2025 12:09:27 -0500 Message-ID: <20251225170930.1151781-6-yury.norov@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225170930.1151781-1-yury.norov@gmail.com> References: <20251225170930.1151781-1-yury.norov@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: quoted-printable Content-Type: text/plain; charset="utf-8" From: Steven Rostedt The __trace_puts() function takes a string pointer and the size of the string itself. All users currently simply pass in the strlen() of the string it is also passing in. There's no reason to pass in the size. Instead have the __trace_puts() function do the strlen() within the function itself. This fixes a header recursion issue where using strlen() in the macro calling __trace_puts() requires adding #include in order to use strlen(). Removing the use of strlen() from the header fixes the recursion issue. Link: https://lore.kernel.org/all/aUN8Hm377C5A0ILX@yury/ Signed-off-by: Steven Rostedt (Google) Signed-off-by: Yury Norov (NVIDIA) --- include/linux/kernel.h | 4 ++-- kernel/trace/trace.c | 7 +++---- kernel/trace/trace.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5b879bfea948..4ee48fb10dec 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -329,10 +329,10 @@ int __trace_printk(unsigned long ip, const char *fmt,= ...); if (__builtin_constant_p(str)) \ __trace_bputs(_THIS_IP_, trace_printk_fmt); \ else \ - __trace_puts(_THIS_IP_, str, strlen(str)); \ + __trace_puts(_THIS_IP_, str); \ }) extern int __trace_bputs(unsigned long ip, const char *str); -extern int __trace_puts(unsigned long ip, const char *str, int size); +extern int __trace_puts(unsigned long ip, const char *str); =20 extern void trace_dump_stack(int skip); =20 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 6f2148df14d9..57f24e2cd19c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1178,11 +1178,10 @@ EXPORT_SYMBOL_GPL(__trace_array_puts); * __trace_puts - write a constant string into the trace buffer. * @ip: The address of the caller * @str: The constant string to write - * @size: The size of the string. */ -int __trace_puts(unsigned long ip, const char *str, int size) +int __trace_puts(unsigned long ip, const char *str) { - return __trace_array_puts(printk_trace, ip, str, size); + return __trace_array_puts(printk_trace, ip, str, strlen(str)); } EXPORT_SYMBOL_GPL(__trace_puts); =20 @@ -1201,7 +1200,7 @@ int __trace_bputs(unsigned long ip, const char *str) int size =3D sizeof(struct bputs_entry); =20 if (!printk_binsafe(tr)) - return __trace_puts(ip, str, strlen(str)); + return __trace_puts(ip, str); =20 if (!(tr->trace_flags & TRACE_ITER(PRINTK))) return 0; diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index b6d42fe06115..de4e6713b84e 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -2116,7 +2116,7 @@ extern void tracing_log_err(struct trace_array *tr, * about performance). The internal_trace_puts() is for such * a purpose. */ -#define internal_trace_puts(str) __trace_puts(_THIS_IP_, str, strlen(str)) +#define internal_trace_puts(str) __trace_puts(_THIS_IP_, str) =20 #undef FTRACE_ENTRY #define FTRACE_ENTRY(call, struct_name, id, tstruct, print) \ --=20 2.43.0