UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

dma-buf: cleanup dma_fence_unwrap selftest v2 

The selftests, fix the error handling, remove unused functions and stop
leaking memory in failed tests.

v2: fix the memory leak correctly.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220518135844.3338-2-christian.koenig@amd.com
This commit is contained in:
Christian König 2022-05-04 12:28:31 +02:00
parent 435c249008
commit 0c5064fa8d
1 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/dma-buf/st-dma-fence-unwrap.c
View File

@ -4,27 +4,19 @@
* Copyright (C) 2022 Advanced Micro Devices, Inc. * Copyright (C) 2022 Advanced Micro Devices, Inc.
*/ */
#include <linux/dma-fence.h>
#include <linux/dma-fence-array.h>
#include <linux/dma-fence-chain.h>
#include <linux/dma-fence-unwrap.h> #include <linux/dma-fence-unwrap.h>
#if 0
#include <linux/kernel.h>
#include <linux/kthread.h>
#include <linux/mm.h>
#include <linux/sched/signal.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/random.h>
#endif
#include "selftest.h" #include "selftest.h"
#define CHAIN_SZ (4 << 10) #define CHAIN_SZ (4 << 10)
static inline struct mock_fence { struct mock_fence {
struct dma_fence base; struct dma_fence base;
spinlock_t lock; spinlock_t lock;
} *to_mock_fence(struct dma_fence *f) { };
return container_of(f, struct mock_fence, base);
}
static const char *mock_name(struct dma_fence *f) static const char *mock_name(struct dma_fence *f)
{ {
@ -45,7 +37,8 @@ static struct dma_fence *mock_fence(void)
return NULL; return NULL;
spin_lock_init(&f->lock); spin_lock_init(&f->lock);
dma_fence_init(&f->base, &mock_ops, &f->lock, 0, 0); dma_fence_init(&f->base, &mock_ops, &f->lock,
dma_fence_context_alloc(1), 1);
return &f->base; return &f->base;
} }
@ -59,7 +52,7 @@ static struct dma_fence *mock_array(unsigned int num_fences, ...)
fences = kcalloc(num_fences, sizeof(*fences), GFP_KERNEL); fences = kcalloc(num_fences, sizeof(*fences), GFP_KERNEL);
if (!fences) if (!fences)
return NULL; goto error_put;
va_start(valist, num_fences); va_start(valist, num_fences);
for (i = 0; i < num_fences; ++i) for (i = 0; i < num_fences; ++i)
@ -70,13 +63,17 @@ static struct dma_fence *mock_array(unsigned int num_fences, ...)
dma_fence_context_alloc(1), dma_fence_context_alloc(1),
1, false); 1, false);
if (!array) if (!array)
goto cleanup; goto error_free;
return &array->base; return &array->base;
cleanup: error_free:
for (i = 0; i < num_fences; ++i)
dma_fence_put(fences[i]);
kfree(fences); kfree(fences);
error_put:
va_start(valist, num_fences);
for (i = 0; i < num_fences; ++i)
dma_fence_put(va_arg(valist, typeof(*fences)));
va_end(valist);
return NULL; return NULL;
} }
@ -113,7 +110,6 @@ static int sanitycheck(void *arg)
if (!chain) if (!chain)
return -ENOMEM; return -ENOMEM;
dma_fence_signal(f);
dma_fence_put(chain); dma_fence_put(chain);
return err; return err;
} }
@ -154,10 +150,8 @@ static int unwrap_array(void *arg)
err = -EINVAL; err = -EINVAL;
} }
dma_fence_signal(f1);
dma_fence_signal(f2);
dma_fence_put(array); dma_fence_put(array);
return 0; return err;
} }
static int unwrap_chain(void *arg) static int unwrap_chain(void *arg)
@ -196,10 +190,8 @@ static int unwrap_chain(void *arg)
err = -EINVAL; err = -EINVAL;
} }
dma_fence_signal(f1);
dma_fence_signal(f2);
dma_fence_put(chain); dma_fence_put(chain);
return 0; return err;
} }
static int unwrap_chain_array(void *arg) static int unwrap_chain_array(void *arg)
@ -242,10 +234,8 @@ static int unwrap_chain_array(void *arg)
err = -EINVAL; err = -EINVAL;
} }
dma_fence_signal(f1);
dma_fence_signal(f2);
dma_fence_put(chain); dma_fence_put(chain);
return 0; return err;
} }
int dma_fence_unwrap(void) int dma_fence_unwrap(void)