From patchwork Thu Sep 8 18:25:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 75814 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp986903qgf; Thu, 8 Sep 2016 11:25:42 -0700 (PDT) X-Received: by 10.98.133.10 with SMTP id u10mr1816173pfd.134.1473359142703; Thu, 08 Sep 2016 11:25:42 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l184si45487013pfc.33.2016.09.08.11.25.39; Thu, 08 Sep 2016 11:25:42 -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 S1758966AbcIHSZa (ORCPT + 27 others); Thu, 8 Sep 2016 14:25:30 -0400 Received: from mail-oi0-f51.google.com ([209.85.218.51]:34078 "EHLO mail-oi0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752327AbcIHSZ0 (ORCPT ); Thu, 8 Sep 2016 14:25:26 -0400 Received: by mail-oi0-f51.google.com with SMTP id m11so84114763oif.1 for ; Thu, 08 Sep 2016 11:25:25 -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=SWD+LqzTcvmTtEj1TUeUcEK/a9YBFfgiMOhpa48LRgU=; b=Xe7S3DeZPsyYmQIbQzoDulsAxusKJSnn4KN++pNuf6upL/NJ1oEAZe38Hrnoiha7yK VktdvLhg0XC56qxznwMNTsIf1cknw98tL2PEX4gDU++SgRrxxqVeO0TzE4j2y4yuB9BG STcknuuuZIE1q5B4IbZYNKrGwQte9nAtbJv8U= 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=SWD+LqzTcvmTtEj1TUeUcEK/a9YBFfgiMOhpa48LRgU=; b=USrAnKzuPzhoxUu9OCfqZS3zOunNOTBF58NQ4C+ZHY0V1+9JmqUinrIf9sXiFX8T1g /nbU8cQn5Xwr4PfvZmnkuN+MJD6lHSO8uXz3eO+k6zOxG/aFOxCtjAGmhlPLAFT7NvmX qN9GOyGOmfycXJokBy9Rd6ThJtsHWW5asgPgN0waZfKtvQlChYc0RpbXGdqiE+NBY+f1 4cvNlAHsWavddBKzh+G/98PMzkdjNpPOjsasy305X5s+0tYaOCXS0swMDt6umWRy/wHW HLN6yE7ut+3ZjJmCoqO3S3OPysg4v4kMyEZjtSk5Wm3PThAcqZ5feO0Thq5t7epGirUe A4fg== X-Gm-Message-State: AE9vXwPp2vWAXPKynZbGHos2l2QbBl0a4INVEGPE8u1H9dW24eKs96Rj7IWf1BcWFrxRPmcG X-Received: by 10.202.253.149 with SMTP id b143mr1282682oii.171.1473359125332; Thu, 08 Sep 2016 11:25:25 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id h86sm219777iod.2.2016.09.08.11.25.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Sep 2016 11:25:24 -0700 (PDT) From: Mathieu Poirier To: acme@kernel.org Cc: adrian.hunter@intel.com, 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 V4] perf tools: adding support for address filters Date: Thu, 8 Sep 2016 12:25:22 -0600 Message-Id: <1473359122-1045-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. CC: Alexander Shishkin Signed-off-by: Mathieu Poirier --- 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 | 17 +++++++++++++++++ tools/perf/util/evsel.h | 2 ++ tools/perf/util/parse-events.c | 39 ++++++++++++++++++++++++++++++++++----- 3 files changed, 53 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index d40f852d2de2..5d809ffb85bc 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1046,6 +1046,23 @@ int perf_evsel__set_filter(struct perf_evsel *evsel, const char *filter) return -1; } +int perf_evsel__append_addr_filter(struct perf_evsel *evsel, + const char *filter) +{ + char *new_filter; + + if (evsel->filter == NULL) + return perf_evsel__set_filter(evsel, filter); + + if (asprintf(&new_filter, "%s,%s", evsel->filter, filter) > 0) { + free(evsel->filter); + evsel->filter = new_filter; + return 0; + } + + return -1; +} + int perf_evsel__append_filter(struct perf_evsel *evsel, const char *op, const char *filter) { diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 8ceb7ebb51f5..15ca5f85e946 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -235,6 +235,8 @@ void perf_evsel__set_sample_id(struct perf_evsel *evsel, bool use_sample_identifier); int perf_evsel__set_filter(struct perf_evsel *evsel, const char *filter); +int perf_evsel__append_addr_filter(struct perf_evsel *evsel, + const char *filter); int perf_evsel__append_filter(struct perf_evsel *evsel, const char *op, const char *filter); int perf_evsel__apply_filter(struct perf_evsel *evsel, int ncpus, int nthreads, diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 2eb8b1ed4cc8..3e158ad7eeb8 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1760,20 +1760,49 @@ 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, "&&", 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_addr_filter(evsel, 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,