Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Duoming Zhou <duoming@zju.edu.cn>
To:     peterz@infradead.org, linux-perf-users@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     mingo@redhat.com, acme@kernel.org, mark.rutland@arm.com,
        alexander.shishkin@linux.intel.com, jolsa@kernel.org,
        namhyung@kernel.org, tglx@linutronix.de, bp@alien8.de,
        dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com,
        Duoming Zhou <duoming@zju.edu.cn>
Subject: [PATCH V3] perf/x86/rapl: fix deadlock in rapl_pmu_event_stop
Date:   Wed, 21 Sep 2022 20:13:32 +0800
Message-Id: <20220921121332.24363-1-duoming@zju.edu.cn>
Precedence: bulk

There is a deadlock in rapl_pmu_event_stop(), the process is
shown below:

    (thread 1)                 |        (thread 2)
rapl_pmu_event_stop()          | rapl_hrtimer_handle()
 ...                           |  if (!pmu->n_active)
 raw_spin_lock_irqsave() //(1) |  ...
  ...                          |
  hrtimer_cancel()             |  raw_spin_lock_irqsave() //(2)
  (block forever)

We hold pmu->lock in position (1) and use hrtimer_cancel() to wait
rapl_hrtimer_handle() to stop, but rapl_hrtimer_handle() also need
pmu->lock in position (2). As a result, the rapl_pmu_event_stop()
will be blocked forever.

This patch uses hrtimer_try_to_cancel() to replace hrtimer_cancel()
and moves the check "if (!pmu->n_active)" into the protection scope
of pmu->lock. If the timer callback function is running, the
hrtimer_try_to_cancel() will directly return. After the
rapl_pmu_event_stop() has finished, the "pmu->n_active" equals to 0
and the rapl_hrtimer_handle() will return "HRTIMER_NORESTART".

Fixes: 65661f96d3b3 ("perf/x86: Add RAPL hrtimer support")
Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
---
Changes in V3:
  - Use hrtimer_try_to_cancel() to replace hrtimer_cancel().
  - Use pmu->lock to protect the check "if (!pmu->n_active)".

 arch/x86/events/rapl.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 77e3a47af5a..a526a08ee6e 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -219,11 +219,13 @@ static enum hrtimer_restart rapl_hrtimer_handle(struct hrtimer *hrtimer)
 	struct perf_event *event;
 	unsigned long flags;
 
-	if (!pmu->n_active)
-		return HRTIMER_NORESTART;
-
 	raw_spin_lock_irqsave(&pmu->lock, flags);
 
+	if (!pmu->n_active) {
+		raw_spin_unlock_irqrestore(&pmu->lock, flags);
+		return HRTIMER_NORESTART;
+	}
+
 	list_for_each_entry(event, &pmu->active_list, active_entry)
 		rapl_event_update(event);
 
@@ -282,7 +284,7 @@ static void rapl_pmu_event_stop(struct perf_event *event, int mode)
 		WARN_ON_ONCE(pmu->n_active <= 0);
 		pmu->n_active--;
 		if (pmu->n_active == 0)
-			hrtimer_cancel(&pmu->hrtimer);
+			hrtimer_try_to_cancel(&pmu->hrtimer);
 
 		list_del(&event->active_entry);
 
-- 
2.17.1