From patchwork Wed Jan 11 14:56:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 42050 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3368327wrt; Wed, 11 Jan 2023 07:02:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXtu69CTj9prOAafNmzkMD8yNuEB1hc2JeTJ5J52GINxqD44z/H3itUQ0excQX/D10Sr1ceo X-Received: by 2002:a05:6a20:6b91:b0:af:ca6c:7d9f with SMTP id bu17-20020a056a206b9100b000afca6c7d9fmr3080956pzb.19.1673449343581; Wed, 11 Jan 2023 07:02:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673449343; cv=none; d=google.com; s=arc-20160816; b=a6wElurOaR7WSGzA269/b5Guo8rczJwQyNo0CoQ/rT5y8zk/YuT+mrjsxPlL2LscYJ kRWc7hcF2FCMVbMIJpWTyQbE16ilfqCqXTDixgD/6VMR5OW5NpzqNkBEIV4+q919fDZZ r5txrsHV7lUBy/xE3kGt6J1Qm4PNGr8UQVrf1yJuM+DqyoXgMrWIHUSX3EXcJ+ASc78Y 2AdVV4FXWJPXyku2EB3rHvEpECASwqt1rIFTBimgRlA5UZbUY6BeGMh0gBtdlQWcH6jF mjcdCMWzRyL+j+CNZHJRQBQfYcyAGRMpnHUIB5iDHSLBL91a/0ugFM9VteEEuzECRUd7 klJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=KVJN1/BKOyrLDOsqdHmOfYiorva2xSd7IM8NAe8ouY8=; b=ico/u24rQWjS9YBRAnRZlFINkOjWUgXyJ9H9eMAV+knwhrDI2DTsCnt4zCWFLGtU0z RDI/wsKxiCtEJy1gnAuPVStMsyhPQp82cxZpyObtFONWlGTcbVjmeK7pU2vm3NIghirf V47SmaEb09gs2C5BGf+u1bhneFC+hyA0p8ecslf4pYOP5UCSrrm1E8pB12kBOqsoZNmR UrkzTC2ufN3SoEccLYZrsxHenzfTV7wtmDRKe8hhvM++rPFQwhWeVJA3nJX1GA0z0+QA CQ8vNf4yJGn+NOubrzV2T383Bf5jBhTacQZZHr571r8R/j+tn9fWjuKHOFO5/1oSYl0x mRdA== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u129-20020a637987000000b00499413885dfsi15376201pgc.291.2023.01.11.07.02.08; Wed, 11 Jan 2023 07:02:23 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232094AbjAKO7G (ORCPT + 99 others); Wed, 11 Jan 2023 09:59:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239512AbjAKO6q (ORCPT ); Wed, 11 Jan 2023 09:58:46 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA7356328; Wed, 11 Jan 2023 06:58:44 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 3FC3361D4F; Wed, 11 Jan 2023 14:58:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4CBCC43392; Wed, 11 Jan 2023 14:58:43 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pFcYs-000M7f-2A; Wed, 11 Jan 2023 09:58:42 -0500 Message-ID: <20230111145842.534011158@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 11 Jan 2023 09:56:38 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Ross Zwisler Subject: [PATCH 2/4] tracing: Add enabling of events to boot instances References: <20230111145636.450953217@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754738819014884342?= X-GMAIL-MSGID: =?utf-8?q?1754738819014884342?= From: "Steven Rostedt (Google)" Add the format of: trace_instance=foo,sched:sched_switch,irq_handler_entry,initcall That will create the "foo" instance and enable the sched_switch event (here were the "sched" system is explicitly specified), the irq_handler_entry event, and all events under the system initcall. Signed-off-by: Steven Rostedt (Google) Reviewed-by: Ross Zwisler --- Documentation/admin-guide/kernel-parameters.txt | 14 ++++++++++++++ kernel/trace/trace.c | 4 ++++ kernel/trace/trace.h | 2 ++ kernel/trace/trace_events.c | 9 ++++----- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index cec486217ccc..7a7f41652719 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6278,6 +6278,20 @@ /sys/kernel/tracing/instances + Events can be enabled at the time the instance is created + via: + + trace_instance=,:,: + + Note, the ":" portion is optional if the event is + unique. + + trace_instance=foo,sched:sched_switch,irq_handler_entry,initcall + + will enable the "sched_switch" event (note, the "sched:" is optional, and + the same thing would happen if it was left off). The irq_handler_entry + event, and all events under the "initcall" system. + trace_options=[option-list] [FTRACE] Enable or disable tracer options at boot. The option-list is a comma delimited list of options diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 34ed504ffca9..e8c52a8d712e 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -10189,6 +10189,10 @@ __init static void enable_instances(void) } /* Allow user space to delete it */ trace_array_put(tr); + + while ((tok = strsep(&curr_str, ","))) { + early_enable_events(tr, tok, true); + } } } diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index e46a49269be2..a56b0b7d23ef 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -1330,6 +1330,8 @@ DECLARE_PER_CPU(int, trace_buffered_event_cnt); void trace_buffered_event_disable(void); void trace_buffered_event_enable(void); +void early_enable_events(struct trace_array *tr, char *buf, bool disable_first); + static inline void __trace_event_discard_commit(struct trace_buffer *buffer, struct ring_buffer_event *event) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index b07931ad97de..cf3fd74fa675 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -3750,10 +3750,9 @@ static __init int event_trace_memsetup(void) return 0; } -static __init void -early_enable_events(struct trace_array *tr, bool disable_first) +__init void +early_enable_events(struct trace_array *tr, char *buf, bool disable_first) { - char *buf = bootup_event_buf; char *token; int ret; @@ -3806,7 +3805,7 @@ static __init int event_trace_enable(void) */ __trace_early_add_events(tr); - early_enable_events(tr, false); + early_enable_events(tr, bootup_event_buf, false); trace_printk_start_comm(); @@ -3834,7 +3833,7 @@ static __init int event_trace_enable_again(void) if (!tr) return -ENODEV; - early_enable_events(tr, true); + early_enable_events(tr, bootup_event_buf, true); return 0; }