Skip to contentSkip to conversation

drm/amdgpu: user pages array memory leak fix

PATCH Superseded Yang, Philip 4 participants 6 messages Oct 3, 2019 – Oct 11, 2019 4 messages not in the archive

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: user pages array memory leak fix

user_pages array should always be freed after validation regardless if user pages are changed after bo is created because with HMM change parse bo always allocate user pages array to get user pages for userptr bo.

Don't need to get user pages while creating uerptr bo because user pages will only be used while validating after parsing userptr bo.

Bugzilla: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1844962

v2: remove unused local variable and amend commit

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c  |  4 +---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +----------------------
 2 files changed, 2 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -3
index 49b767b7238f..961186e7113e 100644
@@ -474,7 +474,6 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
 
 	list_for_each_entry(lobj, validated, tv.head) {
 		struct amdgpu_bo *bo = ttm_to_amdgpu_bo(lobj->tv.bo);
-		bool binding_userptr = false;
 		struct mm_struct *usermm;
 
 		usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);
@@ -491,14 +490,13 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
 
 			amdgpu_ttm_tt_set_user_pages(bo->tbo.ttm,
 						     lobj->user_pages);
-			binding_userptr = true;
 		}
 
 		r = amdgpu_cs_validate(p, bo);
 		if (r)
 			return r;
 
-		if (binding_userptr) {
+		if (lobj->user_pages) {
 			kvfree(lobj->user_pages);
 			lobj->user_pages = NULL;
 		}
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 -22
index a828e3d0bfbd..3ccd61d69964 100644
@@ -283,7 +283,6 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
 int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
 			     struct drm_file *filp)
 {
-	struct ttm_operation_ctx ctx = { true, false };
 	struct amdgpu_device *adev = dev->dev_private;
 	struct drm_amdgpu_gem_userptr *args = data;
 	struct drm_gem_object *gobj;
@@ -326,32 +325,12 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
 			goto release_object;
 	}
 
-	if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE) {
-		r = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);
-		if (r)
-			goto release_object;
-
-		r = amdgpu_bo_reserve(bo, true);
-		if (r)
-			goto user_pages_done;
-
-		amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_GTT);
-		r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
-		amdgpu_bo_unreserve(bo);
-		if (r)
-			goto user_pages_done;
-	}
-
 	r = drm_gem_handle_create(filp, gobj, &handle);
 	if (r)
-		goto user_pages_done;
+		goto release_object;
 
 	args->handle = handle;
 
-user_pages_done:
-	if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE)
-		amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);
-
 release_object:
 	drm_gem_object_put_unlocked(gobj);
 
Signature · 6 lines
2.17.1

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

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

Thanks Joe for the test, I will add your Tested-by.

Hi Christian,

May you help review? The change removes the get user pages from gem_userptr_ioctl, this was done if flags AMDGPU_GEM_USERPTR_VALIDATE is set, and delay the get user pages to amdgpu_cs_parser_bos, and check if user pages are invalidated when amdgpu_cs_submit. I don't find issue for overnight test, but not sure if there is potential side effect.

Thanks,
Philip

Quoted 82 lines · Philip

user_pages array should always be freed after validation regardless if user pages are changed after bo is created because with HMM change parse bo always allocate user pages array to get user pages for userptr bo.

Don't need to get user pages while creating uerptr bo because user pages will only be used while validating after parsing userptr bo.

Bugzilla: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1844962

v2: remove unused local variable and amend commit

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c  |  4 +---
  drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +----------------------
  2 files changed, 2 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -3
index 49b767b7238f..961186e7113e 100644
@@ -474,7 +474,6 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
 
  	list_for_each_entry(lobj, validated, tv.head) {
  		struct amdgpu_bo *bo = ttm_to_amdgpu_bo(lobj->tv.bo);
-		bool binding_userptr = false;
  		struct mm_struct *usermm;
 
  		usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);
@@ -491,14 +490,13 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
 
  			amdgpu_ttm_tt_set_user_pages(bo->tbo.ttm,
  						     lobj->user_pages);
