From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755404AbbIMLNz (ORCPT ); Sun, 13 Sep 2015 07:13:55 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44067 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752291AbbIMLNx (ORCPT ); Sun, 13 Sep 2015 07:13:53 -0400 Date: Sun, 13 Sep 2015 04:13:07 -0700 From: tip-bot for Sukadev Bhattiprolu Message-ID: Cc: peterz@infradead.org, mingo@kernel.org, acme@redhat.com, vincent.weaver@maine.edu, mpe@ellerman.id.au, acme@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, jolsa@redhat.com, hpa@zytor.com, tglx@linutronix.de, eranian@google.com, sukadev@linux.vnet.ibm.com Reply-To: torvalds@linux-foundation.org, acme@kernel.org, tglx@linutronix.de, hpa@zytor.com, eranian@google.com, sukadev@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, jolsa@redhat.com, peterz@infradead.org, mingo@kernel.org, mpe@ellerman.id.au, vincent.weaver@maine.edu, acme@redhat.com In-Reply-To: <1441336073-22750-9-git-send-email-sukadev@linux.vnet.ibm.com> References: <1441336073-22750-9-git-send-email-sukadev@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/core: Define PERF_PMU_TXN_READ interface Git-Commit-ID: 4a00c16e552ea5e71756cd29cd2df7557ec9cac4 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4a00c16e552ea5e71756cd29cd2df7557ec9cac4 Gitweb: http://git.kernel.org/tip/4a00c16e552ea5e71756cd29cd2df7557ec9cac4 Author: Sukadev Bhattiprolu AuthorDate: Thu, 3 Sep 2015 20:07:51 -0700 Committer: Ingo Molnar CommitDate: Sun, 13 Sep 2015 11:27:28 +0200 perf/core: Define PERF_PMU_TXN_READ interface Define a new PERF_PMU_TXN_READ interface to read a group of counters at once. pmu->start_txn() // Initialize before first event for each event in group pmu->read(event); // Queue each event to be read rc = pmu->commit_txn() // Read/update all queued counters Note that we use this interface with all PMUs. PMUs that implement this interface use the ->read() operation to _queue_ the counters to be read and use ->commit_txn() to actually read all the queued counters at once. PMUs that don't implement PERF_PMU_TXN_READ ignore ->start_txn() and ->commit_txn() and continue to read counters one at a time. Thanks to input from Peter Zijlstra. Signed-off-by: Sukadev Bhattiprolu Signed-off-by: Peter Zijlstra (Intel) Cc: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Michael Ellerman Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/1441336073-22750-9-git-send-email-sukadev@linux.vnet.ibm.com Signed-off-by: Ingo Molnar --- include/linux/perf_event.h | 1 + kernel/events/core.c | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index ea3b5dd..b83cea9 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -202,6 +202,7 @@ struct perf_event; #define PERF_EVENT_TXN 0x1 #define PERF_PMU_TXN_ADD 0x1 /* txn to add/schedule event on PMU */ +#define PERF_PMU_TXN_READ 0x2 /* txn to read event group from PMU */ /** * pmu::capabilities flags diff --git a/kernel/events/core.c b/kernel/events/core.c index ade04df..55b0f7c 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3199,6 +3199,7 @@ static void __perf_event_read(void *info) struct perf_event *sub, *event = data->event; struct perf_event_context *ctx = event->ctx; struct perf_cpu_context *cpuctx = __get_cpu_context(ctx); + struct pmu *pmu = event->pmu; /* * If this is a task context, we need to check whether it is @@ -3217,18 +3218,31 @@ static void __perf_event_read(void *info) } update_event_times(event); - if (event->state == PERF_EVENT_STATE_ACTIVE) - event->pmu->read(event); + if (event->state != PERF_EVENT_STATE_ACTIVE) + goto unlock; - if (!data->group) + if (!data->group) { + pmu->read(event); + data->ret = 0; goto unlock; + } + + pmu->start_txn(pmu, PERF_PMU_TXN_READ); + + pmu->read(event); list_for_each_entry(sub, &event->sibling_list, group_entry) { update_event_times(sub); - if (sub->state == PERF_EVENT_STATE_ACTIVE) + if (sub->state == PERF_EVENT_STATE_ACTIVE) { + /* + * Use sibling's PMU rather than @event's since + * sibling could be on different (eg: software) PMU. + */ sub->pmu->read(sub); + } } - data->ret = 0; + + data->ret = pmu->commit_txn(pmu); unlock: raw_spin_unlock(&ctx->lock);