From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jerome Glisse Subject: Re: [PATCH 2/5] drm/radeon: add userptr flag to limit it to anonymous memory Date: Tue, 5 Aug 2014 10:24:37 -0400 Message-ID: <20140805142436.GA1958@gmail.com> References: <1407247867-7093-1-git-send-email-deathsimple@vodafone.de> <1407247867-7093-2-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com [209.85.192.175]) by gabe.freedesktop.org (Postfix) with ESMTP id DFB246E2D5 for ; Tue, 5 Aug 2014 07:24:44 -0700 (PDT) Received: by mail-pd0-f175.google.com with SMTP id r10so1431721pdi.6 for ; Tue, 05 Aug 2014 07:24:44 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1407247867-7093-2-git-send-email-deathsimple@vodafone.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Christian =?iso-8859-1?Q?K=F6nig?= Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Tue, Aug 05, 2014 at 04:11:04PM +0200, Christian K=F6nig wrote: > From: Christian K=F6nig Why do you want that ? NACK until proper explanation and motive. > = > Signed-off-by: Christian K=F6nig > --- > drivers/gpu/drm/radeon/radeon_gem.c | 3 ++- > drivers/gpu/drm/radeon/radeon_ttm.c | 8 ++++++++ > include/uapi/drm/radeon_drm.h | 3 ++- > 3 files changed, 12 insertions(+), 2 deletions(-) > = > diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon= /radeon_gem.c > index 993ab22..032736b 100644 > --- a/drivers/gpu/drm/radeon/radeon_gem.c > +++ b/drivers/gpu/drm/radeon/radeon_gem.c > @@ -290,7 +290,8 @@ int radeon_gem_userptr_ioctl(struct drm_device *dev, = void *data, > return -EACCES; > = > /* reject unknown flag values */ > - if (args->flags & ~RADEON_GEM_USERPTR_READONLY) > + if (args->flags & ~(RADEON_GEM_USERPTR_READONLY | > + RADEON_GEM_USERPTR_ANONONLY)) > return -EINVAL; > = > /* readonly pages not tested on older hardware */ > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon= /radeon_ttm.c > index 0109090..d63e698 100644 > --- a/drivers/gpu/drm/radeon/radeon_ttm.c > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c > @@ -542,6 +542,14 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_tt *= ttm) > ttm->num_pages * PAGE_SIZE)) > return -EFAULT; > = > + if (gtt->userflags & RADEON_GEM_USERPTR_ANONONLY) { > + unsigned long end =3D gtt->userptr + ttm->num_pages * PAGE_SIZE; > + struct vm_area_struct *vma; > + vma =3D find_vma(gtt->usermm, gtt->userptr); > + if (!vma || vma->vm_file || vma->vm_end < end) > + return -EPERM; > + } > + > do { > unsigned num_pages =3D ttm->num_pages - pinned; > uint64_t userptr =3D gtt->userptr + pinned * PAGE_SIZE; > diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h > index a18ec54..4080ad3 100644 > --- a/include/uapi/drm/radeon_drm.h > +++ b/include/uapi/drm/radeon_drm.h > @@ -810,7 +810,8 @@ struct drm_radeon_gem_create { > uint32_t flags; > }; > = > -#define RADEON_GEM_USERPTR_READONLY 0x1 > +#define RADEON_GEM_USERPTR_READONLY (1 << 0) > +#define RADEON_GEM_USERPTR_ANONONLY (1 << 1) > = > struct drm_radeon_gem_userptr { > uint64_t addr; > -- = > 1.9.1 > = > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel