[PATCH] drm: print the current->comm alongside the pid

[Daniel Vetter]

On Mon, May 18, 2020 at 09:33:15AM +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> The question of "what process is this pid" keeps on popping up, so lets
> print the process name alongside the pid.
> 
> Cc: Mauro Rossi <issor.oruam at gmail.com>
> Cc: Bob Beckett <bob.beckett at collabora.com>
> Cc: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  drivers/gpu/drm/drm_file.c  |  7 ++++---
>  drivers/gpu/drm/drm_ioc32.c |  4 ++--
>  drivers/gpu/drm/drm_ioctl.c | 11 ++++++-----
>  3 files changed, 12 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
> index 7194e67e78bd..9b79bfc60ad7 100644
> --- a/drivers/gpu/drm/drm_file.c
> +++ b/drivers/gpu/drm/drm_file.c
> @@ -253,8 +253,8 @@ void drm_file_free(struct drm_file *file)
>  
>  	dev = file->minor->dev;
>  
> -	DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
> -		  task_pid_nr(current),
> +	DRM_DEBUG("comm=\"%s\", pid=%d, dev=0x%lx, open_count=%d\n",
> +		  current->comm, task_pid_nr(current),
>  		  (long)old_encode_dev(file->minor->kdev->devt),
>  		  atomic_read(&dev->open_count));
>  
> @@ -345,7 +345,8 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)
>  	if (dev->switch_power_state != DRM_SWITCH_POWER_ON && dev->switch_power_state != DRM_SWITCH_POWER_DYNAMIC_OFF)
>  		return -EINVAL;
>  
> -	DRM_DEBUG("pid = %d, minor = %d\n", task_pid_nr(current), minor->index);
> +	DRM_DEBUG("comm=\"%s\", pid=%d, minor=%d\n", current->comm,
> +		  task_pid_nr(current), minor->index);
>  
>  	priv = drm_file_alloc(minor);
>  	if (IS_ERR(priv))
> diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
> index 22c7fd7196c8..ff5d40036e21 100644
> --- a/drivers/gpu/drm/drm_ioc32.c
> +++ b/drivers/gpu/drm/drm_ioc32.c
> @@ -985,8 +985,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
>  	if (!fn)
>  		return drm_ioctl(filp, cmd, arg);
>  
> -	DRM_DEBUG("pid=%d, dev=0x%lx, auth=%d, %s\n",
> -		  task_pid_nr(current),
> +	DRM_DEBUG("comm=\"%s\", pid=%d, dev=0x%lx, auth=%d, %s\n",
> +		  current->comm, task_pid_nr(current),
>  		  (long)old_encode_dev(file_priv->minor->kdev->devt),
>  		  file_priv->authenticated,
>  		  drm_compat_ioctls[nr].name);
> diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
> index 73e31dd4e442..b03c34fb4467 100644
> --- a/drivers/gpu/drm/drm_ioctl.c
> +++ b/drivers/gpu/drm/drm_ioctl.c
> @@ -852,8 +852,8 @@ long drm_ioctl(struct file *filp,
>  		out_size = 0;
>  	ksize = max(max(in_size, out_size), drv_size);
>  
> -	DRM_DEBUG("pid=%d, dev=0x%lx, auth=%d, %s\n",
> -		  task_pid_nr(current),
> +	DRM_DEBUG("comm=\"%s\" pid=%d, dev=0x%lx, auth=%d, %s\n",
> +		  current->comm, task_pid_nr(current),
>  		  (long)old_encode_dev(file_priv->minor->kdev->devt),
>  		  file_priv->authenticated, ioctl->name);
>  
> @@ -890,15 +890,16 @@ long drm_ioctl(struct file *filp,
>  
>        err_i1:
>  	if (!ioctl)
> -		DRM_DEBUG("invalid ioctl: pid=%d, dev=0x%lx, auth=%d, cmd=0x%02x, nr=0x%02x\n",
> -			  task_pid_nr(current),
> +		DRM_DEBUG("invalid ioctl: comm=\"%s\", pid=%d, dev=0x%lx, auth=%d, cmd=0x%02x, nr=0x%02x\n",
> +			  current->comm, task_pid_nr(current),
>  			  (long)old_encode_dev(file_priv->minor->kdev->devt),
>  			  file_priv->authenticated, cmd, nr);
>  
>  	if (kdata != stack_kdata)
>  		kfree(kdata);
>  	if (retcode)
> -		DRM_DEBUG("pid=%d, ret = %d\n", task_pid_nr(current), retcode);
> +		DRM_DEBUG("comm=\"%s\", pid=%d, ret = %d\n", current->comm,

Nit: Since you adjust them all, also delete the spaces around the = here
in ret = %d. With that

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> +			  task_pid_nr(current), retcode);
>  	return retcode;
>  }
>  EXPORT_SYMBOL(drm_ioctl);
> -- 
> 2.25.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch