tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: dma-buf: Cleanup minor usage in "Add proper kref handling on dma-buf heaps"

Browse Source 
When submitting a cherry-picked version of commit c700bdd223
("ANDROID: dma-heap: Add proper kref handling on dma-buf heaps")
from the android-mainline tree, Greg had some feedback that
tracking the minor number wasn't necessary as it was already
stored in the heap_devt:
  https://android-review.googlesource.com/c/kernel/common/+/1433176/4#message-b07e73548e082ae85b97c3f3ff889ae4ab6ab09d

So this patch reworks those changes so we don't need an extra
minor field in the dma_heap struct.

Fixes: c700bdd223 ("ANDROID: dma-heap: Add proper kref handling on dma-buf heaps")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I5f12e2249a6a02ee02dc19049b7b3577e094b0ce
Bug: 154341375
This commit is contained in:
John Stultz
2020-10-14 02:40:03 +00:00
parent 0695bfe5fb
commit f1a25121dd
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/dma-buf/dma-heap.c
+6 -5
View File
@@ -40,7 +40,6 @@ struct dma_heap {
dev_t heap_devt;
struct list_head list;
struct cdev heap_cdev;
int minor;
struct kref refcount;
};
@@ -241,13 +240,14 @@ void *dma_heap_get_drvdata(struct dma_heap *heap)
static void dma_heap_release(struct kref *ref)
{
struct dma_heap *heap = container_of(ref, struct dma_heap, refcount);
int minor = MINOR(heap->heap_devt);
/* Note, we already holding the heap_list_lock here */
list_del(&heap->list);
device_destroy(dma_heap_class, heap->heap_devt);
cdev_del(&heap->heap_cdev);
xa_erase(&dma_heap_minors, heap->minor);
xa_erase(&dma_heap_minors, minor);
kfree(heap);
}
@@ -267,6 +267,7 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info)
{
struct dma_heap *heap, *err_ret;
struct device *dev_ret;
int minor;
int ret;
if (!exp_info->name || !strcmp(exp_info->name, "")) {
@@ -298,7 +299,7 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info)
heap->priv = exp_info->priv;
/* Find unused minor number */
ret = xa_alloc(&dma_heap_minors, &heap->minor, heap,
ret = xa_alloc(&dma_heap_minors, &minor, heap,
XA_LIMIT(0, NUM_HEAP_MINORS - 1), GFP_KERNEL);
if (ret < 0) {
pr_err("dma_heap: Unable to get minor number for heap\n");
@@ -307,7 +308,7 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info)
}
/* Create device */
heap->heap_devt = MKDEV(MAJOR(dma_heap_devt), heap->minor);
heap->heap_devt = MKDEV(MAJOR(dma_heap_devt), minor);
cdev_init(&heap->heap_cdev, &dma_heap_fops);
ret = cdev_add(&heap->heap_cdev, heap->heap_devt, 1);
@@ -337,7 +338,7 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info)
err2:
cdev_del(&heap->heap_cdev);
err1:
xa_erase(&dma_heap_minors, heap->minor);
xa_erase(&dma_heap_minors, minor);
err0:
kfree(heap);
return err_ret;