-			binding_userptr = true;
  		}
 
  		r = amdgpu_cs_validate(p, bo);
  		if (r)
  			return r;
 
-		if (binding_userptr) {
+		if (lobj->user_pages) {
  			kvfree(lobj->user_pages);
  			lobj->user_pages = NULL;
  		}
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 -18
index a828e3d0bfbd..3ccd61d69964 100644
@@ -283,7 +283,6 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
  int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
  			     struct drm_file *filp)
  {
-	struct ttm_operation_ctx ctx = { true, false };
  	struct amdgpu_device *adev = dev->dev_private;
  	struct drm_amdgpu_gem_userptr *args = data;
  	struct drm_gem_object *gobj;
@@ -326,32 +325,12 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
  			goto release_object;
  	}
 
-	if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE) {
-		r = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);
-		if (r)
-			goto release_object;
-
-		r = amdgpu_bo_reserve(bo, true);
-		if (r)
-			goto user_pages_done;
-
-		amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_GTT);
-		r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
-		amdgpu_bo_unreserve(bo);
-		if (r)
-			goto user_pages_done;
-	}
-
  	r = drm_gem_handle_create(filp, gobj, &handle);
  	if (r)
-		goto user_pages_done;
+		goto release_object;

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, · line 336

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0 -4
 
  	args->handle = handle;
 
-user_pages_done:
-	if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE)
-		amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);
-
  release_object:
  	drm_gem_object_put_unlocked(gobj);
 

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

A message that is not in the archive (sent off-list or not yet received): e86d92cd-7bae-6704-00db-1a79ccbb1011-5C7GfCeVMHo@public.gmane.org

#4 lore raw

Hi Philip,

Am 04.10.19 um 15:40 schrieb Yang, Philip:

Quoted 9 lines

Thanks Joe for the test, I will add your Tested-by.

Hi Christian,

May you help review? The change removes the get user pages from gem_userptr_ioctl, this was done if flags AMDGPU_GEM_USERPTR_VALIDATE is set, and delay the get user pages to amdgpu_cs_parser_bos, and check if user pages are invalidated when amdgpu_cs_submit. I don't find issue for overnight test, but not sure if there is potential side effect.

Yeah, seen that.

The AMDGPU_GEM_USERPTR_VALIDATE was explicitly added to cause a validation during BO creation because of some very stupid applications.

I didn't wanted to reject that without offering an alternative, but we seriously can't do this or it would break Vulkan/OpenGL.

I need more time to take a closer look,
Christian.

Quoted 89 lines

Thanks,
Philip

Quoted 84 lines · Philip

user_pages array should always be freed after validation regardless if user pages are changed after bo is created because with HMM change parse bo always allocate user pages array to get user pages for userptr bo.

Don't need to get user pages while creating uerptr bo because user pages will only be used while validating after parsing userptr bo.

Bugzilla: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1844962

v2: remove unused local variable and amend commit

---
   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c  |  4 +---
   drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +----------------------
   2 files changed, 2 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -3
index 49b767b7238f..961186e7113e 100644
@@ -474,7 +474,6 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
 
   	list_for_each_entry(lobj, validated, tv.head) {
   		struct amdgpu_bo *bo = ttm_to_amdgpu_bo(lobj->tv.bo);
-		bool binding_userptr = false;
   		struct mm_struct *usermm;
 
   		usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);
@@ -491,14 +490,13 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
 
   			amdgpu_ttm_tt_set_user_pages(bo->tbo.ttm,
   						     lobj->user_pages);
-			binding_userptr = true;
   		}
 
   		r = amdgpu_cs_validate(p, bo);
   		if (r)
   			return r;
 
-		if (binding_userptr) {
+		if (lobj->user_pages) {
   			kvfree(lobj->user_pages);
   			lobj->user_pages = NULL;
   		}
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 -18
index a828e3d0bfbd..3ccd61d69964 100644
@@ -283,7 +283,6 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
   int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
   			     struct drm_file *filp)
   {
-	struct ttm_operation_ctx ctx = { true, false };
   	struct amdgpu_device *adev = dev->dev_private;
   	struct drm_amdgpu_gem_userptr *args = data;
   	struct drm_gem_object *gobj;
@@ -326,32 +325,12 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
   			goto release_object;
   	}
 
