From patchwork Wed Jul 15 03:01:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sukadev Bhattiprolu X-Patchwork-Id: 495392 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0C6C5140772 for ; Wed, 15 Jul 2015 13:10:16 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id DE4A21A2ACB for ; Wed, 15 Jul 2015 13:10:15 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from e34.co.us.ibm.com (e34.co.us.ibm.com [32.97.110.152]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id C71861A006B for ; Wed, 15 Jul 2015 13:03:09 +1000 (AEST) Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 14 Jul 2015 21:03:07 -0600 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 14 Jul 2015 21:03:05 -0600 X-Helo: d03dlp02.boulder.ibm.com X-MailFrom: sukadev@linux.vnet.ibm.com X-RcptTo: linuxppc-dev@lists.ozlabs.org Received: from b03cxnp08025.gho.boulder.ibm.com (b03cxnp08025.gho.boulder.ibm.com [9.17.130.17]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 5570D3E4003B for ; Tue, 14 Jul 2015 21:03:05 -0600 (MDT) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t6F32IvS53477482 for ; Tue, 14 Jul 2015 20:02:18 -0700 Received: from d03av05.boulder.ibm.com (localhost [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t6F334BT026869 for ; Tue, 14 Jul 2015 21:03:05 -0600 Received: from suka-t410.usor.ibm.com (suka-t410.usor.ibm.com [9.70.94.25]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t6F331NW026489; Tue, 14 Jul 2015 21:03:04 -0600 From: Sukadev Bhattiprolu To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Michael Ellerman Subject: [PATCH v3 5/8] perf: Split perf_event_read_value() Date: Tue, 14 Jul 2015 20:01:52 -0700 Message-Id: <1436929315-28520-6-git-send-email-sukadev@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1436929315-28520-1-git-send-email-sukadev@linux.vnet.ibm.com> References: <1436929315-28520-1-git-send-email-sukadev@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15071503-0017-0000-0000-00000C524AD2 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Move the part of perf_event_read_value() that computes the event counts and event times into a new function, perf_event_compute(). This would allow us to call perf_event_compute() independently. Signed-off-by: Sukadev Bhattiprolu Changelog[v3] Rather than move perf_event_read() into callers and then rename, just move the computations into a separate function (redesign to address comment from Peter Zijlstra). --- kernel/events/core.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 44fb89d..b1e9a42 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3704,6 +3704,29 @@ static int perf_release(struct inode *inode, struct file *file) return 0; } +static u64 perf_event_compute(struct perf_event *event, u64 *enabled, + u64 *running) +{ + struct perf_event *child; + u64 total; + + total = perf_event_count(event); + + *enabled += event->total_time_enabled + + atomic64_read(&event->child_total_time_enabled); + *running += event->total_time_running + + atomic64_read(&event->child_total_time_running); + + list_for_each_entry(child, &event->child_list, child_list) { + perf_event_read(child); + total += perf_event_count(child); + *enabled += child->total_time_enabled; + *running += child->total_time_running; + } + + return total; +} + /* * Remove all orphanes events from the context. */ @@ -3742,7 +3765,6 @@ static void orphans_remove_work(struct work_struct *work) u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running) { - struct perf_event *child; u64 total = 0; *enabled = 0; @@ -3751,19 +3773,8 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running) mutex_lock(&event->child_mutex); perf_event_read(event); - total += perf_event_count(event); + total = perf_event_compute(event, enabled, running); - *enabled += event->total_time_enabled + - atomic64_read(&event->child_total_time_enabled); - *running += event->total_time_running + - atomic64_read(&event->child_total_time_running); - - list_for_each_entry(child, &event->child_list, child_list) { - perf_event_read(child); - total += perf_event_count(child); - *enabled += child->total_time_enabled; - *running += child->total_time_running; - } mutex_unlock(&event->child_mutex); return total;