rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-07-25 18:15:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix INVARIANTS support

Browse Source
This commit is contained in:
Sebastian Huber 2017-05-18 09:35:46 +02:00
parent 5be4f06fa8
commit 62c8ca0ead
10 changed files with 138 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freebsd/sys/kern/kern_event.c
View File

@ -2108,8 +2108,10 @@ static void
kqueue_destroy(struct kqueue *kq) kqueue_destroy(struct kqueue *kq)
{ {
#ifndef __rtems__
KASSERT(kq->kq_fdp == NULL, KASSERT(kq->kq_fdp == NULL,
("kqueue still attached to a file descriptor")); ("kqueue still attached to a file descriptor"));
#endif /* __rtems__ */
seldrain(&kq->kq_sel); seldrain(&kq->kq_sel);
knlist_destroy(&kq->kq_sel.si_note); knlist_destroy(&kq->kq_sel.si_note);
mtx_destroy(&kq->kq_lock); mtx_destroy(&kq->kq_lock);

2
freebsd/sys/kern/subr_lock.c
View File

@ -84,8 +84,10 @@ lock_init(struct lock_object *lock, struct lock_class *class, const char *name,
int i; int i;
/* Check for double-init and zero object. */ /* Check for double-init and zero object. */
#ifndef __rtems__
KASSERT(flags & LO_NEW || !lock_initialized(lock), KASSERT(flags & LO_NEW || !lock_initialized(lock),
("lock \"%s\" %p already initialized", name, lock)); ("lock \"%s\" %p already initialized", name, lock));
#endif /* __rtems__ */
/* Look up lock class to find its index. */ /* Look up lock class to find its index. */
for (i = 0; i < LOCK_CLASS_MAX; i++) for (i = 0; i < LOCK_CLASS_MAX; i++)

1
freebsd/sys/sys/rmlock.h
View File

@ -112,6 +112,7 @@ void _rm_assert(const struct rmlock *rm, int what, const char *file,
#define rm_rlock(rm, tracker) do { (void)tracker; rw_rlock(rm); } while (0) #define rm_rlock(rm, tracker) do { (void)tracker; rw_rlock(rm); } while (0)
#define rm_runlock(rm, tracker) do { (void)tracker; rw_runlock(rm); } while (0) #define rm_runlock(rm, tracker) do { (void)tracker; rw_runlock(rm); } while (0)
#define rm_sleep rw_sleep #define rm_sleep rw_sleep
#define _rm_assert _rw_assert
#endif /* __rtems__ */ #endif /* __rtems__ */

4
freebsd/sys/sys/rwlock.h
View File

@ -164,6 +164,10 @@ int _rw_try_rlock(struct rwlock *rw, const char *file, int line);
void _rw_runlock(struct rwlock *rw, const char *file, int line); void _rw_runlock(struct rwlock *rw, const char *file, int line);
int _rw_try_upgrade(struct rwlock *rw, const char *file, int line); int _rw_try_upgrade(struct rwlock *rw, const char *file, int line);
void _rw_downgrade(struct rwlock *rw, const char *file, int line); void _rw_downgrade(struct rwlock *rw, const char *file, int line);
#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
void _rw_assert(const struct rwlock *rw, int what, const char *file,
int line);
#endif
#endif /* __rtems__ */ #endif /* __rtems__ */
#ifndef __rtems__ #ifndef __rtems__

4
freebsd/sys/sys/systm.h
View File

@ -105,7 +105,11 @@ enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV,
VM_GUEST_VMWARE, VM_GUEST_KVM, VM_LAST }; VM_GUEST_VMWARE, VM_GUEST_KVM, VM_LAST };
#if defined(WITNESS) || defined(INVARIANT_SUPPORT) #if defined(WITNESS) || defined(INVARIANT_SUPPORT)
#ifndef __rtems__
void kassert_panic(const char *fmt, ...) __printflike(1, 2); void kassert_panic(const char *fmt, ...) __printflike(1, 2);
#else /* __rtems__ */
#define kassert_panic panic
#endif /* __rtems__ */
#endif #endif
#ifdef INVARIANTS /* The option is always available */ #ifdef INVARIANTS /* The option is always available */

4
freebsd/sys/vm/uma_core.c
View File

@ -2204,8 +2204,10 @@ uma_zalloc_arg(uma_zone_t zone, void *udata, int flags)
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
"uma_zalloc_arg: zone \"%s\"", zone->uz_name); "uma_zalloc_arg: zone \"%s\"", zone->uz_name);
} }
#ifndef __rtems__
KASSERT(curthread->td_critnest == 0 || SCHEDULER_STOPPED(), KASSERT(curthread->td_critnest == 0 || SCHEDULER_STOPPED(),
("uma_zalloc_arg: called with spinlock or critical section held")); ("uma_zalloc_arg: called with spinlock or critical section held"));
#endif /* __rtems__ */
#ifdef DEBUG_MEMGUARD #ifdef DEBUG_MEMGUARD
if (memguard_cmp_zone(zone)) { if (memguard_cmp_zone(zone)) {
@ -2742,8 +2744,10 @@ uma_zfree_arg(uma_zone_t zone, void *item, void *udata)
CTR2(KTR_UMA, "uma_zfree_arg thread %x zone %s", curthread, CTR2(KTR_UMA, "uma_zfree_arg thread %x zone %s", curthread,
zone->uz_name); zone->uz_name);
#ifndef __rtems__
KASSERT(curthread->td_critnest == 0 || SCHEDULER_STOPPED(), KASSERT(curthread->td_critnest == 0 || SCHEDULER_STOPPED(),
("uma_zfree_arg: called with spinlock or critical section held")); ("uma_zfree_arg: called with spinlock or critical section held"));
#endif /* __rtems__ */
/* uma_zfree(..., NULL) does nothing, to match free(9). */ /* uma_zfree(..., NULL) does nothing, to match free(9). */
if (item == NULL) if (item == NULL)

24
rtemsbsd/include/machine/rtems-bsd-muteximpl.h
View File

@ -209,18 +209,32 @@ rtems_bsd_mutex_unlock(rtems_bsd_mutex *m)
} }
} }
static inline int static inline Thread_Control *
rtems_bsd_mutex_owned(rtems_bsd_mutex *m) rtems_bsd_mutex_owner(const rtems_bsd_mutex *m)
{ {
return (m->queue.Queue.owner == _Thread_Get_executing()); return (m->queue.Queue.owner);
} }
static inline int static inline int
rtems_bsd_mutex_recursed(rtems_bsd_mutex *m) rtems_bsd_mutex_owned(const rtems_bsd_mutex *m)
{ {
return (m->nest_level); return (rtems_bsd_mutex_owner(m) == _Thread_Get_executing());
}
static inline int
rtems_bsd_mutex_recursed(const rtems_bsd_mutex *m)
{
return (m->nest_level != 0);
}
static inline const char *
rtems_bsd_mutex_name(const rtems_bsd_mutex *m)
{
return (m->queue.Queue.name);
} }
static inline void static inline void

