On Tue, Apr 26, 2022 at 02:46:36PM +0200, Christian König wrote: > Move the code from the inline functions into exported functions. > > While at it also cleanup the the selftests, fix the error handling, > remove unused functions and stop leaking memory in failed tests.
Can you split this out? At least I'm not seeing why this has to be all smashed into one patch. -Daniel > > Signed-off-by: Christian König <[email protected]> > --- > drivers/dma-buf/Makefile | 2 +- > drivers/dma-buf/dma-fence-unwrap.c | 59 +++++++++++++++++++++++++++ > drivers/dma-buf/st-dma-fence-unwrap.c | 40 ++++++++---------- > include/linux/dma-fence-unwrap.h | 52 ++--------------------- > 4 files changed, 80 insertions(+), 73 deletions(-) > create mode 100644 drivers/dma-buf/dma-fence-unwrap.c > > diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile > index 4c9eb53ba3f8..70ec901edf2c 100644 > --- a/drivers/dma-buf/Makefile > +++ b/drivers/dma-buf/Makefile > @@ -1,6 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0-only > obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \ > - dma-resv.o > + dma-fence-unwrap.o dma-resv.o > obj-$(CONFIG_DMABUF_HEAPS) += dma-heap.o > obj-$(CONFIG_DMABUF_HEAPS) += heaps/ > obj-$(CONFIG_SYNC_FILE) += sync_file.o > diff --git a/drivers/dma-buf/dma-fence-unwrap.c > b/drivers/dma-buf/dma-fence-unwrap.c > new file mode 100644 > index 000000000000..711be125428c > --- /dev/null > +++ b/drivers/dma-buf/dma-fence-unwrap.c > @@ -0,0 +1,59 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * dma-fence-util: misc functions for dma_fence objects > + * > + * Copyright (C) 2022 Advanced Micro Devices, Inc. > + * Authors: > + * Christian König <[email protected]> > + */ > + > +#include <linux/dma-fence.h> > +#include <linux/dma-fence-array.h> > +#include <linux/dma-fence-chain.h> > +#include <linux/dma-fence-unwrap.h> > + > +/* Internal helper to start new array iteration, don't use directly */ > +static struct dma_fence * > +__dma_fence_unwrap_array(struct dma_fence_unwrap *cursor) > +{ > + cursor->array = dma_fence_chain_contained(cursor->chain); > + cursor->index = 0; > + return dma_fence_array_first(cursor->array); > +} > + > +/** > + * dma_fence_unwrap_first - return the first fence from fence containers > + * @head: the entrypoint into the containers > + * @cursor: current position inside the containers > + * > + * Unwraps potential dma_fence_chain/dma_fence_array containers and return > the > + * first fence. > + */ > +struct dma_fence *dma_fence_unwrap_first(struct dma_fence *head, > + struct dma_fence_unwrap *cursor) > +{ > + cursor->chain = dma_fence_get(head); > + return __dma_fence_unwrap_array(cursor); > +} > +EXPORT_SYMBOL_GPL(dma_fence_unwrap_first); > + > +/** > + * dma_fence_unwrap_next - return the next fence from a fence containers > + * @cursor: current position inside the containers > + * > + * Continue unwrapping the dma_fence_chain/dma_fence_array containers and > return > + * the next fence from them. > + */ > +struct dma_fence *dma_fence_unwrap_next(struct dma_fence_unwrap *cursor) > +{ > + struct dma_fence *tmp; > + > + ++cursor->index; > + tmp = dma_fence_array_next(cursor->array, cursor->index); > + if (tmp) > + return tmp; > + > + cursor->chain = dma_fence_chain_walk(cursor->chain); > + return __dma_fence_unwrap_array(cursor); > +} > +EXPORT_SYMBOL_GPL(dma_fence_unwrap_next); > diff --git a/drivers/dma-buf/st-dma-fence-unwrap.c > b/drivers/dma-buf/st-dma-fence-unwrap.c > index 039f016b57be..59628add93f5 100644 > --- a/drivers/dma-buf/st-dma-fence-unwrap.c > +++ b/drivers/dma-buf/st-dma-fence-unwrap.c > @@ -4,27 +4,19 @@ > * 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> > -#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" > > #define CHAIN_SZ (4 << 10) > > -static inline struct mock_fence { > +struct mock_fence { > struct dma_fence base; > 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) > { > @@ -45,7 +37,8 @@ static struct dma_fence *mock_fence(void) > return NULL; > > 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; > } > @@ -113,7 +106,6 @@ static int sanitycheck(void *arg) > if (!chain) > return -ENOMEM; > > - dma_fence_signal(f); > dma_fence_put(chain); > return err; > } > @@ -154,10 +146,10 @@ static int unwrap_array(void *arg) > err = -EINVAL; > } > > - dma_fence_signal(f1); > - dma_fence_signal(f2); > + dma_fence_put(f1); > + dma_fence_put(f2); > dma_fence_put(array); > - return 0; > + return err; > } > > static int unwrap_chain(void *arg) > @@ -196,10 +188,10 @@ static int unwrap_chain(void *arg) > err = -EINVAL; > } > > - dma_fence_signal(f1); > - dma_fence_signal(f2); > + dma_fence_put(f1); > + dma_fence_put(f2); > dma_fence_put(chain); > - return 0; > + return err; > } > > static int unwrap_chain_array(void *arg) > @@ -242,10 +234,10 @@ static int unwrap_chain_array(void *arg) > err = -EINVAL; > } > > - dma_fence_signal(f1); > - dma_fence_signal(f2); > + dma_fence_put(f1); > + dma_fence_put(f2); > dma_fence_put(chain); > - return 0; > + return err; > } > > int dma_fence_unwrap(void) > diff --git a/include/linux/dma-fence-unwrap.h > b/include/linux/dma-fence-unwrap.h > index 77e335a1bcac..e7c219da4ed7 100644 > --- a/include/linux/dma-fence-unwrap.h > +++ b/include/linux/dma-fence-unwrap.h > @@ -1,7 +1,5 @@ > /* SPDX-License-Identifier: GPL-2.0-only */ > /* > - * fence-chain: chain fences together in a timeline > - * > * Copyright (C) 2022 Advanced Micro Devices, Inc. > * Authors: > * Christian König <[email protected]> > @@ -10,8 +8,7 @@ > #ifndef __LINUX_DMA_FENCE_UNWRAP_H > #define __LINUX_DMA_FENCE_UNWRAP_H > > -#include <linux/dma-fence-chain.h> > -#include <linux/dma-fence-array.h> > +struct dma_fence; > > /** > * struct dma_fence_unwrap - cursor into the container structure > @@ -33,50 +30,9 @@ struct dma_fence_unwrap { > unsigned int index; > }; > > -/* Internal helper to start new array iteration, don't use directly */ > -static inline struct dma_fence * > -__dma_fence_unwrap_array(struct dma_fence_unwrap * cursor) > -{ > - cursor->array = dma_fence_chain_contained(cursor->chain); > - cursor->index = 0; > - return dma_fence_array_first(cursor->array); > -} > - > -/** > - * dma_fence_unwrap_first - return the first fence from fence containers > - * @head: the entrypoint into the containers > - * @cursor: current position inside the containers > - * > - * Unwraps potential dma_fence_chain/dma_fence_array containers and return > the > - * first fence. > - */ > -static inline struct dma_fence * > -dma_fence_unwrap_first(struct dma_fence *head, struct dma_fence_unwrap > *cursor) > -{ > - cursor->chain = dma_fence_get(head); > - return __dma_fence_unwrap_array(cursor); > -} > - > -/** > - * dma_fence_unwrap_next - return the next fence from a fence containers > - * @cursor: current position inside the containers > - * > - * Continue unwrapping the dma_fence_chain/dma_fence_array containers and > return > - * the next fence from them. > - */ > -static inline struct dma_fence * > -dma_fence_unwrap_next(struct dma_fence_unwrap *cursor) > -{ > - struct dma_fence *tmp; > - > - ++cursor->index; > - tmp = dma_fence_array_next(cursor->array, cursor->index); > - if (tmp) > - return tmp; > - > - cursor->chain = dma_fence_chain_walk(cursor->chain); > - return __dma_fence_unwrap_array(cursor); > -} > +struct dma_fence *dma_fence_unwrap_first(struct dma_fence *head, > + struct dma_fence_unwrap *cursor); > +struct dma_fence *dma_fence_unwrap_next(struct dma_fence_unwrap *cursor); > > /** > * dma_fence_unwrap_for_each - iterate over all fences in containers > -- > 2.25.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
