[Intel-gfx] [PATCH] drm/i915/pmu: Return -EINVAL when selecting the inactive CPU

Tvrtko Ursulin tursulin at ursulin.net
Tue Nov 28 10:55:15 UTC 2017


From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

In commit 0426c0465461 ("drm/i915/pmu: Only allow running on a single
CPU") I attempted to clarify the CPU hotplug logic in our PMU
implementation, but missed that a more logical error to return, when
attempting to initialize an event on a currently inactive CPU, is -EINVAL
rather than -ENODEV.

This is because i915 PMU explicitly disallows running counters on more
than one CPU at a time, and is not reporting that the requested CPU does
not exist, or is off-line.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
Reported-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_pmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index 3357b690ce90..1c0ee9d68b04 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -338,7 +338,7 @@ static int i915_pmu_event_init(struct perf_event *event)
 
 	/* only allow running on one cpu at a time */
 	if (!cpumask_test_cpu(event->cpu, &i915_pmu_cpumask))
-		return -ENODEV;
+		return -EINVAL;
 
 	if (is_engine_event(event)) {
 		ret = engine_event_init(event);
-- 
2.14.1



More information about the Intel-gfx mailing list