Received: by 2002:a05:6a10:7420:0:0:0:0 with SMTP id hk32csp319441pxb; Tue, 15 Feb 2022 14:13:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNX3EoxI+cTIaPpdXqLSNFtD+8cXtkRnTiZOkQhIHAgBIvsN/vMVpAQ/gX219j6q/8W89l X-Received: by 2002:aa7:cdda:: with SMTP id h26mr1096768edw.33.1644963202141; Tue, 15 Feb 2022 14:13:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644963202; cv=none; d=google.com; s=arc-20160816; b=hZKfKXKo6c4BLR1VhY6D4iq7xSzTp0AGbKuZqfpeGqvjj3DcL5C3ntiovu8n29u/Fq R2c58hyMAwWPnnAlWF6HGDvD7BdGti8iJp3wwuVDuxtyaqZxlXMVa0/eq7+XSaYsfIn2 ETtPzriBnJlVM5xZO8rTW8mg2SJWZw3FZ9hBziQo3E1Rqrza2fG8qA8e5ax+jti6b8xh rYMseBO0sRRcyySWePCaEQaxx3gA3HGgPGQayUQAn5vlAgecqXMzVJhlwZW6SBSy94FI 21f9FFbftG94eCkaM4Z0lxsssSQO8t2qhGD4xT5pkAnD6u68LPdsVzlc0FSZS87u7PV4 W7bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RT2Lma/ATwdV70IkpaWSr0MWLV8ghBiUfJMLPJX+dJ0=; b=YfmDB1f2vILC2Te4aIUXyAMjwM1x1DKWfMO7BdOvVzIEDkzpNkLB8p2LKkiiO8oLHo zSEh4oza6eJMM3poMaT2rsaa3AhGcZ6/1xo6FyFN4d8JZsZXO2u4LuNbkggDMvx0RW/Q PNwRK86btV8A0+VVMLdUodMO6YKOutvya1lHSrlYdV5u6s839I+HlEqwtVYqjOvrRtd8 5jamItPriTgCDFQpslTidaAKsJG5AmiGWRxgHSjaUrmYIv7OX6aCyojAhLw6GAiid5MT PxZQNInnhfGidf3TGQ+oa+jhV/BgiuekSkramiPGHqoU9H7Z7siK1Eap8PDr7CApnAJf ErBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FdwjzkuV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v11si689882edq.181.2022.02.15.14.12.59; Tue, 15 Feb 2022 14:13:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FdwjzkuV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240646AbiBOPfF (ORCPT + 99 others); Tue, 15 Feb 2022 10:35:05 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:46180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240489AbiBOPeD (ORCPT ); Tue, 15 Feb 2022 10:34:03 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE33612553F; Tue, 15 Feb 2022 07:30:33 -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 63275B81A9A; Tue, 15 Feb 2022 15:30:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E767C340F1; Tue, 15 Feb 2022 15:30:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644939031; bh=ByQlx2/Jf/R4CwJu/sdtRN1UzlkUt8oJnCrautKDukc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FdwjzkuVz8wfo8hyzYZH8CW+qOhOq2ar7x378eQyER/JbV8De3SBmu1YByF/jnzmu MWumu+sSZtVlAPQ+UN1b9iaWeB+rQyy42DR6HLn2sHFzN8MfcJ4HizT+gkWJzvoG6V Hx3P7ArGEsyhjblgfrKYCXxJo/aUByZXfK/JqoO/qKrvMZxNY9gMf1/0gnHkpWolhr WbykOgAQ5rDuo5BybM9RIbF/+9pT/EBfgzqWfbbmNrm0vRFQHwvkXDn3yD8n0qyv9N fIUrbBt6bWUrWdWfugsOL8yyMcEODZHsBDUrCnWjoaJ9jU7rSQNrkWebvTnmIjrjC+ hbc+yqeF5G+Fw== 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.10 19/23] tracing: Fix tp_printk option related with tp_printk_stop_on_boot Date: Tue, 15 Feb 2022 10:29:53 -0500 Message-Id: <20220215152957.581303-19-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215152957.581303-1-sashal@kernel.org> References: <20220215152957.581303-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 a0729213f37be..f9fad789321b0 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -250,6 +250,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