From patchwork Mon Feb 21 08:49:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 544930 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 10E34C433EF for ; Mon, 21 Feb 2022 09:09:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347666AbiBUJJk (ORCPT ); Mon, 21 Feb 2022 04:09:40 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:36146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347668AbiBUJI7 (ORCPT ); Mon, 21 Feb 2022 04:08:59 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F4B51110; Mon, 21 Feb 2022 01:01:00 -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 5C9EFB80EAF; Mon, 21 Feb 2022 09:00:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99D10C340E9; Mon, 21 Feb 2022 09:00:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645434058; bh=yeyqDJlMEt+4yzU6WmDQQiir8Jj+abTOVCAaaeSLr5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XSDqj6/LynmVIdbuwcroYAjO8IIV0dsvqYotXvtw+h2NGLGRJnbDZMAQSQ2Mc3J3J tt0FiCtR41ckdrSzNIXAhTVmn70aFoTL5zNCrIlETg5X3w54RXq3Af4zbWd16e/Q+n 715pWza6aU7Ihn4tKxwLouxXqpsa2NEcwWFxP5K4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, JaeSang Yoo , "Steven Rostedt (Google)" , Sasha Levin Subject: [PATCH 5.4 77/80] tracing: Fix tp_printk option related with tp_printk_stop_on_boot Date: Mon, 21 Feb 2022 09:49:57 +0100 Message-Id: <20220221084918.105304722@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084915.554151737@linuxfoundation.org> References: <20220221084915.554151737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 5a4dfb55ba16b..615259d8fa9ad 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -236,6 +236,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;