Commit 719524df authored Aug 08, 2013 by Daniel Vetter Committed by Dave Airlie Aug 19, 2013

drm: hollow-out GET_CLIENT ioctl



We not only have debugfs files to do pretty much the equivalent of
lsof, we also have an ioctl. Not that compared to lsof this dumps a
wee bit more information, but we can still get at that from debugfs
easily.

I've dug around in mesa, libdrm and ddx histories and the only users
seem to be drm/tests/dristat.c and drm/tests/getclients.c. The later
is a testcase for the ioctl itself since up to

commit b018fcda
Author: Eric Anholt <eric@anholt.net>
Date:   Thu Nov 22 18:46:54 2007 +1000

    drm: Make DRM_IOCTL_GET_CLIENT return EINVAL when it can't find client #idx

there was actually no way at all for userspace to enumerate all
clients since the kernel just wouldn't tell it when to stop. Which
completely broke it's only user, dristat -c.

So obviously that ioctl wasn't much use for debugging. Hence I don't
see any point in keeping support for a tool which was pretty obviously
never really used, and while we have good replacements in the form of
equivalent debugfs files.

Still, to keep dristat -c from looping forever again stop it early by
returning an unconditional -EINVAL. Also add a comment in the code
about why.

v2: Slightly less hollowed-out implementation. libva uses GET_CLIENTS
to figure out whether the fd it has is already authenticated or not.
So we need to keep that part of things working. Simplest way is to
just return one entry to keep va_drm_is_authenticated in
libva/va/drm/va_drm_auth.c working.

This is exercised by igt/drm_get_client_auth which contains a
copypasta of the libva auth check code.

Cc: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Cc: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent d678959f

drivers/gpu/drm/drm_ioctl.c

+22 −21

Original line number	Diff line number	Diff line
		@@ -217,30 +217,31 @@ int drm_getclient(struct drm_device dev, void data,
		struct drm_file *file_priv)
		{
		struct drm_client *client = data;
		struct drm_file *pt;
		int idx;
		int i;

		idx = client->idx;
		i = 0;

		mutex_lock(&dev->struct_mutex);
		list_for_each_entry(pt, &dev->filelist, lhead) {
		if (i++ >= idx) {
		client->auth = pt->authenticated;
		client->pid = pid_vnr(pt->pid);
		client->uid = from_kuid_munged(current_user_ns(), pt->uid);
		client->magic = pt->magic;
		client->iocs = pt->ioctl_count;
		mutex_unlock(&dev->struct_mutex);
		/*
		* Hollowed-out getclient ioctl to keep some dead old drm tests/tools
		* not breaking completely. Userspace tools stop enumerating one they
		* get -EINVAL, hence this is the return value we need to hand back for
		* no clients tracked.
		*
		* Unfortunately some clients (cough libva cough) use this in a fun
		* attempt to figure out whether they're authenticated or not. Since
		* that's the only thing they care about, give it to the directly
		* instead of walking one giant list.
		*/
		if (client->idx == 0) {
		client->auth = file_priv->authenticated;
		client->pid = pid_vnr(file_priv->pid);
		client->uid = from_kuid_munged(current_user_ns(),
		file_priv->uid);
		client->magic = 0;
		client->iocs = 0;

		return 0;
		}
		}
		mutex_unlock(&dev->struct_mutex);

		} else {
		return -EINVAL;
		}
		}

		/**
		* Get statistics information.

Admin message