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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E21BC7618B for ; Mon, 15 Jul 2019 05:13:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03C65214C6 for ; Mon, 15 Jul 2019 05:13:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563167594; bh=6gGcfEWCiK1SlavbBcgxKOLLBHAkn0B+lLsSxafwoms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NPyN/bMTEIAa/0e5Cy7s58hjRx58OQ2OxAEs/Odhyol9inEjNa+z0lpEYYw8XTLZn TYlIIwR3tEfNkmjM5XrUba0fy+ECIMyw4fZdOViHSCyEY+ntd78T4ADBYToEAPHUGg POvr/wC5G9oGAT7446hnEEIFON1OHttxSJqq1pFw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729282AbfGOFNN (ORCPT ); Mon, 15 Jul 2019 01:13:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:47498 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725954AbfGOFNM (ORCPT ); Mon, 15 Jul 2019 01:13:12 -0400 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9765E20C01; Mon, 15 Jul 2019 05:13:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563167591; bh=6gGcfEWCiK1SlavbBcgxKOLLBHAkn0B+lLsSxafwoms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZXEfFU1EwGqV7iK0E7BWJA2jwkuLGhy/8m/5UyBR6PfR0Y3q4rJCMpDtxRkCC6r48 7s+Df2V4gfaNX+zcuZXnFWJ062EwtsjI4vr3Q+/U1LJSjjNtXy9hjoV2nfUZxdebh9 4a4VMf/XnWsvooKJwCPmqRTwTRn7LZCpVxTMEY0A= From: Masami Hiramatsu To: Steven Rostedt , Rob Herring , Frank Rowand , Tim Bird Cc: Ingo Molnar , Namhyung Kim , Jiri Olsa , Arnaldo Carvalho de Melo , Tom Zanussi , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [RFC PATCH v2 11/15] tracing: of: Add synthetic event support Date: Mon, 15 Jul 2019 14:13:06 +0900 Message-Id: <156316758602.23477.18131938169057778805.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <156316746861.23477.5815110570539190650.stgit@devnote2> References: <156316746861.23477.5815110570539190650.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add synthetic event node support. The synthetic event node must be a child node of ftrace node, and the node must start with "synth@" prefix. The synth node requires fields string (not string array), which defines the fields as same as tracing/synth_events interface. Signed-off-by: Masami Hiramatsu --- Changes in v2: - Make synth property available only if CONFIG_HIST_TRIGGERS=y --- kernel/trace/trace_events_hist.c | 5 +++ kernel/trace/trace_of.c | 64 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index db973928e580..e7f5d0a353e2 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -1343,6 +1343,11 @@ static int create_or_delete_synth_event(int argc, char **argv) return ret == -ECANCELED ? -EINVAL : ret; } +int synth_event_run_command(const char *command) +{ + return trace_run_command(command, create_or_delete_synth_event); +} + static int synth_event_create(int argc, const char **argv) { const char *name = argv[0]; diff --git a/kernel/trace/trace_of.c b/kernel/trace/trace_of.c index 56c5deb45f54..e9142c63ece1 100644 --- a/kernel/trace/trace_of.c +++ b/kernel/trace/trace_of.c @@ -146,6 +146,49 @@ trace_of_add_kprobe_event(struct device_node *node, } #endif +#ifdef CONFIG_HIST_TRIGGERS +extern int synth_event_run_command(const char *command); + +static int __init +trace_of_add_synth_event(struct device_node *node, const char *event) +{ + struct property *prop; + char buf[MAX_BUF_LEN], *q; + const char *p; + int len, delta, ret; + + len = ARRAY_SIZE(buf); + delta = snprintf(buf, len, "%s", event); + if (delta >= len) { + pr_err("Event name is too long: %s\n", event); + return -E2BIG; + } + len -= delta; q = buf + delta; + + of_property_for_each_string(node, "fields", prop, p) { + delta = snprintf(q, len, " %s;", p); + if (delta >= len) { + pr_err("fields string is too long: %s\n", p); + return -E2BIG; + } + len -= delta; q += delta; + } + + ret = synth_event_run_command(buf); + if (ret < 0) + pr_err("Failed to add synthetic event: %s\n", buf); + + return ret; +} +#else +static inline int __init +trace_of_add_synth_event(struct device_node *node, const char *event) +{ + pr_err("Synthetic event is not supported.\n"); + return -ENOTSUPP; +} +#endif + static void __init trace_of_init_one_event(struct trace_array *tr, struct device_node *node) { @@ -173,15 +216,30 @@ trace_of_init_one_event(struct trace_array *tr, struct device_node *node) event = buf; group = strsep(&event, ":"); - /* For a kprobe event, we have to generates an event at first */ + + /* Generates kprobe/synth event at first */ if (of_find_property(node, "probes", NULL)) { + if (of_find_property(node, "fields", NULL)) { + pr_err("Error: %s node has both probes and fields\n", + of_node_full_name(node)); + return; + } if (!event) { event = buf; group = "kprobes"; } - err = trace_of_add_kprobe_event(node, group, event); - if (err < 0) + if (trace_of_add_kprobe_event(node, group, event) < 0) + return; + } else if (of_find_property(node, "fields", NULL)) { + if (!event) + event = buf; + else if (strcmp(group, "synthetic") != 0) { + pr_err("Synthetic event must be in synthetic group\n"); + return; + } + if (trace_of_add_synth_event(node, event) < 0) return; + group = "synthetic"; } else { if (!event) { pr_err("%s has no group name\n", buf);