Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:10:51 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: dma-fence.h
src/sys/external/bsd/drm2/linux: linux_dma_fence.c
Log Message:
drm: Sprinkle assertions about fence lifetime.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/drm2/include/linux/dma-fence.h
cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/drm2/linux/linux_dma_fence.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/dma-fence.h
diff -u src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.14 src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.15
--- src/sys/external/bsd/drm2/include/linux/dma-fence.h:1.14 Sun Dec 19 12:02:40 2021
+++ src/sys/external/bsd/drm2/include/linux/dma-fence.h Sun Dec 19 12:10:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dma-fence.h,v 1.14 2021/12/19 12:02:40 riastradh Exp $ */
+/* $NetBSD: dma-fence.h,v 1.15 2021/12/19 12:10:51 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -59,6 +59,7 @@ struct dma_fence {
TAILQ_HEAD(, dma_fence_cb) f_callbacks;
kcondvar_t f_cv;
+ uint64_t f_magic;
};
#define DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT 0
Index: src/sys/external/bsd/drm2/linux/linux_dma_fence.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.23 src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.24
--- src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.23 Sun Dec 19 12:09:51 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_fence.c Sun Dec 19 12:10:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_fence.c,v 1.23 2021/12/19 12:09:51 riastradh Exp $ */
+/* $NetBSD: linux_dma_fence.c,v 1.24 2021/12/19 12:10:51 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.23 2021/12/19 12:09:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.24 2021/12/19 12:10:51 riastradh Exp $");
#include <sys/atomic.h>
#include <sys/condvar.h>
@@ -43,6 +43,9 @@ __KERNEL_RCSID(0, "$NetBSD: linux_dma_fe
#include <linux/sched.h>
#include <linux/spinlock.h>
+#define FENCE_MAGIC_GOOD 0x607ba424048c37e5ULL
+#define FENCE_MAGIC_BAD 0x7641ca721344505fULL
+
/*
* linux_dma_fence_trace
*
@@ -57,12 +60,16 @@ int linux_dma_fence_trace = 0;
*
* True if fence has a positive reference count. True after
* dma_fence_init; after the last dma_fence_put, this becomes
- * false.
+ * false. The fence must have been initialized and must not have
+ * been destroyed.
*/
static inline bool __diagused
dma_fence_referenced_p(struct dma_fence *fence)
{
+ KASSERTMSG(fence->f_magic != FENCE_MAGIC_BAD, "fence %p", fence);
+ KASSERTMSG(fence->f_magic == FENCE_MAGIC_GOOD, "fence %p", fence);
+
return kref_referenced_p(&fence->refcount);
}
@@ -86,6 +93,10 @@ dma_fence_init(struct dma_fence *fence,
fence->error = 0;
TAILQ_INIT(&fence->f_callbacks);
cv_init(&fence->f_cv, "dmafence");
+
+#ifdef DIAGNOSTIC
+ fence->f_magic = FENCE_MAGIC_GOOD;
+#endif
}
/*
@@ -102,6 +113,8 @@ dma_fence_reset(struct dma_fence *fence,
spinlock_t *lock, unsigned context, unsigned seqno)
{
+ KASSERTMSG(fence->f_magic != FENCE_MAGIC_BAD, "fence %p", fence);
+ KASSERTMSG(fence->f_magic == FENCE_MAGIC_GOOD, "fence %p", fence);
KASSERT(kref_read(&fence->refcount) == 0 ||
kref_read(&fence->refcount) == 1);
KASSERT(TAILQ_EMPTY(&fence->f_callbacks));
@@ -129,6 +142,10 @@ dma_fence_destroy(struct dma_fence *fenc
KASSERT(!dma_fence_referenced_p(fence));
+#ifdef DIAGNOSTIC
+ fence->f_magic = FENCE_MAGIC_BAD;
+#endif
+
KASSERT(TAILQ_EMPTY(&fence->f_callbacks));
cv_destroy(&fence->f_cv);
}
@@ -194,6 +211,10 @@ bool
dma_fence_is_later(struct dma_fence *a, struct dma_fence *b)
{
+ KASSERTMSG(a->f_magic != FENCE_MAGIC_BAD, "fence %p", a);
+ KASSERTMSG(a->f_magic == FENCE_MAGIC_GOOD, "fence %p", a);
+ KASSERTMSG(b->f_magic != FENCE_MAGIC_BAD, "fence %p", b);
+ KASSERTMSG(b->f_magic == FENCE_MAGIC_GOOD, "fence %p", b);
KASSERTMSG(a->context == b->context, "incommensurate fences"
": %u @ %p =/= %u @ %p", a->context, a, b->context, b);
@@ -232,6 +253,9 @@ struct dma_fence *
dma_fence_get(struct dma_fence *fence)
{
+ KASSERTMSG(fence->f_magic != FENCE_MAGIC_BAD, "fence %p", fence);
+ KASSERTMSG(fence->f_magic == FENCE_MAGIC_GOOD, "fence %p", fence);
+
if (fence)
kref_get(&fence->refcount);
return fence;
@@ -249,6 +273,8 @@ dma_fence_get_rcu(struct dma_fence *fenc
{
__insn_barrier();
+ KASSERTMSG(fence->f_magic != FENCE_MAGIC_BAD, "fence %p", fence);
+ KASSERTMSG(fence->f_magic == FENCE_MAGIC_GOOD, "fence %p", fence);
if (!kref_get_unless_zero(&fence->refcount))
return NULL;
return fence;
@@ -297,6 +323,7 @@ retry:
}
/* Success! */
+ KASSERT(dma_fence_referenced_p(fence));
return fence;
}
@@ -538,6 +565,8 @@ void
dma_fence_set_error(struct dma_fence *fence, int error)
{
+ KASSERTMSG(fence->f_magic != FENCE_MAGIC_BAD, "fence %p", fence);
+ KASSERTMSG(fence->f_magic == FENCE_MAGIC_GOOD, "fence %p", fence);
KASSERT(!(fence->flags & (1u << DMA_FENCE_FLAG_SIGNALED_BIT)));
KASSERTMSG(error >= -ELAST, "%d", error);
KASSERTMSG(error < 0, "%d", error);
@@ -557,6 +586,9 @@ dma_fence_get_status(struct dma_fence *f
{
int ret;
+ KASSERTMSG(fence->f_magic != FENCE_MAGIC_BAD, "fence %p", fence);
+ KASSERTMSG(fence->f_magic == FENCE_MAGIC_GOOD, "fence %p", fence);
+
spin_lock(fence->lock);
if (!dma_fence_is_signaled_locked(fence)) {
ret = 0;
@@ -945,6 +977,9 @@ bool
__dma_fence_signal(struct dma_fence *fence)
{
+ KASSERTMSG(fence->f_magic != FENCE_MAGIC_BAD, "fence %p", fence);
+ KASSERTMSG(fence->f_magic == FENCE_MAGIC_GOOD, "fence %p", fence);
+
if (test_and_set_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags))
return false;
@@ -962,6 +997,9 @@ __dma_fence_signal_wake(struct dma_fence
{
struct dma_fence_cb *fcb, *next;
+ KASSERTMSG(fence->f_magic != FENCE_MAGIC_BAD, "fence %p", fence);
+ KASSERTMSG(fence->f_magic == FENCE_MAGIC_GOOD, "fence %p", fence);
+
spin_lock(fence->lock);
KASSERT(fence->flags & DMA_FENCE_FLAG_SIGNALED_BIT);