-	if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE) {
-		r = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);
-		if (r)
-			goto release_object;
-
-		r = amdgpu_bo_reserve(bo, true);
-		if (r)
-			goto user_pages_done;
-
-		amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_GTT);
-		r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
-		amdgpu_bo_unreserve(bo);
-		if (r)
-			goto user_pages_done;
-	}
-
   	r = drm_gem_handle_create(filp, gobj, &handle);
   	if (r)
-		goto user_pages_done;
+		goto release_object;
 
   	args->handle = handle;
 
Quoted 8 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, · line 336

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0 -4
-user_pages_done:
-	if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE)
-		amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);
-
   release_object:
   	drm_gem_object_put_unlocked(gobj);
 

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

A message that is not in the archive (sent off-list or not yet received): 6640c636-79d1-6159-a1db-5f39f70096a1-5C7GfCeVMHo@public.gmane.org

#6 lore raw

Thanks for looking at this Christian. Let me know if there's anything I can do to help.

In the meantime, is there a workaround to avoid the memory leak other than using a kernel from before the HMM change?

Thanks,
-Joe

Quoted 119 lines · Christian

Hi Philip,

Am 04.10.19 um 15:40 schrieb Yang, Philip:

Quoted 9 lines

Thanks Joe for the test, I will add your Tested-by.

Hi Christian,

May you help review? The change removes the get user pages from gem_userptr_ioctl, this was done if flags AMDGPU_GEM_USERPTR_VALIDATE is set, and delay the get user pages to amdgpu_cs_parser_bos, and check if user pages are invalidated when amdgpu_cs_submit. I don't find issue for overnight test, but not sure if there is potential side effect.

Yeah, seen that.

The AMDGPU_GEM_USERPTR_VALIDATE was explicitly added to cause a validation during BO creation because of some very stupid applications.

I didn't wanted to reject that without offering an alternative, but we seriously can't do this or it would break Vulkan/OpenGL.

I need more time to take a closer look,
Christian.

Quoted 16 lines

Thanks,
Philip

Quoted 11 lines · Philip

user_pages array should always be freed after validation regardless if user pages are changed after bo is created because with HMM change parse bo always allocate user pages array to get user pages for userptr bo.

Don't need to get user pages while creating uerptr bo because user pages will only be used while validating after parsing userptr bo.

Bugzilla: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1844962

v2: remove unused local variable and amend commit

Quoted 7 lines

Review

Quoted 7 lines
---
   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c  |  4 +---
   drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +----------------------
   2 files changed, 2 insertions(+), 25 deletions(-)
(quoted diff) +0 -0

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

