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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8483C4332F for ; Tue, 15 Feb 2022 15:31:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235079AbiBOPbr (ORCPT ); Tue, 15 Feb 2022 10:31:47 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:46864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240449AbiBOPbW (ORCPT ); Tue, 15 Feb 2022 10:31:22 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6463110AEFF; Tue, 15 Feb 2022 07:29:23 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 151B0B81AEF; Tue, 15 Feb 2022 15:29:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC1C4C340F2; Tue, 15 Feb 2022 15:29:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644938960; bh=irm/IpB0amb9hj620Syux/kXZz0jKhnqBvMBFBvfmTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UeP82fvgkUXALQvNnWoguFe5tZX3J+EK/FFxmzuv2BZqZOTTBYkhjMwcDp3FJnGlJ b7tOVv0dh4V7rGtUe8gM2Hhm2wvJjfLPO3RZzUuSnOHKE6OJIP5rAiESdmNy8+HuDy TdfBerDB1sB8TPOiJdGOehFNypMPWSyTgltWYhJLzcSgXUZAP/ArVsp5ffs1OINNXQ 38i18D9rpmuESJNQ3C763Lbhc12QYdafWEZe9mQuY4fcrQTL7N2oHf6wOSCD8WYFea z7stIfHK9NCjqh/VZvsjiS4+Fb0FXOyWHk1hm4iiqw9Z0zLds3EvsIjeWxHT13QINp YEmqBXPJT40Zg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: JaeSang Yoo , JaeSang Yoo , Steven Rostedt , Sasha Levin , mingo@redhat.com Subject: [PATCH AUTOSEL 5.15 26/33] tracing: Fix tp_printk option related with tp_printk_stop_on_boot Date: Tue, 15 Feb 2022 10:28:24 -0500 Message-Id: <20220215152831.580780-26-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215152831.580780-1-sashal@kernel.org> References: <20220215152831.580780-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: JaeSang Yoo [ Upstream commit 3203ce39ac0b2a57a84382ec184c7d4a0bede175 ] The kernel parameter "tp_printk_stop_on_boot" starts with "tp_printk" which is the same as another kernel parameter "tp_printk". If "tp_printk" setup is called before the "tp_printk_stop_on_boot", it will override the latter and keep it from being set. This is similar to other kernel parameter issues, such as: Commit 745a600cf1a6 ("um: console: Ignore console= option") or init/do_mounts.c:45 (setup function of "ro" kernel param) Fix it by checking for a "_" right after the "tp_printk" and if that exists do not process the parameter. Link: https://lkml.kernel.org/r/20220208195421.969326-1-jsyoo5b@gmail.com Signed-off-by: JaeSang Yoo [ Fixed up change log and added space after if condition ] Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- kernel/trace/trace.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 51a87a67e2abe..618c20ce2479d 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -252,6 +252,10 @@ __setup("trace_clock=", set_trace_boot_clock); static int __init set_tracepoint_printk(char *str) { + /* Ignore the "tp_printk_stop_on_boot" param */ + if (*str == '_') + return 0; + if ((strcmp(str, "=0") != 0 && strcmp(str, "=off") != 0)) tracepoint_printk = 1; return 1; -- 2.34.1