From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (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 62EBD3A1E6D for ; Thu, 25 Dec 2025 19:08:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766689701; cv=none; b=IqmHwmfrcLu5FcLu0Fim6Nmik0Tc5XcBlVcF9rZsqH6jYyAYqqYiNcr/IpGtR8213aqwokdVc0g9/LhxQvvZafR4MRUSgqySKJLq56QoSr7De0uHNW+mz4l/KZRuwgVjM/6R3Rsa7abq1kHdBoK2McYGnrQ0kAS9hu096DChabE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766689701; c=relaxed/simple; bh=Sp3BBI7rqWS/x5u5n95rHXBvTYUWZEdDT2uy0cYwMU4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H6n/jTQm1QJwvVjqtE4uRQoL3BnRTfQSDAoPAIffqyjqg/4pTdkG+bimbDEQoimj9lcwstYVvRnrZPDWYXCkkNSNNdGTSmRjjDHsaFMzEDQTovlihk1Pf3TEYFXyx+YnziH5VhPrQqz9KibwL3o4eCBxlrljNeRZu+P1fGOMLR4= 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=hDOLKro4; arc=none smtp.client-ip=209.85.160.175 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="hDOLKro4" Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-4edb6e678ddso99176761cf.2 for ; Thu, 25 Dec 2025 11:08:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766689698; x=1767294498; 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=hDOLKro4qi0veM+aEdrwmznbpyYpMVq6KlFZkCu9yO5p7joAi50/7rWInim6uLZhe/ eLcltJV7SPHNa83lfWyFPdmKJ5IeMcH0dnmycQhvkx6lS6zlYrCHiXdeU8j4cm8raVOS 7qToj8uf3WykxMjy6PkP0cOVbp9iC0AOAGRkbRuYEjQFsQPLWC9I10WPRJ8b8Y7sA7Gh TFj+Z1Ke9DnJqq18y2PHeTL+kxhsi4BbbelKy/ezVM2hmlQexrp/YBpmgeConeUWhid6 /jFiAw/EKf7uVZjAf0TZio5DE4wDQLIUJ4sVPd15lALgSyy1cdWp9crb0jaIZRG7GXNF dblw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766689698; x=1767294498; 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=uJbVGGUzwMsVgTX9wMYRIto/HAUStHKC27SfhyHkW77lrMbXEdMy2sSwC1b18x/Cvn 2RMQamRg+gFjH4+1Ksr7KnuH6pLtwbDGoT+A+7RMcuWqbDXgtS8HpcXGDvsaA9euhuuX 25S88EDCgilrDdyjHz18Q23p8TZE7hYjMbS+CemT9cz0lTUeOaWvlfDTrzqsCIgwSIR5 Mw/WT7/gLcWGpsNfIBnrtKn6mGaKFLw/+DIVc0/yGkpdH8nbbJuwKzxcJpuKsRqHLVQ9 DIYou4sNK+FR7oiqaKcNXdX/qVuCVCXValLCD8diy7mghCioPXjJ9JBp08bt44x/fYN0 W25Q== X-Forwarded-Encrypted: i=1; AJvYcCWpWjlRTaXHNZGl7M8g3SYvodgUs/oTz4+qcMAOMMQyBi3xqLWhuQVtdFEE9+wRbSVyqNxohabH1yij9DK/@vger.kernel.org X-Gm-Message-State: AOJu0Yys32gy14TjHIRZ481Sq3gApPCDd1VR2iEz0mmOQv5GaFTn5jKG lUVRY6M1J7b+Z3uAfCImEw0M7baAsPPS/MUiSWq2tqk3BqdHkHTka6UfXkp3kg== X-Gm-Gg: AY/fxX4LeXlm81b9RWh2QPbnh/LpXqNoSqqUxAGHgQLtgsem8sZd0U5DkqFj0SqCzcV G/UotB0i04HjIG1Su/ezaxuFqJaiFOoy8dmg2oAHh/wroKhFB6YXfrEVKCpZzyOyLpzy5qkmurG bliuiia3uHTTZWcyw0odcYlaxqb19ciBtj45iBeczssTvOTyL4FRVsvwabMruhUdrWjUS4TjuvB e+MY0JikYvKtZHbLAnfhUBRcT/W+m3ftbTkaFglHYxXlcjl+bfP1BVVYBN9QCyebhHdjk5/d4V2 oqgUAmJgYjZfZ1EAm0O04e7KSlWnyx4M71OSdL+GBJvQQPzu0X4478K28U/I9MOUylfjAI2khLe RHM6145NWKoBm/YC0Oba6J+qdOGCnxVxh2ox7Hrgnug3BIsLMg4hiXT3IrUKFmPEHjWwbAnr3zj DI2NngrhA= 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-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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); extern void trace_dump_stack(int skip); 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); @@ -1201,7 +1200,7 @@ int __trace_bputs(unsigned long ip, const char *str) int size = sizeof(struct bputs_entry); if (!printk_binsafe(tr)) - return __trace_puts(ip, str, strlen(str)); + return __trace_puts(ip, str); 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) #undef FTRACE_ENTRY #define FTRACE_ENTRY(call, struct_name, id, tstruct, print) \ -- 2.43.0