Quoted 4 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c static int amdgpu_cs_list_validate(struct

Quoted 4 lines

index 49b767b7238f..961186e7113e 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +0 -0
@@ -474,7 +474,6 @@ static int amdgpu_cs_list_validate(struct

amdgpu_cs_parser *p,

Quoted 8 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c static int amdgpu_cs_list_validate(struct

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +0 -1
     list_for_each_entry(lobj, validated, tv.head) {
             struct amdgpu_bo *bo = ttm_to_amdgpu_bo(lobj->tv.bo);
-            bool binding_userptr = false;
             struct mm_struct *usermm;
 
             usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);
@@ -491,14 +490,13 @@ static int amdgpu_cs_list_validate(struct

amdgpu_cs_parser *p,

Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +0 -1
                     amdgpu_ttm_tt_set_user_pages(bo->tbo.ttm,
                                                  lobj->user_pages);
-                    binding_userptr = true;
             }
 
             r = amdgpu_cs_validate(p, bo);
             if (r)
                     return r;
 
Quoted 6 lines

Review

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -1
-            if (binding_userptr) {
+            if (lobj->user_pages) {
                     kvfree(lobj->user_pages);
                     lobj->user_pages = NULL;
             }
(quoted diff) +0 -0

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

Quoted 4 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c int amdgpu_gem_create_ioctl(struct drm_device *dev,

Quoted 4 lines

index a828e3d0bfbd..3ccd61d69964 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0 -0
@@ -283,7 +283,6 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev,

void *data,

Quoted 8 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c int amdgpu_gem_userptr_ioctl(struct drm_device

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0 -1
   int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
                          struct drm_file *filp)
   {
-    struct ttm_operation_ctx ctx = { true, false };
     struct amdgpu_device *adev = dev->dev_private;
     struct drm_amdgpu_gem_userptr *args = data;
     struct drm_gem_object *gobj;
@@ -326,32 +325,12 @@ int amdgpu_gem_userptr_ioctl(struct drm_device

*dev, void *data,

Quoted 26 lines
Quoted 26 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 -17
                     goto release_object;
     }
 
-    if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE) {
-            r = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);
-            if (r)
-                    goto release_object;
-
-            r = amdgpu_bo_reserve(bo, true);
-            if (r)
-                    goto user_pages_done;
-
-            amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_GTT);
-            r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
-            amdgpu_bo_unreserve(bo);
-            if (r)
-                    goto user_pages_done;
-    }
-
     r = drm_gem_handle_create(filp, gobj, &handle);
     if (r)
-            goto user_pages_done;
+            goto release_object;
 
     args->handle = handle;
 
Quoted 10 lines
Quoted 8 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, · line 336

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0 -4
-user_pages_done:
-    if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE)
-            amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);
-
   release_object:
     drm_gem_object_put_unlocked(gobj);
 

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

#7 lore raw
In reply to a message not in the archive

Am 03.10.19 um 21:44 schrieb Yang, Philip:

Quoted 58 lines

user_pages array should always be freed after validation regardless if user pages are changed after bo is created because with HMM change parse bo always allocate user pages array to get user pages for userptr bo.

Don't need to get user pages while creating uerptr bo because user pages will only be used while validating after parsing userptr bo.

Bugzilla: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1844962

v2: remove unused local variable and amend commit

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c  |  4 +---
  drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +----------------------
  2 files changed, 2 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -3
index 49b767b7238f..961186e7113e 100644
@@ -474,7 +474,6 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
 
  	list_for_each_entry(lobj, validated, tv.head) {
  		struct amdgpu_bo *bo = ttm_to_amdgpu_bo(lobj->tv.bo);
-		bool binding_userptr = false;
  		struct mm_struct *usermm;
 
  		usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);
@@ -491,14 +490,13 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
 
  			amdgpu_ttm_tt_set_user_pages(bo->tbo.ttm,
  						     lobj->user_pages);
-			binding_userptr = true;
  		}
 
  		r = amdgpu_cs_validate(p, bo);
  		if (r)
  			return r;
 
-		if (binding_userptr) {
+		if (lobj->user_pages) {
  			kvfree(lobj->user_pages);
  			lobj->user_pages = NULL;
  		}
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0 -1
index a828e3d0bfbd..3ccd61d69964 100644
@@ -283,7 +283,6 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
  int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
  			     struct drm_file *filp)
  {
-	struct ttm_operation_ctx ctx = { true, false };
  	struct amdgpu_device *adev = dev->dev_private;
  	struct drm_amdgpu_gem_userptr *args = data;
  	struct drm_gem_object *gobj;

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, · line 329

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0 -1
@@ -326,32 +325,12 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
  			goto release_object;
  	}
 
-	if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE) {

We can't drop that handling here, it is mandatory to detect an application bug where an application tries to user an userptr with a VMA which is not anonymous memory.

This must be detected and rejected as invalid here.

I suggest that we allocate a local pages array similar to how we do it during CS and release that after the function is done.

Regards,
Christian.

Quoted 19 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 -16
-		r = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);
-		if (r)
-			goto release_object;
-
-		r = amdgpu_bo_reserve(bo, true);
-		if (r)
-			goto user_pages_done;
-
-		amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_GTT);
-		r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
-		amdgpu_bo_unreserve(bo);
-		if (r)
-			goto user_pages_done;
-	}
-
  	r = drm_gem_handle_create(filp, gobj, &handle);
  	if (r)
