Skip to contentSkip to conversation

drm/amdgpu: switch kzalloc to kvmalloc in amdgpu_bo_create

PATCH In review Changfeng 2 participants 2 messages Jun 2, 2021

Subsystems (2)
lore
Share & tools
lore

Changfeng

author
#0 lore raw

PATCH 1/1 drm/amdgpu: switch kzalloc to kvmalloc in amdgpu_bo_create

From: changzhu <[email protected]>

From: Changfeng <[email protected]>

It will cause error when alloc memory larger than 128KB in amdgpu_bo_create->kzalloc. So it needs to switch kzalloc to kvmalloc.

Call Trace:
   alloc_pages_current+0x6a/0xe0
   kmalloc_order+0x32/0xb0
   kmalloc_order_trace+0x1e/0x80
   __kmalloc+0x249/0x2d0
   amdgpu_bo_create+0x102/0x500 [amdgpu]
   ? xas_create+0x264/0x3e0
   amdgpu_bo_create_vm+0x32/0x60 [amdgpu]
   amdgpu_vm_pt_create+0xf5/0x260 [amdgpu]
   amdgpu_vm_init+0x1fd/0x4d0 [amdgpu]
Change-Id If4082b0f7ba4fcd566af759e010840bc1a779747
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2 -2
index 15cee49f11e2..e5f62ca047a6 100644
@@ -100,7 +100,7 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo)
 		kfree(ubo->metadata);
 	}
 
-	kfree(bo);
+	kvfree(bo);
 }
 
 /**
@@ -565,7 +565,7 @@ int amdgpu_bo_create(struct amdgpu_device *adev,
 	BUG_ON(bp->bo_ptr_size < sizeof(struct amdgpu_bo));
 
 	*bo_ptr = NULL;
-	bo = kzalloc(bp->bo_ptr_size, GFP_KERNEL);
+	bo = kvmalloc(bp->bo_ptr_size, GFP_KERNEL | __GFP_ZERO);
 	if (bo == NULL)
 		return -ENOMEM;
 	drm_gem_private_object_init(adev_to_drm(adev), &bo->tbo.base, size);
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
maintainer
#1 lore raw

Am 02.06.21 um 16:09 schrieb Changfeng:

Quoted 38 lines

From: changzhu <[email protected]>

From: Changfeng <[email protected]>

It will cause error when alloc memory larger than 128KB in amdgpu_bo_create->kzalloc. So it needs to switch kzalloc to kvmalloc.

Call Trace:
    alloc_pages_current+0x6a/0xe0
    kmalloc_order+0x32/0xb0
    kmalloc_order_trace+0x1e/0x80
    __kmalloc+0x249/0x2d0
    amdgpu_bo_create+0x102/0x500 [amdgpu]
    ? xas_create+0x264/0x3e0
    amdgpu_bo_create_vm+0x32/0x60 [amdgpu]
    amdgpu_vm_pt_create+0xf5/0x260 [amdgpu]
    amdgpu_vm_init+0x1fd/0x4d0 [amdgpu]
Change-Id If4082b0f7ba4fcd566af759e010840bc1a779747
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -1
index 15cee49f11e2..e5f62ca047a6 100644
@@ -100,7 +100,7 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo)
  		kfree(ubo->metadata);
  	}
 
-	kfree(bo);
+	kvfree(bo);
  }
 
  /**

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c int amdgpu_bo_create(struct amdgpu_device *adev, · line 568

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -1
@@ -565,7 +565,7 @@ int amdgpu_bo_create(struct amdgpu_device *adev,
  	BUG_ON(bp->bo_ptr_size < sizeof(struct amdgpu_bo));
 
  	*bo_ptr = NULL;
-	bo = kzalloc(bp->bo_ptr_size, GFP_KERNEL);
+	bo = kvmalloc(bp->bo_ptr_size, GFP_KERNEL | __GFP_ZERO);

Please use kvzalloc() here. It has identical functionality but is more convenient I think.

With that done the patch is Reviewed-by: Christian König <[email protected]>

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c int amdgpu_bo_create(struct amdgpu_device *adev, · line 571

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0 -0
  	if (bo == NULL)
  		return -ENOMEM;
  	drm_gem_private_object_init(adev_to_drm(adev), &bo->tbo.base, size);

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