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/netinet/ip_fw2.c | |
| 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/netinet/ip_fw2.c')
| -rw-r--r-- | sys/netinet/ip_fw2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c index a3347e5..428a182 100644 --- a/sys/netinet/ip_fw2.c +++ b/sys/netinet/ip_fw2.c @@ -1974,7 +1974,7 @@ check_uidgid(ipfw_insn_u32 *insn, int proto, struct ifnet *oif, * up the PCB, we can use the one that was supplied. */ if (inp && *lookup == 0) { - INP_LOCK_ASSERT(inp); + INP_WLOCK_ASSERT(inp); if (inp->inp_socket != NULL) { fill_ugid_cache(inp, ugp); *lookup = 1; @@ -2008,12 +2008,12 @@ check_uidgid(ipfw_insn_u32 *insn, int proto, struct ifnet *oif, dst_ip, htons(dst_port), wildcard, NULL); if (pcb != NULL) { - INP_LOCK(pcb); + INP_WLOCK(pcb); if (pcb->inp_socket != NULL) { fill_ugid_cache(pcb, ugp); *lookup = 1; } - INP_UNLOCK(pcb); + INP_WUNLOCK(pcb); } INP_INFO_RUNLOCK(pi); if (*lookup == 0) { |
