Skip to contentSkip to conversation

drm: Update file owner during use

PATCH In review Tvrtko Ursulin 4 participants 6 messages Jun 21, 2023 – Sep 20, 2023

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drm: Update file owner during use

From: Tvrtko Ursulin <[email protected]>

With the typical model where the display server opens the file descriptor and then hands it over to the client(*), we were showing stale data in debugfs.

Fix it by updating the drm_file->pid on ioctl access from a different process.

The field is also made RCU protected to allow for lockless readers. Update side is protected with dev->filelist_mutex.

Before:

$ cat /sys/kernel/debug/dri/0/clients
             command   pid dev master a   uid      magic
                Xorg  2344   0   y    y     0          0
                Xorg  2344   0   n    y     0          2
                Xorg  2344   0   n    y     0          3
                Xorg  2344   0   n    y     0          4

After:

$ cat /sys/kernel/debug/dri/0/clients
             command  tgid dev master a   uid      magic
                Xorg   830   0   y    y     0          0
       xfce4-session   880   0   n    y     0          1
               xfwm4   943   0   n    y     0          2
           neverball  1095   0   n    y     0          3

*)
More detailed and historically accurate description of various handover implementation kindly provided by Emil Velikov:

"""
The traditional model, the server was the orchestrator managing the primary device node. From the fd, to the master status and authentication. But looking at the fd alone, this has varied across the years.

IIRC in the DRI1 days, Xorg (libdrm really) would have a list of open fd(s) and reuse those whenever needed, DRI2 the client was responsible for open() themselves and with DRI3 the fd was passed to the client.

Around the inception of DRI3 and systemd-logind, the latter became another possible orchestrator. Whereby Xorg and Wayland compositors could ask it for the fd. For various reasons (hysterical and genuine ones) Xorg has a fallback path going the open(), whereas Wayland compositors are moving to solely relying on logind... some never had fallback even.

Over the past few years, more projects have emerged which provide functionality similar (be that on API level, Dbus, or otherwise) to systemd-logind.
"""

v2:
* Fixed typo in commit text and added a fine historical explanation from Emil.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c |  6 ++--
 drivers/gpu/drm/drm_auth.c              |  3 +-
 drivers/gpu/drm/drm_debugfs.c           | 10 ++++---
 drivers/gpu/drm/drm_file.c              | 40 +++++++++++++++++++++++--
 drivers/gpu/drm/drm_ioctl.c             |  3 ++
 drivers/gpu/drm/nouveau/nouveau_drm.c   |  5 +++-
 drivers/gpu/drm/vmwgfx/vmwgfx_gem.c     |  6 ++--
 include/drm/drm_file.h                  | 13 ++++++--
 8 files changed, 71 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +4 -2
index 74055cba3dc9..849097dff02b 100644
@@ -963,6 +963,7 @@ static int amdgpu_debugfs_gem_info_show(struct seq_file *m, void *unused)
 	list_for_each_entry(file, &dev->filelist, lhead) {
 		struct task_struct *task;
 		struct drm_gem_object *gobj;
+		struct pid *pid;
 		int id;
 
 		/*
@@ -972,8 +973,9 @@ 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_TGID);
-		seq_printf(m, "pid %8d command %s:\n", pid_nr(file->pid),
+		pid = rcu_dereference(file->pid);
+		task = pid_task(pid, PIDTYPE_TGID);
+		seq_printf(m, "pid %8d command %s:\n", pid_nr(pid),
 			   task ? task->comm : "<unknown>");
 		rcu_read_unlock();
 
drivers/gpu/drm/drm_auth.c +2 -1
index cf92a9ae8034..2ed2585ded37 100644
@@ -235,7 +235,8 @@ static int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv)
 static int
 drm_master_check_perm(struct drm_device *dev, struct drm_file *file_priv)
 {
-	if (file_priv->pid == task_pid(current) && file_priv->was_master)
+	if (file_priv->was_master &&
+	    rcu_access_pointer(file_priv->pid) == task_pid(current))
 		return 0;
 
 	if (!capable(CAP_SYS_ADMIN))
drivers/gpu/drm/drm_debugfs.c +6 -4
index 4855230ba2c6..b46f5ceb24c6 100644
@@ -90,15 +90,17 @@ static int drm_clients_info(struct seq_file *m, void *data)
 	 */
 	mutex_lock(&dev->filelist_mutex);
 	list_for_each_entry_reverse(priv, &dev->filelist, lhead) {
-		struct task_struct *task;
 		bool is_current_master = drm_is_current_master(priv);
+		struct task_struct *task;
+		struct pid *pid;
 
-		rcu_read_lock(); /* locks pid_task()->comm */
-		task = pid_task(priv->pid, PIDTYPE_TGID);
+		rcu_read_lock(); /* Locks priv->pid and pid_task()->comm! */
+		pid = rcu_dereference(priv->pid);
+		task = pid_task(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>",
-			   pid_vnr(priv->pid),
+			   pid_vnr(pid),
 			   priv->minor->index,
 			   is_current_master ? 'y' : 'n',
 			   priv->authenticated ? 'y' : 'n',
drivers/gpu/drm/drm_file.c +37 -3
index 883d83bc0e3d..e692770ef6d3 100644
@@ -160,7 +160,7 @@ struct drm_file *drm_file_alloc(struct drm_minor *minor)
 
 	/* Get a unique identifier for fdinfo: */
 	file->client_id = atomic64_inc_return(&ident);
-	file->pid = get_pid(task_tgid(current));
+	rcu_assign_pointer(file->pid, get_pid(task_tgid(current)));
 	file->minor = minor;
 
 	/* for compatibility root is always authenticated */
@@ -200,7 +200,7 @@ struct drm_file *drm_file_alloc(struct drm_minor *minor)
 		drm_syncobj_release(file);
 	if (drm_core_check_feature(dev, DRIVER_GEM))
 		drm_gem_release(dev, file);
-	put_pid(file->pid);
+	put_pid(rcu_access_pointer(file->pid));
 	kfree(file);
 
 	return ERR_PTR(ret);
@@ -291,7 +291,7 @@ void drm_file_free(struct drm_file *file)
 
 	WARN_ON(!list_empty(&file->event_list));
 
-	put_pid(file->pid);
+	put_pid(rcu_access_pointer(file->pid));
 	kfree(file);
 }
 
@@ -505,6 +505,40 @@ int drm_release(struct inode *inode, struct file *filp)
 }
 EXPORT_SYMBOL(drm_release);
 
+void drm_file_update_pid(struct drm_file *filp)
+{
+	struct drm_device *dev;
+	struct pid *pid, *old;
+
+	/*
+	 * Master nodes need to keep the original ownership in order for
+	 * drm_master_check_perm to keep working correctly. (See comment in
+	 * drm_auth.c.)
+	 */
+	if (filp->was_master)
+		return;
+
+	pid = task_tgid(current);
+
+	/*
+	 * Quick unlocked check since the model is a single handover followed by
+	 * exclusive repeated use.
+	 */
+	if (pid == rcu_access_pointer(filp->pid))
+		return;
+
+	dev = filp->minor->dev;
+	mutex_lock(&dev->filelist_mutex);
+	old = rcu_replace_pointer(filp->pid, pid, 1);
+	mutex_unlock(&dev->filelist_mutex);
+
+	if (pid != old) {
+		get_pid(pid);
+		synchronize_rcu();
+		put_pid(old);
+	}
+}
+
 /**
  * drm_release_noglobal - release method for DRM file
  * @inode: device inode
drivers/gpu/drm/drm_ioctl.c +3 -0
index 7c9d66ee917d..305b18d9d7b6 100644
@@ -775,6 +775,9 @@ long drm_ioctl_kernel(struct file *file, drm_ioctl_t *func, void *kdata,
 	struct drm_device *dev = file_priv->minor->dev;
 	int retcode;
 
+	/* Update drm_file owner if fd was passed along. */
+	drm_file_update_pid(file_priv);
+
 	if (drm_dev_is_unplugged(dev))
 		return -ENODEV;
 
drivers/gpu/drm/nouveau/nouveau_drm.c +4 -1
index 51f1918b44d3..e3cb60eb0bc8 100644
@@ -1101,7 +1101,10 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv)
 	}
 
 	get_task_comm(tmpname, current);
