[RFC 3/3] drm: Update file owner during use
Tvrtko Ursulin
tvrtko.ursulin at linux.intel.com
Thu Dec 1 11:09:35 UTC 2022
On 30/11/2022 14:18, Daniel Vetter wrote:
> On Wed, Nov 30, 2022 at 01:34:07PM +0000, Tvrtko Ursulin wrote:
>> From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
>>
>> With the typical model where the display server opends 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.
>>
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
>> Cc: "Christian König" <christian.koenig at amd.com>
>> ---
>> 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 | 32 ++++++++++++++++++++++++-
>> 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, 65 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
>> index 30e24da1f398..385deb044058 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
>> @@ -959,6 +959,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;
>>
>> /*
>> @@ -968,8 +969,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();
>>
>> diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
>> index cf92a9ae8034..2ed2585ded37 100644
>> --- a/drivers/gpu/drm/drm_auth.c
>> +++ b/drivers/gpu/drm/drm_auth.c
>> @@ -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))
>
> This scares me, and also makes me wonder whether we really want to
> conflate the original owner with the rendering owner. And also, whether we
> really want to keep updating that, because for some of the "bind an fd to
> a pid" use-cases like svm we really do not want to ever again allow a
> change.
>
> So sligthly different idea:
> - we have a separate render pid/drm_file owner frome the open() owner that
> we track in drm_auth.c
> - that one is set the first time a driver specific ioctl is called (which
> for the "pass me the fd" dri3 mode should never be the compositor)
> - we start out with nothing and only set it once, which further simplifies
> the model (still need the mutex for concurrent first ioctl ofc)
Simpler solution sounds plausible and mostly works for me. Certainly is
attractive to simplify things. And as the disclaimer I put in the cover
letter - I wasn't really sure at all if passing a master fd is a thing
or not. Happy to implement your version if that will be the decision.
The only downside I can think of right now with having two owners is if
someone is "naughty" and actually uses the fd for rendering from two
sides. That wouldn't conceptually work for what I am doing in the cgroup
controller, where I need to attribute GPU usage to a process, which is a
lookup from struct pid -> list of drm_files -> etc. So in the two owners
scheme I would just need to ignore the "open owner" and rely that
"render ownder" truly is the only one doing the rendering. Or maybe I'd
need to add support for multiple owners as well.. would be a bit
annoying probably.
Hm now that I think about more.. the one shot nature of this scheme
would have another downside. One could just send the fd back to itself
via a throway forked helper, which only does one ioctl before sending it
back, and then the "render owner" is forever lost. The proposal as I had
it would be immune to this problem at least.
> Eventually we could then use that to enforce static binding to a pid,
> which is what we want for svm style models, i.e. if the pid changes, the
> fd does an -EACCESS or similar.
>
> Thoughts?
This use case I am not familiar with at all so can't comment. Only
intuitively I would ask - why is it something that needs to be solved at
the DRM level? Because essentially it sounds like there is a want to
disallow sending fds via sockets.
Regards,
Tvrtko
> -Daniel
>
>
>> return 0;
>>
>> if (!capable(CAP_SYS_ADMIN))
>> diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
>> index 42f657772025..9d4e3146a2b8 100644
>> --- a/drivers/gpu/drm/drm_debugfs.c
>> +++ b/drivers/gpu/drm/drm_debugfs.c
>> @@ -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',
>> diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
>> index 20a9aef2b398..3433f9610dba 100644
>> --- a/drivers/gpu/drm/drm_file.c
>> +++ b/drivers/gpu/drm/drm_file.c
>> @@ -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_tgid(current));
>> + rcu_assign_pointer(file->pid, get_pid(task_tgid(current)));
>> file->minor = minor;
>>
>> /* for compatibility root is always authenticated */
>> @@ -502,6 +502,36 @@ 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 are not expected to be passed between processes. */
>> + 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
>> diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
>> index 7c9d66ee917d..305b18d9d7b6 100644
>> --- a/drivers/gpu/drm/drm_ioctl.c
>> +++ b/drivers/gpu/drm/drm_ioctl.c
>> @@ -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;
>>
>> diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
>> index 80f154b6adab..a763d3ee61fb 100644
>> --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
>> +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
>> @@ -1097,7 +1097,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;
>> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
>> index f2985337aa53..3853d9bb9ab8 100644
>> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
>> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
>> @@ -251,6 +251,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;
>>
>> /*
>> @@ -260,8 +261,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();
>>
>> diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h
>> index 0d1f853092ab..27d545131d4a 100644
>> --- a/include/drm/drm_file.h
>> +++ b/include/drm/drm_file.h
>> @@ -255,8 +255,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;
>>
>> /** @magic: Authentication magic, see @authenticated. */
>> drm_magic_t magic;
>> @@ -415,6 +422,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.34.1
>>
>
More information about the dri-devel
mailing list