Commit 0b988ca1 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/ttm: protect against reentrant bind in the drivers 



This moves the generic tracking into the drivers and protects
against reentrancy in the drivers. It fixes up radeon and agp
to be able to query the bound status as that is required.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200917043040.146575-2-airlied@gmail.com
parent 67d6a8b3

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

+12 −0
Original line number Diff line number Diff line
@@ -813,6 +813,7 @@ struct amdgpu_ttm_tt { 
	uint64_t		userptr;

	struct task_struct	*usertask;

	uint32_t		userflags;

	bool			bound;

#if IS_ENABLED(CONFIG_DRM_AMDGPU_USERPTR)

	struct hmm_range	*range;

#endif
@@ -1110,6 +1111,12 @@ static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev, 
	uint64_t flags;

	int r = 0;



	if (!bo_mem)

		return -EINVAL;



	if (gtt->bound)

		return 0;



	if (gtt->userptr) {

		r = amdgpu_ttm_tt_pin_userptr(bdev, ttm);

		if (r) {
@@ -1143,6 +1150,7 @@ static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev, 
	if (r)

		DRM_ERROR("failed to bind %lu pages at 0x%08llX\n",

			  ttm->num_pages, gtt->offset);

	gtt->bound = true;

	return r;

}
@@ -1236,6 +1244,9 @@ static void amdgpu_ttm_backend_unbind(struct ttm_bo_device *bdev, 
	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	int r;



	if (!gtt->bound)

		return;



	/* if the pages have userptr pinning then clear that first */

	if (gtt->userptr)

		amdgpu_ttm_tt_unpin_userptr(bdev, ttm);
@@ -1248,6 +1259,7 @@ static void amdgpu_ttm_backend_unbind(struct ttm_bo_device *bdev, 
	if (r)

		DRM_ERROR("failed to unbind %lu pages at 0x%08llX\n",

			  gtt->ttm.ttm.num_pages, gtt->offset);

	gtt->bound = false;

}



static void amdgpu_ttm_backend_destroy(struct ttm_bo_device *bdev,

drivers/gpu/drm/nouveau/nouveau_bo.c

+4 −1
Original line number Diff line number Diff line
@@ -718,7 +718,10 @@ nouveau_ttm_tt_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm, 
{

#if IS_ENABLED(CONFIG_AGP)

	struct nouveau_drm *drm = nouveau_bdev(bdev);



#endif

	if (!reg)

		return -EINVAL;

#if IS_ENABLED(CONFIG_AGP)

	if (drm->agp.bridge)

		return ttm_agp_bind(ttm, reg);

#endif

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+7 −1
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ nouveau_sgdma_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm, struct ttm_re 
	struct nouveau_mem *mem = nouveau_mem(reg);

	int ret;



	if (nvbe->mem)

		return 0;



	ret = nouveau_mem_host(reg, &nvbe->ttm);

	if (ret)

		return ret;
@@ -53,7 +56,10 @@ void 
nouveau_sgdma_unbind(struct ttm_bo_device *bdev, struct ttm_tt *ttm)

{

	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;

	if (nvbe->mem) {

		nouveau_mem_fini(nvbe->mem);

		nvbe->mem = NULL;

	}

}



struct ttm_tt *

drivers/gpu/drm/radeon/radeon.h

+1 −0
Original line number Diff line number Diff line
@@ -2820,6 +2820,7 @@ extern int radeon_ttm_tt_set_userptr(struct radeon_device *rdev, 
				     uint32_t flags);

extern bool radeon_ttm_tt_has_userptr(struct radeon_device *rdev, struct ttm_tt *ttm);

extern bool radeon_ttm_tt_is_readonly(struct radeon_device *rdev, struct ttm_tt *ttm);

bool radeon_ttm_tt_is_bound(struct ttm_bo_device *bdev, struct ttm_tt *ttm);

extern void radeon_vram_location(struct radeon_device *rdev, struct radeon_mc *mc, u64 base);

extern void radeon_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc);

extern int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon);

drivers/gpu/drm/radeon/radeon_mn.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static bool radeon_mn_invalidate(struct mmu_interval_notifier *mn, 
	struct ttm_operation_ctx ctx = { false, false };

	long r;



	if (!bo->tbo.ttm || !ttm_bo_tt_is_bound(&bo->tbo))

	if (!bo->tbo.ttm || !radeon_ttm_tt_is_bound(bo->tbo.bdev, bo->tbo.ttm))

		return true;



	if (!mmu_notifier_range_blockable(range))

CRA Git | Maintained and supported by SUSTech CRA and CCSE