From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [Intel-gfx] [PATCH 5/5] drm: Use names of ioctls in debug traces Date: Wed, 8 May 2013 19:55:18 +0300 Message-ID: <20130508165518.GL14974@intel.com> References: <1368029014-30181-1-git-send-email-damien.lespiau@intel.com> <1368029014-30181-6-git-send-email-damien.lespiau@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline In-Reply-To: <1368029014-30181-6-git-send-email-damien.lespiau@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Damien Lespiau Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, May 08, 2013 at 05:03:34PM +0100, Damien Lespiau wrote: > From: Chris Cummins > = > The intention here is to make the output of dmesg with full verbosity a > bit easier for a human to parse. This commit transforms: > = > [drm:drm_ioctl], pid=3D699, cmd=3D0x6458, nr=3D0x58, dev 0xe200, auth=3D1 > [drm:drm_ioctl], pid=3D699, cmd=3D0xc010645b, nr=3D0x5b, dev 0xe200, auth= =3D1 > [drm:drm_ioctl], pid=3D699, cmd=3D0xc0106461, nr=3D0x61, dev 0xe200, auth= =3D1 > [drm:drm_ioctl], pid=3D699, cmd=3D0xc01c64ae, nr=3D0xae, dev 0xe200, auth= =3D1 > [drm:drm_mode_addfb], [FB:32] > [drm:drm_ioctl], pid=3D699, cmd=3D0xc0106464, nr=3D0x64, dev 0xe200, auth= =3D1 > [drm:drm_vm_open_locked], 0x7fd9302fe000,0x00a00000 > [drm:drm_ioctl], pid=3D699, cmd=3D0x400c645f, nr=3D0x5f, dev 0xe200, auth= =3D1 > [drm:drm_ioctl], pid=3D699, cmd=3D0xc00464af, nr=3D0xaf, dev 0xe200, auth= =3D1 > [drm:intel_crtc_set_config], [CRTC:3] [NOFB] > = > into: > = > [drm:drm_ioctl], pid=3D699, dev=3D0xe200, auth=3D1, I915_GEM_THROTTLE > [drm:drm_ioctl], pid=3D699, dev=3D0xe200, auth=3D1, I915_GEM_CREATE > [drm:drm_ioctl], pid=3D699, dev=3D0xe200, auth=3D1, I915_GEM_SET_TILING > [drm:drm_ioctl], pid=3D699, dev=3D0xe200, auth=3D1, IOCTL_MODE_ADDFB > [drm:drm_mode_addfb], [FB:32] > [drm:drm_ioctl], pid=3D699, dev=3D0xe200, auth=3D1, I915_GEM_MMAP_GTT > [drm:drm_vm_open_locked], 0x7fd9302fe000,0x00a00000 > [drm:drm_ioctl], pid=3D699, dev=3D0xe200, auth=3D1, I915_GEM_SET_DOMAIN > [drm:drm_ioctl], pid=3D699, dev=3D0xe200, auth=3D1, DRM_IOCTL_MODE_RMFB > [drm:intel_crtc_set_config], [CRTC:3] [NOFB] I like it. But I made drm_ioctls const recently so the patch needs a small refresh. BTW am I the only one who hates the DRM_IOCTL_DEF_DRV() macro? Thanks to the cpp magic it's difficult to look up the ioctls using cscope. OTOH with this patch looking up the numbers does become less important. > Signed-off-by: Chris Cummins > --- > drivers/gpu/drm/drm_drv.c | 20 +++++++++++++------- > include/drm/drmP.h | 3 ++- > 2 files changed, 15 insertions(+), 8 deletions(-) > = > diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c > index 25f91cd..0382f6e 100644 > --- a/drivers/gpu/drm/drm_drv.c > +++ b/drivers/gpu/drm/drm_drv.c > @@ -57,7 +57,7 @@ static int drm_version(struct drm_device *dev, void *da= ta, > struct drm_file *file_priv); > = > #define DRM_IOCTL_DEF(ioctl, _func, _flags) \ > - [DRM_IOCTL_NR(ioctl)] =3D {.cmd =3D ioctl, .func =3D _func, .flags =3D = _flags, .cmd_drv =3D 0} > + [DRM_IOCTL_NR(ioctl)] =3D {.cmd =3D ioctl, .func =3D _func, .flags =3D = _flags, .cmd_drv =3D 0, .name =3D #ioctl} > = > /** Ioctl table */ > static struct drm_ioctl_desc drm_ioctls[] =3D { > @@ -375,7 +375,7 @@ long drm_ioctl(struct file *filp, > { > struct drm_file *file_priv =3D filp->private_data; > struct drm_device *dev; > - struct drm_ioctl_desc *ioctl; > + struct drm_ioctl_desc *ioctl =3D NULL; > drm_ioctl_t *func; > unsigned int nr =3D DRM_IOCTL_NR(cmd); > int retcode =3D -EINVAL; > @@ -392,11 +392,6 @@ long drm_ioctl(struct file *filp, > atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]); > ++file_priv->ioctl_count; > = > - DRM_DEBUG("pid=3D%d, cmd=3D0x%02x, nr=3D0x%02x, dev 0x%lx, auth=3D%d\n", > - task_pid_nr(current), cmd, nr, > - (long)old_encode_dev(file_priv->minor->device), > - file_priv->authenticated); > - > if ((nr >=3D DRM_CORE_IOCTL_COUNT) && > ((nr < DRM_COMMAND_BASE) || (nr >=3D DRM_COMMAND_END))) > goto err_i1; > @@ -416,6 +411,11 @@ long drm_ioctl(struct file *filp, > } else > goto err_i1; > = > + DRM_DEBUG("pid=3D%d, dev=3D0x%lx, auth=3D%d, %s\n", > + task_pid_nr(current), > + (long)old_encode_dev(file_priv->minor->device), > + file_priv->authenticated, ioctl->name); > + > /* Do not trust userspace, use our own definition */ > func =3D ioctl->func; > /* is there a local override? */ > @@ -470,6 +470,12 @@ long drm_ioctl(struct file *filp, > } > = > err_i1: > + if (!ioctl) > + DRM_DEBUG("invalid iotcl: pid=3D%d, dev=3D0x%lx, auth=3D%d, cmd=3D0x%0= 2x, nr=3D0x%02x\n", > + task_pid_nr(current), > + (long)old_encode_dev(file_priv->minor->device), > + file_priv->authenticated, cmd, nr); > + > if (kdata !=3D stack_kdata) > kfree(kdata); > atomic_dec(&dev->ioctl_count); > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index 2d94d74..379787c 100644 > --- a/include/drm/drmP.h > +++ b/include/drm/drmP.h > @@ -316,6 +316,7 @@ struct drm_ioctl_desc { > int flags; > drm_ioctl_t *func; > unsigned int cmd_drv; > + const char *name; > }; > = > /** > @@ -324,7 +325,7 @@ struct drm_ioctl_desc { > */ > = > #define DRM_IOCTL_DEF_DRV(ioctl, _func, _flags) \ > - [DRM_IOCTL_NR(DRM_##ioctl)] =3D {.cmd =3D DRM_##ioctl, .func =3D _func,= .flags =3D _flags, .cmd_drv =3D DRM_IOCTL_##ioctl} > + [DRM_IOCTL_NR(DRM_##ioctl)] =3D {.cmd =3D DRM_##ioctl, .func =3D _func,= .flags =3D _flags, .cmd_drv =3D DRM_IOCTL_##ioctl, .name =3D #ioctl} > = > struct drm_magic_entry { > struct list_head head; > -- = > 1.8.1.4 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC