From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754669AbdCPPWO (ORCPT ); Thu, 16 Mar 2017 11:22:14 -0400 Received: from terminus.zytor.com ([65.50.211.136]:55124 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751536AbdCPPWN (ORCPT ); Thu, 16 Mar 2017 11:22:13 -0400 Date: Thu, 16 Mar 2017 08:20:29 -0700 From: tip-bot for Peter Zijlstra Message-ID: Cc: tglx@linutronix.de, mathieu.desnoyers@efficios.com, oleg@redhat.com, acme@redhat.com, torvalds@linux-foundation.org, peterz@infradead.org, vincent.weaver@maine.edu, acme@kernel.org, mingo@kernel.org, jolsa@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, dvyukov@google.com, alexander.shishkin@linux.intel.com, eranian@google.com Reply-To: vincent.weaver@maine.edu, acme@kernel.org, jolsa@redhat.com, mingo@kernel.org, alexander.shishkin@linux.intel.com, dvyukov@google.com, linux-kernel@vger.kernel.org, hpa@zytor.com, eranian@google.com, tglx@linutronix.de, mathieu.desnoyers@efficios.com, oleg@redhat.com, acme@redhat.com, torvalds@linux-foundation.org, peterz@infradead.org In-Reply-To: <20170316125823.239678244@infradead.org> References: <20170316125823.239678244@infradead.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/core: Simplify perf_event_free_task() Git-Commit-ID: 15121c789e001168decac6483d192bdb7ea29e74 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: 15121c789e001168decac6483d192bdb7ea29e74 Gitweb: http://git.kernel.org/tip/15121c789e001168decac6483d192bdb7ea29e74 Author: Peter Zijlstra AuthorDate: Thu, 16 Mar 2017 13:47:50 +0100 Committer: Ingo Molnar CommitDate: Thu, 16 Mar 2017 14:16:53 +0100 perf/core: Simplify perf_event_free_task() We have ctx->event_list that contains all events; no need to repeatedly iterate the group lists to find them all. Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo Cc: Dmitry Vyukov Cc: Jiri Olsa Cc: Linus Torvalds Cc: Mathieu Desnoyers Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: fweisbec@gmail.com Link: http://lkml.kernel.org/r/20170316125823.239678244@infradead.org Signed-off-by: Ingo Molnar --- kernel/events/core.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index fc7c9a8..5f21e5e 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -10426,21 +10426,11 @@ void perf_event_free_task(struct task_struct *task) WRITE_ONCE(ctx->task, TASK_TOMBSTONE); put_task_struct(task); /* cannot be last */ raw_spin_unlock_irq(&ctx->lock); -again: - list_for_each_entry_safe(event, tmp, &ctx->pinned_groups, - group_entry) - perf_free_event(event, ctx); - list_for_each_entry_safe(event, tmp, &ctx->flexible_groups, - group_entry) + list_for_each_entry_safe(event, tmp, &ctx->event_list, event_entry) perf_free_event(event, ctx); - if (!list_empty(&ctx->pinned_groups) || - !list_empty(&ctx->flexible_groups)) - goto again; - mutex_unlock(&ctx->mutex); - put_ctx(ctx); } }