From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752320AbdCPNBI (ORCPT ); Thu, 16 Mar 2017 09:01:08 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:50622 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752051AbdCPNAR (ORCPT ); Thu, 16 Mar 2017 09:00:17 -0400 Message-Id: <20170316125823.239678244@infradead.org> User-Agent: quilt/0.63-1 Date: Thu, 16 Mar 2017 13:47:50 +0100 From: Peter Zijlstra To: mingo@kernel.org Cc: linux-kernel@vger.kernel.org, acme@kernel.org, mathieu.desnoyers@efficios.com, alexander.shishkin@linux.intel.com, dvyukov@google.com, fweisbec@gmail.com, oleg@redhat.com, peterz@infradead.org Subject: [PATCH 3/4] perf: Simplify perf_event_free_task() References: <20170316124747.804596354@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-perf-simplify-perf_event_free_task.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have ctx->event_list that contains all events; no need to repeatedly iterate the group lists to find them all. Cc: Arnaldo Carvalho de Melo Cc: Mathieu Desnoyers Cc: Ingo Molnar Cc: Alexander Shishkin Cc: Dmitry Vyukov Cc: Oleg Nesterov Signed-off-by: Peter Zijlstra (Intel) --- kernel/events/core.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -10567,21 +10567,11 @@ void perf_event_free_task(struct task_st 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); } }