[PATCH 2/5] drm/radeon: add userptr flag to limit it to anonymous memory

[Christian König]

Am 05.08.2014 um 16:24 schrieb Jerome Glisse:
> On Tue, Aug 05, 2014 at 04:11:04PM +0200, Christian König wrote:
>> From: Christian König <christian.koenig at amd.com>
> Why do you want that ?
To avoid any problems with writeback (which as far as I understand 
should only happen on mmaped files).

> NACK until proper explanation and motive.
Going to update the commit message and add a code comment.

Christian.

>
>> Signed-off-by: Christian König <christian.koenig at amd.com>
>> ---
>>   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 = gtt->userptr + ttm->num_pages * PAGE_SIZE;
>> +		struct vm_area_struct *vma;
>> +		vma = find_vma(gtt->usermm, gtt->userptr);
>> +		if (!vma || vma->vm_file || vma->vm_end < end)
>> +			return -EPERM;
>> +	}
>> +
>>   	do {
>>   		unsigned num_pages = ttm->num_pages - pinned;
>>   		uint64_t userptr = 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 at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel