Skip to contentSkip to conversation

drm/amdkfd: simplify vm_validate_pt_pd_bos

PATCH In review Lang Yu 3 participants 4 messages Jun 14, 2022 – Jun 30, 2022

Subsystems (3)
lore
Share & tools
lore

Lang Yu

author
#0 lore raw

PATCH v3 1/1 drm/amdkfd: simplify vm_validate_pt_pd_bos

We don't need to validate and map root PD specially here, it would be validated and mapped by amdgpu_vm_validate_pt_bos if it is evicted.

The special case is when turning a GFX VM to a compute VM, if vm_update_mode changed, we should make sure root PD gets mapped. So just map root PD after updating vm->update_funcs in amdgpu_vm_make_compute whether the vm_update_mode changed or not.

v3:
- Add some comments suggested by Christian.

v2:
- Don't rename vm_validate_pt_pd_bos and make it public.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 14 --------------
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c           |  8 ++++++++
 2 files changed, 8 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0 -14
index 50bb590c3306..c9ef242177e2 100644
@@ -439,22 +439,8 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)
 		return ret;
 	}
 
-	ret = amdgpu_amdkfd_validate_vm_bo(NULL, pd);
-	if (ret) {
-		pr_err("failed to validate PD\n");
-		return ret;
-	}
-
 	vm->pd_phys_addr = amdgpu_gmc_pd_addr(vm->root.bo);
 
-	if (vm->use_cpu_for_update) {
-		ret = amdgpu_bo_kmap(pd, NULL);
-		if (ret) {
-			pr_err("failed to kmap PD, ret=%d\n", ret);
-			return ret;
-		}
-	}
-
 	return 0;
 }
 
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +8 -0
index 703552f9a6d7..3a6b827e540c 100644
@@ -2225,6 +2225,14 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
 	} else {
 		vm->update_funcs = &amdgpu_vm_sdma_funcs;
 	}
+	/*
+	 * Make sure root PD gets mapped. As vm_update_mode could be changed
+	 * when turning a GFX VM into a compute VM.
+	 */
+	r = vm->update_funcs->map_table(to_amdgpu_bo_vm(vm->root.bo));
+	if (r)
+		goto unreserve_bo;
+
 	dma_fence_put(vm->last_update);
 	vm->last_update = NULL;
 	vm->is_compute_context = true;
Signature · 1 line
2.25.1
maintainer Acked-by on v3 1/1
#1 lore raw

Am 14.06.22 um 11:03 schrieb Lang Yu:

Quoted 10 lines

We don't need to validate and map root PD specially here, it would be validated and mapped by amdgpu_vm_validate_pt_bos if it is evicted.

The special case is when turning a GFX VM to a compute VM, if vm_update_mode changed, we should make sure root PD gets mapped. So just map root PD after updating vm->update_funcs in amdgpu_vm_make_compute whether the vm_update_mode changed or not.

Quoted 7 lines

v3:
- Add some comments suggested by Christian.

v2:
- Don't rename vm_validate_pt_pd_bos and make it public.

I can't judge the kfd part, but the VM stuff looks good to me now.

Quoted 51 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 14 --------------
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c           |  8 ++++++++
  2 files changed, 8 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0 -14
index 50bb590c3306..c9ef242177e2 100644
@@ -439,22 +439,8 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)
  		return ret;
  	}
 
-	ret = amdgpu_amdkfd_validate_vm_bo(NULL, pd);
-	if (ret) {
-		pr_err("failed to validate PD\n");
-		return ret;
-	}
-
  	vm->pd_phys_addr = amdgpu_gmc_pd_addr(vm->root.bo);
 
-	if (vm->use_cpu_for_update) {
-		ret = amdgpu_bo_kmap(pd, NULL);
-		if (ret) {
-			pr_err("failed to kmap PD, ret=%d\n", ret);
-			return ret;
-		}
-	}
-
  	return 0;
  }
 
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +8 -0
index 703552f9a6d7..3a6b827e540c 100644
@@ -2225,6 +2225,14 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
  	} else {
  		vm->update_funcs = &amdgpu_vm_sdma_funcs;
  	}
+	/*
+	 * Make sure root PD gets mapped. As vm_update_mode could be changed
+	 * when turning a GFX VM into a compute VM.
+	 */
+	r = vm->update_funcs->map_table(to_amdgpu_bo_vm(vm->root.bo));
+	if (r)
+		goto unreserve_bo;
+
  	dma_fence_put(vm->last_update);
  	vm->last_update = NULL;
  	vm->is_compute_context = true;
author
#2 lore raw

[AMD Official Use Only - General]

Ping!

Hi Felix, what do you think? Thanks!

Regards,
Lang

Quoted 88 lines

