浏览代码

drm/i915: Add process identifier to requests

We use the pid of the process which opened our device when
we track which was the culprit of the gpu hang. But as that
file descriptor might get inherited, we might blame the
wrong process when we record the error state.

Track process identifiers in requests to always find
the correct offender.

v2: Track only user processes (Chris)

Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
[danvet: drop NULL check before put_pid as suggested by Chris.]
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Mika Kuoppala 10 年之前
父节点
当前提交
071c92de1d
共有 3 个文件被更改,包括 9 次插入3 次删除
  1. 3 0
      drivers/gpu/drm/i915/i915_drv.h
  2. 4 0
      drivers/gpu/drm/i915/i915_gem.c
  3. 2 3
      drivers/gpu/drm/i915/i915_gpu_error.c

+ 3 - 0
drivers/gpu/drm/i915/i915_drv.h

@@ -2160,6 +2160,9 @@ struct drm_i915_gem_request {
 	/** file_priv list entry for this request */
 	/** file_priv list entry for this request */
 	struct list_head client_list;
 	struct list_head client_list;
 
 
+	/** process identifier submitting this request */
+	struct pid *pid;
+
 	uint32_t uniq;
 	uint32_t uniq;
 
 
 	/**
 	/**

+ 4 - 0
drivers/gpu/drm/i915/i915_gem.c

@@ -2493,6 +2493,8 @@ int __i915_add_request(struct intel_engine_cs *ring,
 		list_add_tail(&request->client_list,
 		list_add_tail(&request->client_list,
 			      &file_priv->mm.request_list);
 			      &file_priv->mm.request_list);
 		spin_unlock(&file_priv->mm.lock);
 		spin_unlock(&file_priv->mm.lock);
+
+		request->pid = get_pid(task_pid(current));
 	}
 	}
 
 
 	trace_i915_gem_request_add(request);
 	trace_i915_gem_request_add(request);
@@ -2573,6 +2575,8 @@ static void i915_gem_free_request(struct drm_i915_gem_request *request)
 	list_del(&request->list);
 	list_del(&request->list);
 	i915_gem_request_remove_from_client(request);
 	i915_gem_request_remove_from_client(request);
 
 
+	put_pid(request->pid);
+
 	i915_gem_request_unreference(request);
 	i915_gem_request_unreference(request);
 }
 }
 
 

+ 2 - 3
drivers/gpu/drm/i915/i915_gpu_error.c

@@ -994,12 +994,11 @@ static void i915_gem_record_rings(struct drm_device *dev,
 					i915_error_ggtt_object_create(dev_priv,
 					i915_error_ggtt_object_create(dev_priv,
 							     ring->scratch.obj);
 							     ring->scratch.obj);
 
 
-			if (request->file_priv) {
+			if (request->pid) {
 				struct task_struct *task;
 				struct task_struct *task;
 
 
 				rcu_read_lock();
 				rcu_read_lock();
-				task = pid_task(request->file_priv->file->pid,
-						PIDTYPE_PID);
+				task = pid_task(request->pid, PIDTYPE_PID);
 				if (task) {
 				if (task) {
 					strcpy(error->ring[i].comm, task->comm);
 					strcpy(error->ring[i].comm, task->comm);
 					error->ring[i].pid = task->pid;
 					error->ring[i].pid = task->pid;