49
rtemsbsd/rtems/rtems-kernel-mutex.c
View File

@ -164,33 +164,30 @@ _mtx_unlock_flags(struct mtx *m, int opts, const char *file, int line)
void void
_mtx_assert(struct mtx *m, int what, const char *file, int line) _mtx_assert(struct mtx *m, int what, const char *file, int line)
{ {
const char *name = rtems_bsd_mutex_name(&m->mutex);
if (panicstr != NULL || dumping) switch (what) {
return; case MA_OWNED:
switch (what) { case MA_OWNED | MA_RECURSED:
case MA_OWNED: case MA_OWNED | MA_NOTRECURSED:
case MA_OWNED | MA_RECURSED: if (!mtx_owned(m))
case MA_OWNED | MA_NOTRECURSED: panic("mutex %s not owned at %s:%d", name, file, line);
if (!mtx_owned(m)) if (mtx_recursed(m)) {
panic("mutex %s not owned at %s:%d", if ((what & MA_NOTRECURSED) != 0)
m->lock_object.lo_name, file, line); panic("mutex %s recursed at %s:%d", name, file,
if (mtx_recursed(m)) { line);
if ((what & MA_NOTRECURSED) != 0) } else if ((what & MA_RECURSED) != 0) {
panic("mutex %s recursed at %s:%d", panic("mutex %s unrecursed at %s:%d", name, file,
m->lock_object.lo_name, file, line); line);
} else if ((what & MA_RECURSED) != 0) { }
panic("mutex %s unrecursed at %s:%d", break;
m->lock_object.lo_name, file, line); case MA_NOTOWNED:
} if (mtx_owned(m))
break; panic("mutex %s owned at %s:%d", name, file, line);
case MA_NOTOWNED: break;
if (mtx_owned(m)) default:
panic("mutex %s owned at %s:%d", panic("unknown mtx_assert at %s:%d", file, line);
m->lock_object.lo_name, file, line); }
break;
default:
panic("unknown mtx_assert at %s:%d", file, line);
}
} }
#endif #endif

