Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp3621764ybl; Sun, 25 Aug 2019 20:33:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqwrQgp9ly5ThDbsbDgtM9r2Ahz8RQ2lyFXgCtdSIt8jtKeZS7CgY3ow8NS7ZmKDDCAF0TQL X-Received: by 2002:a65:5889:: with SMTP id d9mr14232534pgu.380.1566790389373; Sun, 25 Aug 2019 20:33:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566790389; cv=none; d=google.com; s=arc-20160816; b=eWb1Zx4fDIrUU3+MYZfOJHr4zoiiJOPksvD2bEXKEkOlD0dFw5MHTLbZwNIBiliGYT sejoqhLSAA2eh/T4nJH7FewZs8of6gL4eNLIzuUWy01F7GJw2PHCeoMOs3oCM2dctMt0 qkZ/ReQmMWotSIy0o+eIZxZt8TaHaDUwFf9KcGeZCY5g4l83IGADAGIIKfpo6zNls6gD GCmcoJSE85YHJHqObQOKTd5zt7yyZwF+pTyuKO4W/S2CpcLygRxd1xOWGuJLrcZcjJmk oSFYJxE34GL9d70t8wrPFMJnOV2rNm5j1qOKe6Dm856bo0v8JPRL0atG15gTn/a8PZKo tFrw== 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=w/wxZ5xzwOWfx1P4Aa2rgOTJc0BfbZpshAMidwYx538=; b=yCHDEe9Tn1TvbyvOSZCDkHaAXLIlEJ8JRrVoWbUXiBJEIb22KXyXqYNF6txGK5ZWHM bEdFIEgGyXoTW9kLcl23lk8EXm1rciv4Zf57rQOJiKkqS/EYkk8TzO3VzqBKxde+7NW6 T8netuM3A1QaPuVCytOtYucKjnUqT1DHcAHYwk8SnLKNH0M6PDYb7al9qFovcw9SH7KO EHl4R2Y0pkyoTrKefLPwpN5LwLEfwr7t6cnOe8YGYl1LWJ0fThwNdiWyUrCIHleYN4Xb lOIC8k743vflS/Vzb2p8QDAV9B/7HnUhVPf0dDclXj/QtB9LUIPizyanXMSv8vZ0yK1Z GeIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=q9OBvZnN; 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 z190si7778028pgd.303.2019.08.25.20.32.53; Sun, 25 Aug 2019 20:33:09 -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=q9OBvZnN; 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 S1729356AbfHZDSI (ORCPT + 99 others); Sun, 25 Aug 2019 23:18:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:36806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726434AbfHZDSI (ORCPT ); Sun, 25 Aug 2019 23:18:08 -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 AAD972070B; Mon, 26 Aug 2019 03:18:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566789486; bh=ICuWmK4ZyGjBiw83BcImptVaBmrjkJy1XTmFQ1gPbnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q9OBvZnNPTKKgua28v62Sv95I3gKvJxXx8bV9qybIst5UpQ3NvH/C+HUqg0yMP5sp 6+bXKi9Irl/VL3WlIfdqj5CAMPnjE+sfwqVetOyBw9lga98pzmI4cZjx5rb2I/vqn5 YQul7ggrPcCg4D7ICnfy/NYbz+E7y++duWZeTDWA= From: Masami Hiramatsu To: Steven Rostedt , Frank Rowand Cc: Ingo Molnar , Namhyung Kim , Tim Bird , Jiri Olsa , Arnaldo Carvalho de Melo , Tom Zanussi , Rob Herring , Andrew Morton , Thomas Gleixner , Greg Kroah-Hartman , Alexey Dobriyan , Jonathan Corbet , Linus Torvalds , linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v3 12/19] tracing/boot: Add per-event settings Date: Mon, 26 Aug 2019 12:18:00 +0900 Message-Id: <156678948034.21459.12734081118923661873.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <156678933823.21459.4100380582025186209.stgit@devnote2> References: <156678933823.21459.4100380582025186209.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 for boottime tracing. User can set filter, actions and enable on each event on boot. The event entries are under ftrace.event.GROUP.EVENT node (note that the option key includes event's group name and event name.) This supports below commands. - ftrace.event.GROUP.EVENT.enable; Enables GROUP:EVENT tracing. - ftrace.event.GROUP.EVENT.filter = FILTER; Set FILTER rule to the GROUP:EVENT. - ftrace.event.GROUP.EVENT.actions = ACTION[, ACTION2...]; Set ACTIONs to the GROUP:EVENT. For example, ftrace.event.sched.sched_process_exec { filter = "pid < 128"; enable; } this will enable tracing "sched:sched_process_exec" event with "pid < 128" filter. Signed-off-by: Masami Hiramatsu --- kernel/trace/trace_boot.c | 60 +++++++++++++++++++++++++++++++++++ kernel/trace/trace_events_trigger.c | 2 + 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c index cc5e81368065..cfd628c16761 100644 --- a/kernel/trace/trace_boot.c +++ b/kernel/trace/trace_boot.c @@ -80,6 +80,7 @@ trace_boot_set_ftrace_options(struct trace_array *tr, struct skc_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_boot_enable_events(struct trace_array *tr, struct skc_node *node) @@ -98,8 +99,66 @@ trace_boot_enable_events(struct trace_array *tr, struct skc_node *node) pr_err("Failed to enable event: %s\n", p); } } + +static void __init +trace_boot_init_one_event(struct trace_array *tr, struct skc_node *gnode, + struct skc_node *enode) +{ + struct trace_event_file *file; + struct skc_node *anode; + char buf[MAX_BUF_LEN]; + const char *p, *group, *event; + + group = skc_node_get_data(gnode); + event = skc_node_get_data(enode); + + mutex_lock(&event_mutex); + file = find_event_file(tr, group, event); + if (!file) { + pr_err("Failed to find event: %s:%s\n", group, event); + goto out; + } + + p = skc_node_find_value(enode, "filter", NULL); + if (p && *p != '\0') { + if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf)) + pr_err("filter string is too long: %s\n", p); + else if (apply_event_filter(file, buf) < 0) + pr_err("Failed to apply filter: %s\n", buf); + } + + skc_node_for_each_array_value(enode, "actions", anode, p) { + if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf)) + pr_err("action string is too long: %s\n", p); + else if (trigger_process_regex(file, buf) < 0) + pr_err("Failed to apply an action: %s\n", buf); + } + + if (skc_node_find_value(enode, "enable", NULL)) { + if (trace_event_enable_disable(file, 1, 0) < 0) + pr_err("Failed to enable event node: %s:%s\n", + group, event); + } +out: + mutex_unlock(&event_mutex); +} + +static void __init +trace_boot_init_events(struct trace_array *tr, struct skc_node *node) +{ + struct skc_node *gnode, *enode; + + node = skc_node_find_child(node, "event"); + if (!node) + return; + /* per-event key starts with "event.GROUP.EVENT" */ + skc_node_for_each_child(node, gnode) + skc_node_for_each_child(gnode, enode) + trace_boot_init_one_event(tr, gnode, enode); +} #else #define trace_boot_enable_events(tr, node) do {} while (0) +#define trace_boot_init_events(tr, node) do {} while (0) #endif static void __init @@ -128,6 +187,7 @@ static int __init trace_boot_init(void) 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); 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;