From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: Re: [PATCH 1/2] drm: Make control nodes master-less Date: Fri, 28 Feb 2014 14:31:21 +0100 Message-ID: <53108FA9.8010101@vmware.com> References: <1392817242-15889-1-git-send-email-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from smtp-outbound-1.vmware.com (smtp-outbound-1.vmware.com [208.91.2.12]) by gabe.freedesktop.org (Postfix) with ESMTP id C4673FA79E for ; Fri, 28 Feb 2014 05:31:24 -0800 (PST) In-Reply-To: <1392817242-15889-1-git-send-email-thellstrom@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: Thomas Hellstrom Cc: airlied@redhat.com, linux-graphics-maintainer@vmware.com, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Hi! Could someone please review these two patches? Thanks, Thomas On 02/19/2014 02:40 PM, Thomas Hellstrom wrote: > Like for render-nodes, there is no point in maintaining the master concept > for control nodes, so set the struct drm_file::master pointer to NULL. > > At the same time, make sure DRM_MASTER | DRM_CONTROL_ALLOW ioctls are always > allowed when called through the control node. Previously the caller also > needed to be master. > > Signed-off-by: Thomas Hellstrom > --- > drivers/gpu/drm/drm_drv.c | 5 +++-- > drivers/gpu/drm/drm_fops.c | 5 +++-- > include/drm/drmP.h | 5 +++++ > 3 files changed, 11 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c > index 345be03..42af8bd 100644 > --- a/drivers/gpu/drm/drm_drv.c > +++ b/drivers/gpu/drm/drm_drv.c > @@ -355,8 +355,9 @@ long drm_ioctl(struct file *filp, > retcode = -EINVAL; > } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) || > ((ioctl->flags & DRM_AUTH) && !drm_is_render_client(file_priv) && !file_priv->authenticated) || > - ((ioctl->flags & DRM_MASTER) && !file_priv->is_master) || > - (!(ioctl->flags & DRM_CONTROL_ALLOW) && (file_priv->minor->type == DRM_MINOR_CONTROL)) || > + (((ioctl->flags & DRM_MASTER) && !file_priv->is_master) && > + !(drm_is_control(file_priv) && (ioctl->flags & DRM_CONTROL_ALLOW))) || > + (!(ioctl->flags & DRM_CONTROL_ALLOW) && drm_is_control(file_priv)) || > (!(ioctl->flags & DRM_RENDER_ALLOW) && drm_is_render_client(file_priv))) { > retcode = -EACCES; > } else { > diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c > index 7f2af9a..08a3196 100644 > --- a/drivers/gpu/drm/drm_fops.c > +++ b/drivers/gpu/drm/drm_fops.c > @@ -259,7 +259,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp, > /* if there is no current master make this fd it, but do not create > * any master object for render clients */ > mutex_lock(&dev->struct_mutex); > - if (!priv->minor->master && !drm_is_render_client(priv)) { > + if (!priv->minor->master && !drm_is_render_client(priv) && > + !drm_is_control(priv)) { > /* create a new master */ > priv->minor->master = drm_master_create(priv->minor); > if (!priv->minor->master) { > @@ -297,7 +298,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp, > goto out_close; > } > } > - } else if (!drm_is_render_client(priv)) { > + } else if (!drm_is_render_client(priv) && !drm_is_control(priv)) { > /* get a reference to the master */ > priv->master = drm_master_get(priv->minor->master); > } > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index 04a7f31..ff68e26 100644 > --- a/include/drm/drmP.h > +++ b/include/drm/drmP.h > @@ -1246,6 +1246,11 @@ static inline bool drm_is_render_client(struct drm_file *file_priv) > return file_priv->minor->type == DRM_MINOR_RENDER; > } > > +static inline bool drm_is_control(struct drm_file *file_priv) > +{ > + return file_priv->minor->type == DRM_MINOR_CONTROL; > +} > + > /******************************************************************/ > /** \name Internal function definitions */ > /*@{*/