[PATCH 1/2] drm/amdgpu: abstract bo_base init function

[PATCH 1/2] drm/amdgpu: abstract bo_base init function

[Chunming Zhou]

Change-Id: Ia3e57dbacff05f32b6c02e29aeadabd36f08028e
Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 75 ++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 8c34060e130f..c75b96433ee7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -94,6 +94,9 @@ struct amdgpu_prt_cb {
 	struct dma_fence_cb cb;
 };
 
+static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
+				   struct amdgpu_vm *vm,
+				   struct amdgpu_bo *bo);
 /**
  * amdgpu_vm_level_shift - return the addr shift for each level
  *
@@ -446,11 +449,9 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev,
 			*/
 			pt->parent = amdgpu_bo_ref(parent->base.bo);
 
-			entry->base.vm = vm;
-			entry->base.bo = pt;
-			list_add_tail(&entry->base.bo_list, &pt->va);
+			amdgpu_vm_bo_base_init(&entry->base, vm, pt);
 			spin_lock(&vm->status_lock);
-			list_add(&entry->base.vm_status, &vm->relocated);
+			list_move(&entry->base.vm_status, &vm->relocated);
 			spin_unlock(&vm->status_lock);
 		}
 
@@ -1821,6 +1822,35 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev,
 	return r;
 }
 
+static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
+				   struct amdgpu_vm *vm,
+				   struct amdgpu_bo *bo)
+{
+	base->vm = vm;
+	base->bo = bo;
+	INIT_LIST_HEAD(&base->bo_list);
+	INIT_LIST_HEAD(&base->vm_status);
+
+	if (!bo)
+		return;
+	list_add_tail(&base->bo_list, &bo->va);
+
+	if (bo->tbo.resv != vm->root.base.bo->tbo.resv)
+		return;
+
+	if (bo->preferred_domains &
+	    amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type))
+		return;
+
+	/*
+	 * we checked all the prerequisites, but it looks like this per vm bo
+	 * is currently evicted. add the bo to the evicted list to make sure it
+	 * is validated on next vm use to avoid fault.
+	 * */
+	spin_lock(&vm->status_lock);
+	list_move_tail(&base->vm_status, &vm->evicted);
+	spin_unlock(&vm->status_lock);
+}
 /**
  * amdgpu_vm_bo_add - add a bo to a specific vm
  *
@@ -1844,36 +1874,12 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
 	if (bo_va == NULL) {
 		return NULL;
 	}
-	bo_va->base.vm = vm;
-	bo_va->base.bo = bo;
-	INIT_LIST_HEAD(&bo_va->base.bo_list);
-	INIT_LIST_HEAD(&bo_va->base.vm_status);
+	amdgpu_vm_bo_base_init(&bo_va->base, vm, bo);
 
 	bo_va->ref_count = 1;
 	INIT_LIST_HEAD(&bo_va->valids);
 	INIT_LIST_HEAD(&bo_va->invalids);
 
-	if (!bo)
-		return bo_va;
-
-	list_add_tail(&bo_va->base.bo_list, &bo->va);
-
-	if (bo->tbo.resv != vm->root.base.bo->tbo.resv)
-		return bo_va;
-
-	if (bo->preferred_domains &
-	    amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type))
-		return bo_va;
-
-	/*
-	 * We checked all the prerequisites, but it looks like this per VM BO
-	 * is currently evicted. add the BO to the evicted list to make sure it
-	 * is validated on next VM use to avoid fault.
-	 * */
-	spin_lock(&vm->status_lock);
-	list_move_tail(&bo_va->base.vm_status, &vm->evicted);
-	spin_unlock(&vm->status_lock);
-
 	return bo_va;
 }
 
