Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp3613391ybl; Sun, 25 Aug 2019 20:20:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqwt3Ggb4RTM+qaCt7SCExbtmsmvRO8HMlp134oGA1Dqq2sGuvfWvdMRuo3y1znVbRHxJCR9 X-Received: by 2002:a17:90a:a486:: with SMTP id z6mr17018376pjp.13.1566789637546; Sun, 25 Aug 2019 20:20:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566789637; cv=none; d=google.com; s=arc-20160816; b=GhamPqdAptwgeLRS09HH4OpmjpfEaQ7ICrnnHq2S7TdVaEn7ZUpWaXtY319QFBEWCB TamORFVWkz6hfdfLCnNM6p3pBQd4UIAUQqj0ZQ0aOylWv6r345SQRNmA0EmBoghHpnyE y6mO2NVx80Do+Ufh4i6NtU7uXw7Hi33/F6eLo0gObashrbR2WhfItqt4w9Mb3otGDgY3 xKq0huYjCr0nfnH2L41+BcjZS+3Cqb3DLilR2MW5yTtTFznhI0svJDHn0DmVcvDrot4q 5z7goZy2avdM0VlYuDrjjpwguQIoYmx0NLrfp97dJ9b1MnjSDfoNwR0nbrf42FC4pXX2 ZqLA== 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=hS0p6VOh140v5sia/AnsSiM0KYKhDTMinYYZVgEOS5A=; b=cBDLN8GUM3MHiTR2pC0b9ErJjA+3PnvXJVe4055TNyVx1nd0FrLMjvsSncxZ0kx6VT 5UOF86p83VS+5eva9G2QQqlARgilf0NwVbU8gtpa1BeN5vLv0afAN4wp00YYucG1H4Sn JbJX19MrY+ADMNy9nYYxGlnzfrpG6JW1n0XW4G+vYhp5MU0pxyF+RNd2b3SK3ZYTYdEv ys7lHrOZJzT4pvukjpps5xqoIKIHrklfAvNxc4VB0NjljI9rd9FIyQ0XpRLv8ErgGlUC t/ZAhttpSSCbgxu5c3lPXDoScDu5kvg/UVxlkAqCbG6Cda10Fx18is1HNhXf5inFQPFd fQfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1K7Herj2; 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 x19si7734137pgi.515.2019.08.25.20.20.22; Sun, 25 Aug 2019 20:20:37 -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=1K7Herj2; 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 S1729489AbfHZDSc (ORCPT + 99 others); Sun, 25 Aug 2019 23:18:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:37046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726434AbfHZDSb (ORCPT ); Sun, 25 Aug 2019 23:18:31 -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 5C25A2070B; Mon, 26 Aug 2019 03:18:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566789510; bh=P7oPsfV6A0jtk+MZWB9QHUi0b3uNU8xu4OT8knJjVa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1K7Herj2qVxuRZLdPAV/Cv9TvLbxJbtCpuG0CWOHV0lL3dB+sSx4aZJtbypAx7O9g VOTCVwzOmNcB1vLQP/IvyW1uOZIMqZCre7rRHOzGNMa0xcWmf0fOY/VBUAk4BbAqX1 4NZcjANnRUM+4zIKKwzJbDo6p9wpVEISMhcFmhqM= 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 14/19] tracing/boot: Add synthetic event support Date: Mon, 26 Aug 2019 12:18:24 +0900 Message-Id: <156678950390.21459.4719180337950500537.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 synthetic event node support. The synthetic event is a kind of event node, but the group name is "synthetic". - ftrace.event.synthetic.EVENT.fields = FIELD[, FIELD2...]; Defines new synthetic event with FIELDs. Each field should be "type varname". The synthetic node requires "fields" string arraies, which defines the fields as same as tracing/synth_events interface. Signed-off-by: Masami Hiramatsu --- kernel/trace/trace_boot.c | 47 ++++++++++++++++++++++++++++++++++++++ kernel/trace/trace_events_hist.c | 5 ++++ 2 files changed, 52 insertions(+) diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c index 40c89c7ceee0..2e9fddff660f 100644 --- a/kernel/trace/trace_boot.c +++ b/kernel/trace/trace_boot.c @@ -142,6 +142,50 @@ trace_boot_add_kprobe_event(struct skc_node *node, const char *event) } #endif +#ifdef CONFIG_HIST_TRIGGERS +extern int synth_event_run_command(const char *command); + +static int __init +trace_boot_add_synth_event(struct skc_node *node, const char *event) +{ + struct skc_node *anode; + 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; + + skc_node_for_each_array_value(node, "fields", anode, 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_boot_add_synth_event(struct skc_node *node, const char *event) +{ + pr_err("Synthetic event is not supported.\n"); + return -ENOTSUPP; +} +#endif + static void __init trace_boot_init_one_event(struct trace_array *tr, struct skc_node *gnode, struct skc_node *enode) @@ -157,6 +201,9 @@ trace_boot_init_one_event(struct trace_array *tr, struct skc_node *gnode, if (!strcmp(group, "kprobes")) if (trace_boot_add_kprobe_event(enode, event) < 0) return; + if (!strcmp(group, "synthetic")) + if (trace_boot_add_synth_event(enode, event) < 0) + return; mutex_lock(&event_mutex); file = find_event_file(tr, group, event); 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];