From ec3b783a00cd99146e96e03e43f820de8b74d5bf Mon Sep 17 00:00:00 2001
From: Martin Pieuchot <mpi@cvs.openbsd.org>
Date: Mon, 26 Jun 2017 09:32:33 +0000
Subject: Assert that the corresponding socket is locked when manipulating
 socket buffers.

This is one step towards unlocking TCP input path.  Note that all the
functions asserting for the socket lock are not necessarilly MP-safe.
All the fields of 'struct socket' aren't protected.

Introduce a new kernel-only kqueue hint, NOTE_SUBMIT, to be able to
tell when a filter needs to lock the underlying data structures.  Logic
and name taken from NetBSD.

Tested by Hrvoje Popovski.

ok claudio@, bluhm@, mikeb@
---
 sys/net/rtsock.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'sys/net/rtsock.c')

diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index f46a398e94a..fff48f069ab 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsock.c,v 1.238 2017/06/09 12:56:43 mpi Exp $	*/
+/*	$OpenBSD: rtsock.c,v 1.239 2017/06/26 09:32:32 mpi Exp $	*/
 /*	$NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $	*/
 
 /*
@@ -174,7 +174,7 @@ route_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
 		 * empty so that we can clear the flag.
 		 */
 		if (((rop->flags & ROUTECB_FLAG_FLUSH) != 0) &&
-		    ((sbspace(&rp->rcb_socket->so_rcv) ==
+		    ((sbspace(rp->rcb_socket, &rp->rcb_socket->so_rcv) ==
 		    rp->rcb_socket->so_rcv.sb_hiwat)))
 			rop->flags &= ~ROUTECB_FLAG_FLUSH;
 		break;
@@ -325,7 +325,8 @@ route_senddesync(void *data)
 	 */
 	desync_mbuf = rtm_msg1(RTM_DESYNC, NULL);
 	if (desync_mbuf != NULL) {
-		if (sbappendaddr(&rp->rcb_socket->so_rcv, &route_src,
+		struct socket *so = rp->rcb_socket;
+		if (sbappendaddr(so, &so->so_rcv, &route_src,
 		    desync_mbuf, NULL) != 0) {
 			rop->flags &= ~ROUTECB_FLAG_DESYNC;
 			sorwakeup(rp->rcb_socket);
@@ -431,8 +432,8 @@ route_input(struct mbuf *m0, struct socket *so, sa_family_t sa_family)
 		if (last) {
 			struct mbuf *n;
 			if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) != NULL) {
-				if (sbspace(&last->so_rcv) < (2 * MSIZE) ||
-				    sbappendaddr(&last->so_rcv, sosrc,
+				if (sbspace(last, &last->so_rcv) < (2*MSIZE) ||
+				    sbappendaddr(last, &last->so_rcv, sosrc,
 				    n, (struct mbuf *)NULL) == 0) {
 					/*
 					 * Flag socket as desync'ed and
@@ -452,8 +453,8 @@ route_input(struct mbuf *m0, struct socket *so, sa_family_t sa_family)
 		last = rp->rcb_socket;
 	}
 	if (last) {
-		if (sbspace(&last->so_rcv) < (2 * MSIZE) ||
-		    sbappendaddr(&last->so_rcv, sosrc,
+		if (sbspace(last, &last->so_rcv) < (2 * MSIZE) ||
+		    sbappendaddr(last, &last->so_rcv, sosrc,
 		    m, (struct mbuf *)NULL) == 0) {
 			/* Flag socket as desync'ed and flush required */
 			sotoroutecb(last)->flags |=
-- 
cgit v1.2.3