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 D4296C433EF for ; Thu, 3 Mar 2022 03:56:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229603AbiCCD5R (ORCPT ); Wed, 2 Mar 2022 22:57:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbiCCD5Q (ORCPT ); Wed, 2 Mar 2022 22:57:16 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05E9614EF47 for ; Wed, 2 Mar 2022 19:56:31 -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 8CEB1B82227 for ; Thu, 3 Mar 2022 03:56:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96313C004E1; Thu, 3 Mar 2022 03:56:28 +0000 (UTC) Date: Wed, 2 Mar 2022 22:56:26 -0500 From: Steven Rostedt To: Randy Dunlap Cc: linux-kernel@vger.kernel.org, Igor Zhbanov , Masami Hiramatsu , Ingo Molnar Subject: Re: [PATCH] trace: fix return value of __setup handlers Message-ID: <20220302225626.013dd819@rorschach.local.home> In-Reply-To: <20220303031744.32356-1-rdunlap@infradead.org> References: <20220303031744.32356-1-rdunlap@infradead.org> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2 Mar 2022 19:17:44 -0800 Randy Dunlap wrote: > __setup() handlers should generally return 1 to indicate that the > boot options have been handled. > > Using invalid option values causes the entire kernel boot option > string to be reported as Unknown and added to init's environment > strings, polluting it. > > Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc6 > kprobe_event=p,syscall_any,$arg1 trace_options=quiet > trace_clock=jiffies", will be passed to user space. > > Run /sbin/init as init process > with arguments: > /sbin/init > with environment: > HOME=/ > TERM=linux > BOOT_IMAGE=/boot/bzImage-517rc6 > kprobe_event=p,syscall_any,$arg1 > trace_options=quiet > trace_clock=jiffies > > Return 1 from the __setup() handlers so that init's environment is not > polluted with kernel boot options. > > Fixes: 7bcfaf54f591 ("tracing: Add trace_options kernel command line parameter") > Fixes: e1e232ca6b8f ("tracing: Add trace_clock= kernel parameter") > Fixes: 970988e19eb0 ("tracing/kprobe: Add kprobe_event= boot parameter") > Signed-off-by: Randy Dunlap > Reported-by: Igor Zhbanov > Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru > Cc: Steven Rostedt > Cc: Masami Hiramatsu > Cc: Ingo Molnar > --- > "trace_clock=" reports invalid parameter usage later, when it tries > to use the value: > Trace clock jiffies not defined, going back to default That's because there's no "jiffies" clock. You want to try "trace_clock=uptime". Thanks, I'll add this. -- Steve > > kernel/trace/trace.c | 4 ++-- > kernel/trace/trace_kprobe.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > --- linux-next-20220302.orig/kernel/trace/trace.c > +++ linux-next-20220302/kernel/trace/trace.c > @@ -235,7 +235,7 @@ static char trace_boot_options_buf[MAX_T > static int __init set_trace_boot_options(char *str) > { > strlcpy(trace_boot_options_buf, str, MAX_TRACER_SIZE); > - return 0; > + return 1; > } > __setup("trace_options=", set_trace_boot_options); > > @@ -246,7 +246,7 @@ static int __init set_trace_boot_clock(c > { > strlcpy(trace_boot_clock_buf, str, MAX_TRACER_SIZE); > trace_boot_clock = trace_boot_clock_buf; > - return 0; > + return 1; > } > __setup("trace_clock=", set_trace_boot_clock); > > --- linux-next-20220302.orig/kernel/trace/trace_kprobe.c > +++ linux-next-20220302/kernel/trace/trace_kprobe.c > @@ -32,7 +32,7 @@ static int __init set_kprobe_boot_events > strlcpy(kprobe_boot_events_buf, str, COMMAND_LINE_SIZE); > disable_tracing_selftest("running kprobe events"); > > - return 0; > + return 1; > } > __setup("kprobe_event=", set_kprobe_boot_events); >