src - FreeBSD source tree

diff options


context:
space:
mode:

author	John Baldwin <jhb@FreeBSD.org>	2008-09-25 13:42:19 +0000
committer	John Baldwin <jhb@FreeBSD.org>	2008-09-25 13:42:19 +0000
commit	7d43ca696e9e185c54cd4ce5bf89fbb963a3b223 (patch)
tree	7eaa8e1950a106baf0107b59b8404d89167c4544 /sys
parent	0dae32f2ebcdda4f44f6f16df3447cdb618b61b7 (diff)
download	src-7d43ca696e9e185c54cd4ce5bf89fbb963a3b223.tar.gz src-7d43ca696e9e185c54cd4ce5bf89fbb963a3b223.zip

- Don't do a WITNESS_SAVE() on the interlock if it is Giant in the condition

variable wait routines. DROP_GIANT() already manages that state in the Giant interlock case. - Assert that Giant is held when it is passed as a sleep interlock.

Notes

Notes: svn path=/head/; revision=183352

Diffstat (limited to 'sys')

-rw-r--r--

sys/kern/kern_condvar.c

-rw-r--r--

sys/kern/kern_synch.c

2 files changed, 14 insertions, 4 deletions

diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c
index 8b002b1998fd..dbc9833e5b8f 100644
--- a/sys/kern/kern_condvar.c
+++ b/sys/kern/kern_condvar.c

@@ -108,7 +108,6 @@ _cv_wait(struct cv *cvp, struct lock_object *lock)

CV_ASSERT(cvp, lock, td);

WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock,

"Waiting on \"%s\"", cvp->cv_description);

- WITNESS_SAVE(lock, lock_witness);

class = LOCK_CLASS(lock);

if (cold || panicstr) {

@@ -124,12 +123,15 @@ _cv_wait(struct cv *cvp, struct lock_object *lock)

sleepq_lock(cvp);

cvp->cv_waiters++;

+ if (lock == &Giant.lock_object)

+ mtx_assert(&Giant, MA_OWNED);

DROP_GIANT();

sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR, 0);

if (lock != &Giant.lock_object) {

if (class->lc_flags & LC_SLEEPABLE)

sleepq_release(cvp);

+ WITNESS_SAVE(lock, lock_witness);

lock_state = class->lc_unlock(lock);

if (class->lc_flags & LC_SLEEPABLE)

sleepq_lock(cvp);

@@ -225,7 +227,6 @@ _cv_wait_sig(struct cv *cvp, struct lock_object *lock)

CV_ASSERT(cvp, lock, td);

WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock,

"Waiting on \"%s\"", cvp->cv_description);

- WITNESS_SAVE(lock, lock_witness);

class = LOCK_CLASS(lock);

if (cold || panicstr) {

@@ -241,6 +242,8 @@ _cv_wait_sig(struct cv *cvp, struct lock_object *lock)

sleepq_lock(cvp);

cvp->cv_waiters++;

+ if (lock == &Giant.lock_object)

+ mtx_assert(&Giant, MA_OWNED);

DROP_GIANT();

sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR |

@@ -248,6 +251,7 @@ _cv_wait_sig(struct cv *cvp, struct lock_object *lock)

if (lock != &Giant.lock_object) {

if (class->lc_flags & LC_SLEEPABLE)

sleepq_release(cvp);

+ WITNESS_SAVE(lock, lock_witness);

lock_state = class->lc_unlock(lock);

if (class->lc_flags & LC_SLEEPABLE)

sleepq_lock(cvp);

@@ -290,7 +294,6 @@ _cv_timedwait(struct cv *cvp, struct lock_object *lock, int timo)

CV_ASSERT(cvp, lock, td);

WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock,

"Waiting on \"%s\"", cvp->cv_description);

- WITNESS_SAVE(lock, lock_witness);

class = LOCK_CLASS(lock);

if (cold || panicstr) {

@@ -306,6 +309,8 @@ _cv_timedwait(struct cv *cvp, struct lock_object *lock, int timo)

sleepq_lock(cvp);

cvp->cv_waiters++;

+ if (lock == &Giant.lock_object)

+ mtx_assert(&Giant, MA_OWNED);

DROP_GIANT();

sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR, 0);

@@ -313,6 +318,7 @@ _cv_timedwait(struct cv *cvp, struct lock_object *lock, int timo)

if (lock != &Giant.lock_object) {

if (class->lc_flags & LC_SLEEPABLE)

sleepq_release(cvp);

+ WITNESS_SAVE(lock, lock_witness);

lock_state = class->lc_unlock(lock);

if (class->lc_flags & LC_SLEEPABLE)

sleepq_lock(cvp);

@@ -358,7 +364,6 @@ _cv_timedwait_sig(struct cv *cvp, struct lock_object *lock, int timo)

CV_ASSERT(cvp, lock, td);

WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock,

"Waiting on \"%s\"", cvp->cv_description);

- WITNESS_SAVE(lock, lock_witness);

class = LOCK_CLASS(lock);

if (cold || panicstr) {

@@ -374,6 +379,8 @@ _cv_timedwait_sig(struct cv *cvp, struct lock_object *lock, int timo)

sleepq_lock(cvp);

cvp->cv_waiters++;

+ if (lock == &Giant.lock_object)

+ mtx_assert(&Giant, MA_OWNED);

DROP_GIANT();

sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR |

@@ -382,6 +389,7 @@ _cv_timedwait_sig(struct cv *cvp, struct lock_object *lock, int timo)

if (lock != &Giant.lock_object) {

if (class->lc_flags & LC_SLEEPABLE)

sleepq_release(cvp);

+ WITNESS_SAVE(lock, lock_witness);

lock_state = class->lc_unlock(lock);

if (class->lc_flags & LC_SLEEPABLE)

sleepq_lock(cvp);

diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 9b7804b1bde9..4f1205d17156 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c

@@ -181,6 +181,8 @@ _sleep(void *ident, struct lock_object *lock, int priority,

CTR5(KTR_PROC, "sleep: thread %ld (pid %ld, %s) on %s (%p)",

td->td_tid, p->p_pid, td->td_name, wmesg, ident);

+ if (lock == &Giant.lock_object)

+ mtx_assert(&Giant, MA_OWNED);

DROP_GIANT();

if (lock != NULL && lock != &Giant.lock_object &&

!(class->lc_flags & LC_SLEEPABLE)) {