Skip to contentSkip to conversation

drm/amdkfd: use allowed domain for vmbo validation

PATCH In review Nirmoy Das 3 participants 3 messages Jun 8, 2021

Subsystems (3)
lore
Share & tools
lore

Nirmoy Das

author
#0 lore raw

PATCH v3 1/1 drm/amdkfd: use allowed domain for vmbo validation

Fixes handling when page tables are in system memory.

v3: remove struct amdgpu_vm_parser.
v2: remove unwanted variable.
change amdgpu_amdkfd_validate instead of amdgpu_amdkfd_bo_validate.

---
 .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c  | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4 -17
index d6cb7cf76623..016815b7a773 100644
@@ -47,12 +47,6 @@ static struct {
 	spinlock_t mem_limit_lock;
 } kfd_mem_limit;
 
-/* Struct used for amdgpu_amdkfd_bo_validate */
-struct amdgpu_vm_parser {
-	uint32_t        domain;
-	bool            wait;
-};
-
 static const char * const domain_bit_to_string[] = {
 		"CPU",
 		"GTT",
@@ -348,11 +342,9 @@ static int amdgpu_amdkfd_bo_validate(struct amdgpu_bo *bo, uint32_t domain,
 	return ret;
 }
 
-static int amdgpu_amdkfd_validate(void *param, struct amdgpu_bo *bo)
+static int amdgpu_amdkfd_validate_vm_bo(void *_unused, struct amdgpu_bo *bo)
 {
-	struct amdgpu_vm_parser *p = param;
-
-	return amdgpu_amdkfd_bo_validate(bo, p->domain, p->wait);
+	return amdgpu_amdkfd_bo_validate(bo, bo->allowed_domains, false);
 }
 
 /* vm_validate_pt_pd_bos - Validate page table and directory BOs
@@ -366,20 +358,15 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)
 {
 	struct amdgpu_bo *pd = vm->root.base.bo;
 	struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev);
-	struct amdgpu_vm_parser param;
 	int ret;
 
-	param.domain = AMDGPU_GEM_DOMAIN_VRAM;
-	param.wait = false;
-
-	ret = amdgpu_vm_validate_pt_bos(adev, vm, amdgpu_amdkfd_validate,
-					&param);
+	ret = amdgpu_vm_validate_pt_bos(adev, vm, amdgpu_amdkfd_validate_vm_bo, NULL);
 	if (ret) {
 		pr_err("failed to validate PT BOs\n");
 		return ret;
 	}
 
-	ret = amdgpu_amdkfd_validate(&param, pd);
+	ret = amdgpu_amdkfd_validate_vm_bo(NULL, pd);
 	if (ret) {
 		pr_err("failed to validate PD\n");
 		return ret;

--
2.31.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

maintainer Reviewed-by on v3 1/1
#1 lore raw

Am 08.06.21 um 15:06 schrieb Nirmoy Das:

Quoted 7 lines

Fixes handling when page tables are in system memory.

v3: remove struct amdgpu_vm_parser.
v2: remove unwanted variable.
change amdgpu_amdkfd_validate instead of amdgpu_amdkfd_bo_validate.

Quoted 59 lines
---
  .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c  | 21 ++++---------------
  1 file changed, 4 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4 -18
index d6cb7cf76623..016815b7a773 100644
@@ -47,12 +47,6 @@ static struct {
  	spinlock_t mem_limit_lock;
  } kfd_mem_limit;
 
-/* Struct used for amdgpu_amdkfd_bo_validate */
-struct amdgpu_vm_parser {
-	uint32_t        domain;
-	bool            wait;
-};
-
  static const char * const domain_bit_to_string[] = {
  		"CPU",
  		"GTT",
@@ -348,11 +342,9 @@ static int amdgpu_amdkfd_bo_validate(struct amdgpu_bo *bo, uint32_t domain,
  	return ret;
  }
 
-static int amdgpu_amdkfd_validate(void *param, struct amdgpu_bo *bo)
+static int amdgpu_amdkfd_validate_vm_bo(void *_unused, struct amdgpu_bo *bo)
  {
-	struct amdgpu_vm_parser *p = param;
-
-	return amdgpu_amdkfd_bo_validate(bo, p->domain, p->wait);
+	return amdgpu_amdkfd_bo_validate(bo, bo->allowed_domains, false);
  }
 
  /* vm_validate_pt_pd_bos - Validate page table and directory BOs
@@ -366,20 +358,15 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)
  {
  	struct amdgpu_bo *pd = vm->root.base.bo;
  	struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev);
-	struct amdgpu_vm_parser param;
  	int ret;
 
-	param.domain = AMDGPU_GEM_DOMAIN_VRAM;
-	param.wait = false;
-
-	ret = amdgpu_vm_validate_pt_bos(adev, vm, amdgpu_amdkfd_validate,
-					&param);
+	ret = amdgpu_vm_validate_pt_bos(adev, vm, amdgpu_amdkfd_validate_vm_bo, NULL);
  	if (ret) {
  		pr_err("failed to validate PT BOs\n");
  		return ret;
  	}
 
-	ret = amdgpu_amdkfd_validate(&param, pd);
+	ret = amdgpu_amdkfd_validate_vm_bo(NULL, pd);
  	if (ret) {
  		pr_err("failed to validate PD\n");
  		return ret;
--
Quoted 2 lines

2.31.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

maintainer Reviewed-by
#2 lore raw

Am 2021-06-08 um 9:08 a.m. schrieb Christian König:

Quoted 11 lines

Am 08.06.21 um 15:06 schrieb Nirmoy Das:

Quoted 7 lines

Fixes handling when page tables are in system memory.

v3: remove struct amdgpu_vm_parser.
v2: remove unwanted variable.
     change amdgpu_amdkfd_validate instead of amdgpu_amdkfd_bo_validate.

should probably take a look as well.

Thanks.

Quoted 59 lines
Quoted 59 lines

---
  .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c  | 21 ++++---------------

  1 file changed, 4 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +2 -10
index d6cb7cf76623..016815b7a773 100644
@@ -47,12 +47,6 @@ static struct {
       spinlock_t mem_limit_lock;
   } kfd_mem_limit;
 
-/* Struct used for amdgpu_amdkfd_bo_validate */
-struct amdgpu_vm_parser {
-    uint32_t        domain;
-    bool            wait;
-};
-
   static const char * const domain_bit_to_string[] = {
           "CPU",
           "GTT",
@@ -348,11 +342,9 @@ static int amdgpu_amdkfd_bo_validate(struct
 amdgpu_bo *bo, uint32_t domain,
       return ret;
   }
 
-static int amdgpu_amdkfd_validate(void *param, struct amdgpu_bo *bo)
+static int amdgpu_amdkfd_validate_vm_bo(void *_unused, struct
 amdgpu_bo *bo)
   {
-    struct amdgpu_vm_parser *p = param;
-
-    return amdgpu_amdkfd_bo_validate(bo, p->domain, p->wait);
+    return amdgpu_amdkfd_bo_validate(bo, bo->allowed_domains, false);
   }

  /* vm_validate_pt_pd_bos - Validate page table and directory BOs

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1 -6
@@ -366,20 +358,15 @@ static int vm_validate_pt_pd_bos(struct
 amdgpu_vm *vm)
   {
       struct amdgpu_bo *pd = vm->root.base.bo;
       struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev);
-    struct amdgpu_vm_parser param;
       int ret;
 
-    param.domain = AMDGPU_GEM_DOMAIN_VRAM;
-    param.wait = false;
-
-    ret = amdgpu_vm_validate_pt_bos(adev, vm, amdgpu_amdkfd_validate,
-                    &param);
+    ret = amdgpu_vm_validate_pt_bos(adev, vm,
 amdgpu_amdkfd_validate_vm_bo, NULL);
       if (ret) {
           pr_err("failed to validate PT BOs\n");
           return ret;
       }
 
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1 -1
-    ret = amdgpu_amdkfd_validate(&param, pd);
+    ret = amdgpu_amdkfd_validate_vm_bo(NULL, pd);
       if (ret) {

          pr_err("failed to validate PD\n");
          return ret;

Signature · 1 line
2.31.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx