Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp3784930ybi; Sun, 14 Jul 2019 22:13:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqxLFzPysnF8lzXsevN4gSUjLX8jGq4UaCVzFo/QzX137rgNCRwewGJukuFs0kyqhqfxoCCc X-Received: by 2002:a65:52c5:: with SMTP id z5mr10547241pgp.118.1563167639153; Sun, 14 Jul 2019 22:13:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563167639; cv=none; d=google.com; s=arc-20160816; b=y9ggwL3M+cXSVbdJgHkjT9DmQLYOjfl1izGwkz1CKQ0GUWNeamUW+jIbBwM8vNQxH3 XSowKTvrOSX4uGUc+Qpl4/CzvITD+cvkfdXsKTsrFbp+r9hBaezDIxr25A5SliGRyhqo jqRejUCEG5+hH//kf1j/yASV9llbxuRRMJBIwzIAUHTT4ZmBROcxzJF+6VZD5R5sJdg1 dcC7su1XgrlGbv4YCblCgg4MYdmNWkmcMnxWbeepChXtk9ez2v9bSlFQic2GsyhCkowa +Dpxa1TFhmjgsgY5PasZ8OMoFGAdYK2+6YGaA26VU18P7I8kXP/iPWpUlXNoUC68r/2z OBMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4UVGjOkveYWI5yzUcPWRRXELIXTaY+e7tX5j6FMdxTc=; b=cVVwokVD4iX3QdfB+VbQNMPkZgYpcW8UWIQZU4SchwmLzdcIa4jTcWqMtAMQm/Ue32 TheFLKcMy2GIxxgkwptJzyTyTGQQcOcDB0Hrmld19rN6NsMOocwb6QhhRVaRp51eaDDD xIEpA1nHrFtvPa4zYBzEsRIuscxmqGWVcAvkJe/8a+2lL8E9TrvyjO83TXyZbzKq1l6H kH0pE3b9YYB7+p+Z8eEIAuSIWIrBLr1yTghaTmJTlm34k/4M+HGrl3JB9sxRZwqq7uwB xgCgjwvZO33NVLI0WVsypL3D7tS+JkB7xOq8hIw87scOigAN3cK5FHWEyqzQkUrrtrsd MS2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uBqgp5I6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j6si15309996pgb.206.2019.07.14.22.13.43; Sun, 14 Jul 2019 22:13:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uBqgp5I6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729239AbfGOFMv (ORCPT + 99 others); Mon, 15 Jul 2019 01:12:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:47256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726075AbfGOFMv (ORCPT ); Mon, 15 Jul 2019 01:12:51 -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 4D19C214DA; Mon, 15 Jul 2019 05:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563167570; bh=rnYqu90gFhMlvGUQmo3HOEqC0mOA+PgGI1p0yQM7YLc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uBqgp5I6ckXFwtcgDRD3c262GB04+/tgu78VUL9JMzeFHLAsZz+T0TJnzeUGKXEUr Wkowwdlz+Xm2pfMetbGLf4JpdjCL4ZfYdT0Li/hC8Czw6sWfTRw41B3rm+/VPSTtmU GAUlZG20lb7GLxMWckH9ZqFM29LaHzkDNtBAH9zw= 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 09/15] tracing: of: Add trace event settings Date: Mon, 15 Jul 2019 14:12:45 +0900 Message-Id: <156316756493.23477.857559505771671133.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 per-event settings, which includes filter and actions. Signed-off-by: Masami Hiramatsu --- Changes in v2: - Make event node available only if CONFIG_EVENT_TRACING=y --- kernel/trace/trace_events_trigger.c | 2 - kernel/trace/trace_of.c | 82 +++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c index 2a2912cb4533..74a19c18219f 100644 --- a/kernel/trace/trace_events_trigger.c +++ b/kernel/trace/trace_events_trigger.c @@ -208,7 +208,7 @@ static int event_trigger_regex_open(struct inode *inode, struct file *file) return ret; } -static int trigger_process_regex(struct trace_event_file *file, char *buff) +int trigger_process_regex(struct trace_event_file *file, char *buff) { char *command, *next = buff; struct event_command *p; diff --git a/kernel/trace/trace_of.c b/kernel/trace/trace_of.c index 5e108a1d5bb3..3719f711144a 100644 --- a/kernel/trace/trace_of.c +++ b/kernel/trace/trace_of.c @@ -81,6 +81,7 @@ trace_of_set_ftrace_options(struct trace_array *tr, struct device_node *node) #ifdef CONFIG_EVENT_TRACING extern int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set); +extern int trigger_process_regex(struct trace_event_file *file, char *buff); static void __init trace_of_enable_events(struct trace_array *tr, struct device_node *node) @@ -99,8 +100,88 @@ trace_of_enable_events(struct trace_array *tr, struct device_node *node) pr_err("Failed to enable event: %s\n", p); } } + +static void __init +trace_of_init_one_event(struct trace_array *tr, struct device_node *node) +{ + struct trace_event_file *file; + struct property *prop; + char buf[MAX_BUF_LEN]; + char *bufp; + const char *p; + int err; + + if (!of_node_name_prefix(node, "event")) + return; + + err = of_property_read_string(node, "event", &p); + if (err) { + pr_err("Failed to find event on %s\n", of_node_full_name(node)); + return; + } + + err = strlcpy(buf, p, ARRAY_SIZE(buf)); + if (err >= ARRAY_SIZE(buf)) { + pr_err("Event name is too long: %s\n", p); + return; + } + bufp = buf; + + p = strsep(&bufp, ":"); + if (!bufp) { + pr_err("%s has no group name\n", buf); + return; + } + + mutex_lock(&event_mutex); + file = find_event_file(tr, buf, bufp); + if (!file) { + pr_err("Failed to find event: %s\n", buf); + return; + } + + err = of_property_read_string(node, "filter", &p); + if (!err) { + if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf)) { + pr_err("filter string is too long: %s\n", p); + return; + } + + if (apply_event_filter(file, buf) < 0) { + pr_err("Failed to apply filter: %s\n", buf); + return; + } + } + + of_property_for_each_string(node, "actions", prop, p) { + if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf)) { + pr_err("action string is too long: %s\n", p); + continue; + } + + if (trigger_process_regex(file, buf) < 0) + pr_err("Failed to apply an action: %s\n", buf); + } + + if (of_property_read_bool(node, "enable")) { + if (trace_event_enable_disable(file, 1, 0) < 0) + pr_err("Failed to enable event node: %s\n", + of_node_full_name(node)); + } + mutex_unlock(&event_mutex); +} + +static void __init +trace_of_init_events(struct trace_array *tr, struct device_node *node) +{ + struct device_node *enode; + + for_each_child_of_node(node, enode) + trace_of_init_one_event(tr, enode); +} #else #define trace_of_enable_events(tr, node) do {} while (0) +#define trace_of_init_events(tr, node) do {} while (0) #endif static void __init @@ -139,6 +220,7 @@ static int __init trace_of_init(void) goto end; trace_of_set_ftrace_options(tr, trace_node); + trace_of_init_events(tr, trace_node); trace_of_enable_events(tr, trace_node); trace_of_enable_tracer(tr, trace_node);