From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759481AbcIWLaQ (ORCPT ); Fri, 23 Sep 2016 07:30:16 -0400 Received: from mga04.intel.com ([192.55.52.120]:1661 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759413AbcIWLaK (ORCPT ); Fri, 23 Sep 2016 07:30:10 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,381,1470726000"; d="scan'208";a="172354653" 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 6/6] perf: Disable IRQs in address filter sync path Date: Fri, 23 Sep 2016 14:27:26 +0300 Message-Id: <20160923112726.5890-7-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 PMU callbacks are executed in hardirq context, the address filter sync code needs to disable interrupts when taking its spinlock to be consistent with the rest of its users. This may happen if the PMU is used in AUX sampling. Signed-off-by: Alexander Shishkin --- kernel/events/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index f6582df1c9..047c495c94 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2568,16 +2568,17 @@ static int perf_event_stop(struct perf_event *event, int restart) void perf_event_addr_filters_sync(struct perf_event *event) { struct perf_addr_filters_head *ifh = perf_event_addr_filters(event); + unsigned long flags; if (!has_addr_filter(event)) return; - raw_spin_lock(&ifh->lock); + raw_spin_lock_irqsave(&ifh->lock, flags); if (event->addr_filters_gen != event->hw.addr_filters_gen) { event->pmu->addr_filters_sync(event); event->hw.addr_filters_gen = event->addr_filters_gen; } - raw_spin_unlock(&ifh->lock); + raw_spin_unlock_irqrestore(&ifh->lock, flags); } EXPORT_SYMBOL_GPL(perf_event_addr_filters_sync); -- 2.9.3