From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753333AbdA3L7V (ORCPT ); Mon, 30 Jan 2017 06:59:21 -0500 Received: from terminus.zytor.com ([65.50.211.136]:48078 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752900AbdA3L7J (ORCPT ); Mon, 30 Jan 2017 06:59:09 -0500 Date: Mon, 30 Jan 2017 03:58:04 -0800 From: tip-bot for David Carrillo-Cisneros Message-ID: Cc: acme@redhat.com, mark.rutland@arm.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, peterz@infradead.org, tglx@linutronix.de, dave.hansen@linux.intel.com, srinivas.pandruvada@linux.intel.com, acme@kernel.org, eranian@google.com, hpa@zytor.com, bp@suse.de, vince@deater.net, vincent.weaver@maine.edu, davidcc@google.com, pjt@google.com, mingo@kernel.org, jolsa@redhat.com, vikas.shivappa@linux.intel.com, alexander.shishkin@linux.intel.com, kan.liang@intel.com Reply-To: davidcc@google.com, vincent.weaver@maine.edu, vince@deater.net, pjt@google.com, vikas.shivappa@linux.intel.com, jolsa@redhat.com, kan.liang@intel.com, alexander.shishkin@linux.intel.com, mingo@kernel.org, mark.rutland@arm.com, acme@redhat.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, srinivas.pandruvada@linux.intel.com, acme@kernel.org, bp@suse.de, hpa@zytor.com, eranian@google.com, tglx@linutronix.de, peterz@infradead.org, dave.hansen@linux.intel.com In-Reply-To: <20170118192454.58008-3-davidcc@google.com> References: <20170118192454.58008-3-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/core: Remove perf_cpu_context::unique_pmu Git-Commit-ID: 1fd7e416995401ec082fc0fe6090a223969beda5 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: 1fd7e416995401ec082fc0fe6090a223969beda5 Gitweb: http://git.kernel.org/tip/1fd7e416995401ec082fc0fe6090a223969beda5 Author: David Carrillo-Cisneros AuthorDate: Wed, 18 Jan 2017 11:24:54 -0800 Committer: Ingo Molnar CommitDate: Mon, 30 Jan 2017 12:01:14 +0100 perf/core: Remove perf_cpu_context::unique_pmu cpuctx->unique_pmu was originally introduced as a way to identify cpuctxs with shared pmus in order to avoid visiting the same cpuctx more than once in a for_each_pmu loop. cpuctx->unique_pmu == cpuctx->pmu in non-software task contexts since they have only one pmu per cpuctx. Since perf_pmu_sched_task() is only called in hw contexts, this patch replaces cpuctx->unique_pmu by cpuctx->pmu in it. The change above, together with the previous patch in this series, removed the remaining uses of cpuctx->unique_pmu, so we remove it altogether. Signed-off-by: David Carrillo-Cisneros Signed-off-by: Peter Zijlstra (Intel) Acked-by: Mark Rutland Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: Dave Hansen Cc: Jiri Olsa Cc: Kan Liang Cc: Linus Torvalds Cc: Paul Turner Cc: Peter Zijlstra Cc: Srinivas Pandruvada Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vikas Shivappa Cc: Vince Weaver Cc: Vince Weaver Link: http://lkml.kernel.org/r/20170118192454.58008-3-davidcc@google.com Signed-off-by: Ingo Molnar --- include/linux/perf_event.h | 1 - kernel/events/core.c | 31 +------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index dfa7257..5c58e93 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -785,7 +785,6 @@ struct perf_cpu_context { ktime_t hrtimer_interval; unsigned int hrtimer_active; - struct pmu *unique_pmu; #ifdef CONFIG_CGROUP_PERF struct perf_cgroup *cgrp; struct list_head cgrp_cpuctx_entry; diff --git a/kernel/events/core.c b/kernel/events/core.c index 928a818..d92c7ad 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2932,7 +2932,7 @@ static void perf_pmu_sched_task(struct task_struct *prev, return; list_for_each_entry(cpuctx, this_cpu_ptr(&sched_cb_list), sched_cb_entry) { - pmu = cpuctx->unique_pmu; /* software PMUs will not have sched_task */ + pmu = cpuctx->ctx.pmu; /* software PMUs will not have sched_task */ if (WARN_ON_ONCE(!pmu->sched_task)) continue; @@ -8636,37 +8636,10 @@ static struct perf_cpu_context __percpu *find_pmu_context(int ctxn) return NULL; } -static void update_pmu_context(struct pmu *pmu, struct pmu *old_pmu) -{ - int cpu; - - for_each_possible_cpu(cpu) { - struct perf_cpu_context *cpuctx; - - cpuctx = per_cpu_ptr(pmu->pmu_cpu_context, cpu); - - if (cpuctx->unique_pmu == old_pmu) - cpuctx->unique_pmu = pmu; - } -} - static void free_pmu_context(struct pmu *pmu) { - struct pmu *i; - mutex_lock(&pmus_lock); - /* - * Like a real lame refcount. - */ - list_for_each_entry(i, &pmus, entry) { - if (i->pmu_cpu_context == pmu->pmu_cpu_context) { - update_pmu_context(i, pmu); - goto out; - } - } - free_percpu(pmu->pmu_cpu_context); -out: mutex_unlock(&pmus_lock); } @@ -8870,8 +8843,6 @@ skip_type: cpuctx->ctx.pmu = pmu; __perf_mux_hrtimer_init(cpuctx, cpu); - - cpuctx->unique_pmu = pmu; } got_cpu_context: