Commit e095b551 authored by Sunil Khatri's avatar Sunil Khatri Committed by Alex Deucher
Browse files

drm/amdgpu: use user provided hmm_range buffer in amdgpu_ttm_tt_get_user_pages 



update the amdgpu_ttm_tt_get_user_pages and all dependent function
along with it callers to use a user allocated hmm_range buffer instead
hmm layer allocates the buffer.

This is a need to get hmm_range pointers easily accessible
without accessing the bo and that is a requirement for the
userqueue to lock the userptrs effectively.

Signed-off-by: default avatarSunil Khatri <sunil.khatri@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 079ae511

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

+14 −2
Original line number Diff line number Diff line
@@ -1089,8 +1089,15 @@ static int init_user_pages(struct kgd_mem *mem, uint64_t user_addr, 
		return 0;

	}



	ret = amdgpu_ttm_tt_get_user_pages(bo, &range);

	range = kzalloc(sizeof(*range), GFP_KERNEL);

	if (unlikely(!range)) {

		ret = -ENOMEM;

		goto unregister_out;

	}



	ret = amdgpu_ttm_tt_get_user_pages(bo, range);

	if (ret) {

		kfree(range);

		if (ret == -EAGAIN)

			pr_debug("Failed to get user pages, try again\n");

		else
@@ -2566,9 +2573,14 @@ static int update_invalid_user_pages(struct amdkfd_process_info *process_info, 
			}

		}



		mem->range = kzalloc(sizeof(*mem->range), GFP_KERNEL);

		if (unlikely(!mem->range))

			return -ENOMEM;

		/* Get updated user pages */

		ret = amdgpu_ttm_tt_get_user_pages(bo, &mem->range);

		ret = amdgpu_ttm_tt_get_user_pages(bo, mem->range);

		if (ret) {

			kfree(mem->range);

			mem->range = NULL;

			pr_debug("Failed %d to get user pages\n", ret);



			/* Return -EFAULT bad address error as success. It will

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

+5 −1
Original line number Diff line number Diff line
@@ -891,7 +891,11 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
		bool userpage_invalidated = false;

		struct amdgpu_bo *bo = e->bo;



		r = amdgpu_ttm_tt_get_user_pages(bo, &e->range);

		e->range = kzalloc(sizeof(*e->range), GFP_KERNEL);

		if (unlikely(!e->range))

			return -ENOMEM;



		r = amdgpu_ttm_tt_get_user_pages(bo, e->range);

		if (r)

			goto out_free_user_pages;

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

+7 −3
Original line number Diff line number Diff line
@@ -572,10 +572,14 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, 
		goto release_object;



	if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE) {

		r = amdgpu_ttm_tt_get_user_pages(bo, &range);

		if (r)

		range = kzalloc(sizeof(*range), GFP_KERNEL);

		if (unlikely(!range))

			return -ENOMEM;

		r = amdgpu_ttm_tt_get_user_pages(bo, range);

		if (r) {

			kfree(range);

			goto release_object;



		}

		r = amdgpu_bo_reserve(bo, true);

		if (r)

			goto user_pages_done;

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

+1 −10
Original line number Diff line number Diff line
@@ -168,18 +168,13 @@ void amdgpu_hmm_unregister(struct amdgpu_bo *bo) 
int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier,

			       uint64_t start, uint64_t npages, bool readonly,

			       void *owner,

			       struct hmm_range **phmm_range)

			       struct hmm_range *hmm_range)

{

	struct hmm_range *hmm_range;

	unsigned long end;

	unsigned long timeout;

	unsigned long *pfns;

	int r = 0;



	hmm_range = kzalloc(sizeof(*hmm_range), GFP_KERNEL);

	if (unlikely(!hmm_range))

		return -ENOMEM;



	pfns = kvmalloc_array(npages, sizeof(*pfns), GFP_KERNEL);

	if (unlikely(!pfns)) {

		r = -ENOMEM;
@@ -221,15 +216,11 @@ int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier, 
	hmm_range->start = start;

	hmm_range->hmm_pfns = pfns;



	*phmm_range = hmm_range;



	return 0;



out_free_pfns:

	kvfree(pfns);

out_free_range:

	kfree(hmm_range);



	if (r == -EBUSY)

		r = -EAGAIN;

	return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier,

			       uint64_t start, uint64_t npages, bool readonly,

			       void *owner,

			       struct hmm_range **phmm_range);

			       struct hmm_range *hmm_range);

bool amdgpu_hmm_range_get_pages_done(struct hmm_range *hmm_range);



#if defined(CONFIG_HMM_MIRROR)