dma-buf/dma-fence: Remove dma_fence_later()
Subsystems (3)
Philipp Stanner
maintainerPATCH 1/1 dma-buf/dma-fence: Remove dma_fence_later()
dma_fence_later() does not have any in-tree users anymore. dma_fence_is_later() is available as an alternative.
Remove the surplus function.
---
No idea why we have two such functions.
dma_fence_later() seems to be older, coming from a big-bang commit in 2014. Yet Christian added dma_fence_is_later() in 2015.
*shrug*
--- drivers/dma-buf/dma-fence.c | 6 ------ include/linux/dma-fence.h | 26 -------------------------- 2 files changed, 32 deletions(-)
drivers/dma-buf/dma-fence.c +0 -6
@@ -1099,9 +1099,6 @@ __dma_fence_init(struct dma_fence *fence, const struct dma_fence_ops *ops,* refcount after committing with this fence, but it will need to hold a * refcount again if &dma_fence_ops.enable_signaling gets called. * -* context and seqno are used for easy comparison between fences, allowing -* to check which fence is later by simply using dma_fence_later(). -* * External locks are a relic of legacy use cases that needed a shared lock * to serialize signaling when no out-of-order signaling was possible through * &dma_fence_ops.signaled. Drivers have abandoned this concept since the
@@ -1129,9 +1126,6 @@ EXPORT_SYMBOL(dma_fence_init);* refcount after committing with this fence, but it will need to hold a * refcount again if &dma_fence_ops.enable_signaling gets called. * -* Context and seqno are used for easy comparison between fences, allowing -* to check which fence is later by simply using dma_fence_later(). -* * New users MUST NOT use external locks. Check the documentation in * dma_fence_init() to understand the motives behind the legacy use cases. */
include/linux/dma-fence.h +0 -26
@@ -633,32 +633,6 @@ static inline bool dma_fence_is_later_or_same(struct dma_fence *f1,return f1 == f2 ||dma_fence_is_later (f1, f2); } -/** -* dma_fence_later - return the chronologically later fence -* @f1: the first fence from the same context -* @f2: the second fence from the same context -* -* Returns NULL if both fences are signaled, otherwise the fence that would be -* signaled last. Both fences must be from the same context, since a seqno is -* not re-used across contexts. -*/ -static inline struct dma_fence *dma_fence_later (struct dma_fence *f1, -struct dma_fence *f2) -{ -if (WARN_ON (f1->context != f2->context)) -return NULL ; - -/* -* Can't check just DMA_FENCE_FLAG_SIGNALED_BIT here, it may never -* have been set if enable_signaling wasn't called, and enabling that -* here is overkill. -*/ -if (dma_fence_is_later (f1, f2)) -return dma_fence_is_signaled (f1) ?NULL : f1; -else -return dma_fence_is_signaled (f2) ?NULL : f2; -} -/** * dma_fence_get_status_locked - returns the status upon completion * @fence: the dma_fence to query
Signature · 1 line
2.56.0
Quoted 4 lines · Philipp Stanner
dma_fence_later()does not have any in-tree users anymore.dma_fence_is_later()is available as an alternative.Remove the surplus function.
Ah, yes please :)
Quoted 1 line
Signed-off-by Philipp Stanner <[email protected]>
Quoted 7 lines
---
No idea why we have two such functions.
dma_fence_later()seems to be older, coming from a big-bang commit in 2014. Yet Christian addeddma_fence_is_later()in 2015.*shrug*
Because we had multiple occasions with dma_fence_later() where people were surprised that they got NULL in return resulting in NULL pointer dereference.
I wanted to phase out the old function over time but didn't noticed that this is actually finished.
Thanks,
Christian.
Quoted 66 lines
--- drivers/dma-buf/dma-fence.c | 6 ------ include/linux/dma-fence.h | 26 -------------------------- 2 files changed, 32 deletions(-)drivers/dma-buf/dma-fence.c +0
-6@@ -1099,9 +1099,6 @@ __dma_fence_init(struct dma_fence *fence, const struct dma_fence_ops *ops,* refcount after committing with this fence, but it will need to hold a * refcount again if &dma_fence_ops.enable_signaling gets called. * -* context and seqno are used for easy comparison between fences, allowing -* to check which fence is later by simply using dma_fence_later(). -* * External locks are a relic of legacy use cases that needed a shared lock * to serialize signaling when no out-of-order signaling was possible through * &dma_fence_ops.signaled. Drivers have abandoned this concept since the @@ -1129,9 +1126,6 @@ EXPORT_SYMBOL(dma_fence_init);* refcount after committing with this fence, but it will need to hold a * refcount again if &dma_fence_ops.enable_signaling gets called. * -* Context and seqno are used for easy comparison between fences, allowing -* to check which fence is later by simply using dma_fence_later(). -* * New users MUST NOT use external locks. Check the documentation in * dma_fence_init() to understand the motives behind the legacy use cases. */ include/linux/dma-fence.h +0
-26@@ -633,32 +633,6 @@ static inline bool dma_fence_is_later_or_same(struct dma_fence *f1,return f1 == f2 ||dma_fence_is_later (f1, f2); } -/** -* dma_fence_later - return the chronologically later fence -* @f1: the first fence from the same context -* @f2: the second fence from the same context -* -* Returns NULL if both fences are signaled, otherwise the fence that would be -* signaled last. Both fences must be from the same context, since a seqno is -* not re-used across contexts. -*/ -static inline struct dma_fence *dma_fence_later (struct dma_fence *f1, -struct dma_fence *f2) -{ -if (WARN_ON (f1->context != f2->context)) -return NULL ; - -/* -* Can't check just DMA_FENCE_FLAG_SIGNALED_BIT here, it may never -* have been set if enable_signaling wasn't called, and enabling that -* here is overkill. -*/ -if (dma_fence_is_later (f1, f2)) -return dma_fence_is_signaled (f1) ?NULL : f1; -else -return dma_fence_is_signaled (f2) ?NULL : f2; -} -/** * dma_fence_get_status_locked - returns the status upon completion * @fence: the dma_fence to query