-----Original Message-----
From: Koenig, Christian <[email protected]>
Sent: Tuesday, June 14, 2022 5:08 PM
To: Yu, Lang <[email protected]>; [email protected]
Cc: Kuehling, Felix <[email protected]>; Deucher, Alexander <[email protected]>; Huang, Ray <[email protected]>
Subject: Re: [PATCH v3] drm/amdkfd: simplify vm_validate_pt_pd_bos

Am 14.06.22 um 11:03 schrieb Lang Yu:

Quoted 7 lines

We don't need to validate and map root PD specially here, it would be validated and mapped by amdgpu_vm_validate_pt_bos if it is evicted.

The special case is when turning a GFX VM to a compute VM, if vm_update_mode changed, we should make sure root PD gets mapped. So just map root PD after updating vm->update_funcs in amdgpu_vm_make_compute whether the vm_update_mode changed or

not.

Quoted 8 lines

v3:
- Add some comments suggested by Christian.

v2:
- Don't rename vm_validate_pt_pd_bos and make it public.

I can't judge the kfd part, but the VM stuff looks good to me now.

Quoted 2 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 14 -------------

-

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c static int vm_validate_pt_pd_bos(struct

Quoted 9 lines
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c           |  8 ++++++++
  2 files changed, 8 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0 -0
index 50bb590c3306..c9ef242177e2 100644
@@ -439,22 +439,8 @@ static int vm_validate_pt_pd_bos(struct

amdgpu_vm *vm)

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_make_compute(struct

Quoted 28 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0 -14
  		return ret;
  	}
 
-	ret = amdgpu_amdkfd_validate_vm_bo(NULL, pd);
-	if (ret) {
-		pr_err("failed to validate PD\n");
-		return ret;
-	}
-
  	vm->pd_phys_addr = amdgpu_gmc_pd_addr(vm->root.bo);
 
-	if (vm->use_cpu_for_update) {
-		ret = amdgpu_bo_kmap(pd, NULL);
-		if (ret) {
-			pr_err("failed to kmap PD, ret=%d\n", ret);
-			return ret;
-		}
-	}
-
  	return 0;
  }
 
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -0
index 703552f9a6d7..3a6b827e540c 100644
@@ -2225,6 +2225,14 @@ int amdgpu_vm_make_compute(struct

amdgpu_device *adev, struct amdgpu_vm *vm)

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -0
  	} else {
  		vm->update_funcs = &amdgpu_vm_sdma_funcs;
  	}
+	/*
+	 * Make sure root PD gets mapped. As vm_update_mode could be

changed

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +6 -0
+	 * when turning a GFX VM into a compute VM.
+	 */
+	r = vm->update_funcs->map_table(to_amdgpu_bo_vm(vm-
 root.bo));
+	if (r)
+		goto unreserve_bo;
+
  	dma_fence_put(vm->last_update);
  	vm->last_update = NULL;
  	vm->is_compute_context = true;
maintainer Reviewed-by on v3 1/1
#3 lore raw
In reply to Lang Yu
Quoted 10 lines · Lang Yu

We don't need to validate and map root PD specially here, it would be validated and mapped by amdgpu_vm_validate_pt_bos if it is evicted.

The special case is when turning a GFX VM to a compute VM, if vm_update_mode changed, we should make sure root PD gets mapped. So just map root PD after updating vm->update_funcs in amdgpu_vm_make_compute whether the vm_update_mode changed or not.

Quoted 7 lines

v3:
- Add some comments suggested by Christian.

v2:
- Don't rename vm_validate_pt_pd_bos and make it public.

Quoted 51 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 14 --------------
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c           |  8 ++++++++
  2 files changed, 8 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0 -14
index 50bb590c3306..c9ef242177e2 100644
@@ -439,22 +439,8 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)
  		return ret;
  	}
 
-	ret = amdgpu_amdkfd_validate_vm_bo(NULL, pd);
-	if (ret) {
-		pr_err("failed to validate PD\n");
-		return ret;
-	}
-
  	vm->pd_phys_addr = amdgpu_gmc_pd_addr(vm->root.bo);
 
-	if (vm->use_cpu_for_update) {
-		ret = amdgpu_bo_kmap(pd, NULL);
-		if (ret) {
-			pr_err("failed to kmap PD, ret=%d\n", ret);
-			return ret;
-		}
-	}
-
  	return 0;
  }
 
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +8 -0
index 703552f9a6d7..3a6b827e540c 100644
@@ -2225,6 +2225,14 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
  	} else {
  		vm->update_funcs = &amdgpu_vm_sdma_funcs;
  	}
+	/*
+	 * Make sure root PD gets mapped. As vm_update_mode could be changed
+	 * when turning a GFX VM into a compute VM.
+	 */
+	r = vm->update_funcs->map_table(to_amdgpu_bo_vm(vm->root.bo));
+	if (r)
+		goto unreserve_bo;
+
  	dma_fence_put(vm->last_update);
  	vm->last_update = NULL;
  	vm->is_compute_context = true;