Commit 4230cea8 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Christian König
Browse files

drm: Track clients by tgid and not tid 



Thread group id (aka pid from userspace point of view) is a more
interesting thing to show as an owner of a DRM fd, so track and show that
instead of the thread id.

In the next patch we will make the owner updated post file descriptor
handover, which will also be tgid based to avoid ping-pong when multiple
threads access the fd.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarZack Rusin <zackr@vmware.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230314141904.1210824-2-tvrtko.ursulin@linux.intel.com
parent e2945e6c

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ static int amdgpu_debugfs_gem_info_show(struct seq_file *m, void *unused) 
		 * Therefore, we need to protect this ->comm access using RCU.

		 */

		rcu_read_lock();

		task = pid_task(file->pid, PIDTYPE_PID);

		task = pid_task(file->pid, PIDTYPE_TGID);

		seq_printf(m, "pid %8d command %s:\n", pid_nr(file->pid),

			   task ? task->comm : "<unknown>");

		rcu_read_unlock();

drivers/gpu/drm/drm_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int drm_clients_info(struct seq_file *m, void *data) 
	seq_printf(m,

		   "%20s %5s %3s master a %5s %10s\n",

		   "command",

		   "pid",

		   "tgid",

		   "dev",

		   "uid",

		   "magic");
@@ -94,7 +94,7 @@ static int drm_clients_info(struct seq_file *m, void *data) 
		bool is_current_master = drm_is_current_master(priv);



		rcu_read_lock(); /* locks pid_task()->comm */

		task = pid_task(priv->pid, PIDTYPE_PID);

		task = pid_task(priv->pid, PIDTYPE_TGID);

		uid = task ? __task_cred(task)->euid : GLOBAL_ROOT_UID;

		seq_printf(m, "%20s %5d %3d   %c    %c %5d %10u\n",

			   task ? task->comm : "<unknown>",

drivers/gpu/drm/drm_file.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ struct drm_file *drm_file_alloc(struct drm_minor *minor) 
	if (!file)

		return ERR_PTR(-ENOMEM);



	file->pid = get_pid(task_pid(current));

	file->pid = get_pid(task_tgid(current));

	file->minor = minor;



	/* for compatibility root is always authenticated */

drivers/gpu/drm/vmwgfx/vmwgfx_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int vmw_debugfs_gem_info_show(struct seq_file *m, void *unused) 
		 * Therefore, we need to protect this ->comm access using RCU.

		 */

		rcu_read_lock();

		task = pid_task(file->pid, PIDTYPE_PID);

		task = pid_task(file->pid, PIDTYPE_TGID);

		seq_printf(m, "pid %8d command %s:\n", pid_nr(file->pid),

			   task ? task->comm : "<unknown>");

		rcu_read_unlock();