Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get_tcppcb() is nearly always called upon entry to usrreqs so

Browse Source 
KASSERT(solocked(so)) inside it and remove the redundant KASSERT
everywhere we are using tcp_getpcb()
This commit is contained in:
rtr 2014-08-05 07:10:41 +00:00
parent d6ada9d4ac
commit 8e80ae3c97
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/netinet/tcp_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcp_usrreq.c,v 1.196 2014/08/05 05:24:26 rtr Exp $ */ /* $NetBSD: tcp_usrreq.c,v 1.197 2014/08/05 07:10:41 rtr Exp $ */
/* /*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -99,7 +99,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.196 2014/08/05 05:24:26 rtr Exp $"); __KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.197 2014/08/05 07:10:41 rtr Exp $");
#include "opt_inet.h" #include "opt_inet.h"
#include "opt_ipsec.h" #include "opt_ipsec.h"
@ -181,6 +181,9 @@ static int
tcp_getpcb(struct socket *so, struct inpcb **inp, tcp_getpcb(struct socket *so, struct inpcb **inp,
struct in6pcb **in6p, struct tcpcb **tp) struct in6pcb **in6p, struct tcpcb **tp)
{ {
KASSERT(solocked(so));
/* /*
* When a TCP is attached to a socket, then there will be * When a TCP is attached to a socket, then there will be
* a (struct inpcb) pointed at by the socket, and this * a (struct inpcb) pointed at by the socket, and this
@ -273,8 +276,6 @@ tcp_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
return (0); return (0);
} }
KASSERT(solocked(so));
if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0) { if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0) {
splx(s); splx(s);
return error; return error;
@ -687,8 +688,6 @@ tcp_detach(struct socket *so)
struct tcpcb *tp = NULL; struct tcpcb *tp = NULL;
int s; int s;
KASSERT(solocked(so));
if (tcp_getpcb(so, &inp, &in6p, &tp) != 0) if (tcp_getpcb(so, &inp, &in6p, &tp) != 0)
return; return;
@ -707,8 +706,6 @@ tcp_accept(struct socket *so, struct mbuf *nam)
int error = 0; int error = 0;
int s; int s;
KASSERT(solocked(so));
if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0) if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0)
return error; return error;
@ -746,8 +743,6 @@ tcp_bind(struct socket *so, struct mbuf *nam, struct lwp *l)
int error = 0; int error = 0;
int ostate = 0; int ostate = 0;
KASSERT(solocked(so));
if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0) if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0)
return error; return error;
@ -792,8 +787,6 @@ tcp_listen(struct socket *so, struct lwp *l)
int ostate = 0; int ostate = 0;
int s; int s;
KASSERT(solocked(so));
if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0) if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0)
return error; return error;
@ -836,8 +829,6 @@ tcp_connect(struct socket *so, struct mbuf *nam, struct lwp *l)
int error = 0; int error = 0;
int ostate = 0; int ostate = 0;
KASSERT(solocked(so));
if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0) if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0)
return error; return error;
@ -925,8 +916,6 @@ tcp_disconnect(struct socket *so)
int ostate = 0; int ostate = 0;
int s; int s;
KASSERT(solocked(so));
if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0) if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0)
return error; return error;
@ -961,8 +950,6 @@ tcp_shutdown(struct socket *so)
int ostate = 0; int ostate = 0;
int s; int s;
KASSERT(solocked(so));
if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0) if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0)
return error; return error;
@ -991,8 +978,6 @@ tcp_abort(struct socket *so)
int ostate = 0; int ostate = 0;
int s; int s;
KASSERT(solocked(so));
if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0) if ((error = tcp_getpcb(so, &inp, &in6p, &tp)) != 0)
return error; return error;