Lock down a socket, milestone 1.

o Add a mutex (sb_mtx) to struct sockbuf. This protects the data in a
  socket buffer. The mutex in the receive buffer also protects the data
  in struct socket.

o Determine the lock strategy for each members in struct socket.

o Lock down the following members:

  - so_count
  - so_options
  - so_linger
  - so_state

o Remove *_locked() socket APIs.  Make the following socket APIs
  touching the members above now require a locked socket:

 - sodisconnect()
 - soisconnected()
 - soisconnecting()
 - soisdisconnected()
 - soisdisconnecting()
 - sofree()
 - soref()
 - sorele()
 - sorwakeup()
 - sotryfree()
 - sowakeup()
 - sowwakeup()

Reviewed by:	alfred

3 files changed, 27 insertions, 5 deletions

diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 0dac2e5..21bb1be 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -35,11 +35,13 @@
  */
 
 #include <sys/param.h>
+#include <sys/domain.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
 
 #include <net/raw_cb.h>
 
@@ -97,6 +99,7 @@ raw_detach(rp)
 	struct socket *so = rp->rcb_socket;
 
 	so->so_pcb = 0;
+	SOCK_LOCK(so);
 	sotryfree(so);
 	LIST_REMOVE(rp, list);
 #ifdef notdef
@@ -120,8 +123,12 @@ raw_disconnect(rp)
 		m_freem(dtom(rp->rcb_faddr));
 	rp->rcb_faddr = 0;
 #endif
-	if (rp->rcb_socket->so_state & SS_NOFDREF)
+	SOCK_LOCK(rp->rcb_socket);
+	if (rp->rcb_socket->so_state & SS_NOFDREF) {
+		SOCK_UNLOCK(rp->rcb_socket);
 		raw_detach(rp);
+	} else
+		SOCK_UNLOCK(rp->rcb_socket);
 }
 
 #ifdef notdef
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 7afab70..631b2e8 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -37,6 +37,7 @@
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mbuf.h>
+#include <sys/mutex.h>
 #include <sys/protosw.h>
 #include <sys/signalvar.h>
 #include <sys/socket.h>
@@ -105,7 +106,9 @@ raw_input(m0, proto, src, dst)
 					/* should notify about lost packet */
 					m_freem(n);
 				else {
+					SOCK_LOCK(last);
 					sorwakeup(last);
+					SOCK_UNLOCK(last);
 					sockets++;
 				}
 			}
@@ -117,7 +120,9 @@ raw_input(m0, proto, src, dst)
 		    m, (struct mbuf *)0) == 0)
 			m_freem(m);
 		else {
+			SOCK_LOCK(last);
 			sorwakeup(last);
+			SOCK_UNLOCK(last);
 			sockets++;
 		}
 	} else
@@ -145,8 +150,11 @@ raw_uabort(struct socket *so)
 	if (rp == 0)
 		return EINVAL;
 	raw_disconnect(rp);
+	SOCK_LOCK(so);
 	sotryfree(so);
+	SOCK_LOCK(so);
 	soisdisconnected(so);	/* XXX huh? called after the sofree()? */
+	SOCK_UNLOCK(so);
 	return 0;
 }
 
@@ -203,7 +211,9 @@ raw_udisconnect(struct socket *so)
 		return ENOTCONN;
 	}
 	raw_disconnect(rp);
+	SOCK_LOCK(so);
 	soisdisconnected(so);
+	SOCK_UNLOCK(so);
 	return 0;
 }
 
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 47031c2..407d6f3 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -147,8 +147,10 @@ rts_attach(struct socket *so, int proto, struct thread *td)
 	}
 	rp->rcb_faddr = &route_src;
 	route_cb.any_count++;
-	soisconnected_locked(so);
+	SOCK_LOCK(so);
+	soisconnected(so);
 	so->so_options |= SO_USELOOPBACK;
+	SOCK_UNLOCK(so);
 	splx(s);
 	return 0;
 }
@@ -472,7 +474,9 @@ flush:
 	/*
 	 * Check to see if we don't want our own messages.
 	 */
+	SOCK_LOCK(so);
 	if ((so->so_options & SO_USELOOPBACK) == 0) {
+		SOCK_UNLOCK(so);
 		if (route_cb.any_count <= 1) {
 			if (rtm)
 				Free(rtm);
@@ -481,7 +485,8 @@ flush:
 		}
 		/* There is another listener, so construct message */
 		rp = sotorawcb(so);
-	}
+	} else
+		SOCK_UNLOCK(so);
 	if (rtm) {
 		m_copyback(m, 0, rtm->rtm_msglen, (caddr_t)rtm);
 		if (m->m_pkthdr.len < rtm->rtm_msglen) {