112
rtemsbsd/rtems/rtems-kernel-rwlock.c
View File

@ -79,9 +79,9 @@ struct lock_class lock_class_rw = {
#endif #endif
}; };
#define rw_wowner(rw) ((rw)->mutex.owner) #define rw_wowner(rw) rtems_bsd_mutex_owner(&(rw)->mutex)
#define rw_recursed(rw) ((rw)->mutex.nest_level != 0) #define rw_recursed(rw) rtems_bsd_mutex_recursed(&(rw)->mutex)
void void
assert_rw(struct lock_object *lock, int what) assert_rw(struct lock_object *lock, int what)
@ -207,87 +207,53 @@ _rw_downgrade(struct rwlock *rw, const char *file, int line)
} }
#ifdef INVARIANT_SUPPORT #ifdef INVARIANT_SUPPORT
#ifndef INVARIANTS
#undef _rw_assert
#endif
/* /*
* In the non-WITNESS case, rw_assert() can only detect that at least * In the non-WITNESS case, rw_assert() can only detect that at least
* *some* thread owns an rlock, but it cannot guarantee that *this* * *some* thread owns an rlock, but it cannot guarantee that *this*
* thread owns an rlock. * thread owns an rlock.
*/ */
void void
_rw_assert(struct rwlock *rw, int what, const char *file, int line) _rw_assert(const struct rwlock *rw, int what, const char *file, int line)
{ {
const char *name = rtems_bsd_mutex_name(&rw->mutex);
if (panicstr != NULL) switch (what) {
return; case RA_LOCKED:
switch (what) { case RA_LOCKED | RA_RECURSED:
case RA_LOCKED: case RA_LOCKED | RA_NOTRECURSED:
case RA_LOCKED | RA_RECURSED: case RA_RLOCKED:
case RA_LOCKED | RA_NOTRECURSED: case RA_RLOCKED | RA_RECURSED:
case RA_RLOCKED: case RA_RLOCKED | RA_NOTRECURSED:
#ifndef __rtems__ case RA_WLOCKED:
case RA_WLOCKED | RA_RECURSED:
case RA_WLOCKED | RA_NOTRECURSED:
if (rw_wowner(rw) != _Thread_Get_executing())
panic("Lock %s not exclusively locked @ %s:%d\n",
name, file, line);
if (rw_recursed(rw)) {
if (what & RA_NOTRECURSED)
panic("Lock %s recursed @ %s:%d\n", name, file,
line);
} else if (what & RA_RECURSED)
panic("Lock %s not recursed @ %s:%d\n", name, file,
line);
break;
case RA_UNLOCKED:
#ifdef WITNESS #ifdef WITNESS
witness_assert(&rw->lock_object, what, file, line); witness_assert(&rw->lock_object, what, file, line);
#else #else
/* /*
* If some other thread has a write lock or we have one * If we hold a write lock fail. We can't reliably check
* and are asserting a read lock, fail. Also, if no one * to see if we hold a read lock or not.
* has a lock at all, fail. */
*/ if (rw_wowner(rw) == _Thread_Get_executing())
if (rw->rw_lock == RW_UNLOCKED || panic("Lock %s exclusively locked @ %s:%d\n", name,
(!(rw->rw_lock & RW_LOCK_READ) && (what == RA_RLOCKED || file, line);
rw_wowner(rw) != curthread)))
panic("Lock %s not %slocked @ %s:%d\n",
rw->lock_object.lo_name, (what == RA_RLOCKED) ?
"read " : "", file, line);
if (!(rw->rw_lock & RW_LOCK_READ)) {
if (rw_recursed(rw)) {
if (what & RA_NOTRECURSED)
panic("Lock %s recursed @ %s:%d\n",
rw->lock_object.lo_name, file,
line);
} else if (what & RA_RECURSED)
panic("Lock %s not recursed @ %s:%d\n",
rw->lock_object.lo_name, file, line);
}
#endif #endif
break; break;
#else /* __rtems__ */ default:
/* FALLTHROUGH */ panic("Unknown rw lock assertion: %d @ %s:%d", what, file,
#endif /* __rtems__ */ line);
case RA_WLOCKED: }
case RA_WLOCKED | RA_RECURSED:
case RA_WLOCKED | RA_NOTRECURSED:
if (rw_wowner(rw) != _Thread_Get_executing())
panic("Lock %s not exclusively locked @ %s:%d\n",
rw->lock_object.lo_name, file, line);
if (rw_recursed(rw)) {
if (what & RA_NOTRECURSED)
panic("Lock %s recursed @ %s:%d\n",
rw->lock_object.lo_name, file, line);
} else if (what & RA_RECURSED)
panic("Lock %s not recursed @ %s:%d\n",
rw->lock_object.lo_name, file, line);
break;
case RA_UNLOCKED:
#ifdef WITNESS
witness_assert(&rw->lock_object, what, file, line);
#else
/*
* If we hold a write lock fail. We can't reliably check
* to see if we hold a read lock or not.
*/
if (rw_wowner(rw) == _Thread_Get_executing())
panic("Lock %s exclusively locked @ %s:%d\n",
rw->lock_object.lo_name, file, line);
#endif
break;
default:
panic("Unknown rw lock assertion: %d @ %s:%d", what, file,
line);
}
} }
#endif /* INVARIANT_SUPPORT */ #endif /* INVARIANT_SUPPORT */

131
rtemsbsd/rtems/rtems-kernel-sx.c
View File

@ -47,10 +47,6 @@
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/sx.h> #include <sys/sx.h>
#ifndef INVARIANTS
#define _sx_assert(sx, what, file, line)
#endif
static void assert_sx(struct lock_object *lock, int what); static void assert_sx(struct lock_object *lock, int what);
static void lock_sx(struct lock_object *lock, int how); static void lock_sx(struct lock_object *lock, int how);
#ifdef KDTRACE_HOOKS #ifdef KDTRACE_HOOKS
@ -72,9 +68,9 @@ struct lock_class lock_class_sx = {
#endif #endif
}; };
#define sx_xholder(sx) ((sx)->mutex.owner) #define sx_xholder(sx) rtems_bsd_mutex_owner(&(sx)->mutex)
#define sx_recursed(sx) ((sx)->mutex.nest_level != 0) #define sx_recursed(sx) rtems_bsd_mutex_recursed(&(sx)->mutex)
void void
assert_sx(struct lock_object *lock, int what) assert_sx(struct lock_object *lock, int what)
@ -170,102 +166,55 @@ sx_downgrade_(struct sx *sx, const char *file, int line)
} }
#ifdef INVARIANT_SUPPORT #ifdef INVARIANT_SUPPORT
#ifndef INVARIANTS
#undef _sx_assert
#endif
/* /*
* In the non-WITNESS case, sx_assert() can only detect that at least * In the non-WITNESS case, sx_assert() can only detect that at least
* *some* thread owns an slock, but it cannot guarantee that *this* * *some* thread owns an slock, but it cannot guarantee that *this*
* thread owns an slock. * thread owns an slock.
*/ */
void void
_sx_assert(struct sx *sx, int what, const char *file, int line) _sx_assert(const struct sx *sx, int what, const char *file, int line)
{ {
#ifndef __rtems__ const char *name = rtems_bsd_mutex_name(&sx->mutex);
#ifndef WITNESS
int slocked = 0;
#endif
#endif /* __rtems__ */
if (panicstr != NULL) switch (what) {
return; case SA_SLOCKED:
switch (what) { case SA_SLOCKED | SA_NOTRECURSED:
case SA_SLOCKED: case SA_SLOCKED | SA_RECURSED:
case SA_SLOCKED | SA_NOTRECURSED: case SA_LOCKED:
case SA_SLOCKED | SA_RECURSED: case SA_LOCKED | SA_NOTRECURSED:
#ifndef __rtems__ case SA_LOCKED | SA_RECURSED:
#ifndef WITNESS case SA_XLOCKED:
slocked = 1; case SA_XLOCKED | SA_NOTRECURSED:
/* FALLTHROUGH */ case SA_XLOCKED | SA_RECURSED:
#endif if (sx_xholder(sx) != _Thread_Get_executing())
#endif /* __rtems__ */ panic("Lock %s not exclusively locked @ %s:%d\n", name,
case SA_LOCKED: file, line);
case SA_LOCKED | SA_NOTRECURSED: if (sx_recursed(sx)) {
case SA_LOCKED | SA_RECURSED: if (what & SA_NOTRECURSED)
#ifndef __rtems__ panic("Lock %s recursed @ %s:%d\n", name, file,
line);
} else if (what & SA_RECURSED)
panic("Lock %s not recursed @ %s:%d\n", name, file,
line);
break;
case SA_UNLOCKED:
#ifdef WITNESS #ifdef WITNESS
witness_assert(&sx->lock_object, what, file, line); witness_assert(&sx->lock_object, what, file, line);
#else #else
/* /*
* If some other thread has an exclusive lock or we * If we hold an exclusve lock fail. We can't
* have one and are asserting a shared lock, fail. * reliably check to see if we hold a shared lock or
* Also, if no one has a lock at all, fail. * not.
*/ */
if (sx->sx_lock == SX_LOCK_UNLOCKED || if (sx_xholder(sx) == _Thread_Get_executing())
(!(sx->sx_lock & SX_LOCK_SHARED) && (slocked || panic("Lock %s exclusively locked @ %s:%d\n", name,
sx_xholder(sx) != curthread))) file, line);
panic("Lock %s not %slocked @ %s:%d\n",
sx->lock_object.lo_name, slocked ? "share " : "",
file, line);
if (!(sx->sx_lock & SX_LOCK_SHARED)) {
if (sx_recursed(sx)) {
if (what & SA_NOTRECURSED)
panic("Lock %s recursed @ %s:%d\n",
sx->lock_object.lo_name, file,
line);
} else if (what & SA_RECURSED)
panic("Lock %s not recursed @ %s:%d\n",
sx->lock_object.lo_name, file, line);
}
#endif #endif
break; break;
#else /* __rtems__ */ default:
/* FALLTHROUGH */ panic("Unknown sx lock assertion: %d @ %s:%d", what, file,
#endif /* __rtems__ */ line);
case SA_XLOCKED: }
case SA_XLOCKED | SA_NOTRECURSED:
case SA_XLOCKED | SA_RECURSED:
if (sx_xholder(sx) != _Thread_Get_executing())
panic("Lock %s not exclusively locked @ %s:%d\n",
sx->lock_object.lo_name, file, line);
if (sx_recursed(sx)) {
if (what & SA_NOTRECURSED)
panic("Lock %s recursed @ %s:%d\n",
sx->lock_object.lo_name, file, line);
} else if (what & SA_RECURSED)
panic("Lock %s not recursed @ %s:%d\n",
sx->lock_object.lo_name, file, line);
break;
case SA_UNLOCKED:
#ifdef WITNESS
witness_assert(&sx->lock_object, what, file, line);
#else
/*
* If we hold an exclusve lock fail. We can't
* reliably check to see if we hold a shared lock or
* not.
*/
if (sx_xholder(sx) == _Thread_Get_executing())
panic("Lock %s exclusively locked @ %s:%d\n",
sx->lock_object.lo_name, file, line);
#endif
break;
default:
panic("Unknown sx lock assertion: %d @ %s:%d", what, file,
line);
}
} }
#endif /* INVARIANT_SUPPORT */ #endif /* INVARIANT_SUPPORT */