@@ -2373,6 +2379,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
 		   int vm_context, unsigned int pasid)
 {
 	struct amdgpu_bo_param bp;
+	struct amdgpu_bo *root;
 	const unsigned align = min(AMDGPU_VM_PTB_ALIGN_SIZE,
 		AMDGPU_VM_PTE_COUNT(adev) * 8);
 	unsigned ring_instance;
@@ -2434,23 +2441,21 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
 	bp.flags = flags;
 	bp.type = ttm_bo_type_kernel;
 	bp.resv = NULL;
-	r = amdgpu_bo_create(adev, &bp, &vm->root.base.bo);
+	r = amdgpu_bo_create(adev, &bp, &root);
 	if (r)
 		goto error_free_sched_entity;
 
-	r = amdgpu_bo_reserve(vm->root.base.bo, true);
+	r = amdgpu_bo_reserve(root, true);
 	if (r)
 		goto error_free_root;
 
-	r = amdgpu_vm_clear_bo(adev, vm, vm->root.base.bo,
+	r = amdgpu_vm_clear_bo(adev, vm, root,
 			       adev->vm_manager.root_level,
 			       vm->pte_support_ats);
 	if (r)
 		goto error_unreserve;
 
-	vm->root.base.vm = vm;
-	list_add_tail(&vm->root.base.bo_list, &vm->root.base.bo->va);
-	list_add_tail(&vm->root.base.vm_status, &vm->evicted);
+	amdgpu_vm_bo_base_init(&vm->root.base, vm, root);
 	amdgpu_bo_unreserve(vm->root.base.bo);
 
 	if (pasid) {
-- 
2.14.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 2/2] drm/amdgpu: link shadow bo as well

[Chunming Zhou]

Shadow BO is located on GTT and its parent (PT and PD) BO could located on VRAM.
In some case, the BO on GTT could be evicted but the parent did not. This may
cause the shadow BO not be put in the evict list and could not be invalidate
correctly.

Change-Id: Iad10d9a3031fa2b243879b9e58ee4d8c527eb433
Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Reported-by: Shaoyun Liu <Shaoyun.Liu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c     |  5 -----
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c     | 11 +++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h     |  1 +
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index e1756b68a17b..9c9f6fc5c994 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -462,11 +462,6 @@ static int amdgpu_cs_validate(void *param, struct amdgpu_bo *bo)
 	do {
 		r = amdgpu_cs_bo_validate(p, bo);
 	} while (r == -ENOMEM && amdgpu_cs_try_evict(p, bo));
-	if (r)
-		return r;
-
-	if (bo->shadow)
-		r = amdgpu_cs_bo_validate(p, bo->shadow);
 
 	return r;
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
index 540e03fa159f..8078da36aec7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
@@ -58,6 +58,7 @@ struct amdgpu_bo_va_mapping {
 /* User space allocated BO in a VM */
 struct amdgpu_bo_va {
 	struct amdgpu_vm_bo_base	base;
+	struct amdgpu_vm_bo_base	shadow_base;
 
 	/* protected by bo being reserved */
 	unsigned			ref_count;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index c75b96433ee7..026147cc5104 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -450,8 +450,13 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev,
 			pt->parent = amdgpu_bo_ref(parent->base.bo);
 
 			amdgpu_vm_bo_base_init(&entry->base, vm, pt);
+			amdgpu_vm_bo_base_init(&entry->shadow_base, vm,
+					       pt->shadow);
 			spin_lock(&vm->status_lock);
 			list_move(&entry->base.vm_status, &vm->relocated);
+			if (pt->shadow)
+				list_move(&entry->shadow_base.vm_status,
+					  &vm->relocated);
 			spin_unlock(&vm->status_lock);
 		}
 
@@ -1875,6 +1880,7 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
 		return NULL;
 	}
 	amdgpu_vm_bo_base_init(&bo_va->base, vm, bo);
+	amdgpu_vm_bo_base_init(&bo_va->shadow_base, vm, bo ? bo->shadow : NULL);
 
 	bo_va->ref_count = 1;
 	INIT_LIST_HEAD(&bo_va->valids);
@@ -2220,9 +2226,11 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
 	struct amdgpu_vm *vm = bo_va->base.vm;
 
 	list_del(&bo_va->base.bo_list);
+	list_del(&bo_va->shadow_base.bo_list);
 
 	spin_lock(&vm->status_lock);
 	list_del(&bo_va->base.vm_status);
+	list_del(&bo_va->shadow_base.vm_status);
 	spin_unlock(&vm->status_lock);
 
 	list_for_each_entry_safe(mapping, next, &bo_va->valids, list) {
@@ -2456,6 +2464,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
 		goto error_unreserve;
 
 	amdgpu_vm_bo_base_init(&vm->root.base, vm, root);
+	amdgpu_vm_bo_base_init(&vm->root.shadow_base, vm, root->shadow);
 	amdgpu_bo_unreserve(vm->root.base.bo);
 
 	if (pasid) {
@@ -2575,6 +2584,8 @@ static void amdgpu_vm_free_levels(struct amdgpu_device *adev,
 	if (parent->base.bo) {
 		list_del(&parent->base.bo_list);
 		list_del(&parent->base.vm_status);
+		list_del(&parent->shadow_base.bo_list);
+		list_del(&parent->shadow_base.vm_status);
 		amdgpu_bo_unref(&parent->base.bo->shadow);
 		amdgpu_bo_unref(&parent->base.bo);
 	}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
index 30f080364c97..f4ae6c6b28b8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
@@ -153,6 +153,7 @@ struct amdgpu_vm_bo_base {
 
 struct amdgpu_vm_pt {
 	struct amdgpu_vm_bo_base	base;
+	struct amdgpu_vm_bo_base	shadow_base;
 	bool				huge;
 
 	/* array of page tables, one for each directory entry */
-- 
2.14.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] drm/amdgpu: abstract bo_base init function

[Zhang, Jerry (Junwei)]

On 04/24/2018 03:35 PM, Chunming Zhou wrote:
> Change-Id: Ia3e57dbacff05f32b6c02e29aeadabd36f08028e
> Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>

some trivial comments.

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 75 ++++++++++++++++++----------------
>   1 file changed, 40 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 8c34060e130f..c75b96433ee7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -94,6 +94,9 @@ struct amdgpu_prt_cb {
>   	struct dma_fence_cb cb;
>   };
>
> +static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
> +				   struct amdgpu_vm *vm,
> +				   struct amdgpu_bo *bo);

Move the function upper, we could avoid such declaration.

>   /**
>    * amdgpu_vm_level_shift - return the addr shift for each level
>    *
> @@ -446,11 +449,9 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev,
>   			*/
>   			pt->parent = amdgpu_bo_ref(parent->base.bo);
>
> -			entry->base.vm = vm;
> -			entry->base.bo = pt;
> -			list_add_tail(&entry->base.bo_list, &pt->va);
> +			amdgpu_vm_bo_base_init(&entry->base, vm, pt);
>   			spin_lock(&vm->status_lock);
> -			list_add(&entry->base.vm_status, &vm->relocated);
> +			list_move(&entry->base.vm_status, &vm->relocated);
>   			spin_unlock(&vm->status_lock);
>   		}
>
> @@ -1821,6 +1822,35 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev,
>   	return r;
>   }
>
> +static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
> +				   struct amdgpu_vm *vm,
> +				   struct amdgpu_bo *bo)
> +{
> +	base->vm = vm;
> +	base->bo = bo;
> +	INIT_LIST_HEAD(&base->bo_list);
> +	INIT_LIST_HEAD(&base->vm_status);
> +
> +	if (!bo)
> +		return;
> +	list_add_tail(&base->bo_list, &bo->va);
> +
> +	if (bo->tbo.resv != vm->root.base.bo->tbo.resv)
> +		return;
> +
> +	if (bo->preferred_domains &
> +	    amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type))
> +		return;
> +
> +	/*
> +	 * we checked all the prerequisites, but it looks like this per vm bo
> +	 * is currently evicted. add the bo to the evicted list to make sure it
> +	 * is validated on next vm use to avoid fault.
> +	 * */

/*
  *
  */  is expected

> +	spin_lock(&vm->status_lock);
> +	list_move_tail(&base->vm_status, &vm->evicted);
> +	spin_unlock(&vm->status_lock);
> +}
>   /**
>    * amdgpu_vm_bo_add - add a bo to a specific vm
>    *
> @@ -1844,36 +1874,12 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
>   	if (bo_va == NULL) {
>   		return NULL;
>   	}
> -	bo_va->base.vm = vm;
> -	bo_va->base.bo = bo;
> -	INIT_LIST_HEAD(&bo_va->base.bo_list);
> -	INIT_LIST_HEAD(&bo_va->base.vm_status);
> +	amdgpu_vm_bo_base_init(&bo_va->base, vm, bo);
>
>   	bo_va->ref_count = 1;
>   	INIT_LIST_HEAD(&bo_va->valids);
>   	INIT_LIST_HEAD(&bo_va->invalids);
>
> -	if (!bo)
> -		return bo_va;
> -
> -	list_add_tail(&bo_va->base.bo_list, &bo->va);
> -
> -	if (bo->tbo.resv != vm->root.base.bo->tbo.resv)
> -		return bo_va;
> -
> -	if (bo->preferred_domains &
> -	    amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type))
> -		return bo_va;
> -
> -	/*
> -	 * We checked all the prerequisites, but it looks like this per VM BO
> -	 * is currently evicted. add the BO to the evicted list to make sure it
> -	 * is validated on next VM use to avoid fault.
> -	 * */
> -	spin_lock(&vm->status_lock);
> -	list_move_tail(&bo_va->base.vm_status, &vm->evicted);
> -	spin_unlock(&vm->status_lock);
> -
>   	return bo_va;
>   }
>
> @@ -2373,6 +2379,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>   		   int vm_context, unsigned int pasid)
>   {
>   	struct amdgpu_bo_param bp;
> +	struct amdgpu_bo *root;
>   	const unsigned align = min(AMDGPU_VM_PTB_ALIGN_SIZE,
>   		AMDGPU_VM_PTE_COUNT(adev) * 8);
>   	unsigned ring_instance;
> @@ -2434,23 +2441,21 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>   	bp.flags = flags;
>   	bp.type = ttm_bo_type_kernel;
>   	bp.resv = NULL;
> -	r = amdgpu_bo_create(adev, &bp, &vm->root.base.bo);
> +	r = amdgpu_bo_create(adev, &bp, &root);
>   	if (r)
>   		goto error_free_sched_entity;
>
> -	r = amdgpu_bo_reserve(vm->root.base.bo, true);
> +	r = amdgpu_bo_reserve(root, true);
>   	if (r)
>   		goto error_free_root;
>
> -	r = amdgpu_vm_clear_bo(adev, vm, vm->root.base.bo,
> +	r = amdgpu_vm_clear_bo(adev, vm, root,
>   			       adev->vm_manager.root_level,
>   			       vm->pte_support_ats);
>   	if (r)
>   		goto error_unreserve;
>
> -	vm->root.base.vm = vm;
> -	list_add_tail(&vm->root.base.bo_list, &vm->root.base.bo->va);
> -	list_add_tail(&vm->root.base.vm_status, &vm->evicted);
> +	amdgpu_vm_bo_base_init(&vm->root.base, vm, root);
>   	amdgpu_bo_unreserve(vm->root.base.bo);
>
>   	if (pasid) {
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/2] drm/amdgpu: link shadow bo as well

[Zhang, Jerry (Junwei)]

On 04/24/2018 03:35 PM, Chunming Zhou wrote:
> Shadow BO is located on GTT and its parent (PT and PD) BO could located on VRAM.
> In some case, the BO on GTT could be evicted but the parent did not. This may
> cause the shadow BO not be put in the evict list and could not be invalidate
> correctly.
>
> Change-Id: Iad10d9a3031fa2b243879b9e58ee4d8c527eb433
> Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
> Reported-by: Shaoyun Liu <Shaoyun.Liu@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c     |  5 -----
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  1 +
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c     | 11 +++++++++++
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h     |  1 +
>   4 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index e1756b68a17b..9c9f6fc5c994 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -462,11 +462,6 @@ static int amdgpu_cs_validate(void *param, struct amdgpu_bo *bo)
>   	do {
>   		r = amdgpu_cs_bo_validate(p, bo);
>   	} while (r == -ENOMEM && amdgpu_cs_try_evict(p, bo));
> -	if (r)
> -		return r;
> -
> -	if (bo->shadow)
> -		r = amdgpu_cs_bo_validate(p, bo->shadow);
>
>   	return r;
>   }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> index 540e03fa159f..8078da36aec7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> @@ -58,6 +58,7 @@ struct amdgpu_bo_va_mapping {
>   /* User space allocated BO in a VM */
>   struct amdgpu_bo_va {
>   	struct amdgpu_vm_bo_base	base;
> +	struct amdgpu_vm_bo_base	shadow_base;
>
>   	/* protected by bo being reserved */
>   	unsigned			ref_count;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index c75b96433ee7..026147cc5104 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -450,8 +450,13 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev,
>   			pt->parent = amdgpu_bo_ref(parent->base.bo);
>
>   			amdgpu_vm_bo_base_init(&entry->base, vm, pt);
> +			amdgpu_vm_bo_base_init(&entry->shadow_base, vm,
> +					       pt->shadow);
>   			spin_lock(&vm->status_lock);
>   			list_move(&entry->base.vm_status, &vm->relocated);
> +			if (pt->shadow)
> +				list_move(&entry->shadow_base.vm_status,
> +					  &vm->relocated);

I'm afraid the PD shadow bo could not be updated correctly.

When update PDs, we need get PD and PD's parent for PDE update.
For PD shadow bo, it's parent is the PD in VRAM rather than the PD's upper level 
PD bo.

Please confirm that.

Jerry

>   			spin_unlock(&vm->status_lock);
>   		}
>
> @@ -1875,6 +1880,7 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
>   		return NULL;
>   	}
>   	amdgpu_vm_bo_base_init(&bo_va->base, vm, bo);
> +	amdgpu_vm_bo_base_init(&bo_va->shadow_base, vm, bo ? bo->shadow : NULL);
>
>   	bo_va->ref_count = 1;
>   	INIT_LIST_HEAD(&bo_va->valids);
> @@ -2220,9 +2226,11 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
>   	struct amdgpu_vm *vm = bo_va->base.vm;
>
>   	list_del(&bo_va->base.bo_list);
> +	list_del(&bo_va->shadow_base.bo_list);
>
>   	spin_lock(&vm->status_lock);
>   	list_del(&bo_va->base.vm_status);
> +	list_del(&bo_va->shadow_base.vm_status);
>   	spin_unlock(&vm->status_lock);
>
>   	list_for_each_entry_safe(mapping, next, &bo_va->valids, list) {
> @@ -2456,6 +2464,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>   		goto error_unreserve;
>
>   	amdgpu_vm_bo_base_init(&vm->root.base, vm, root);
> +	amdgpu_vm_bo_base_init(&vm->root.shadow_base, vm, root->shadow);
>   	amdgpu_bo_unreserve(vm->root.base.bo);
>
>   	if (pasid) {
> @@ -2575,6 +2584,8 @@ static void amdgpu_vm_free_levels(struct amdgpu_device *adev,
>   	if (parent->base.bo) {
>   		list_del(&parent->base.bo_list);
>   		list_del(&parent->base.vm_status);
> +		list_del(&parent->shadow_base.bo_list);
> +		list_del(&parent->shadow_base.vm_status);
>   		amdgpu_bo_unref(&parent->base.bo->shadow);
>   		amdgpu_bo_unref(&parent->base.bo);
>   	}
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> index 30f080364c97..f4ae6c6b28b8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> @@ -153,6 +153,7 @@ struct amdgpu_vm_bo_base {
>
>   struct amdgpu_vm_pt {
>   	struct amdgpu_vm_bo_base	base;
> +	struct amdgpu_vm_bo_base	shadow_base;
>   	bool				huge;
>
>   	/* array of page tables, one for each directory entry */
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] drm/amdgpu: abstract bo_base init function

[Christian König]

Am 26.04.2018 um 05:01 schrieb Zhang, Jerry (Junwei):
> On 04/24/2018 03:35 PM, Chunming Zhou wrote:
>> Change-Id: Ia3e57dbacff05f32b6c02e29aeadabd36f08028e
>> Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
> Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
>
> some trivial comments.

Both a nice cleanup as well as the right comments.

With Jerry's comments addressed Reviewed-by: Christian König 
<christian.koenig@amd.com> as well.

>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 75 
>> ++++++++++++++++++----------------
>>   1 file changed, 40 insertions(+), 35 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> index 8c34060e130f..c75b96433ee7 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> @@ -94,6 +94,9 @@ struct amdgpu_prt_cb {
>>       struct dma_fence_cb cb;
>>   };
>>
>> +static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
>> +                   struct amdgpu_vm *vm,
>> +                   struct amdgpu_bo *bo);
>
> Move the function upper, we could avoid such declaration.
>
>>   /**
>>    * amdgpu_vm_level_shift - return the addr shift for each level
>>    *
>> @@ -446,11 +449,9 @@ static int amdgpu_vm_alloc_levels(struct 
>> amdgpu_device *adev,
>>               */
>>               pt->parent = amdgpu_bo_ref(parent->base.bo);
>>
>> -            entry->base.vm = vm;
>> -            entry->base.bo = pt;
>> -            list_add_tail(&entry->base.bo_list, &pt->va);
>> +            amdgpu_vm_bo_base_init(&entry->base, vm, pt);
>>               spin_lock(&vm->status_lock);
>> -            list_add(&entry->base.vm_status, &vm->relocated);
>> +            list_move(&entry->base.vm_status, &vm->relocated);
>>               spin_unlock(&vm->status_lock);
>>           }
>>
>> @@ -1821,6 +1822,35 @@ int amdgpu_vm_handle_moved(struct 
>> amdgpu_device *adev,
>>       return r;
>>   }
>>
>> +static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
>> +                   struct amdgpu_vm *vm,
>> +                   struct amdgpu_bo *bo)
>> +{
>> +    base->vm = vm;
>> +    base->bo = bo;
>> +    INIT_LIST_HEAD(&base->bo_list);
>> +    INIT_LIST_HEAD(&base->vm_status);
>> +
>> +    if (!bo)
>> +        return;
>> +    list_add_tail(&base->bo_list, &bo->va);
>> +
>> +    if (bo->tbo.resv != vm->root.base.bo->tbo.resv)
>> +        return;
>> +
>> +    if (bo->preferred_domains &
>> +        amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type))
>> +        return;
>> +
>> +    /*
>> +     * we checked all the prerequisites, but it looks like this per 
>> vm bo
>> +     * is currently evicted. add the bo to the evicted list to make 
>> sure it
>> +     * is validated on next vm use to avoid fault.
>> +     * */
>
> /*
>  *
>  */  is expected
>
>> +    spin_lock(&vm->status_lock);
>> +    list_move_tail(&base->vm_status, &vm->evicted);
>> +    spin_unlock(&vm->status_lock);
>> +}
>>   /**
>>    * amdgpu_vm_bo_add - add a bo to a specific vm
>>    *
>> @@ -1844,36 +1874,12 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct 
>> amdgpu_device *adev,
>>       if (bo_va == NULL) {
>>           return NULL;
>>       }
>> -    bo_va->base.vm = vm;
>> -    bo_va->base.bo = bo;
>> -    INIT_LIST_HEAD(&bo_va->base.bo_list);
>> -    INIT_LIST_HEAD(&bo_va->base.vm_status);
>> +    amdgpu_vm_bo_base_init(&bo_va->base, vm, bo);
>>
>>       bo_va->ref_count = 1;
>>       INIT_LIST_HEAD(&bo_va->valids);
>>       INIT_LIST_HEAD(&bo_va->invalids);
>>
>> -    if (!bo)
>> -        return bo_va;
>> -
>> -    list_add_tail(&bo_va->base.bo_list, &bo->va);
>> -
>> -    if (bo->tbo.resv != vm->root.base.bo->tbo.resv)
>> -        return bo_va;
>> -
>> -    if (bo->preferred_domains &
>> -        amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type))
>> -        return bo_va;
>> -
>> -    /*
>> -     * We checked all the prerequisites, but it looks like this per 
>> VM BO
>> -     * is currently evicted. add the BO to the evicted list to make 
>> sure it
>> -     * is validated on next VM use to avoid fault.
>> -     * */
>> -    spin_lock(&vm->status_lock);
>> -    list_move_tail(&bo_va->base.vm_status, &vm->evicted);
>> -    spin_unlock(&vm->status_lock);
>> -
>>       return bo_va;
>>   }
>>
>> @@ -2373,6 +2379,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, 
>> struct amdgpu_vm *vm,
>>              int vm_context, unsigned int pasid)
>>   {
>>       struct amdgpu_bo_param bp;
>> +    struct amdgpu_bo *root;
>>       const unsigned align = min(AMDGPU_VM_PTB_ALIGN_SIZE,
>>           AMDGPU_VM_PTE_COUNT(adev) * 8);
>>       unsigned ring_instance;
>> @@ -2434,23 +2441,21 @@ int amdgpu_vm_init(struct amdgpu_device 
>> *adev, struct amdgpu_vm *vm,
>>       bp.flags = flags;
>>       bp.type = ttm_bo_type_kernel;
>>       bp.resv = NULL;
>> -    r = amdgpu_bo_create(adev, &bp, &vm->root.base.bo);
>> +    r = amdgpu_bo_create(adev, &bp, &root);
>>       if (r)
>>           goto error_free_sched_entity;
>>
>> -    r = amdgpu_bo_reserve(vm->root.base.bo, true);
>> +    r = amdgpu_bo_reserve(root, true);
>>       if (r)
>>           goto error_free_root;
>>
>> -    r = amdgpu_vm_clear_bo(adev, vm, vm->root.base.bo,
>> +    r = amdgpu_vm_clear_bo(adev, vm, root,
>>                      adev->vm_manager.root_level,
>>                      vm->pte_support_ats);
>>       if (r)
>>           goto error_unreserve;
>>
>> -    vm->root.base.vm = vm;
>> -    list_add_tail(&vm->root.base.bo_list, &vm->root.base.bo->va);
>> -    list_add_tail(&vm->root.base.vm_status, &vm->evicted);
>> +    amdgpu_vm_bo_base_init(&vm->root.base, vm, root);
>>       amdgpu_bo_unreserve(vm->root.base.bo);
>>
>>       if (pasid) {
>>

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/2] drm/amdgpu: link shadow bo as well

[Christian König]

Am 24.04.2018 um 09:35 schrieb Chunming Zhou:
> Shadow BO is located on GTT and its parent (PT and PD) BO could located on VRAM.
> In some case, the BO on GTT could be evicted but the parent did not. This may
> cause the shadow BO not be put in the evict list and could not be invalidate
> correctly.
>
> Change-Id: Iad10d9a3031fa2b243879b9e58ee4d8c527eb433
> Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
> Reported-by: Shaoyun Liu <Shaoyun.Liu@amd.com>

Way to much memory usage and to complicated.

What we need to do is just to handle the real BO as evicted when the 
shadow BO is evicted.

Something like the following at the start of amdgpu_vm_bo_invalidate() 
should be sufficient:

if (bo->parent && bo->parent->shadow == bo)
     bo = bo->parent;

Regards,
Christian.


> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c     |  5 -----
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  1 +
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c     | 11 +++++++++++
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h     |  1 +
>   4 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index e1756b68a17b..9c9f6fc5c994 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -462,11 +462,6 @@ static int amdgpu_cs_validate(void *param, struct amdgpu_bo *bo)
>   	do {
>   		r = amdgpu_cs_bo_validate(p, bo);
>   	} while (r == -ENOMEM && amdgpu_cs_try_evict(p, bo));
> -	if (r)
> -		return r;
> -
> -	if (bo->shadow)
> -		r = amdgpu_cs_bo_validate(p, bo->shadow);
>   
>   	return r;
>   }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> index 540e03fa159f..8078da36aec7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> @@ -58,6 +58,7 @@ struct amdgpu_bo_va_mapping {
>   /* User space allocated BO in a VM */
>   struct amdgpu_bo_va {
>   	struct amdgpu_vm_bo_base	base;
> +	struct amdgpu_vm_bo_base	shadow_base;
>   
>   	/* protected by bo being reserved */
>   	unsigned			ref_count;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index c75b96433ee7..026147cc5104 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -450,8 +450,13 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev,
>   			pt->parent = amdgpu_bo_ref(parent->base.bo);
>   
>   			amdgpu_vm_bo_base_init(&entry->base, vm, pt);
> +			amdgpu_vm_bo_base_init(&entry->shadow_base, vm,
> +					       pt->shadow);
>   			spin_lock(&vm->status_lock);
>   			list_move(&entry->base.vm_status, &vm->relocated);
> +			if (pt->shadow)
> +				list_move(&entry->shadow_base.vm_status,
> +					  &vm->relocated);
>   			spin_unlock(&vm->status_lock);
>   		}
>   
> @@ -1875,6 +1880,7 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
>   		return NULL;
>   	}
>   	amdgpu_vm_bo_base_init(&bo_va->base, vm, bo);
> +	amdgpu_vm_bo_base_init(&bo_va->shadow_base, vm, bo ? bo->shadow : NULL);
>   
>   	bo_va->ref_count = 1;
>   	INIT_LIST_HEAD(&bo_va->valids);
> @@ -2220,9 +2226,11 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
>   	struct amdgpu_vm *vm = bo_va->base.vm;
>   
>   	list_del(&bo_va->base.bo_list);
> +	list_del(&bo_va->shadow_base.bo_list);
>   
>   	spin_lock(&vm->status_lock);
>   	list_del(&bo_va->base.vm_status);
> +	list_del(&bo_va->shadow_base.vm_status);
>   	spin_unlock(&vm->status_lock);
>   
>   	list_for_each_entry_safe(mapping, next, &bo_va->valids, list) {
> @@ -2456,6 +2464,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>   		goto error_unreserve;
>   
>   	amdgpu_vm_bo_base_init(&vm->root.base, vm, root);
> +	amdgpu_vm_bo_base_init(&vm->root.shadow_base, vm, root->shadow);
>   	amdgpu_bo_unreserve(vm->root.base.bo);
>   
>   	if (pasid) {
> @@ -2575,6 +2584,8 @@ static void amdgpu_vm_free_levels(struct amdgpu_device *adev,
>   	if (parent->base.bo) {
>   		list_del(&parent->base.bo_list);
>   		list_del(&parent->base.vm_status);
> +		list_del(&parent->shadow_base.bo_list);
> +		list_del(&parent->shadow_base.vm_status);
>   		amdgpu_bo_unref(&parent->base.bo->shadow);
>   		amdgpu_bo_unref(&parent->base.bo);
>   	}
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> index 30f080364c97..f4ae6c6b28b8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> @@ -153,6 +153,7 @@ struct amdgpu_vm_bo_base {
>   
>   struct amdgpu_vm_pt {
>   	struct amdgpu_vm_bo_base	base;
> +	struct amdgpu_vm_bo_base	shadow_base;
>   	bool				huge;
>   
>   	/* array of page tables, one for each directory entry */

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/2] drm/amdgpu: link shadow bo as well

[zhoucm1]

On 2018年05月03日 18:14, Christian König wrote:
> Am 24.04.2018 um 09:35 schrieb Chunming Zhou:
>> Shadow BO is located on GTT and its parent (PT and PD) BO could 
>> located on VRAM.
>> In some case, the BO on GTT could be evicted but the parent did not. 
>> This may
>> cause the shadow BO not be put in the evict list and could not be 
>> invalidate
>> correctly.
>>
>> Change-Id: Iad10d9a3031fa2b243879b9e58ee4d8c527eb433
>> Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
>> Reported-by: Shaoyun Liu <Shaoyun.Liu@amd.com>
>
> Way to much memory usage and to complicated.
>
> What we need to do is just to handle the real BO as evicted when the 
> shadow BO is evicted.
>
> Something like the following at the start of amdgpu_vm_bo_invalidate() 
> should be sufficient:
>
> if (bo->parent && bo->parent->shadow == bo)
>     bo = bo->parent;
clever, will send a patch soon.

Regards,
David Zhou
>
> Regards,
> Christian.
>
>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c     |  5 -----
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  1 +
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c     | 11 +++++++++++
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h     |  1 +
>>   4 files changed, 13 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
>> index e1756b68a17b..9c9f6fc5c994 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
>> @@ -462,11 +462,6 @@ static int amdgpu_cs_validate(void *param, 
>> struct amdgpu_bo *bo)
>>       do {
>>           r = amdgpu_cs_bo_validate(p, bo);
>>       } while (r == -ENOMEM && amdgpu_cs_try_evict(p, bo));
>> -    if (r)
>> -        return r;
>> -
>> -    if (bo->shadow)
>> -        r = amdgpu_cs_bo_validate(p, bo->shadow);
>>         return r;
>>   }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
>> index 540e03fa159f..8078da36aec7 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
>> @@ -58,6 +58,7 @@ struct amdgpu_bo_va_mapping {
>>   /* User space allocated BO in a VM */
>>   struct amdgpu_bo_va {
>>       struct amdgpu_vm_bo_base    base;
>> +    struct amdgpu_vm_bo_base    shadow_base;
>>         /* protected by bo being reserved */
>>       unsigned            ref_count;
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> index c75b96433ee7..026147cc5104 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> @@ -450,8 +450,13 @@ static int amdgpu_vm_alloc_levels(struct 
>> amdgpu_device *adev,
>>               pt->parent = amdgpu_bo_ref(parent->base.bo);
>>                 amdgpu_vm_bo_base_init(&entry->base, vm, pt);
>> +            amdgpu_vm_bo_base_init(&entry->shadow_base, vm,
>> +                           pt->shadow);
>>               spin_lock(&vm->status_lock);
>>               list_move(&entry->base.vm_status, &vm->relocated);
>> +            if (pt->shadow)
>> +                list_move(&entry->shadow_base.vm_status,
>> +                      &vm->relocated);
>>               spin_unlock(&vm->status_lock);
>>           }
>>   @@ -1875,6 +1880,7 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct 
>> amdgpu_device *adev,
>>           return NULL;
>>       }
>>       amdgpu_vm_bo_base_init(&bo_va->base, vm, bo);
>> +    amdgpu_vm_bo_base_init(&bo_va->shadow_base, vm, bo ? bo->shadow 
>> : NULL);
>>         bo_va->ref_count = 1;
>>       INIT_LIST_HEAD(&bo_va->valids);
>> @@ -2220,9 +2226,11 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
>>       struct amdgpu_vm *vm = bo_va->base.vm;
>>         list_del(&bo_va->base.bo_list);
>> +    list_del(&bo_va->shadow_base.bo_list);
>>         spin_lock(&vm->status_lock);
>>       list_del(&bo_va->base.vm_status);
>> +    list_del(&bo_va->shadow_base.vm_status);
>>       spin_unlock(&vm->status_lock);
>>         list_for_each_entry_safe(mapping, next, &bo_va->valids, list) {
>> @@ -2456,6 +2464,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, 
>> struct amdgpu_vm *vm,
>>           goto error_unreserve;
>>         amdgpu_vm_bo_base_init(&vm->root.base, vm, root);
>> +    amdgpu_vm_bo_base_init(&vm->root.shadow_base, vm, root->shadow);
>>       amdgpu_bo_unreserve(vm->root.base.bo);
>>         if (pasid) {
>> @@ -2575,6 +2584,8 @@ static void amdgpu_vm_free_levels(struct 
>> amdgpu_device *adev,
>>       if (parent->base.bo) {
>>           list_del(&parent->base.bo_list);
>>           list_del(&parent->base.vm_status);
>> +        list_del(&parent->shadow_base.bo_list);
>> +        list_del(&parent->shadow_base.vm_status);
>>           amdgpu_bo_unref(&parent->base.bo->shadow);
>>           amdgpu_bo_unref(&parent->base.bo);
>>       }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
>> index 30f080364c97..f4ae6c6b28b8 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
>> @@ -153,6 +153,7 @@ struct amdgpu_vm_bo_base {
>>     struct amdgpu_vm_pt {
>>       struct amdgpu_vm_bo_base    base;
>> +    struct amdgpu_vm_bo_base    shadow_base;
>>       bool                huge;
>>         /* array of page tables, one for each directory entry */
>

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx