diff options
author | rwatson <rwatson@FreeBSD.org> | 2008-04-17 21:38:18 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2008-04-17 21:38:18 +0000 |
commit | ca47fccd6b260693108c5ee5634bd0e011c67f5e (patch) | |
tree | fd64d5b5062ffc1979994100cac82014c5ed48b6 /sys/dev/cxgb/ulp | |
parent | 3e83d6e7db0e2c7d805fd36da3475e635fbb4b3e (diff) | |
download | FreeBSD-src-ca47fccd6b260693108c5ee5634bd0e011c67f5e.zip FreeBSD-src-ca47fccd6b260693108c5ee5634bd0e011c67f5e.tar.gz |
Convert pcbinfo and inpcb mutexes to rwlocks, and modify macros to
explicitly select write locking for all use of the inpcb mutex.
Update some pcbinfo lock assertions to assert locked rather than
write-locked, although in practice almost all uses of the pcbinfo
rwlock main exclusive, and all instances of inpcb lock acquisition
are exclusive.
This change should introduce (ideally) little functional change.
However, it lays the groundwork for significantly increased
parallelism in the TCP/IP code.
MFC after: 3 months
Tested by: kris (superset of committered patch)
Diffstat (limited to 'sys/dev/cxgb/ulp')
-rw-r--r-- | sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c b/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c index 2ad4520..2f9a92e 100644 --- a/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c +++ b/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c @@ -336,9 +336,9 @@ copy_data(const struct mbuf *m, int offset, int len, struct uio *uio) static void cxgb_wait_dma_completion(struct toepcb *toep) { - struct mtx *lock; + struct rwlock *lock; - lock = &toep->tp_tp->t_inpcb->inp_mtx; + lock = &toep->tp_tp->t_inpcb->inp_lock; inp_wlock(toep->tp_tp->t_inpcb); cv_wait_unlock(&toep->tp_cv, lock); } |