From nobody Sun Apr 12 18:35:38 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 4ftzkM4z24z6YW7V for ; Sun, 12 Apr 2026 18:35:39 +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 4ftzkL6vtnz3ZpR for ; Sun, 12 Apr 2026 18:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776018939; 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=6mXOWQDpTvyo3MOXjNK95HhINJS2uwlWL7iNpSifyT4=; b=Owvl8S3or89AN94jvP/I04s2unUNEXDmCyiv5hM3HGndCPMFx+QdmtfQD++AvCVFJFlevK yS5bhrqARWuvVCSQ79PHg49tATlCG2IEqdEmygJz0c7KBTEn214j18Xuiy7bUoL/G/7rU8 qrQY2E/42mqYlET/ImH/eFeaUtTZX7wm3rWjKYOJ8u930VE/HwHlIjopfBr995c0HeTyCx QiHozhyQDCrmMyRVibxK8EOL54yhkDGB8/Y/hZhw+61IOWWRyDZnw2dFtjW7BeKAIdDfoC 4zYJc+Mi0rw0fGjhpVLFBt01HAu8XaM2vovu03z/UwAlJcRuyEI5CC0Gw/L3qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776018939; a=rsa-sha256; cv=none; b=JALu80p0zN8+0yzT9na0vnKQ+oGNnFdtsK2/EuSL9LsOB6IX41674OcTmyoYJQn9psnQcm CBqnDTwWRsMRNPvjZ5NX9IDX1rJcQpHfcBwfGJK2NKbXuE2b3OilHkz0JpYS0YjFkrM9Nl 3i+PnKXFxb07WePoOfhRgJxXA8/Qs3ejSlIuRDFXtBDlleXxaPrSo8UlfBZJjd6nyUV49S bPgj2lRaFVQ51Y1dh2TStbs7IXMYHnSd5hdbx5sS1MsRffGOuFGKu8NQ1ysEDdChogaRUj MBIXUp17FOa16zAFL1RrahS+ptSKLaNqZxtAD9A3rw+DojIr+8V8CvtXTVInRw== 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=1776018939; 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=6mXOWQDpTvyo3MOXjNK95HhINJS2uwlWL7iNpSifyT4=; b=XJMc7PGMGH4CCEQB8PWvgFlN9Bh/FveAM6W/JYbJaY71HbGQ1m1LTGo38NomflZw5DhPkl 4at8Hi7HWtaXZTCd97rSHXP69rDJ9zrj012+0RiAL2s19qMMBKraosjXPHp+tW0ivSi2Vb AR223dbvFqUeDOdhIReW0zc3NJVs6s6uw/0tW3FukTkSXMyQ0Uj7ybHPu5QXjzyHBy0gP5 yzotsaeyOTNjBV/F/AEhs2RddUmTGqt9rENQ4Oq+7GYDRu+OsFdPhV+13vM5wrDbdThwKK 5bKVKOJJ9XCtarFupWXgTTADgNy2/QYHqHW8SHwcQmQuzNf13tpdSGr5y1kaOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftzkL6DrTzDJS for ; Sun, 12 Apr 2026 18:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a204 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 18:35:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: d7c409174d25 - main - inpcb: make in6_pcbsetport() 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: d7c409174d25f925c1e93f54957cdadb4545da3a Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 18:35:38 +0000 Message-Id: <69dbe5fa.3a204.1df830b8@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d7c409174d25f925c1e93f54957cdadb4545da3a commit d7c409174d25f925c1e93f54957cdadb4545da3a Author: Gleb Smirnoff AuthorDate: 2026-04-12 18:33:41 +0000 Commit: Gleb Smirnoff CommitDate: 2026-04-12 18:33:41 +0000 inpcb: make in6_pcbsetport() acquire the hash lock internally Reviewed by: pouria, rrs, markj Differential Revision: https://reviews.freebsd.org/D55972 --- sys/netinet6/in6_pcb.c | 25 ++++++++++++++++++------- sys/netinet6/udp6_usrreq.c | 5 ----- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 05ca68d014ff..136f5c8a9828 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -112,18 +112,16 @@ #include #include -int -in6_pcbsetport(struct in6_addr *laddr, struct inpcb *inp, struct ucred *cred) +static int +in6_pcbsetport_locked(struct in6_addr *laddr, struct inpcb *inp, + struct ucred *cred) { struct socket *so = inp->inp_socket; u_int16_t lport = 0; int error, lookupflags = 0; -#ifdef INVARIANTS - struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; -#endif INP_WLOCK_ASSERT(inp); - INP_HASH_WLOCK_ASSERT(pcbinfo); + INP_HASH_WLOCK_ASSERT(inp->inp_pcbinfo); error = prison_local_ip6(cred, laddr, ((inp->inp_flags & IN6P_IPV6_V6ONLY) != 0)); @@ -150,6 +148,18 @@ in6_pcbsetport(struct in6_addr *laddr, struct inpcb *inp, struct ucred *cred) return (0); } +int +in6_pcbsetport(struct in6_addr *laddr, struct inpcb *inp, struct ucred *cred) +{ + int error; + + INP_HASH_WLOCK(inp->inp_pcbinfo); + error = in6_pcbsetport_locked(laddr, inp, cred); + INP_HASH_WUNLOCK(inp->inp_pcbinfo); + + return (error); +} + /* * Determine whether the inpcb can be bound to the specified address/port tuple. */ @@ -341,7 +351,8 @@ in6_pcbbind(struct inpcb *inp, struct sockaddr_in6 *sin6, int flags, if ((flags & INPBIND_FIB) != 0) inp->inp_flags |= INP_BOUNDFIB; if (lport == 0) { - if ((error = in6_pcbsetport(&inp->in6p_laddr, inp, cred)) != 0) { + error = in6_pcbsetport_locked(&inp->in6p_laddr, inp, cred); + if (__predict_false(error != 0)) { INP_HASH_WUNLOCK(inp->inp_pcbinfo); /* Undo an address bind that may have occurred. */ inp->inp_flags &= ~INP_BOUNDFIB; diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 98d9d52d2a61..3f4c3111fa5b 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -832,14 +832,9 @@ udp6_send(struct socket *so, int flags_arg, struct mbuf *m, laddr = &in6a; if (inp->inp_lport == 0) { - struct inpcbinfo *pcbinfo; - INP_WLOCK_ASSERT(inp); - pcbinfo = udp_get_inpcbinfo(so->so_proto->pr_protocol); - INP_HASH_WLOCK(pcbinfo); error = in6_pcbsetport(laddr, inp, td->td_ucred); - INP_HASH_WUNLOCK(pcbinfo); if (error != 0) { /* Undo an address bind that may have occurred. */ inp->in6p_laddr = in6addr_any;