Commit e5eaa7cc authored by Philip Yang's avatar Philip Yang Committed by Alex Deucher
Browse files

drm/amdgpu: Prepare for hmm_range_register API change (v2) 



An upcoming change in the hmm_range_register API requires passing in
a pointer to an hmm_mirror instead of mm_struct. To access the
hmm_mirror we need pass bo instead of ttm to amdgpu_ttm_tt_get_user_pages
because mirror is part of amdgpu_mn structure, which is accessible from bo.

v2: fix building without CONFIG_HMM_MIRROR (Arnd)

Signed-off-by: default avatarPhilip Yang <Philip.Yang@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3e2bb60a

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

+2 −3
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static int init_user_pages(struct kgd_mem *mem, struct mm_struct *mm, 
		goto out;

	}



	ret = amdgpu_ttm_tt_get_user_pages(bo->tbo.ttm, bo->tbo.ttm->pages);

	ret = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);

	if (ret) {

		pr_err("%s: Failed to get user pages: %d\n", __func__, ret);

		goto unregister_out;
@@ -1729,8 +1729,7 @@ static int update_invalid_user_pages(struct amdkfd_process_info *process_info, 
		bo = mem->bo;



		/* Get updated user pages */

		ret = amdgpu_ttm_tt_get_user_pages(bo->tbo.ttm,

						   bo->tbo.ttm->pages);

		ret = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);

		if (ret) {

			pr_debug("%s: Failed to get user pages: %d\n",

				__func__, ret);

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

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
			return -ENOMEM;

		}



		r = amdgpu_ttm_tt_get_user_pages(bo->tbo.ttm, e->user_pages);

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

		if (r) {

			kvfree(e->user_pages);

			e->user_pages = NULL;

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

+1 −2
Original line number Diff line number Diff line
@@ -327,8 +327,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, 
	}



	if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE) {

		r = amdgpu_ttm_tt_get_user_pages(bo->tbo.ttm,

						 bo->tbo.ttm->pages);

		r = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);

		if (r)

			goto release_object;

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

+0 −37
Original line number Diff line number Diff line
@@ -45,48 +45,11 @@ 


#include <linux/firmware.h>

#include <linux/module.h>

#include <linux/hmm.h>

#include <linux/interval_tree.h>



#include <drm/drm.h>



#include "amdgpu.h"

#include "amdgpu_amdkfd.h"



/**

 * struct amdgpu_mn

 *

 * @adev: amdgpu device pointer

 * @mm: process address space

 * @type: type of MMU notifier

 * @work: destruction work item

 * @node: hash table node to find structure by adev and mn

 * @lock: rw semaphore protecting the notifier nodes

 * @objects: interval tree containing amdgpu_mn_nodes

 * @mirror: HMM mirror function support

 *

 * Data for each amdgpu device and process address space.

 */

struct amdgpu_mn {

	/* constant after initialisation */

	struct amdgpu_device	*adev;

	struct mm_struct	*mm;

	enum amdgpu_mn_type	type;



	/* only used on destruction */

	struct work_struct	work;



	/* protected by adev->mn_lock */

	struct hlist_node	node;



	/* objects protected by lock */

	struct rw_semaphore	lock;

	struct rb_root_cached	objects;



	/* HMM mirror */

	struct hmm_mirror	mirror;

};



/**

 * struct amdgpu_mn_node

 *

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

+41 −5
Original line number Diff line number Diff line
@@ -24,17 +24,53 @@ 
#ifndef __AMDGPU_MN_H__

#define __AMDGPU_MN_H__



/*

 * HMM mirror

 */

struct amdgpu_mn;

struct hmm_range;

#include <linux/types.h>

#include <linux/hmm.h>

#include <linux/rwsem.h>

#include <linux/workqueue.h>

#include <linux/interval_tree.h>



enum amdgpu_mn_type {

	AMDGPU_MN_TYPE_GFX,

	AMDGPU_MN_TYPE_HSA,

};



/**

 * struct amdgpu_mn

 *

 * @adev: amdgpu device pointer

 * @mm: process address space

 * @type: type of MMU notifier

 * @work: destruction work item

 * @node: hash table node to find structure by adev and mn

 * @lock: rw semaphore protecting the notifier nodes

 * @objects: interval tree containing amdgpu_mn_nodes

 * @mirror: HMM mirror function support

 *

 * Data for each amdgpu device and process address space.

 */

struct amdgpu_mn {

	/* constant after initialisation */

	struct amdgpu_device	*adev;

	struct mm_struct	*mm;

	enum amdgpu_mn_type	type;



	/* only used on destruction */

	struct work_struct	work;



	/* protected by adev->mn_lock */

	struct hlist_node	node;



	/* objects protected by lock */

	struct rw_semaphore	lock;

	struct rb_root_cached	objects;



#ifdef CONFIG_HMM_MIRROR

	/* HMM mirror */

	struct hmm_mirror	mirror;

#endif

};



#if defined(CONFIG_HMM_MIRROR)

void amdgpu_mn_lock(struct amdgpu_mn *mn);

void amdgpu_mn_unlock(struct amdgpu_mn *mn);

CRA Git | Maintained and supported by SUSTech CRA and CCSE