-	snprintf(name, sizeof(name), "%s[%d]", tmpname, pid_nr(fpriv->pid));
+	rcu_read_lock();
+	snprintf(name, sizeof(name), "%s[%d]",
+		 tmpname, pid_nr(rcu_dereference(fpriv->pid)));
+	rcu_read_unlock();
 
 	if (!(cli = kzalloc(sizeof(*cli), GFP_KERNEL))) {
 		ret = -ENOMEM;
drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +4 -2
index c0da89e16e6f..a07e5b7e2f2f 100644
@@ -232,6 +232,7 @@ static int vmw_debugfs_gem_info_show(struct seq_file *m, void *unused)
 	list_for_each_entry(file, &dev->filelist, lhead) {
 		struct task_struct *task;
 		struct drm_gem_object *gobj;
+		struct pid *pid;
 		int id;
 
 		/*
@@ -241,8 +242,9 @@ 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_TGID);
-		seq_printf(m, "pid %8d command %s:\n", pid_nr(file->pid),
+		pid = rcu_dereference(file->pid);
+		task = pid_task(pid, PIDTYPE_TGID);
+		seq_printf(m, "pid %8d command %s:\n", pid_nr(pid),
 			   task ? task->comm : "<unknown>");
 		rcu_read_unlock();
 
include/drm/drm_file.h +11 -2
index 966912053cb0..c76249d5467e 100644
@@ -256,8 +256,15 @@ struct drm_file {
 	/** @master_lookup_lock: Serializes @master. */
 	spinlock_t master_lookup_lock;
 
-	/** @pid: Process that opened this file. */
-	struct pid *pid;
+	/**
+	 * @pid: Process that is using this file.
+	 *
+	 * Must only be dereferenced under a rcu_read_lock or equivalent.
+	 *
+	 * Updates are guarded with dev->filelist_mutex and reference must be
+	 * dropped after a RCU grace period to accommodate lockless readers.
+	 */
+	struct pid __rcu *pid;
 
 	/** @client_id: A unique id for fdinfo */
 	u64 client_id;
@@ -420,6 +427,8 @@ static inline bool drm_is_accel_client(const struct drm_file *file_priv)
 	return file_priv->minor->type == DRM_MINOR_ACCEL;
 }
 
+void drm_file_update_pid(struct drm_file *);
+
 int drm_open(struct inode *inode, struct file *filp);
 int drm_open_helper(struct file *filp, struct drm_minor *minor);
 ssize_t drm_read(struct file *filp, char __user *buffer,
Signature · 1 line
2.39.2
#1 lore raw

[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm: Update file owner during use

== Series Details ==

== Series Details ==

Series: drm: Update file owner during use
URL : https://patchwork.freedesktop.org/series/119670/
State : warning

== Summary ==

Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.

#2 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm: Update file owner during use

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: drm: Update file owner during use
URL : https://patchwork.freedesktop.org/series/119670/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_13302 -> Patchwork_119670v1
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_119670v1 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_119670v1, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/index.html

Participating hosts (41 -> 42)
------------------------------

Additional (1): fi-kbl-soraka

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_119670v1:

### IGT changes ###

#### Possible regressions ####

* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-d-dp-5:
- bat-adlp-11: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-adlp-11/igt@kms_pipe_crc_basic@[email protected]

Known issues
------------

Here are the changes found in Patchwork_119670v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271] / [i915#2190])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/fi-kbl-soraka/igt@[email protected]

* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#4613]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/fi-kbl-soraka/igt@[email protected]

* igt@i915_selftest@live@gt_heartbeat:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][4] ([i915#5334] / [i915#7872])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/fi-kbl-soraka/igt@i915_selftest@live@gt_heartbeat.html

* igt@i915_selftest@live@gt_mocs:
- bat-mtlp-6: [PASS][5] -> [DMESG-FAIL][6] ([i915#7059])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13302/bat-mtlp-6/igt@i915_selftest@live@gt_mocs.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-mtlp-6/igt@i915_selftest@live@gt_mocs.html

* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][7] ([i915#1886] / [i915#7913])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html

* igt@i915_selftest@live@slpc:
- bat-mtlp-6: [PASS][8] -> [DMESG-WARN][9] ([i915#6367])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13302/bat-mtlp-6/igt@i915_selftest@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-mtlp-6/igt@i915_selftest@[email protected]
- bat-rpls-2: NOTRUN -> [DMESG-WARN][10] ([i915#6367])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-rpls-2/igt@i915_selftest@[email protected]

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-kbl-soraka: NOTRUN -> [SKIP][11] ([fdo#109271]) +14 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/fi-kbl-soraka/igt@[email protected]

* igt@kms_flip@basic-flip-vs-modeset@d-dp6:
- bat-adlp-11: NOTRUN -> [DMESG-WARN][12] ([i915#6868])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-adlp-11/igt@kms_flip@[email protected]

* igt@kms_flip@basic-flip-vs-wf_vblank:
- bat-adlp-11: NOTRUN -> [SKIP][13] ([i915#3637])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-adlp-11/igt@kms_flip@basic-flip-vs-wf_vblank.html

* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-c-dp-5:
- bat-adlp-11: NOTRUN -> [DMESG-FAIL][14] ([i915#6868])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-adlp-11/igt@kms_pipe_crc_basic@[email protected]

* igt@kms_psr@primary_page_flip:
- bat-adlp-11: NOTRUN -> [SKIP][15] ([i915#1072]) +3 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-adlp-11/igt@kms_psr@primary_page_flip.html

* igt@kms_setmode@basic-clone-single-crtc:
- bat-adlp-11: NOTRUN -> [ABORT][16] ([i915#4579] / [i915#8260])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-adlp-11/igt@[email protected]
- fi-kbl-soraka: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#4579])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/fi-kbl-soraka/igt@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@gt_heartbeat:
- fi-kbl-guc: [DMESG-FAIL][18] ([i915#5334] / [i915#7872]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13302/fi-kbl-guc/igt@i915_selftest@live@gt_heartbeat.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/fi-kbl-guc/igt@i915_selftest@live@gt_heartbeat.html

* igt@i915_selftest@live@gt_mocs:
- bat-mtlp-8: [DMESG-FAIL][20] ([i915#7059]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13302/bat-mtlp-8/igt@i915_selftest@live@gt_mocs.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-mtlp-8/igt@i915_selftest@live@gt_mocs.html

* igt@i915_selftest@live@mman:
- bat-rpls-2: [TIMEOUT][22] ([i915#6794] / [i915#7392]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13302/bat-rpls-2/igt@i915_selftest@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-rpls-2/igt@i915_selftest@[email protected]

* igt@kms_flip@basic-flip-vs-dpms@b-dp6:
- bat-adlp-11: [DMESG-WARN][24] ([i915#6868]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13302/bat-adlp-11/igt@kms_flip@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-adlp-11/igt@kms_flip@[email protected]

* igt@kms_flip@basic-flip-vs-dpms@d-dp6:
- bat-adlp-11: [FAIL][26] ([i915#6121]) -> [PASS][27] +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13302/bat-adlp-11/igt@kms_flip@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-adlp-11/igt@kms_flip@[email protected]

* {igt@kms_pipe_crc_basic@compare-crc-sanitycheck-xr24@pipe-c-dp-5}:
- bat-adlp-11: [ABORT][28] ([i915#4423]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13302/bat-adlp-11/igt@kms_pipe_crc_basic@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-adlp-11/igt@kms_pipe_crc_basic@[email protected]

* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-d-dp-1:
- bat-dg2-8: [FAIL][30] ([i915#7932]) -> [PASS][31] +1 similar issue
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13302/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#4423]: https://gitlab.freedesktop.org/drm/intel/issues/4423
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#6121]: https://gitlab.freedesktop.org/drm/intel/issues/6121
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794
[i915#6868]: https://gitlab.freedesktop.org/drm/intel/issues/6868
[i915#7059]: https://gitlab.freedesktop.org/drm/intel/issues/7059
[i915#7392]: https://gitlab.freedesktop.org/drm/intel/issues/7392
[i915#7872]: https://gitlab.freedesktop.org/drm/intel/issues/7872
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
[i915#8260]: https://gitlab.freedesktop.org/drm/intel/issues/8260

Build changes
-------------

* Linux: CI_DRM_13302 -> Patchwork_119670v1

CI-20190529: 20190529
CI_DRM_13302: 839a0f1c0fba27caa09cb8c3c07ba21ba7428bb6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7344: 1c715e38251905d4d7797651fa448b11bf42a4a4 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_119670v1: 839a0f1c0fba27caa09cb8c3c07ba21ba7428bb6 @ git://anongit.freedesktop.org/gfx-ci/linux

### Linux commits

d0b4fb8b689f drm: Update file owner during use

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119670v1/index.html

Reviewed-by Tested-by on v2 1/1
#3 lore raw
In reply to Tvrtko Ursulin
Quoted 61 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

With the typical model where the display server opens the file descriptor and then hands it over to the client(*), we were showing stale data in debugfs.

Fix it by updating the drm_file->pid on ioctl access from a different process.

The field is also made RCU protected to allow for lockless readers. Update side is protected with dev->filelist_mutex.

Before:

$ cat /sys/kernel/debug/dri/0/clients
             command   pid dev master a   uid      magic
                Xorg  2344   0   y    y     0          0
                Xorg  2344   0   n    y     0          2
                Xorg  2344   0   n    y     0          3
                Xorg  2344   0   n    y     0          4

After:

$ cat /sys/kernel/debug/dri/0/clients
             command  tgid dev master a   uid      magic
                Xorg   830   0   y    y     0          0
       xfce4-session   880   0   n    y     0          1
               xfwm4   943   0   n    y     0          2
           neverball  1095   0   n    y     0          3

*)
More detailed and historically accurate description of various handover implementation kindly provided by Emil Velikov:

"""
The traditional model, the server was the orchestrator managing the primary device node. From the fd, to the master status and authentication. But looking at the fd alone, this has varied across the years.

IIRC in the DRI1 days, Xorg (libdrm really) would have a list of open fd(s) and reuse those whenever needed, DRI2 the client was responsible for open() themselves and with DRI3 the fd was passed to the client.

Around the inception of DRI3 and systemd-logind, the latter became another possible orchestrator. Whereby Xorg and Wayland compositors could ask it for the fd. For various reasons (hysterical and genuine ones) Xorg has a fallback path going the open(), whereas Wayland compositors are moving to solely relying on logind... some never had fallback even.

Over the past few years, more projects have emerged which provide functionality similar (be that on API level, Dbus, or otherwise) to systemd-logind.
"""

v2:
* Fixed typo in commit text and added a fine historical explanation from Emil.

Quoted 5 lines
Quoted 235 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c |  6 ++--
 drivers/gpu/drm/drm_auth.c              |  3 +-
 drivers/gpu/drm/drm_debugfs.c           | 10 ++++---
 drivers/gpu/drm/drm_file.c              | 40 +++++++++++++++++++++++--
 drivers/gpu/drm/drm_ioctl.c             |  3 ++
 drivers/gpu/drm/nouveau/nouveau_drm.c   |  5 +++-
 drivers/gpu/drm/vmwgfx/vmwgfx_gem.c     |  6 ++--
 include/drm/drm_file.h                  | 13 ++++++--
 8 files changed, 71 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +4 -2
index 74055cba3dc9..849097dff02b 100644
@@ -963,6 +963,7 @@ static int amdgpu_debugfs_gem_info_show(struct seq_file *m, void *unused)
        list_for_each_entry(file, &dev->filelist, lhead) {
                struct task_struct *task;
                struct drm_gem_object *gobj;
+               struct pid *pid;
                int id;
 
                /*
@@ -972,8 +973,9 @@ 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_TGID);
-               seq_printf(m, "pid %8d command %s:\n", pid_nr(file->pid),
+               pid = rcu_dereference(file->pid);
+               task = pid_task(pid, PIDTYPE_TGID);
+               seq_printf(m, "pid %8d command %s:\n", pid_nr(pid),
                           task ? task->comm : "<unknown>");
                rcu_read_unlock();
 
drivers/gpu/drm/drm_auth.c +2 -1
index cf92a9ae8034..2ed2585ded37 100644
@@ -235,7 +235,8 @@ static int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv)
 static int
 drm_master_check_perm(struct drm_device *dev, struct drm_file *file_priv)
 {
-       if (file_priv->pid == task_pid(current) && file_priv->was_master)
+       if (file_priv->was_master &&
+           rcu_access_pointer(file_priv->pid) == task_pid(current))
                return 0;
 
        if (!capable(CAP_SYS_ADMIN))
drivers/gpu/drm/drm_debugfs.c +6 -4
index 4855230ba2c6..b46f5ceb24c6 100644
@@ -90,15 +90,17 @@ static int drm_clients_info(struct seq_file *m, void *data)
         */
        mutex_lock(&dev->filelist_mutex);
        list_for_each_entry_reverse(priv, &dev->filelist, lhead) {
-               struct task_struct *task;
                bool is_current_master = drm_is_current_master(priv);
+               struct task_struct *task;
+               struct pid *pid;
 
-               rcu_read_lock(); /* locks pid_task()->comm */
-               task = pid_task(priv->pid, PIDTYPE_TGID);
+               rcu_read_lock(); /* Locks priv->pid and pid_task()->comm! */
+               pid = rcu_dereference(priv->pid);
+               task = pid_task(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>",
-                          pid_vnr(priv->pid),
+                          pid_vnr(pid),
                           priv->minor->index,
                           is_current_master ? 'y' : 'n',
                           priv->authenticated ? 'y' : 'n',
drivers/gpu/drm/drm_file.c +37 -3
index 883d83bc0e3d..e692770ef6d3 100644
@@ -160,7 +160,7 @@ struct drm_file *drm_file_alloc(struct drm_minor *minor)
 
        /* Get a unique identifier for fdinfo: */
        file->client_id = atomic64_inc_return(&ident);
-       file->pid = get_pid(task_tgid(current));
+       rcu_assign_pointer(file->pid, get_pid(task_tgid(current)));
        file->minor = minor;
 
        /* for compatibility root is always authenticated */
@@ -200,7 +200,7 @@ struct drm_file *drm_file_alloc(struct drm_minor *minor)
                drm_syncobj_release(file);
        if (drm_core_check_feature(dev, DRIVER_GEM))
                drm_gem_release(dev, file);
-       put_pid(file->pid);
+       put_pid(rcu_access_pointer(file->pid));
        kfree(file);
 
        return ERR_PTR(ret);
@@ -291,7 +291,7 @@ void drm_file_free(struct drm_file *file)
 
        WARN_ON(!list_empty(&file->event_list));
 
-       put_pid(file->pid);
+       put_pid(rcu_access_pointer(file->pid));
        kfree(file);
 }
 
@@ -505,6 +505,40 @@ int drm_release(struct inode *inode, struct file *filp)
 }
 EXPORT_SYMBOL(drm_release);
 
+void drm_file_update_pid(struct drm_file *filp)
+{
+       struct drm_device *dev;
+       struct pid *pid, *old;
+
+       /*
+        * Master nodes need to keep the original ownership in order for
+        * drm_master_check_perm to keep working correctly. (See comment in
+        * drm_auth.c.)
+        */
+       if (filp->was_master)
+               return;
+
+       pid = task_tgid(current);
+
+       /*
+        * Quick unlocked check since the model is a single handover followed by
+        * exclusive repeated use.
+        */
+       if (pid == rcu_access_pointer(filp->pid))
+               return;
+
+       dev = filp->minor->dev;
+       mutex_lock(&dev->filelist_mutex);
+       old = rcu_replace_pointer(filp->pid, pid, 1);
+       mutex_unlock(&dev->filelist_mutex);
+
+       if (pid != old) {
+               get_pid(pid);
+               synchronize_rcu();
+               put_pid(old);
+       }
+}
+
 /**
  * drm_release_noglobal - release method for DRM file
  * @inode: device inode
drivers/gpu/drm/drm_ioctl.c +3 -0
index 7c9d66ee917d..305b18d9d7b6 100644
@@ -775,6 +775,9 @@ long drm_ioctl_kernel(struct file *file, drm_ioctl_t *func, void *kdata,
        struct drm_device *dev = file_priv->minor->dev;
        int retcode;
 
+       /* Update drm_file owner if fd was passed along. */
+       drm_file_update_pid(file_priv);
+
        if (drm_dev_is_unplugged(dev))
                return -ENODEV;
 
drivers/gpu/drm/nouveau/nouveau_drm.c +4 -1
index 51f1918b44d3..e3cb60eb0bc8 100644
@@ -1101,7 +1101,10 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv)
        }
 
        get_task_comm(tmpname, current);
-       snprintf(name, sizeof(name), "%s[%d]", tmpname, pid_nr(fpriv->pid));
+       rcu_read_lock();
+       snprintf(name, sizeof(name), "%s[%d]",
+                tmpname, pid_nr(rcu_dereference(fpriv->pid)));
+       rcu_read_unlock();
 
        if (!(cli = kzalloc(sizeof(*cli), GFP_KERNEL))) {
                ret = -ENOMEM;
drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +4 -2
index c0da89e16e6f..a07e5b7e2f2f 100644
@@ -232,6 +232,7 @@ static int vmw_debugfs_gem_info_show(struct seq_file *m, void *unused)
        list_for_each_entry(file, &dev->filelist, lhead) {
                struct task_struct *task;
                struct drm_gem_object *gobj;
+               struct pid *pid;
                int id;
 
                /*
@@ -241,8 +242,9 @@ 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_TGID);
-               seq_printf(m, "pid %8d command %s:\n", pid_nr(file->pid),
+               pid = rcu_dereference(file->pid);
+               task = pid_task(pid, PIDTYPE_TGID);
+               seq_printf(m, "pid %8d command %s:\n", pid_nr(pid),
                           task ? task->comm : "<unknown>");
                rcu_read_unlock();
 
include/drm/drm_file.h +11 -3
index 966912053cb0..c76249d5467e 100644
@@ -256,8 +256,15 @@ struct drm_file {
        /** @master_lookup_lock: Serializes @master. */
        spinlock_t master_lookup_lock;
 
-       /** @pid: Process that opened this file. */
-       struct pid *pid;
+       /**
+        * @pid: Process that is using this file.
+        *
+        * Must only be dereferenced under a rcu_read_lock or equivalent.
+        *
+        * Updates are guarded with dev->filelist_mutex and reference must be
+        * dropped after a RCU grace period to accommodate lockless readers.
+        */
+       struct pid __rcu *pid;
 
        /** @client_id: A unique id for fdinfo */
        u64 client_id;
@@ -420,6 +427,8 @@ static inline bool drm_is_accel_client(const struct drm_file *file_priv)
        return file_priv->minor->type == DRM_MINOR_ACCEL;
 }
 
+void drm_file_update_pid(struct drm_file *);
+
 int drm_open(struct inode *inode, struct file *filp);
 int drm_open_helper(struct file *filp, struct drm_minor *minor);
 ssize_t drm_read(struct file *filp, char __user *buffer,
--

2.39.2

#4 lore raw
Quoted 63 lines · Rob Clark
Quoted 61 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

With the typical model where the display server opens the file descriptor and then hands it over to the client(*), we were showing stale data in debugfs.

Fix it by updating the drm_file->pid on ioctl access from a different process.

The field is also made RCU protected to allow for lockless readers. Update side is protected with dev->filelist_mutex.

Before:

$ cat /sys/kernel/debug/dri/0/clients
              command   pid dev master a   uid      magic
                 Xorg  2344   0   y    y     0          0
                 Xorg  2344   0   n    y     0          2
                 Xorg  2344   0   n    y     0          3
                 Xorg  2344   0   n    y     0          4

After:

$ cat /sys/kernel/debug/dri/0/clients
              command  tgid dev master a   uid      magic
                 Xorg   830   0   y    y     0          0
        xfce4-session   880   0   n    y     0          1
                xfwm4   943   0   n    y     0          2
            neverball  1095   0   n    y     0          3

*)
More detailed and historically accurate description of various handover implementation kindly provided by Emil Velikov:

"""
The traditional model, the server was the orchestrator managing the primary device node. From the fd, to the master status and authentication. But looking at the fd alone, this has varied across the years.

IIRC in the DRI1 days, Xorg (libdrm really) would have a list of open fd(s) and reuse those whenever needed, DRI2 the client was responsible for open() themselves and with DRI3 the fd was passed to the client.

Around the inception of DRI3 and systemd-logind, the latter became another possible orchestrator. Whereby Xorg and Wayland compositors could ask it for the fd. For various reasons (hysterical and genuine ones) Xorg has a fallback path going the open(), whereas Wayland compositors are moving to solely relying on logind... some never had fallback even.

Over the past few years, more projects have emerged which provide functionality similar (be that on API level, Dbus, or otherwise) to systemd-logind.
"""

v2:
* Fixed typo in commit text and added a fine historical explanation from Emil.

Quoted 8 lines
Quoted 5 lines

Thanks. If everyone else is happy with this approach I don't have the commit rights for drm-misc.

Regards,

Tvrtko

Quoted 236 lines
Quoted 236 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c |  6 ++--
  drivers/gpu/drm/drm_auth.c              |  3 +-
  drivers/gpu/drm/drm_debugfs.c           | 10 ++++---
  drivers/gpu/drm/drm_file.c              | 40 +++++++++++++++++++++++--
  drivers/gpu/drm/drm_ioctl.c             |  3 ++
  drivers/gpu/drm/nouveau/nouveau_drm.c   |  5 +++-
  drivers/gpu/drm/vmwgfx/vmwgfx_gem.c     |  6 ++--
  include/drm/drm_file.h                  | 13 ++++++--
  8 files changed, 71 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +4 -2
index 74055cba3dc9..849097dff02b 100644
@@ -963,6 +963,7 @@ static int amdgpu_debugfs_gem_info_show(struct seq_file *m, void *unused)
         list_for_each_entry(file, &dev->filelist, lhead) {
                 struct task_struct *task;
                 struct drm_gem_object *gobj;
+               struct pid *pid;
                 int id;
 
                 /*
@@ -972,8 +973,9 @@ 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_TGID);
-               seq_printf(m, "pid %8d command %s:\n", pid_nr(file->pid),
+               pid = rcu_dereference(file->pid);
+               task = pid_task(pid, PIDTYPE_TGID);
+               seq_printf(m, "pid %8d command %s:\n", pid_nr(pid),
                            task ? task->comm : "<unknown>");
                 rcu_read_unlock();
 
drivers/gpu/drm/drm_auth.c +2 -1
index cf92a9ae8034..2ed2585ded37 100644
@@ -235,7 +235,8 @@ static int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv)
  static int
  drm_master_check_perm(struct drm_device *dev, struct drm_file *file_priv)
  {
-       if (file_priv->pid == task_pid(current) && file_priv->was_master)
+       if (file_priv->was_master &&
+           rcu_access_pointer(file_priv->pid) == task_pid(current))
                 return 0;
 
         if (!capable(CAP_SYS_ADMIN))
drivers/gpu/drm/drm_debugfs.c +6 -4
index 4855230ba2c6..b46f5ceb24c6 100644
@@ -90,15 +90,17 @@ static int drm_clients_info(struct seq_file *m, void *data)
          */
         mutex_lock(&dev->filelist_mutex);
         list_for_each_entry_reverse(priv, &dev->filelist, lhead) {
-               struct task_struct *task;
                 bool is_current_master = drm_is_current_master(priv);
+               struct task_struct *task;
+               struct pid *pid;
 
-               rcu_read_lock(); /* locks pid_task()->comm */
-               task = pid_task(priv->pid, PIDTYPE_TGID);
+               rcu_read_lock(); /* Locks priv->pid and pid_task()->comm! */
+               pid = rcu_dereference(priv->pid);
+               task = pid_task(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>",
-                          pid_vnr(priv->pid),
+                          pid_vnr(pid),
                            priv->minor->index,
                            is_current_master ? 'y' : 'n',
                            priv->authenticated ? 'y' : 'n',
drivers/gpu/drm/drm_file.c +37 -3
index 883d83bc0e3d..e692770ef6d3 100644
@@ -160,7 +160,7 @@ struct drm_file *drm_file_alloc(struct drm_minor *minor)
 
         /* Get a unique identifier for fdinfo: */
         file->client_id = atomic64_inc_return(&ident);
-       file->pid = get_pid(task_tgid(current));
+       rcu_assign_pointer(file->pid, get_pid(task_tgid(current)));
         file->minor = minor;
 
         /* for compatibility root is always authenticated */
@@ -200,7 +200,7 @@ struct drm_file *drm_file_alloc(struct drm_minor *minor)
                 drm_syncobj_release(file);
         if (drm_core_check_feature(dev, DRIVER_GEM))
                 drm_gem_release(dev, file);
-       put_pid(file->pid);
+       put_pid(rcu_access_pointer(file->pid));
         kfree(file);
 
         return ERR_PTR(ret);
@@ -291,7 +291,7 @@ void drm_file_free(struct drm_file *file)
 
         WARN_ON(!list_empty(&file->event_list));
 
-       put_pid(file->pid);
+       put_pid(rcu_access_pointer(file->pid));
         kfree(file);
  }
 
@@ -505,6 +505,40 @@ int drm_release(struct inode *inode, struct file *filp)
  }
  EXPORT_SYMBOL(drm_release);
 
+void drm_file_update_pid(struct drm_file *filp)
+{
+       struct drm_device *dev;
+       struct pid *pid, *old;
+
+       /*
+        * Master nodes need to keep the original ownership in order for
+        * drm_master_check_perm to keep working correctly. (See comment in
+        * drm_auth.c.)
+        */
+       if (filp->was_master)
+               return;
+
+       pid = task_tgid(current);
+
+       /*
+        * Quick unlocked check since the model is a single handover followed by
+        * exclusive repeated use.
+        */
+       if (pid == rcu_access_pointer(filp->pid))
+               return;
+
+       dev = filp->minor->dev;
+       mutex_lock(&dev->filelist_mutex);
+       old = rcu_replace_pointer(filp->pid, pid, 1);
+       mutex_unlock(&dev->filelist_mutex);
+
+       if (pid != old) {
+               get_pid(pid);
+               synchronize_rcu();
+               put_pid(old);
+       }
+}
+
  /**
   * drm_release_noglobal - release method for DRM file
   * @inode: device inode
drivers/gpu/drm/drm_ioctl.c +3 -0
index 7c9d66ee917d..305b18d9d7b6 100644
@@ -775,6 +775,9 @@ long drm_ioctl_kernel(struct file *file, drm_ioctl_t *func, void *kdata,
         struct drm_device *dev = file_priv->minor->dev;
         int retcode;
 
+       /* Update drm_file owner if fd was passed along. */
+       drm_file_update_pid(file_priv);
+
         if (drm_dev_is_unplugged(dev))
                 return -ENODEV;
 
drivers/gpu/drm/nouveau/nouveau_drm.c +4 -1
index 51f1918b44d3..e3cb60eb0bc8 100644
@@ -1101,7 +1101,10 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv)
         }
 
         get_task_comm(tmpname, current);
-       snprintf(name, sizeof(name), "%s[%d]", tmpname, pid_nr(fpriv->pid));
+       rcu_read_lock();
+       snprintf(name, sizeof(name), "%s[%d]",
+                tmpname, pid_nr(rcu_dereference(fpriv->pid)));
+       rcu_read_unlock();
 
         if (!(cli = kzalloc(sizeof(*cli), GFP_KERNEL))) {
                 ret = -ENOMEM;
drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +4 -2
index c0da89e16e6f..a07e5b7e2f2f 100644
@@ -232,6 +232,7 @@ static int vmw_debugfs_gem_info_show(struct seq_file *m, void *unused)
         list_for_each_entry(file, &dev->filelist, lhead) {
                 struct task_struct *task;
                 struct drm_gem_object *gobj;
+               struct pid *pid;
                 int id;
 
                 /*
@@ -241,8 +242,9 @@ 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_TGID);
-               seq_printf(m, "pid %8d command %s:\n", pid_nr(file->pid),
+               pid = rcu_dereference(file->pid);
+               task = pid_task(pid, PIDTYPE_TGID);
+               seq_printf(m, "pid %8d command %s:\n", pid_nr(pid),
                            task ? task->comm : "<unknown>");
                 rcu_read_unlock();
 
include/drm/drm_file.h +11 -3
index 966912053cb0..c76249d5467e 100644
@@ -256,8 +256,15 @@ struct drm_file {
         /** @master_lookup_lock: Serializes @master. */
         spinlock_t master_lookup_lock;
 
-       /** @pid: Process that opened this file. */
-       struct pid *pid;
+       /**
+        * @pid: Process that is using this file.
+        *
+        * Must only be dereferenced under a rcu_read_lock or equivalent.
+        *
+        * Updates are guarded with dev->filelist_mutex and reference must be
+        * dropped after a RCU grace period to accommodate lockless readers.
+        */
+       struct pid __rcu *pid;
 
         /** @client_id: A unique id for fdinfo */
         u64 client_id;
@@ -420,6 +427,8 @@ static inline bool drm_is_accel_client(const struct drm_file *file_priv)
         return file_priv->minor->type == DRM_MINOR_ACCEL;
  }
 
+void drm_file_update_pid(struct drm_file *);
+
  int drm_open(struct inode *inode, struct file *filp);
  int drm_open_helper(struct file *filp, struct drm_minor *minor);
  ssize_t drm_read(struct file *filp, char __user *buffer,
--

2.39.2

maintainer
#5 lore raw

Am 20.09.23 um 15:21 schrieb Tvrtko Ursulin:

Quoted 71 lines · Rob Clark
Quoted 69 lines
Quoted 66 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

With the typical model where the display server opens the file descriptor and then hands it over to the client(*), we were showing stale data in debugfs.

Fix it by updating the drm_file->pid on ioctl access from a different process.

The field is also made RCU protected to allow for lockless readers. Update side is protected with dev->filelist_mutex.

Before:

$ cat /sys/kernel/debug/dri/0/clients
              command   pid dev master a   uid      magic
                 Xorg  2344   0   y    y     0          0
                 Xorg  2344   0   n    y     0          2
                 Xorg  2344   0   n    y     0          3
                 Xorg  2344   0   n    y     0          4

After:

$ cat /sys/kernel/debug/dri/0/clients
              command  tgid dev master a   uid      magic
                 Xorg   830   0   y    y     0          0
        xfce4-session   880   0   n    y     0          1
                xfwm4   943   0   n    y     0          2
            neverball  1095   0   n    y     0          3

*)
More detailed and historically accurate description of various handover implementation kindly provided by Emil Velikov:

"""
The traditional model, the server was the orchestrator managing the primary device node. From the fd, to the master status and authentication. But looking at the fd alone, this has varied across the years.

IIRC in the DRI1 days, Xorg (libdrm really) would have a list of open fd(s) and reuse those whenever needed, DRI2 the client was responsible for open() themselves and with DRI3 the fd was passed to the client.

Around the inception of DRI3 and systemd-logind, the latter became another possible orchestrator. Whereby Xorg and Wayland compositors could ask it for the fd. For various reasons (hysterical and genuine ones) Xorg has a fallback path going the open(), whereas Wayland compositors are moving to solely relying on logind... some never had fallback even.

Over the past few years, more projects have emerged which provide functionality similar (be that on API level, Dbus, or otherwise) to systemd-logind.
"""

v2:
  * Fixed typo in commit text and added a fine historical explanation from Emil.

Quoted 4 lines
Quoted 2 lines

Thanks. If everyone else is happy with this approach I don't have the commit rights for drm-misc.

Going to take care of pushing this.

Regards,
Christian.

Quoted 265 lines

Regards,

Tvrtko

Quoted 260 lines
Quoted 260 lines

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c |  6 ++-- drivers/gpu/drm/drm_auth.c              |  3 +- drivers/gpu/drm/drm_debugfs.c           | 10 ++++--- drivers/gpu/drm/drm_file.c              | 40
+++++++++++++++++++++++--
  drivers/gpu/drm/drm_ioctl.c             |  3 ++ drivers/gpu/drm/nouveau/nouveau_drm.c   |  5 +++- drivers/gpu/drm/vmwgfx/vmwgfx_gem.c     |  6 ++-- include/drm/drm_file.h                  | 13 ++++++--

  8 files changed, 71 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 -0
index 74055cba3dc9..849097dff02b 100644
@@ -963,6 +963,7 @@ static int amdgpu_debugfs_gem_info_show(struct 
 seq_file *m, void *unused)
          list_for_each_entry(file, &dev->filelist, lhead) {
                  struct task_struct *task;
                  struct drm_gem_object *gobj;
+               struct pid *pid;
                  int id;
 

                 /*

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +3 -2
@@ -972,8 +973,9 @@ 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_TGID);
-               seq_printf(m, "pid %8d command %s:\n", 
 pid_nr(file->pid),
+               pid = rcu_dereference(file->pid);
+               task = pid_task(pid, PIDTYPE_TGID);
+               seq_printf(m, "pid %8d command %s:\n", pid_nr(pid),
                             task ? task->comm : "<unknown>");

                 rcu_read_unlock();

drivers/gpu/drm/drm_auth.c +0 -0
index cf92a9ae8034..2ed2585ded37 100644
@@ -235,7 +235,8 @@ static int drm_new_set_master(struct drm_device 
 *dev, struct drm_file *fpriv)

  static int
  drm_master_check_perm(struct drm_device *dev, struct drm_file *file_priv) {
-       if (file_priv->pid == task_pid(current) && file_priv->was_master)
+       if (file_priv->was_master &&
+           rcu_access_pointer(file_priv->pid) == task_pid(current)) return 0;

         if (!capable(CAP_SYS_ADMIN))

drivers/gpu/drm/drm_debugfs.c +3 -3
index 4855230ba2c6..b46f5ceb24c6 100644
@@ -90,15 +90,17 @@ static int drm_clients_info(struct seq_file *m, 
 void *data)
           */
          mutex_lock(&dev->filelist_mutex);
          list_for_each_entry_reverse(priv, &dev->filelist, lhead) {
-               struct task_struct *task;
                  bool is_current_master = drm_is_current_master(priv);
+               struct task_struct *task;
+               struct pid *pid;
 
-               rcu_read_lock(); /* locks pid_task()->comm */
-               task = pid_task(priv->pid, PIDTYPE_TGID);
+               rcu_read_lock(); /* Locks priv->pid and 

pid_task()->comm! */
+               pid = rcu_dereference(priv->pid);
+               task = pid_task(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>", -                          pid_vnr(priv->pid),
+                          pid_vnr(pid),
                            priv->minor->index, is_current_master ? 'y' : 'n', priv->authenticated ? 'y' : 'n',

drivers/gpu/drm/drm_file.c +1 -1
index 883d83bc0e3d..e692770ef6d3 100644
@@ -160,7 +160,7 @@ struct drm_file *drm_file_alloc(struct drm_minor 
 *minor)
 
          /* Get a unique identifier for fdinfo: */
          file->client_id = atomic64_inc_return(&ident);
-       file->pid = get_pid(task_tgid(current));
+       rcu_assign_pointer(file->pid, get_pid(task_tgid(current)));
          file->minor = minor;
 

         /* for compatibility root is always authenticated */

drivers/gpu/drm/drm_file.c +1 -1
@@ -200,7 +200,7 @@ struct drm_file *drm_file_alloc(struct drm_minor 
 *minor)
                  drm_syncobj_release(file);
          if (drm_core_check_feature(dev, DRIVER_GEM))
                  drm_gem_release(dev, file);
-       put_pid(file->pid);
+       put_pid(rcu_access_pointer(file->pid));
          kfree(file);
 

         return ERR_PTR(ret);

drivers/gpu/drm/drm_file.c +8 -1
@@ -291,7 +291,7 @@ void drm_file_free(struct drm_file *file)
 
          WARN_ON(!list_empty(&file->event_list));
 
-       put_pid(file->pid);
+       put_pid(rcu_access_pointer(file->pid));
          kfree(file);
   }
 
@@ -505,6 +505,40 @@ int drm_release(struct inode *inode, struct 
 file *filp)
   }
   EXPORT_SYMBOL(drm_release);
 
+void drm_file_update_pid(struct drm_file *filp)
+{
+       struct drm_device *dev;
+       struct pid *pid, *old;
+
+       /*
+        * Master nodes need to keep the original ownership in order 

for
+        * drm_master_check_perm to keep working correctly. (See comment in
+        * drm_auth.c.)
+        */
+       if (filp->was_master)
+               return;

drivers/gpu/drm/drm_file.c +5 -0
+
+       pid = task_tgid(current);
+
+       /*
+        * Quick unlocked check since the model is a single handover 

followed by
+        * exclusive repeated use.
+        */
+       if (pid == rcu_access_pointer(filp->pid))
+               return;

drivers/gpu/drm/drm_file.c +13 -0
+
+       dev = filp->minor->dev;
+       mutex_lock(&dev->filelist_mutex);
+       old = rcu_replace_pointer(filp->pid, pid, 1);
+       mutex_unlock(&dev->filelist_mutex);
+
+       if (pid != old) {
+               get_pid(pid);
+               synchronize_rcu();
+               put_pid(old);
+       }
+}
+

  /**
   * drm_release_noglobal - release method for DRM file
   * @inode: device inode

drivers/gpu/drm/drm_ioctl.c +3 -0
index 7c9d66ee917d..305b18d9d7b6 100644
@@ -775,6 +775,9 @@ long drm_ioctl_kernel(struct file *file, 
 drm_ioctl_t *func, void *kdata,
          struct drm_device *dev = file_priv->minor->dev;
          int retcode;
 
+       /* Update drm_file owner if fd was passed along. */
+       drm_file_update_pid(file_priv);
+
          if (drm_dev_is_unplugged(dev))
                  return -ENODEV;
drivers/gpu/drm/nouveau/nouveau_drm.c +4 -1
index 51f1918b44d3..e3cb60eb0bc8 100644
@@ -1101,7 +1101,10 @@ nouveau_drm_open(struct drm_device *dev, 
 struct drm_file *fpriv)
          }
 
          get_task_comm(tmpname, current);
-       snprintf(name, sizeof(name), "%s[%d]", tmpname, 
 pid_nr(fpriv->pid));
+       rcu_read_lock();
+       snprintf(name, sizeof(name), "%s[%d]",
+                tmpname, pid_nr(rcu_dereference(fpriv->pid)));
+       rcu_read_unlock();
 

         if (!(cli = kzalloc(sizeof(*cli), GFP_KERNEL))) { ret = -ENOMEM;

drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +1 -0
index c0da89e16e6f..a07e5b7e2f2f 100644
@@ -232,6 +232,7 @@ static int vmw_debugfs_gem_info_show(struct 
 seq_file *m, void *unused)
          list_for_each_entry(file, &dev->filelist, lhead) {
                  struct task_struct *task;
                  struct drm_gem_object *gobj;
+               struct pid *pid;
                  int id;
 

                 /*

drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +3 -2
@@ -241,8 +242,9 @@ 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_TGID);
-               seq_printf(m, "pid %8d command %s:\n", 
 pid_nr(file->pid),
+               pid = rcu_dereference(file->pid);
+               task = pid_task(pid, PIDTYPE_TGID);
+               seq_printf(m, "pid %8d command %s:\n", pid_nr(pid),
                             task ? task->comm : "<unknown>");

                 rcu_read_unlock();

include/drm/drm_file.h +4 -2
index 966912053cb0..c76249d5467e 100644
@@ -256,8 +256,15 @@ struct drm_file {
          /** @master_lookup_lock: Serializes @master. */
          spinlock_t master_lookup_lock;
 
-       /** @pid: Process that opened this file. */
-       struct pid *pid;
+       /**
+        * @pid: Process that is using this file.
+        *
+        * Must only be dereferenced under a rcu_read_lock or 

equivalent.
+        *
+        * Updates are guarded with dev->filelist_mutex and reference must be
+        * dropped after a RCU grace period to accommodate lockless readers.
+        */
+       struct pid __rcu *pid;

         /** @client_id: A unique id for fdinfo */ u64 client_id;

include/drm/drm_file.h +2 -0
@@ -420,6 +427,8 @@ static inline bool drm_is_accel_client(const 
 struct drm_file *file_priv)
          return file_priv->minor->type == DRM_MINOR_ACCEL;
   }
 
+void drm_file_update_pid(struct drm_file *);
+
   int drm_open(struct inode *inode, struct file *filp);
   int drm_open_helper(struct file *filp, struct drm_minor *minor);

  ssize_t drm_read(struct file *filp, char __user *buffer,

Signature · 1 line
2.39.2