From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>,
Frank Rowand <frowand.list@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>,
Randy Dunlap <rdunlap@infradead.org>,
Namhyung Kim <namhyung@kernel.org>, Tim Bird <Tim.Bird@sony.com>,
Jiri Olsa <jolsa@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Tom Zanussi <tom.zanussi@linux.intel.com>,
Rob Herring <robh+dt@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Alexey Dobriyan <adobriyan@gmail.com>,
Jonathan Corbet <corbet@lwn.net>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v5 19/22] tracing/boot: Add instance node support
Date: Thu, 26 Dec 2019 23:07:39 +0900 [thread overview]
Message-ID: <157736925917.11126.17834194462403458721.stgit@devnote2> (raw)
In-Reply-To: <157736902773.11126.2531161235817081873.stgit@devnote2>
Add instance node support to boot-time tracing. User can set
some options and event nodes under instance node.
- ftrace.instance.INSTANCE[...]
Add new INSTANCE instance. Some options and event nodes
are acceptable for instance node.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
Changes in v4:
- Use trace_array_get_by_name() instead of trace_array_create().
- Remove global boot option setting.
---
0 files changed
diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c
index 3054921b0877..f5db30d25b0b 100644
--- a/kernel/trace/trace_boot.c
+++ b/kernel/trace/trace_boot.c
@@ -20,7 +20,7 @@ extern ssize_t tracing_resize_ring_buffer(struct trace_array *tr,
unsigned long size, int cpu_id);
static void __init
-trace_boot_set_ftrace_options(struct trace_array *tr, struct xbc_node *node)
+trace_boot_set_instance_options(struct trace_array *tr, struct xbc_node *node)
{
struct xbc_node *anode;
const char *p;
@@ -242,6 +242,40 @@ trace_boot_enable_tracer(struct trace_array *tr, struct xbc_node *node)
}
}
+static void __init
+trace_boot_init_one_instance(struct trace_array *tr, struct xbc_node *node)
+{
+ trace_boot_set_instance_options(tr, node);
+ trace_boot_init_events(tr, node);
+ trace_boot_enable_events(tr, node);
+ trace_boot_enable_tracer(tr, node);
+}
+
+static void __init
+trace_boot_init_instances(struct xbc_node *node)
+{
+ struct xbc_node *inode;
+ struct trace_array *tr;
+ const char *p;
+
+ node = xbc_node_find_child(node, "instance");
+ if (!node)
+ return;
+
+ xbc_node_for_each_child(node, inode) {
+ p = xbc_node_get_data(inode);
+ if (!p || *p == '\0')
+ continue;
+
+ tr = trace_array_get_by_name(p);
+ if (IS_ERR(tr)) {
+ pr_err("Failed to get trace instance %s\n", p);
+ continue;
+ }
+ trace_boot_init_one_instance(tr, inode);
+ }
+}
+
static int __init trace_boot_init(void)
{
struct xbc_node *trace_node;
@@ -255,10 +289,9 @@ static int __init trace_boot_init(void)
if (!tr)
return 0;
- trace_boot_set_ftrace_options(tr, trace_node);
- trace_boot_init_events(tr, trace_node);
- trace_boot_enable_events(tr, trace_node);
- trace_boot_enable_tracer(tr, trace_node);
+ /* Global trace array is also one instance */
+ trace_boot_init_one_instance(tr, trace_node);
+ trace_boot_init_instances(trace_node);
return 0;
}
next prev parent reply other threads:[~2019-12-26 14:07 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-26 14:03 [PATCH v5 00/22] tracing: bootconfig: Boot-time tracing and Extra boot config Masami Hiramatsu
2019-12-26 14:04 ` [PATCH v5 01/22] bootconfig: Add Extra Boot Config support Masami Hiramatsu
2020-01-08 1:59 ` Steven Rostedt
2020-01-08 3:03 ` Steven Rostedt
2020-01-08 5:17 ` Masami Hiramatsu
2020-01-08 14:01 ` Steven Rostedt
2019-12-26 14:04 ` [PATCH v5 02/22] bootconfig: Load boot config from the tail of initrd Masami Hiramatsu
2019-12-26 14:04 ` [PATCH v5 03/22] tools: bootconfig: Add bootconfig command Masami Hiramatsu
2019-12-26 14:04 ` [PATCH v5 04/22] tools: bootconfig: Add bootconfig test script Masami Hiramatsu
2019-12-26 14:04 ` [PATCH v5 05/22] proc: bootconfig: Add /proc/bootconfig to show boot config list Masami Hiramatsu
2020-01-09 21:37 ` Steven Rostedt
2020-01-10 0:52 ` Masami Hiramatsu
2019-12-26 14:05 ` [PATCH v5 06/22] init/main.c: Alloc initcall_command_line in do_initcall() and free it Masami Hiramatsu
2019-12-26 14:05 ` [PATCH v5 07/22] bootconfig: init: Allow admin to use bootconfig for kernel command line Masami Hiramatsu
2019-12-26 14:05 ` [PATCH v5 08/22] bootconfig: init: Allow admin to use bootconfig for init " Masami Hiramatsu
2019-12-26 14:05 ` [PATCH v5 09/22] Documentation: bootconfig: Add a doc for extended boot config Masami Hiramatsu
2019-12-26 14:05 ` [PATCH v5 10/22] tracing: Apply soft-disabled and filter to tracepoints printk Masami Hiramatsu
2019-12-26 14:06 ` [PATCH v5 11/22] tracing: kprobes: Output kprobe event to printk buffer Masami Hiramatsu
2019-12-26 14:06 ` [PATCH v5 12/22] tracing: kprobes: Register to dynevent earlier stage Masami Hiramatsu
2019-12-26 14:06 ` [PATCH v5 13/22] tracing: Accept different type for synthetic event fields Masami Hiramatsu
2019-12-26 14:06 ` [PATCH v5 14/22] tracing: Add NULL trace-array check in print_synth_event() Masami Hiramatsu
2019-12-26 14:06 ` [PATCH v5 15/22] tracing/boot: Add boot-time tracing Masami Hiramatsu
2019-12-26 14:07 ` [PATCH v5 16/22] tracing/boot: Add per-event settings Masami Hiramatsu
2019-12-26 14:07 ` [PATCH v5 17/22] tracing/boot Add kprobe event support Masami Hiramatsu
2019-12-26 14:07 ` [PATCH v5 18/22] tracing/boot: Add synthetic " Masami Hiramatsu
2019-12-26 14:07 ` Masami Hiramatsu [this message]
2019-12-26 14:07 ` [PATCH v5 20/22] tracing/boot: Add cpu_mask option support Masami Hiramatsu
2019-12-26 14:08 ` [PATCH v5 21/22] tracing/boot: Add function tracer filter options Masami Hiramatsu
2019-12-26 18:05 ` kbuild test robot
2019-12-27 2:56 ` Masami Hiramatsu
2019-12-26 14:08 ` [PATCH v5 22/22] Documentation: tracing: Add boot-time tracing document Masami Hiramatsu
2020-01-09 23:10 ` [PATCH v5 00/22] tracing: bootconfig: Boot-time tracing and Extra boot config Steven Rostedt
2020-01-10 15:30 ` Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=157736925917.11126.17834194462403458721.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=Tim.Bird@sony.com \
--cc=acme@kernel.org \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=corbet@lwn.net \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jolsa@redhat.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=rdunlap@infradead.org \
--cc=robh+dt@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=tom.zanussi@linux.intel.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).