From owner-svn-src-all@freebsd.org Wed Jan 22 06:01:26 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 A140A22E0FF; Wed, 22 Jan 2020 06:01:26 +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 482ZXk3qgZz4c3Q; Wed, 22 Jan 2020 06:01:26 +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 7EA4320F39; Wed, 22 Jan 2020 06:01:26 +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 00M61QR4027812; Wed, 22 Jan 2020 06:01:26 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00M61QVQ027811; Wed, 22 Jan 2020 06:01:26 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <202001220601.00M61QVQ027811@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 06:01:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356978 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 356978 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 06:01:26 -0000 Author: glebius Date: Wed Jan 22 06:01:26 2020 New Revision: 356978 URL: https://svnweb.freebsd.org/changeset/base/356978 Log: tcp_usr_attach() doesn't need network epoch. in_pcbfree() and in_pcbdetach() perform all necessary synchronization themselves. Modified: head/sys/netinet/tcp_usrreq.c Modified: head/sys/netinet/tcp_usrreq.c ============================================================================== --- head/sys/netinet/tcp_usrreq.c Wed Jan 22 05:58:29 2020 (r356977) +++ head/sys/netinet/tcp_usrreq.c Wed Jan 22 06:01:26 2020 (r356978) @@ -151,7 +151,6 @@ 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; @@ -169,12 +168,9 @@ tcp_usr_attach(struct socket *so, int proto, struct th 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); + if (error) goto out; - } inp = sotoinpcb(so); #ifdef INET6 if (inp->inp_vflag & INP_IPV6PROTO) { @@ -188,15 +184,13 @@ tcp_usr_attach(struct socket *so, int proto, struct th inp->inp_vflag |= INP_IPV4; tp = tcp_newtcpcb(inp); if (tp == NULL) { + error = ENOBUFS; 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;