[PATCH 02/10] drm/amdkfd: add owner ref param to get hmm pages

[Felix Kuehling]

On 2021-06-21 12:04 p.m., Alex Sierra wrote:
> The parameter is used in the dev_private_owner to decide if device
> pages in the range require to be migrated back to system memory, based
> if they are or not in the same memory domain.
> In this case, this reference could come from the same memory domain
> with devices connected to the same hive.
>
> Signed-off-by: Alex Sierra <alex.sierra at amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>


> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c  | 3 ++-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h  | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
>   drivers/gpu/drm/amd/amdkfd/kfd_svm.c    | 4 ++--
>   4 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
> index 2741c28ff1b5..378c238c2099 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
> @@ -160,7 +160,7 @@ int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier,
>   			       struct mm_struct *mm, struct page **pages,
>   			       uint64_t start, uint64_t npages,
>   			       struct hmm_range **phmm_range, bool readonly,
> -			       bool mmap_locked)
> +			       bool mmap_locked, void *owner)
>   {
>   	struct hmm_range *hmm_range;
>   	unsigned long timeout;
> @@ -185,6 +185,7 @@ int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier,
>   	hmm_range->hmm_pfns = pfns;
>   	hmm_range->start = start;
>   	hmm_range->end = start + npages * PAGE_SIZE;
> +	hmm_range->dev_private_owner = owner;
>   
>   	/* Assuming 512MB takes maxmium 1 second to fault page address */
>   	timeout = max(npages >> 17, 1ULL) * HMM_RANGE_DEFAULT_TIMEOUT;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h
> index 7f7d37a457c3..14a3c1864085 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h
> @@ -34,7 +34,7 @@ int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier,
>   			       struct mm_struct *mm, struct page **pages,
>   			       uint64_t start, uint64_t npages,
>   			       struct hmm_range **phmm_range, bool readonly,
> -			       bool mmap_locked);
> +			       bool mmap_locked, void *owner);
>   int amdgpu_hmm_range_get_pages_done(struct hmm_range *hmm_range);
>   
>   #if defined(CONFIG_HMM_MIRROR)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 7e7d8330d64b..c13f7fbfc070 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -709,7 +709,7 @@ int amdgpu_ttm_tt_get_user_pages(struct amdgpu_bo *bo, struct page **pages)
>   	readonly = amdgpu_ttm_tt_is_readonly(ttm);
>   	r = amdgpu_hmm_range_get_pages(&bo->notifier, mm, pages, start,
>   				       ttm->num_pages, &gtt->range, readonly,
> -				       false);
> +				       false, NULL);
>   out_putmm:
>   	mmput(mm);
>   
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> index b665e9ff77e3..b939f353ac8c 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> @@ -1392,7 +1392,7 @@ static int svm_range_validate_and_map(struct mm_struct *mm,
>   		r = amdgpu_hmm_range_get_pages(&prange->notifier, mm, NULL,
>   					       prange->start << PAGE_SHIFT,
>   					       prange->npages, &hmm_range,
> -					       false, true);
> +					       false, true, NULL);
>   		if (r) {
>   			pr_debug("failed %d to get svm range pages\n", r);
>   			goto unreserve_out;
> @@ -2657,7 +2657,7 @@ void svm_range_prefault(struct svm_range *prange, struct mm_struct *mm)
>   	r = amdgpu_hmm_range_get_pages(&prange->notifier, mm, NULL,
>   				       prange->start << PAGE_SHIFT,
>   				       prange->npages, &hmm_range,
> -				       false, true);
> +				       false, true, NULL);
>   	if (!r) {
>   		amdgpu_hmm_range_get_pages_done(hmm_range);
>   		prange->validated_once = true;