-		goto user_pages_done;
+		goto release_object;

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, · line 336

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0 -4
 
  	args->handle = handle;
 
-user_pages_done:
-	if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE)
-		amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);
-
  release_object:
  	drm_gem_object_put_unlocked(gobj);
 

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

A message that is not in the archive (sent off-list or not yet received): af664c43-a81b-bae4-8f6f-c70bc4ab9de5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#9 lore raw
Quoted 68 lines · Christian König

Am 03.10.19 um 21:44 schrieb Yang, Philip:

Quoted 58 lines

user_pages array should always be freed after validation regardless if user pages are changed after bo is created because with HMM change parse bo always allocate user pages array to get user pages for userptr bo.

Don't need to get user pages while creating uerptr bo because user pages will only be used while validating after parsing userptr bo.

Bugzilla: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1844962

v2: remove unused local variable and amend commit

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c  |  4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +----------------------

  2 files changed, 2 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -3
index 49b767b7238f..961186e7113e 100644
@@ -474,7 +474,6 @@ static int amdgpu_cs_list_validate(struct 
 amdgpu_cs_parser *p,
       list_for_each_entry(lobj, validated, tv.head) {
           struct amdgpu_bo *bo = ttm_to_amdgpu_bo(lobj->tv.bo);
-        bool binding_userptr = false;
           struct mm_struct *usermm;
           usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);
@@ -491,14 +490,13 @@ static int amdgpu_cs_list_validate(struct 
 amdgpu_cs_parser *p,
               amdgpu_ttm_tt_set_user_pages(bo->tbo.ttm,
                                lobj->user_pages);
-            binding_userptr = true;
           }
           r = amdgpu_cs_validate(p, bo);
           if (r)
               return r;
-        if (binding_userptr) {
+        if (lobj->user_pages) {
               kvfree(lobj->user_pages);
               lobj->user_pages = NULL;
           }
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0 -1
index a828e3d0bfbd..3ccd61d69964 100644
@@ -283,7 +283,6 @@ int amdgpu_gem_create_ioctl(struct drm_device 
 *dev, void *data,
   int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
                    struct drm_file *filp)
   {
-    struct ttm_operation_ctx ctx = { true, false };
       struct amdgpu_device *adev = dev->dev_private;
       struct drm_amdgpu_gem_userptr *args = data;

      struct drm_gem_object *gobj;

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c int amdgpu_gem_userptr_ioctl(struct drm_device · line 329

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0 -1
@@ -326,32 +325,12 @@ int amdgpu_gem_userptr_ioctl(struct drm_device 
 *dev, void *data,
               goto release_object;
       }
-    if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE) {

We can't drop that handling here, it is mandatory to detect an application bug where an application tries to user an userptr with a VMA which is not anonymous memory.

Quoted 5 lines

This must be detected and rejected as invalid here.

I suggest that we allocate a local pages array similar to how we do it during CS and release that after the function is done.

Thanks for this, we can use bo->tbo.ttm->pages array here to avoid extra alloc/free of pages array because CS uses local pages array and update to bo->tbo.ttm->pages if user pages are moved. I will submit patch v3 for review.

Quoted 21 lines

Regards,
Christian.

Quoted 18 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0 -16
-        r = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);
-        if (r)
-            goto release_object;
-
-        r = amdgpu_bo_reserve(bo, true);
-        if (r)
-            goto user_pages_done;
-
-        amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_GTT);
-        r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
-        amdgpu_bo_unreserve(bo);
-        if (r)
-            goto user_pages_done;
-    }
-
       r = drm_gem_handle_create(filp, gobj, &handle);
       if (r)
-        goto user_pages_done;
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 -4
+        goto release_object;
       args->handle = handle;
-user_pages_done:
-    if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE)
-        amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);
-

  release_object:
      drm_gem_object_put_unlocked(gobj);

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