From patchwork Mon Sep 12 17:53:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 76017 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp969835qgf; Mon, 12 Sep 2016 10:53:28 -0700 (PDT) X-Received: by 10.98.133.10 with SMTP id u10mr35100801pfd.134.1473702808383; Mon, 12 Sep 2016 10:53:28 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f63si22665651pfb.109.2016.09.12.10.53.28; Mon, 12 Sep 2016 10:53:28 -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 S1755434AbcILRxX (ORCPT + 27 others); Mon, 12 Sep 2016 13:53:23 -0400 Received: from mail-oi0-f52.google.com ([209.85.218.52]:34161 "EHLO mail-oi0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932412AbcILRxS (ORCPT ); Mon, 12 Sep 2016 13:53:18 -0400 Received: by mail-oi0-f52.google.com with SMTP id m11so325997732oif.1 for ; Mon, 12 Sep 2016 10:53:18 -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; bh=LdCa3L+4O1iJGcmKI3eiTQdrBb5WUdLyygQm3/qOxYU=; b=XcgNkGE/dPlBXPTkKiuAZNT11Y26smVaY0tbH9MWwZiGL+lbEVYts0IsDhy3sXt2ZN gT7XelXLCzYtr+rRDL1x1mUTXxwLloZjfNwkAY7fZdpJ+Pw47z9KhiZRY3xPk9XxOH97 UDwgk8qKrMGllohjwClgnvyyM8sE7pEuMbU4o= 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; bh=LdCa3L+4O1iJGcmKI3eiTQdrBb5WUdLyygQm3/qOxYU=; b=RojISqt55Xysmu2ufjTwWl7fb8rjkCizNg+HaWzMX661QIs5RR0RQGdC3WvJnly+wN QuhXQdvf/pw4A8XKhFVzK2+x7c64axneS7AEBGb5yOEUcIQI3GAxQKwMuLSmPZjENXr8 OjtBnYuoEoHcnV1999xb5NAPMiBzTWxor148rdoG8Kx14BNgHBWVWyD9404zLEt/E8WE XQ5+NO9SNDI+2kDh48obDgtA4i90JsRxF8zyTqQv9KH4buFvZpl7gAG6QOkVXi8c+K8z nTf3R81mWF7HWgY3+Dx2Y+Km4JCw8HlM59qHK88zGg2i3R4FUbzYGB/e8AoHKo1ah1CH Dw4g== X-Gm-Message-State: AE9vXwMnl6FsBcXZXQ9KG7J2ctbLXgDYU4DP6d8zVcMcv+3VHShr43pkZGiyDrrt3VtenPQB X-Received: by 10.202.48.79 with SMTP id w76mr278904oiw.19.1473702797487; Mon, 12 Sep 2016 10:53:17 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id c136sm468180ith.5.2016.09.12.10.53.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Sep 2016 10:53:16 -0700 (PDT) From: Mathieu Poirier To: acme@kernel.org, adrian.hunter@intel.com Cc: mingo@redhat.com, peterz@infradead.org, alexander.shishkin@linux.intel.com, jolsa@kernel.org, acme@infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH V5] perf tools: adding support for address filters Date: Mon, 12 Sep 2016 11:53:14 -0600 Message-Id: <1473702794-8493-1-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch makes it possible to use the current filter framework with address filters. That way address filters for HW tracers such as CoreSight and IntelPT can be communicated to the kernel drivers. Signed-off-by: Mathieu Poirier --- Changes for V5: - Modified perf_evsel__append_filter() to take a string format rather than an operation. Changes for V4: - Added support for address filters over more than one nibble. - Removed Jiri's ack, this version is too different from what was reviewed. Changes for V3: - Added Jiri's ack. - Rebased to v4.8-rc5. Changes for V2: - Rebased to v4.8-rc4. - Revisited error path. tools/perf/util/evsel.c | 4 ++-- tools/perf/util/evsel.h | 2 +- tools/perf/util/parse-events.c | 40 +++++++++++++++++++++++++++++++++++----- 3 files changed, 38 insertions(+), 8 deletions(-) -- 2.7.4 diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index d40f852d2de2..a9bb277f221f 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1047,14 +1047,14 @@ int perf_evsel__set_filter(struct perf_evsel *evsel, const char *filter) } int perf_evsel__append_filter(struct perf_evsel *evsel, - const char *op, const char *filter) + const char *fmt, const char *filter) { char *new_filter; if (evsel->filter == NULL) return perf_evsel__set_filter(evsel, filter); - if (asprintf(&new_filter,"(%s) %s (%s)", evsel->filter, op, filter) > 0) { + if (asprintf(&new_filter, fmt, evsel->filter, filter) > 0) { free(evsel->filter); evsel->filter = new_filter; return 0; diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 8ceb7ebb51f5..50595c8c7207 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -236,7 +236,7 @@ void perf_evsel__set_sample_id(struct perf_evsel *evsel, int perf_evsel__set_filter(struct perf_evsel *evsel, const char *filter); int perf_evsel__append_filter(struct perf_evsel *evsel, - const char *op, const char *filter); + const char *fmt, const char *filter); int perf_evsel__apply_filter(struct perf_evsel *evsel, int ncpus, int nthreads, const char *filter); int perf_evsel__apply_drv_configs(struct perf_evsel *evsel, diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 2eb8b1ed4cc8..8e683979ccd8 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1760,20 +1760,50 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist, static int set_filter(struct perf_evsel *evsel, const void *arg) { const char *str = arg; + bool found = false; + int nr_addr_filters = 0; + struct perf_pmu *pmu = NULL; - if (evsel == NULL || evsel->attr.type != PERF_TYPE_TRACEPOINT) { - fprintf(stderr, - "--filter option should follow a -e tracepoint option\n"); - return -1; + if (evsel == NULL) + goto err; + + if (evsel->attr.type == PERF_TYPE_TRACEPOINT) { + if (perf_evsel__append_filter(evsel, + "(%s) && (%s)", str) < 0) { + fprintf(stderr, + "not enough memory to hold filter string\n"); + return -1; + } + + return 0; } - if (perf_evsel__append_filter(evsel, "&&", str) < 0) { + while ((pmu = perf_pmu__scan(pmu)) != NULL) + if (pmu->type == evsel->attr.type) { + found = true; + break; + } + + if (found) + perf_pmu__scan_file(pmu, "nr_addr_filters", + "%d", &nr_addr_filters); + + if (!nr_addr_filters) + goto err; + + if (perf_evsel__append_filter(evsel, "%s,%s", str) < 0) { fprintf(stderr, "not enough memory to hold filter string\n"); return -1; } return 0; + +err: + fprintf(stderr, + "--filter option should follow a -e tracepoint or HW tracer option\n"); + + return -1; } int parse_filter(const struct option *opt, const char *str,