From nobody Sun Apr 12 18:35:37 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftzkL5VCSz6YW2Z for ; Sun, 12 Apr 2026 18:35:38 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftzkK6Fg4z3Zm2 for ; Sun, 12 Apr 2026 18:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776018937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nf6jJ92Crcsdfpc5plDXRC47TDr88rUj2tZELyHNeFc=; b=v1Sh7ITzEOh13+w3JRADZGiDrjbEGfBhyjMy8uglB94dKRiEtxzwfzgCF/EvuaDnXxreOY lfwtGDY5gbT1xqwtS+X5aqn2O6am5bp9Xh6UvXGXpHR6xOqpx+1gI891h7Em/ZZutChwHo EsoDL9bvYAnKw46qypHSWLydhdjU36Bo9gsa3FLJKO2iuvkyBVCQnEuaERvYTf+4H83BzV iF8Dw4t5Fc9eYB/tdoELzjvAv8OEvn/Xe4itV4sCt8lOohXIIgpUTyYoLAlo6lt0eQYKag MupEA0/iE/Mu/N7nJYBFTm69nU2pJ5pUDDLWgVJroOzS+F25CxMAB8i88kSE4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776018937; a=rsa-sha256; cv=none; b=PzlTjOegvkIujc7ISYPEItoZWYHKYzBQ/36jZQdWps6N4Ox1Yf8Z+6zdXsdrl+ks4CIMxr Oysmj6g4xDoPQWB64PV7T14RFtDrkBXtoAd/47fdf0vQg7rAXLF7uHstXdBUs4ZbRsO9L5 Haxcp06jHpk+TthFnSQNYGH4cRVpEMdNxe6jipLVD8Rp0acmwgncabhygaKsS/GnaTTbNo IA9nETR7cb+TTP85LAkUKpsTR8QEoP+Br27xAD3LDh9ZsE7wsei9A8Dt4m2/rRyAinjl// uUsPYZEj4R7nYoJnLpmkmscMhuPo5dHnvqYqVgBGoXOgAkaGOKpMHUXnbrKk6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776018937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nf6jJ92Crcsdfpc5plDXRC47TDr88rUj2tZELyHNeFc=; b=Bqr4mMvoc3fOvvKUNR6nwmjBMLAiGb+/F3A0Hj8Y3/dQ2wtMPoVPmM8q8bY9+c+zzBSh+A cJqytPBLLyNun7jz1TpNQvy0deS8S1gg2hb/f2CGFvcOHRnKYJTXFQgNxAxbE+Qi7beYB6 9NH9i+Fdvh2wOkGsnlP4dRE7xpiOnTeFv7TkGb1b3xsAbpZkPaRRXcUjkgQmrA6lCVdGuz M13E4IGq2kmTVmS3R4Ku+FXqB5hBlQjtt9v69rT2rg2uhNauw/mT++wQXTyHSNm7xmlIc5 bqzIkZUH/oXGvT1HGL2PQScHeUG5DcNoaz2iZ+wtIipaZ7x+RKNBg6LhctOz3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftzkK5dvFzDSY for ; Sun, 12 Apr 2026 18:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a4db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 18:35:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 2c48736c55c2 - main - inpcb: make in_pcbconnect() acquire the hash lock internally List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c48736c55c2154327f7e9219d4d69224181ab72 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 18:35:37 +0000 Message-Id: <69dbe5f9.3a4db.5b38239e@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=2c48736c55c2154327f7e9219d4d69224181ab72 commit 2c48736c55c2154327f7e9219d4d69224181ab72 Author: Gleb Smirnoff AuthorDate: 2026-04-12 18:33:30 +0000 Commit: Gleb Smirnoff CommitDate: 2026-04-12 18:33:30 +0000 inpcb: make in_pcbconnect() acquire the hash lock internally Reviewed by: pouria, rrs, markj Differential Revision: https://reviews.freebsd.org/D55971 --- sys/netinet/in_pcb.c | 17 ++++++++++++----- sys/netinet/tcp_syncache.c | 4 ---- sys/netinet/tcp_usrreq.c | 4 ---- sys/netinet/udp_usrreq.c | 4 ---- sys/netinet6/in6_pcb.c | 15 +++++++++++---- sys/netinet6/udp6_usrreq.c | 6 ------ 6 files changed, 23 insertions(+), 27 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 6c5b7869d945..69974d931e44 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1096,8 +1096,8 @@ in_pcbconnect(struct inpcb *inp, struct sockaddr_in *sin, struct ucred *cred) int error; bool anonport; + NET_EPOCH_ASSERT(); INP_WLOCK_ASSERT(inp); - INP_HASH_WLOCK_ASSERT(inp->inp_pcbinfo); KASSERT(in_nullhost(inp->inp_faddr), ("%s: inp is already connected", __func__)); KASSERT(sin->sin_family == AF_INET, @@ -1134,10 +1134,13 @@ in_pcbconnect(struct inpcb *inp, struct sockaddr_in *sin, struct ucred *cred) } else faddr = sin->sin_addr; + INP_HASH_WLOCK(inp->inp_pcbinfo); if (in_nullhost(inp->inp_laddr)) { error = in_pcbladdr(inp, &faddr, &laddr, cred); - if (error) + if (__predict_false(error)) { + INP_HASH_WUNLOCK(inp->inp_pcbinfo); return (error); + } } else laddr = inp->inp_laddr; @@ -1154,13 +1157,16 @@ in_pcbconnect(struct inpcb *inp, struct sockaddr_in *sin, struct ucred *cred) error = in_pcb_lport_dest(inp, (struct sockaddr *)&lsin, &lport, (struct sockaddr *)&fsin, sin->sin_port, cred, INPLOOKUP_WILDCARD); - if (error) + if (__predict_false(error)) { + INP_HASH_WUNLOCK(inp->inp_pcbinfo); return (error); + } } else if (in_pcblookup_hash_locked(inp->inp_pcbinfo, faddr, sin->sin_port, laddr, inp->inp_lport, 0, M_NODOM, RT_ALL_FIBS) != - NULL) + NULL) { + INP_HASH_WUNLOCK(inp->inp_pcbinfo); return (EADDRINUSE); - else + } else lport = inp->inp_lport; MPASS(!in_nullhost(inp->inp_laddr) || inp->inp_lport != 0 || @@ -1176,6 +1182,7 @@ in_pcbconnect(struct inpcb *inp, struct sockaddr_in *sin, struct ucred *cred) MPASS(error == 0); } else in_pcbrehash(inp); + INP_HASH_WUNLOCK(inp->inp_pcbinfo); if (V_fib_hash_outbound) { uint32_t hash_val, hash_type; diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 1d628bce0d80..22f260db9805 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -846,9 +846,7 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) sin6.sin6_addr = sc->sc_inc.inc6_faddr; sin6.sin6_port = sc->sc_inc.inc_fport; sin6.sin6_flowinfo = sin6.sin6_scope_id = 0; - INP_HASH_WLOCK(&V_tcbinfo); error = in6_pcbconnect(inp, &sin6, thread0.td_ucred, false); - INP_HASH_WUNLOCK(&V_tcbinfo); if (error != 0) goto abort; /* Override flowlabel from in6_pcbconnect. */ @@ -875,9 +873,7 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) sin.sin_addr = sc->sc_inc.inc_faddr; sin.sin_port = sc->sc_inc.inc_fport; bzero((caddr_t)sin.sin_zero, sizeof(sin.sin_zero)); - INP_HASH_WLOCK(&V_tcbinfo); error = in_pcbconnect(inp, &sin, thread0.td_ucred); - INP_HASH_WUNLOCK(&V_tcbinfo); if (error != 0) goto abort; } diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 72100a0fb9d9..277f8fa2af36 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1424,9 +1424,7 @@ tcp_connect(struct tcpcb *tp, struct sockaddr_in *sin, struct thread *td) if (__predict_false((so->so_options & SO_REUSEPORT_LB) != 0)) return (EOPNOTSUPP); - INP_HASH_WLOCK(&V_tcbinfo); error = in_pcbconnect(inp, sin, td->td_ucred); - INP_HASH_WUNLOCK(&V_tcbinfo); if (error != 0) return (error); @@ -1473,9 +1471,7 @@ tcp6_connect(struct tcpcb *tp, struct sockaddr_in6 *sin6, struct thread *td) if (__predict_false((so->so_options & SO_REUSEPORT_LB) != 0)) return (EOPNOTSUPP); - INP_HASH_WLOCK(&V_tcbinfo); error = in6_pcbconnect(inp, sin6, td->td_ucred, true); - INP_HASH_WUNLOCK(&V_tcbinfo); if (error != 0) return (error); diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 3e8011542753..a94e1ec813c4 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1644,11 +1644,9 @@ 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; int error; - pcbinfo = udp_get_inpcbinfo(so->so_proto->pr_protocol); inp = sotoinpcb(so); KASSERT(inp != NULL, ("udp_connect: inp == NULL")); @@ -1669,9 +1667,7 @@ udp_connect(struct socket *so, struct sockaddr *nam, struct thread *td) return (error); } NET_EPOCH_ENTER(et); - INP_HASH_WLOCK(pcbinfo); error = in_pcbconnect(inp, sin, td->td_ucred); - INP_HASH_WUNLOCK(pcbinfo); NET_EPOCH_EXIT(et); if (error == 0) soisconnected(so); diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index c4469136fc90..05ca68d014ff 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -444,7 +444,6 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, NET_EPOCH_ASSERT(); INP_WLOCK_ASSERT(inp); - INP_HASH_WLOCK_ASSERT(pcbinfo); KASSERT(sin6->sin6_family == AF_INET6, ("%s: invalid address family for %p", __func__, sin6)); KASSERT(sin6->sin6_len == sizeof(*sin6), @@ -468,23 +467,30 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, * Call inner routine, to assign local interface address. * in6_pcbladdr() may automatically fill in sin6_scope_id. */ + INP_HASH_WLOCK(pcbinfo); if ((error = in6_pcbladdr(inp, sin6, &laddr6.sin6_addr, - sas_required)) != 0) + sas_required)) != 0) { + INP_HASH_WUNLOCK(pcbinfo); return (error); + } if (in6_pcblookup_hash_locked(pcbinfo, &sin6->sin6_addr, sin6->sin6_port, IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr) ? &laddr6.sin6_addr : &inp->in6p_laddr, inp->inp_lport, 0, - M_NODOM, RT_ALL_FIBS) != NULL) + M_NODOM, RT_ALL_FIBS) != NULL) { + INP_HASH_WUNLOCK(pcbinfo); return (EADDRINUSE); + } if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)) { if (inp->inp_lport == 0) { error = in_pcb_lport_dest(inp, (struct sockaddr *) &laddr6, &inp->inp_lport, (struct sockaddr *) sin6, sin6->sin6_port, cred, INPLOOKUP_WILDCARD); - if (error) + if (__predict_false(error)) { + INP_HASH_WUNLOCK(pcbinfo); return (error); + } } inp->in6p_laddr = laddr6.sin6_addr; } @@ -501,6 +507,7 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, MPASS(error == 0); } else in_pcbrehash(inp); + INP_HASH_WUNLOCK(pcbinfo); return (0); } diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 6e37586f16e4..98d9d52d2a61 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -1120,12 +1120,10 @@ udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { struct epoch_tracker et; struct inpcb *inp; - struct inpcbinfo *pcbinfo; struct sockaddr_in6 *sin6; int error; u_char vflagsav; - pcbinfo = udp_get_inpcbinfo(so->so_proto->pr_protocol); inp = sotoinpcb(so); KASSERT(inp != NULL, ("udp6_connect: inp == NULL")); @@ -1163,9 +1161,7 @@ udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td) inp->inp_vflag |= INP_IPV4; inp->inp_vflag &= ~INP_IPV6; NET_EPOCH_ENTER(et); - INP_HASH_WLOCK(pcbinfo); error = in_pcbconnect(inp, &sin, td->td_ucred); - INP_HASH_WUNLOCK(pcbinfo); NET_EPOCH_EXIT(et); /* * If connect succeeds, mark socket as connected. If @@ -1196,9 +1192,7 @@ udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td) inp->inp_vflag &= ~INP_IPV4; inp->inp_vflag |= INP_IPV6; NET_EPOCH_ENTER(et); - INP_HASH_WLOCK(pcbinfo); error = in6_pcbconnect(inp, sin6, td->td_ucred, true); - INP_HASH_WUNLOCK(pcbinfo); NET_EPOCH_EXIT(et); /* * If connect succeeds, mark socket as connected. If