From patchwork Fri Sep 2 12:37:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 75302 Delivered-To: patch@linaro.org Received: by 10.140.29.8 with SMTP id a8csp848550qga; Fri, 2 Sep 2016 05:38:56 -0700 (PDT) X-Received: by 10.66.235.100 with SMTP id ul4mr35783224pac.50.1472819936406; Fri, 02 Sep 2016 05:38:56 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fh4si11425554pad.76.2016.09.02.05.38.56; Fri, 02 Sep 2016 05:38:56 -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=@linaro.org; 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 dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753673AbcIBMiy (ORCPT + 27 others); Fri, 2 Sep 2016 08:38:54 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:33332 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753246AbcIBMiC (ORCPT ); Fri, 2 Sep 2016 08:38:02 -0400 Received: by mail-pf0-f182.google.com with SMTP id g202so19120085pfb.0 for ; Fri, 02 Sep 2016 05:38:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w87OsbbXBVamFCKOQUyzpw84xvbLjSLsNEeUbeLNXAM=; b=aK7DqbsbokeBbfZUcMpJ10peUXj/wjkrbmG793THlJWxrW/wK9m5JXoGfoPd5RCzPv FCt0o9zNGycqtvGhpVQp996g2QY3/zacFAJ5jIf4TX4EtXGCNDdOMiXK4phFUACo5Djm i/5Ouuo0Cd6xBE1b9kzl07y+ZJ4bVfQ6gxBRs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=w87OsbbXBVamFCKOQUyzpw84xvbLjSLsNEeUbeLNXAM=; b=RU/XAoYT3dVaPkQ9mhM1fp7KJ79qZbWZlG6WYAVHNtdeV8VnhkvzVuc3VPlcwwi9gk Fj8kujyOVahxL973VssJ3Yu+p7kKJzMI0quRB+RpdT/A+sBzB1a57vs8ZR3s7JmQ1spi CTeL68rrMi/HaRgy6v3lvDh44uPFjXnVewxH8UiUZzoraTna79fdy88rxLSJa6XLIhA8 1wx2X3i93e4dKO/OZx6mwiz1jAgHuCfwCbLX4TNxxVUzwOthInmHTgvAPL34qih+APMZ DLcxocGg5MGzp+veuuQK2gBm7xeYxr0Ic+0PYvjQjihN493R4q6lshoVI+gBgRACA6MS F2Hg== X-Gm-Message-State: AE9vXwNSWFnKxElmNDT7bFAVdE+HSunwNga+Ylt9LAp4smhLKyCp3c4AMF7vEiUHuTQM9Dvd X-Received: by 10.98.196.77 with SMTP id y74mr35930011pff.97.1472819881517; Fri, 02 Sep 2016 05:38:01 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id i7sm14796781paf.9.2016.09.02.05.37.58 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Sep 2016 05:38:01 -0700 (PDT) From: Binoy Jayan To: "Steven Rostedt (Red Hat)" Cc: Ingo Molnar , Daniel Wagner , Arnd Bergmann , linux-kernel@vger.kernel.org, Masami , Binoy Jayan Subject: [PATCH v5 2/4] tracing: Add cpu as a key field in histogram Date: Fri, 2 Sep 2016 18:07:29 +0530 Message-Id: <1472819851-12857-3-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1472819851-12857-1-git-send-email-binoy.jayan@linaro.org> References: <1472819851-12857-1-git-send-email-binoy.jayan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The field 'cpu' although part of the set of generic fields, is not made part of the key fields when mentioned in the trigger command. This hack suggested by Daniel marks it as one of the key fields and make it appear in the histogram output. Signed-off-by: Binoy Jayan --- kernel/trace/trace_events.c | 3 ++- kernel/trace/trace_events_hist.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 03c0a48..c395608 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -152,7 +152,8 @@ EXPORT_SYMBOL_GPL(trace_define_field); #define __generic_field(type, item, filter_type) \ ret = __trace_define_field(&ftrace_generic_fields, #type, \ - #item, 0, 0, is_signed_type(type), \ + #item, 0, sizeof(type), \ + is_signed_type(type), \ filter_type); \ if (ret) \ return ret; diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 0c05b8a..4e0a12e 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -75,6 +75,11 @@ static u64 hist_field_log2(struct hist_field *hist_field, void *event) return (u64) ilog2(roundup_pow_of_two(val)); } +static u64 hist_field_cpu(struct hist_field *hist_field, void *event) +{ + return (u64) raw_smp_processor_id(); +} + #define DEFINE_HIST_FIELD_FN(type) \ static u64 hist_field_##type(struct hist_field *hist_field, void *event)\ { \ @@ -119,6 +124,7 @@ enum hist_field_flags { HIST_FIELD_FL_SYSCALL = 128, HIST_FIELD_FL_STACKTRACE = 256, HIST_FIELD_FL_LOG2 = 512, + HIST_FIELD_FL_CPU = 1024, }; struct hist_trigger_attrs { @@ -371,6 +377,11 @@ static struct hist_field *create_hist_field(struct ftrace_event_field *field, goto out; } + if (flags & HIST_FIELD_FL_CPU) { + hist_field->fn = hist_field_cpu; + goto out; + } + if (WARN_ON_ONCE(!field)) goto out; @@ -526,6 +537,9 @@ static int create_key_field(struct hist_trigger_data *hist_data, } else { char *field_name = strsep(&field_str, "."); + if (strcmp(field_name, "cpu") == 0) + flags |= HIST_FIELD_FL_CPU; + if (field_str) { if (strcmp(field_str, "hex") == 0) flags |= HIST_FIELD_FL_HEX; @@ -556,6 +570,7 @@ static int create_key_field(struct hist_trigger_data *hist_data, key_size = MAX_FILTER_STR_VAL; else key_size = field->size; + } hist_data->fields[key_idx] = create_hist_field(field, flags);