diff options
author | rwatson <rwatson@FreeBSD.org> | 2004-06-26 19:10:39 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2004-06-26 19:10:39 +0000 |
commit | 758f90deb8956a64f2e2336aa6bd1f8252df3aa9 (patch) | |
tree | 0215a39aaab05d8f4180c75adc66451aa52aac5c /sys/netinet/raw_ip.c | |
parent | 11da9eaee1fdbe9e6c047dd1d81374f90e0359b3 (diff) | |
download | FreeBSD-src-758f90deb8956a64f2e2336aa6bd1f8252df3aa9.zip FreeBSD-src-758f90deb8956a64f2e2336aa6bd1f8252df3aa9.tar.gz |
Reduce the number of unnecessary unlock-relocks on socket buffer mutexes
associated with performing a wakeup on the socket buffer:
- When performing an sbappend*() followed by a so[rw]wakeup(), explicitly
acquire the socket buffer lock and use the _locked() variants of both
calls. Note that the _locked() sowakeup() versions unlock the mutex on
return. This is done in uipc_send(), divert_packet(), mroute
socket_send(), raw_append(), tcp_reass(), tcp_input(), and udp_append().
- When the socket buffer lock is dropped before a sowakeup(), remove the
explicit unlock and use the _locked() sowakeup() variant. This is done
in soisdisconnecting(), soisdisconnected() when setting the can't send/
receive flags and dropping data, and in uipc_rcvd() which adjusting
back-pressure on the sockets.
For UNIX domain sockets running mpsafe with a contention-intensive SMP
mysql benchmark, this results in a 1.6% query rate improvement due to
reduce mutex costs.
Diffstat (limited to 'sys/netinet/raw_ip.c')
-rw-r--r-- | sys/netinet/raw_ip.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 85eaaf2..dd79877 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -160,18 +160,22 @@ raw_append(struct inpcb *last, struct ip *ip, struct mbuf *n) #endif if (!policyfail) { struct mbuf *opts = NULL; + struct socket *so; + so = last->inp_socket; if ((last->inp_flags & INP_CONTROLOPTS) || - (last->inp_socket->so_options & SO_TIMESTAMP)) + (so->so_options & SO_TIMESTAMP)) ip_savecontrol(last, &opts, ip, n); - if (sbappendaddr(&last->inp_socket->so_rcv, + SOCKBUF_LOCK(&so->so_rcv); + if (sbappendaddr_locked(&so->so_rcv, (struct sockaddr *)&ripsrc, n, opts) == 0) { /* should notify about lost packet */ m_freem(n); if (opts) m_freem(opts); + SOCKBUF_UNLOCK(&so->so_rcv); } else - sorwakeup(last->inp_socket); + sorwakeup_locked(so); } else m_freem(n); return policyfail; |