From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e39.co.us.ibm.com (e39.co.us.ibm.com [32.97.110.160]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 58D8F1A036E for ; Mon, 27 Jul 2015 15:42:03 +1000 (AEST) Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 26 Jul 2015 23:42:01 -0600 Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 2A5563E40041 for ; Sun, 26 Jul 2015 23:41:59 -0600 (MDT) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t6R5fQRk42467556 for ; Sun, 26 Jul 2015 22:41:26 -0700 Received: from d03av03.boulder.ibm.com (localhost [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t6R5fwBk026635 for ; Sun, 26 Jul 2015 23:41:58 -0600 From: Sukadev Bhattiprolu To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Michael Ellerman Cc: , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org Subject: [PATCH 06/10] perf: Add return value for perf_event_read(). Date: Sun, 26 Jul 2015 22:40:34 -0700 Message-Id: <1437975638-789-7-git-send-email-sukadev@linux.vnet.ibm.com> In-Reply-To: <1437975638-789-1-git-send-email-sukadev@linux.vnet.ibm.com> References: <1437975638-789-1-git-send-email-sukadev@linux.vnet.ibm.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Add a return value to perf_event_read(). The return value will be needed later in perf_read_group() implements ability to read several counters in a PERF_PMU_TXN_READ transaction. Signed-off-by: Sukadev Bhattiprolu --- kernel/events/core.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 0ce3012..21a55d1 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3212,7 +3212,7 @@ static inline u64 perf_event_count(struct perf_event *event) return __perf_event_count(event); } -static void perf_event_read(struct perf_event *event) +static int perf_event_read(struct perf_event *event) { /* * If event is enabled and currently active on a CPU, update the @@ -3238,6 +3238,8 @@ static void perf_event_read(struct perf_event *event) update_event_times(event); raw_spin_unlock_irqrestore(&ctx->lock, flags); } + + return 0; } /* @@ -3720,7 +3722,7 @@ static u64 perf_event_aggregate(struct perf_event *event, u64 *enabled, lockdep_assert_held(&event->child_mutex); list_for_each_entry(child, &event->child_list, child_list) { - perf_event_read(child); + (void)perf_event_read(child); total += perf_event_count(child); *enabled += child->total_time_enabled; *running += child->total_time_running; @@ -3774,7 +3776,7 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running) mutex_lock(&event->child_mutex); - perf_event_read(event); + (void)perf_event_read(event); total = perf_event_aggregate(event, enabled, running); mutex_unlock(&event->child_mutex); @@ -3798,7 +3800,12 @@ static int perf_read_group(struct perf_event *event, mutex_lock(&leader->child_mutex); - perf_event_read(leader); + ret = perf_event_read(leader); + if (ret) { + mutex_unlock(&leader->child_mutex); + return ret; + } + count = perf_event_aggregate(leader, &enabled, &running); mutex_unlock(&leader->child_mutex); @@ -3824,7 +3831,7 @@ static int perf_read_group(struct perf_event *event, mutex_lock(&leader->child_mutex); - perf_event_read(sub); + (void)perf_event_read(sub); values[n++] = perf_event_aggregate(sub, &enabled, &running); mutex_unlock(&leader->child_mutex); @@ -3946,7 +3953,7 @@ static unsigned int perf_poll(struct file *file, poll_table *wait) static void _perf_event_reset(struct perf_event *event) { - perf_event_read(event); + (void)perf_event_read(event); local64_set(&event->count, 0); perf_event_update_userpage(event); } -- 1.7.9.5