From owner-svn-src-all@freebsd.org Wed Jan 22 05:54:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD9C222DDFF; Wed, 22 Jan 2020 05:54:58 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 482ZPG56Vvz4bK6; Wed, 22 Jan 2020 05:54:58 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AAC3B20DB8; Wed, 22 Jan 2020 05:54:58 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00M5sw9j025561; Wed, 22 Jan 2020 05:54:58 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00M5swhR025560; Wed, 22 Jan 2020 05:54:58 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <202001220554.00M5swhR025560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 22 Jan 2020 05:54:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356976 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 356976 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jan 2020 05:54:58 -0000 Author: glebius Date: Wed Jan 22 05:54:58 2020 New Revision: 356976 URL: https://svnweb.freebsd.org/changeset/base/356976 Log: Inline tcp_attach() into tcp_usr_attach(). Not a functional change. Modified: head/sys/netinet/tcp_usrreq.c Modified: head/sys/netinet/tcp_usrreq.c ============================================================================== --- head/sys/netinet/tcp_usrreq.c Wed Jan 22 05:53:16 2020 (r356975) +++ head/sys/netinet/tcp_usrreq.c Wed Jan 22 05:54:58 2020 (r356976) @@ -121,7 +121,6 @@ __FBSDID("$FreeBSD$"); /* * TCP protocol interface to socket abstraction. */ -static int tcp_attach(struct socket *); #ifdef INET static int tcp_connect(struct tcpcb *, struct sockaddr *, struct thread *td); @@ -152,6 +151,7 @@ static void tcp_fill_info(struct tcpcb *, struct tcp_i static int tcp_usr_attach(struct socket *so, int proto, struct thread *td) { + struct epoch_tracker et; struct inpcb *inp; struct tcpcb *tp = NULL; int error; @@ -161,19 +161,49 @@ tcp_usr_attach(struct socket *so, int proto, struct th KASSERT(inp == NULL, ("tcp_usr_attach: inp != NULL")); TCPDEBUG1(); - error = tcp_attach(so); - if (error) - goto out; + if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { + error = soreserve(so, V_tcp_sendspace, V_tcp_recvspace); + if (error) + goto out; + } + so->so_rcv.sb_flags |= SB_AUTOSIZE; + so->so_snd.sb_flags |= SB_AUTOSIZE; + NET_EPOCH_ENTER(et); + error = in_pcballoc(so, &V_tcbinfo); + if (error) { + NET_EPOCH_EXIT(et); + goto out; + } + inp = sotoinpcb(so); +#ifdef INET6 + if (inp->inp_vflag & INP_IPV6PROTO) { + inp->inp_vflag |= INP_IPV6; + if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) + inp->inp_vflag |= INP_IPV4; + inp->in6p_hops = -1; /* use kernel default */ + } + else +#endif + inp->inp_vflag |= INP_IPV4; + tp = tcp_newtcpcb(inp); + if (tp == NULL) { + in_pcbdetach(inp); + in_pcbfree(inp); + NET_EPOCH_EXIT(et); + error = ENOBUFS; + goto out; + } + tp->t_state = TCPS_CLOSED; + INP_WUNLOCK(inp); + NET_EPOCH_EXIT(et); + TCPSTATES_INC(TCPS_CLOSED); if ((so->so_options & SO_LINGER) && so->so_linger == 0) so->so_linger = TCP_LINGERTIME; - - inp = sotoinpcb(so); - tp = intotcpcb(inp); out: TCPDEBUG2(PRU_ATTACH); TCP_PROBE2(debug__user, tp, PRU_ATTACH); - return error; + return (error); } /* @@ -2403,57 +2433,6 @@ unhold: } #undef INP_WLOCK_RECHECK #undef INP_WLOCK_RECHECK_CLEANUP - -/* - * Attach TCP protocol to socket, allocating - * internet protocol control block, tcp control block, - * bufer space, and entering LISTEN state if to accept connections. - */ -static int -tcp_attach(struct socket *so) -{ - struct tcpcb *tp; - struct inpcb *inp; - struct epoch_tracker et; - int error; - - if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { - error = soreserve(so, V_tcp_sendspace, V_tcp_recvspace); - if (error) - return (error); - } - so->so_rcv.sb_flags |= SB_AUTOSIZE; - so->so_snd.sb_flags |= SB_AUTOSIZE; - NET_EPOCH_ENTER(et); - error = in_pcballoc(so, &V_tcbinfo); - if (error) { - NET_EPOCH_EXIT(et); - return (error); - } - inp = sotoinpcb(so); -#ifdef INET6 - if (inp->inp_vflag & INP_IPV6PROTO) { - inp->inp_vflag |= INP_IPV6; - if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) - inp->inp_vflag |= INP_IPV4; - inp->in6p_hops = -1; /* use kernel default */ - } - else -#endif - inp->inp_vflag |= INP_IPV4; - tp = tcp_newtcpcb(inp); - if (tp == NULL) { - in_pcbdetach(inp); - in_pcbfree(inp); - NET_EPOCH_EXIT(et); - return (ENOBUFS); - } - tp->t_state = TCPS_CLOSED; - INP_WUNLOCK(inp); - NET_EPOCH_EXIT(et); - TCPSTATES_INC(TCPS_CLOSED); - return (0); -} /* * Initiate (or continue) disconnect.