From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759446AbcIWLaO (ORCPT ); Fri, 23 Sep 2016 07:30:14 -0400 Received: from mga09.intel.com ([134.134.136.24]:37747 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759366AbcIWLaH (ORCPT ); Fri, 23 Sep 2016 07:30:07 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,381,1470726000"; d="scan'208";a="764820564" From: Alexander Shishkin To: Peter Zijlstra Cc: Ingo Molnar , linux-kernel@vger.kernel.org, vince@deater.net, eranian@google.com, Arnaldo Carvalho de Melo , tglx@linutronix.de, ak@linux.intel.com, Alexander Shishkin Subject: [RFC PATCH 5/6] perf: Disable PMU around address filter adjustment Date: Fri, 23 Sep 2016 14:27:25 +0300 Message-Id: <20160923112726.5890-6-alexander.shishkin@linux.intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160923112726.5890-1-alexander.shishkin@linux.intel.com> References: <20160923112726.5890-1-alexander.shishkin@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the PMU is used for AUX data sampling, the hardware event that triggers it may come in during a critical section of address filters adjustment (if it's delivered as NMI) and in turn call the address filter sync code, causing a spinlock recursion. To prevent this, disable the PMU around these critical sections, so that AUX sampling won't take place there. Signed-off-by: Alexander Shishkin --- kernel/events/core.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/kernel/events/core.c b/kernel/events/core.c index fdb20fdeb1..f6582df1c9 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6377,6 +6377,12 @@ static void perf_event_addr_filters_exec(struct perf_event *event, void *data) if (!has_addr_filter(event)) return; + /* + * if sampling kicks in in the critical section, + * we risk spinlock recursion on the ifh::lock + */ + perf_pmu_disable(event->pmu); + raw_spin_lock_irqsave(&ifh->lock, flags); list_for_each_entry(filter, &ifh->list, entry) { if (filter->inode) { @@ -6387,6 +6393,8 @@ static void perf_event_addr_filters_exec(struct perf_event *event, void *data) count++; } + perf_pmu_enable(event->pmu); + if (restart) event->addr_filters_gen++; raw_spin_unlock_irqrestore(&ifh->lock, flags); @@ -6942,6 +6950,8 @@ static void __perf_addr_filters_adjust(struct perf_event *event, void *data) if (!file) return; + perf_pmu_disable(event->pmu); + raw_spin_lock_irqsave(&ifh->lock, flags); list_for_each_entry(filter, &ifh->list, entry) { if (perf_addr_filter_match(filter, file, off, @@ -6953,6 +6963,8 @@ static void __perf_addr_filters_adjust(struct perf_event *event, void *data) count++; } + perf_pmu_enable(event->pmu); + if (restart) event->addr_filters_gen++; raw_spin_unlock_irqrestore(&ifh->lock, flags); @@ -8126,6 +8138,8 @@ static void perf_event_addr_filters_apply(struct perf_event *event) down_read(&mm->mmap_sem); + perf_pmu_disable(event->pmu); + raw_spin_lock_irqsave(&ifh->lock, flags); list_for_each_entry(filter, &ifh->list, entry) { event->addr_filters_offs[count] = 0; @@ -8144,6 +8158,8 @@ static void perf_event_addr_filters_apply(struct perf_event *event) event->addr_filters_gen++; raw_spin_unlock_irqrestore(&ifh->lock, flags); + perf_pmu_enable(event->pmu); + up_read(&mm->mmap_sem); mmput(mm); -- 2.9.3