Commit 4cbed770 authored by Umesh Nerlige Ramappa's avatar Umesh Nerlige Ramappa Committed by Rodrigo Vivi
Browse files

drm/i915/pmu: Check if pmu is closed before stopping event 

When the driver unbinds, pmu is unregistered and i915->uabi_engines is
set to RB_ROOT. Due to this, when i915 PMU tries to stop the engine
events, it issues a warn_on because engine lookup fails.

All perf hooks are taking care of this using a pmu->closed flag that is
set when PMU unregisters. The stop event seems to have been left out.

Check for pmu->closed in pmu_event_stop as well.

Based on discussion here -
https://patchwork.freedesktop.org/patch/492079/?series=105790&rev=2



v2: s/is/if/ in commit title
v3: Add fixes tag and cc stable

Cc: <stable@vger.kernel.org> # v5.11+
Fixes: b00bccb3 ("drm/i915/pmu: Handle PCI unbind")
Signed-off-by: default avatarUmesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231020152441.3764850-1-umesh.nerlige.ramappa@intel.com


(cherry picked from commit 31f6a06f)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 78cc55e0

drivers/gpu/drm/i915/i915_pmu.c

+9 −0
Original line number Diff line number Diff line
@@ -832,9 +832,18 @@ static void i915_pmu_event_start(struct perf_event *event, int flags) 


static void i915_pmu_event_stop(struct perf_event *event, int flags)

{

	struct drm_i915_private *i915 =

		container_of(event->pmu, typeof(*i915), pmu.base);

	struct i915_pmu *pmu = &i915->pmu;



	if (pmu->closed)

		goto out;



	if (flags & PERF_EF_UPDATE)

		i915_pmu_event_read(event);

	i915_pmu_disable(event);



out:

	event->hw.state = PERF_HES_STOPPED;

}