From owner-svn-src-head@freebsd.org Wed Jan 22 06:10:42 2020 Return-Path: Delivered-To: svn-src-head@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 CBACB22E797; Wed, 22 Jan 2020 06:10:42 +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 482ZlQ4nMLz4dGg; Wed, 22 Jan 2020 06:10:42 +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 9F74720FCB; Wed, 22 Jan 2020 06:10:42 +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 00M6AgG7034936; Wed, 22 Jan 2020 06:10:42 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00M6AfiD034933; Wed, 22 Jan 2020 06:10:41 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <202001220610.00M6AfiD034933@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:10:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356983 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 356983 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jan 2020 06:10:42 -0000 Author: glebius Date: Wed Jan 22 06:10:41 2020 New Revision: 356983 URL: https://svnweb.freebsd.org/changeset/base/356983 Log: Make in_pcbladdr() require network epoch entered by its callers. Together with this widen network epoch coverage up to tcp_connect() and udp_connect(). Revisions from r356974 and up to this revision cover D23187. Differential Revision: https://reviews.freebsd.org/D23187 Modified: head/sys/netinet/in_pcb.c head/sys/netinet/raw_ip.c head/sys/netinet/tcp_usrreq.c head/sys/netinet/udp_usrreq.c Modified: head/sys/netinet/in_pcb.c ============================================================================== --- head/sys/netinet/in_pcb.c Wed Jan 22 06:07:27 2020 (r356982) +++ head/sys/netinet/in_pcb.c Wed Jan 22 06:10:41 2020 (r356983) @@ -1028,9 +1028,9 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct sockaddr *sa; struct sockaddr_in *sin; struct route sro; - struct epoch_tracker et; int error; + NET_EPOCH_ASSERT(); KASSERT(laddr != NULL, ("%s: laddr NULL", __func__)); /* * Bypass source address selection and use the primary jail IP @@ -1064,7 +1064,6 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, * network and try to find a corresponding interface to take * the source address from. */ - NET_EPOCH_ENTER(et); if (sro.ro_rt == NULL || sro.ro_rt->rt_ifp == NULL) { struct in_ifaddr *ia; struct ifnet *ifp; @@ -1228,7 +1227,6 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, } done: - NET_EPOCH_EXIT(et); if (sro.ro_rt != NULL) RTFREE(sro.ro_rt); return (error); @@ -1266,6 +1264,7 @@ in_pcbconnect_setup(struct inpcb *inp, struct sockaddr * Because a global state change doesn't actually occur here, a read * lock is sufficient. */ + NET_EPOCH_ASSERT(); INP_LOCK_ASSERT(inp); INP_HASH_LOCK_ASSERT(inp->inp_pcbinfo); Modified: head/sys/netinet/raw_ip.c ============================================================================== --- head/sys/netinet/raw_ip.c Wed Jan 22 06:07:27 2020 (r356982) +++ head/sys/netinet/raw_ip.c Wed Jan 22 06:10:41 2020 (r356983) @@ -491,8 +491,10 @@ rip_output(struct mbuf *m, struct socket *so, ...) * want to see from jails. */ if (ip->ip_src.s_addr == INADDR_ANY) { - error = in_pcbladdr(inp, &ip->ip_dst, &ip->ip_src, - inp->inp_cred); + NET_EPOCH_ENTER(et); + error = in_pcbladdr(inp, &ip->ip_dst, + &ip->ip_src, inp->inp_cred); + NET_EPOCH_EXIT(et); } else { error = prison_local_ip4(inp->inp_cred, &ip->ip_src); Modified: head/sys/netinet/tcp_usrreq.c ============================================================================== --- head/sys/netinet/tcp_usrreq.c Wed Jan 22 06:07:27 2020 (r356982) +++ head/sys/netinet/tcp_usrreq.c Wed Jan 22 06:10:41 2020 (r356983) @@ -557,17 +557,18 @@ tcp_usr_connect(struct socket *so, struct sockaddr *na } tp = intotcpcb(inp); TCPDEBUG1(); + NET_EPOCH_ENTER(et); if ((error = tcp_connect(tp, nam, td)) != 0) - goto out; + goto out_in_epoch; #ifdef TCP_OFFLOAD if (registered_toedevs > 0 && (so->so_options & SO_NO_OFFLOAD) == 0 && (error = tcp_offload_connect(so, nam)) == 0) - goto out; + goto out_in_epoch; #endif tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp)); - NET_EPOCH_ENTER(et); error = tp->t_fb->tfb_tcp_output(tp); +out_in_epoch: NET_EPOCH_EXIT(et); out: TCPDEBUG2(PRU_CONNECT); @@ -644,18 +645,17 @@ tcp6_usr_connect(struct socket *so, struct sockaddr *n goto out; inp->inp_vflag |= INP_IPV4; inp->inp_vflag &= ~INP_IPV6; + NET_EPOCH_ENTER(et); if ((error = tcp_connect(tp, (struct sockaddr *)&sin, td)) != 0) - goto out; + goto out_in_epoch; #ifdef TCP_OFFLOAD if (registered_toedevs > 0 && (so->so_options & SO_NO_OFFLOAD) == 0 && (error = tcp_offload_connect(so, nam)) == 0) - goto out; + goto out_in_epoch; #endif - NET_EPOCH_ENTER(et); error = tp->t_fb->tfb_tcp_output(tp); - NET_EPOCH_EXIT(et); - goto out; + goto out_in_epoch; } else { if ((inp->inp_vflag & INP_IPV6) == 0) { error = EAFNOSUPPORT; @@ -679,6 +679,7 @@ tcp6_usr_connect(struct socket *so, struct sockaddr *n tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp)); NET_EPOCH_ENTER(et); error = tp->t_fb->tfb_tcp_output(tp); +out_in_epoch: NET_EPOCH_EXIT(et); out: /* @@ -1468,6 +1469,7 @@ tcp_connect(struct tcpcb *tp, struct sockaddr *nam, st u_short lport; int error; + NET_EPOCH_ASSERT(); INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK(&V_tcbinfo); Modified: head/sys/netinet/udp_usrreq.c ============================================================================== --- head/sys/netinet/udp_usrreq.c Wed Jan 22 06:07:27 2020 (r356982) +++ head/sys/netinet/udp_usrreq.c Wed Jan 22 06:10:41 2020 (r356983) @@ -1606,6 +1606,7 @@ udp_close(struct socket *so) static int udp_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { + struct epoch_tracker et; struct inpcb *inp; struct inpcbinfo *pcbinfo; struct sockaddr_in *sin; @@ -1625,9 +1626,11 @@ udp_connect(struct socket *so, struct sockaddr *nam, s INP_WUNLOCK(inp); return (error); } + NET_EPOCH_ENTER(et); INP_HASH_WLOCK(pcbinfo); error = in_pcbconnect(inp, nam, td->td_ucred); INP_HASH_WUNLOCK(pcbinfo); + NET_EPOCH_EXIT(et); if (error == 0) soisconnected(so); INP_WUNLOCK(inp);