Skip to content

Commit

Permalink
drm/i915/pmu: Keep a reference to module while active
Browse files Browse the repository at this point in the history
While a perf event is open, keep a reference to the module so we don't
remove the driver internals mid-sampling.

Testcase: igt/perf_pmu/module-unload
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200430183324.23984-1-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed May 1, 2020
1 parent 16e8745 commit 3b55cde
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/gpu/drm/i915/i915_pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,7 @@ static u64 count_interrupts(struct drm_i915_private *i915)
static void i915_pmu_event_destroy(struct perf_event *event)
{
WARN_ON(event->parent);
module_put(THIS_MODULE);
}

static int
Expand Down Expand Up @@ -533,8 +534,10 @@ static int i915_pmu_event_init(struct perf_event *event)
if (ret)
return ret;

if (!event->parent)
if (!event->parent) {
__module_get(THIS_MODULE);
event->destroy = i915_pmu_event_destroy;
}

return 0;
}
Expand Down

0 comments on commit 3b55cde

Please sign in to comment.