Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc325d19 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: check userptrs mm earlier 



Instead of when we try to bind it check the usermm when
we try to use it in the IOCTLs.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 04db4caf

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −1
Original line number Diff line number Diff line
@@ -2364,7 +2364,7 @@ void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *rbo, u32 domain); 
bool amdgpu_ttm_bo_is_amdgpu_bo(struct ttm_buffer_object *bo);

int amdgpu_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr,

				     uint32_t flags);

bool amdgpu_ttm_tt_has_userptr(struct ttm_tt *ttm);

struct mm_struct *amdgpu_ttm_tt_get_usermm(struct ttm_tt *ttm);

bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start,

				  unsigned long end);

bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm);

drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c

+13 −3
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, 


	bool has_userptr = false;

	unsigned i;

	int r;



	array = drm_malloc_ab(num_entries, sizeof(struct amdgpu_bo_list_entry));

	if (!array)
@@ -102,17 +103,26 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, 
	for (i = 0; i < num_entries; ++i) {

		struct amdgpu_bo_list_entry *entry = &array[i];

		struct drm_gem_object *gobj;

		struct mm_struct *usermm;



		gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);

		if (!gobj)

		if (!gobj) {

			r = -ENOENT;

			goto error_free;

		}



		entry->robj = amdgpu_bo_ref(gem_to_amdgpu_bo(gobj));

		drm_gem_object_unreference_unlocked(gobj);

		entry->priority = min(info[i].bo_priority,

				      AMDGPU_BO_LIST_MAX_PRIORITY);

		if (amdgpu_ttm_tt_has_userptr(entry->robj->tbo.ttm))

		usermm = amdgpu_ttm_tt_get_usermm(entry->robj->tbo.ttm);

		if (usermm) {

			if (usermm != current->mm) {

				r = -EPERM;

				goto error_free;

			}

			has_userptr = true;

		}

		entry->tv.bo = &entry->robj->tbo;

		entry->tv.shared = true;
@@ -142,7 +152,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, 


error_free:

	drm_free_large(array);

	return -ENOENT;

	return r;

}



struct amdgpu_bo_list *

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+6 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, 
	p->uf.bo = amdgpu_bo_ref(gem_to_amdgpu_bo(gobj));

	p->uf.offset = fence_data->offset;



	if (amdgpu_ttm_tt_has_userptr(p->uf.bo->tbo.ttm)) {

	if (amdgpu_ttm_tt_get_usermm(p->uf.bo->tbo.ttm)) {

		drm_gem_object_unreference_unlocked(gobj);

		return -EINVAL;

	}
@@ -296,8 +296,13 @@ int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, 


	list_for_each_entry(lobj, validated, tv.head) {

		struct amdgpu_bo *bo = lobj->robj;

		struct mm_struct *usermm;

		uint32_t domain;



		usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);

		if (usermm && usermm != current->mm)

			return -EPERM;



		if (bo->pin_count)

			continue;

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp, 
		return -ENOENT;

	}

	robj = gem_to_amdgpu_bo(gobj);

	if (amdgpu_ttm_tt_has_userptr(robj->tbo.ttm) ||

	if (amdgpu_ttm_tt_get_usermm(robj->tbo.ttm) ||

	    (robj->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)) {

		drm_gem_object_unreference_unlocked(gobj);

		return -EPERM;
@@ -638,7 +638,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, 
		break;

	}

	case AMDGPU_GEM_OP_SET_PLACEMENT:

		if (amdgpu_ttm_tt_has_userptr(robj->tbo.ttm)) {

		if (amdgpu_ttm_tt_get_usermm(robj->tbo.ttm)) {

			r = -EPERM;

			amdgpu_bo_unreserve(robj);

			break;

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
	int r, i;

	unsigned fpfn, lpfn;



	if (amdgpu_ttm_tt_has_userptr(bo->tbo.ttm))

	if (amdgpu_ttm_tt_get_usermm(bo->tbo.ttm))

		return -EPERM;



	if (WARN_ON_ONCE(min_offset > max_offset))