Skip to contentSkip to conversation

drm/panfrost: Use kvfree() to free bo->sgts in panfrost_mmu_map_fault_addr()

PATCH Superseded Denis Efremov 2 participants 4 messages Jun 5, 2020 – Jun 11, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/panfrost: Use kvfree() to free bo->sgts in panfrost_mmu_map_fault_addr()

Use kvfree() to free bo->sgts, because the memory is allocated with kvmalloc_array().

Fixes 187d2929206e ("drm/panfrost: Add support for GPU heap allocations")
---
 drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panfrost/panfrost_mmu.c +1 -1
index ed28aeba6d59..3c8ae7411c80 100644
@@ -486,7 +486,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,
 		pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT,
 				       sizeof(struct page *), GFP_KERNEL | __GFP_ZERO);
 		if (!pages) {
-			kfree(bo->sgts);
+			kvfree(bo->sgts);
 			bo->sgts = NULL;
 			mutex_unlock(&bo->base.pages_lock);
 			ret = -ENOMEM;
Signature · 1 line
2.26.2
maintainer
#1 lore raw
Quoted 6 lines · Denis Efremov

Use kvfree() to free bo->sgts, because the memory is allocated with kvmalloc_array().

Fixes 187d2929206e ("drm/panfrost: Add support for GPU heap allocations")

Well spotted, but there's another one in panfrost_gem_free_object(). Please can you fix that at the same time?

Thanks,

Steve

Quoted 18 lines
---
  drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panfrost/panfrost_mmu.c +1 -1
index ed28aeba6d59..3c8ae7411c80 100644
@@ -486,7 +486,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,
  		pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT,
  				       sizeof(struct page *), GFP_KERNEL | __GFP_ZERO);
  		if (!pages) {
-			kfree(bo->sgts);
+			kvfree(bo->sgts);
  			bo->sgts = NULL;
  			mutex_unlock(&bo->base.pages_lock);
  			ret = -ENOMEM;
#2 lore raw

PATCH v2 1/1 drm/panfrost: Use kvfree() to free bo->sgts

In reply to Denis Efremov

Use kvfree() to free bo->sgts, because the memory is allocated with kvmalloc_array() in panfrost_mmu_map_fault_addr().

Fixes 187d2929206e ("drm/panfrost: Add support for GPU heap allocations")

---
Change in v2:
- kvfree() fixed in panfrost_gem_free_object(), thanks to Steven Price

 drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +-
 drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panfrost/panfrost_gem.c +1 -1
index 17b654e1eb94..556181ea4a07 100644
@@ -46,7 +46,7 @@ static void panfrost_gem_free_object(struct drm_gem_object *obj)
 				sg_free_table(&bo->sgts[i]);
 			}
 		}
-		kfree(bo->sgts);
+		kvfree(bo->sgts);
 	}
 
 	drm_gem_shmem_free_object(obj);
drivers/gpu/drm/panfrost/panfrost_mmu.c +1 -1
index ed28aeba6d59..3c8ae7411c80 100644
@@ -486,7 +486,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,
 		pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT,
 				       sizeof(struct page *), GFP_KERNEL | __GFP_ZERO);
 		if (!pages) {
-			kfree(bo->sgts);
+			kvfree(bo->sgts);
 			bo->sgts = NULL;
 			mutex_unlock(&bo->base.pages_lock);
 			ret = -ENOMEM;
Signature · 1 line
2.26.2
maintainer Reviewed-by on v2 1/1
#3 lore raw

Re: [PATCH v2] drm/panfrost: Use kvfree() to free bo->sgts

Quoted 6 lines · Denis Efremov

Use kvfree() to free bo->sgts, because the memory is allocated with kvmalloc_array() in panfrost_mmu_map_fault_addr().

Fixes 187d2929206e ("drm/panfrost: Add support for GPU heap allocations")

Thanks,

Steve

Quoted 27 lines

---
Change in v2:
- kvfree() fixed in panfrost_gem_free_object(), thanks to Steven Price

  drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +-
  drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panfrost/panfrost_gem.c +1 -1
index 17b654e1eb94..556181ea4a07 100644
@@ -46,7 +46,7 @@ static void panfrost_gem_free_object(struct drm_gem_object *obj)
  				sg_free_table(&bo->sgts[i]);
  			}
  		}
-		kfree(bo->sgts);
+		kvfree(bo->sgts);
  	}
 
  	drm_gem_shmem_free_object(obj);
drivers/gpu/drm/panfrost/panfrost_mmu.c +0 -0
index ed28aeba6d59..3c8ae7411c80 100644

drivers/gpu/drm/panfrost/panfrost_mmu.c static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, · line 492

Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +1 -1
@@ -486,7 +486,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,
  		pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT,
  				       sizeof(struct page *), GFP_KERNEL | __GFP_ZERO);
  		if (!pages) {
-			kfree(bo->sgts);
+			kvfree(bo->sgts);
  			bo->sgts = NULL;
  			mutex_unlock(&bo->base.pages_lock);
  			ret = -ENOMEM;

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