From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759998AbcBYIFl (ORCPT ); Thu, 25 Feb 2016 03:05:41 -0500 Received: from torg.zytor.com ([198.137.202.12]:58742 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759518AbcBYIFj (ORCPT ); Thu, 25 Feb 2016 03:05:39 -0500 Date: Thu, 25 Feb 2016 00:04:58 -0800 From: tip-bot for Peter Zijlstra Message-ID: Cc: torvalds@linux-foundation.org, peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org, alexander.shishkin@linux.intel.com, jolsa@redhat.com, acme@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: alexander.shishkin@linux.intel.com, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, hpa@zytor.com, acme@redhat.com, jolsa@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <20160224174947.860690919@infradead.org> References: <20160224174947.860690919@infradead.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf: Only update context time when active Git-Commit-ID: 6f932e5be1503ab0783699e843db325d44c2fabb 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: 6f932e5be1503ab0783699e843db325d44c2fabb Gitweb: http://git.kernel.org/tip/6f932e5be1503ab0783699e843db325d44c2fabb Author: Peter Zijlstra AuthorDate: Wed, 24 Feb 2016 18:45:43 +0100 Committer: Ingo Molnar CommitDate: Thu, 25 Feb 2016 08:42:33 +0100 perf: Only update context time when active Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: dvyukov@google.com Cc: eranian@google.com Cc: oleg@redhat.com Cc: panand@redhat.com Cc: sasha.levin@oracle.com Cc: vince@deater.net Link: http://lkml.kernel.org/r/20160224174947.860690919@infradead.org Signed-off-by: Ingo Molnar --- kernel/events/core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index d5299e2..64698fb 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2170,12 +2170,12 @@ perf_install_in_context(struct perf_event_context *ctx, raw_spin_unlock_irq(&ctx->lock); return; } - update_context_time(ctx); - /* - * Update cgrp time only if current cgrp matches event->cgrp. - * Must be done before calling add_event_to_ctx(). - */ - update_cgrp_time_from_event(event); + + if (ctx->is_active) { + update_context_time(ctx); + update_cgrp_time_from_event(event); + } + add_event_to_ctx(event, ctx); raw_spin_unlock_irq(&ctx->lock);