From nobody Mon Aug 10 17:40:28 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 4hJhqJ5jgDz6X2fK for ; Mon, 10 Aug 2026 17:40:28 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hJhqJ2GPdz48rh for ; Mon, 10 Aug 2026 17:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786383628; 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=+EHj4HyEq17/pX2O7LWkkgy9pH16nUslNmEnF4Z9f3s=; b=qWzvhZ0EPuvIdDZugHY2Wqxd3odNrmXycERuA4AlqoKTXlaJZ6yi5fb9kZuMd8epUVPzJU 0LalTDBlKy9zOE44ffFJZuZ97wqJ+kzPNYIjAtUlo0G6uANWYM4jk0SDGuHLbEtP7Max6E NwMPn1cARMERtfERau2UbxAQagm4hQ9tzyPIN18dzghwfdHYKNVKJE+CmaeR+u/D0dJ6ZP YkRIMHJMlohtXqE8IKOGiLMdoUjf9RWtr5Xkr3yjkttJ97oXvfqYfhUqa9h2vRiO5PQ6Ef dmymQlrKvQxZQf/JysMS9/4d3rSLN8Qs3tW7WeFj0Dsc2rP2f+PkMruAxBr3Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786383628; a=rsa-sha256; cv=none; b=fpOchW6EzDlZKg8Vsy6tySDrtEZ4i6n3CHCLl/kkKdJHB5mx6Bv1BE679hiwX6IS/ENVrZ J6XVax+oASPVm7rbasNAdOxRpbA92YHq2BcvkTPXU0EJPUSZKOmrs2gIixLdgp2jJqR38R ZiABWFOQ9+D4JQ/JVh0OrH0dehYFLQGtmn9b7wv1h6X7HpylNy1wotsPQEd/VGLifYCxE1 qWrA5YFBM0of8xZp6ThAtdYXqQ2PXVzKtYOqy04sYwhGBt5vUbWXhsTYSmHog9at+v1lMY oMArfjajwb2rIclOnWTqdBUcKqn94EnsXdIa1Nz2pWz1kmMLS8syUzctDsrRwQ== 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=1786383628; 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=+EHj4HyEq17/pX2O7LWkkgy9pH16nUslNmEnF4Z9f3s=; b=XNhpEJzr4axYbbSUZR0phj0LAdEIcUaf+r0cBCwTRGLm+Qso5NasMHMrVk0RiQC31CeXce nJpA+qayjSCdM9VlWN6wIwiP7/C5RQXKxw2dDAPkKWUIWVGzLvrKmvW18mlN9ENyDO3HU2 aBXov3ptmITSBj+Y24MHnJVSWFiQLS+0JOIH9kbP0m5WAOQ1AEXuwt+lVf0WkajlhkRopB NKNE/a55hp9xCjmRv1sAgIa7hWRg+DgoF1rWg3AVABDSh8cm779N3E+Tsm3jnWfcUdEsz9 iI6KcbLCac4QgCYmK0AaFXoc2YKXSzR+3k5NL+QC+sXN/CU0u2rJRHa7YmURCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hJhqJ0KXtz3sw for ; Mon, 10 Aug 2026 17:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fad2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 10 Aug 2026 17:40:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e27d36e038bf - main - unix: Simplify uipc_detach() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e27d36e038bf0d681d19a07d3512e0dc5adb20c7 Auto-Submitted: auto-generated Date: Mon, 10 Aug 2026 17:40:28 +0000 Message-Id: <6a7a0d0c.3fad2.191c95f8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e27d36e038bf0d681d19a07d3512e0dc5adb20c7 commit e27d36e038bf0d681d19a07d3512e0dc5adb20c7 Author: Mark Johnston AuthorDate: 2026-08-10 14:41:22 +0000 Commit: Mark Johnston CommitDate: 2026-08-10 17:31:21 +0000 unix: Simplify uipc_detach() uipc_close() handles detaching a unix socket from the vnode to which it's bound, if any, so doing the same in uipc_detach() is redundant. Moreover, it's conceptually wrong that uipc_detach() might need to handle this: detach happens when there are no remaining references to the socket, and that should include the vnode's reference, even though it's not explicitly counted. No functional change intended. Reviewed by: John Ericson , glebius MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58675 --- sys/kern/uipc_usrreq.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 835daa09fc9a..df9568015724 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -802,15 +802,10 @@ static void uipc_detach(struct socket *so) { struct unpcb *unp, *unp2; - struct mtx *vplock; - struct vnode *vp; unp = sotounpcb(so); KASSERT(unp != NULL, ("uipc_detach: unp == NULL")); - vp = NULL; - vplock = NULL; - if (!SOLISTENING(so)) unp_dispose(so); @@ -822,23 +817,9 @@ uipc_detach(struct socket *so) --unp_count; UNP_LINK_WUNLOCK(); - UNP_PCB_UNLOCK_ASSERT(unp); - restart: - if ((vp = unp->unp_vnode) != NULL) { - vplock = mtx_pool_find(unp_vp_mtxpool, vp); - mtx_lock(vplock); - } UNP_PCB_LOCK(unp); - if (unp->unp_vnode != vp && unp->unp_vnode != NULL) { - if (vplock) - mtx_unlock(vplock); - UNP_PCB_UNLOCK(unp); - goto restart; - } - if ((vp = unp->unp_vnode) != NULL) { - VOP_UNP_DETACH(vp); - unp->unp_vnode = NULL; - } + KASSERT(unp->unp_vnode == NULL, + ("%s: unp %p has vnode", __func__, unp)); if ((unp2 = unp_pcb_lock_peer(unp)) != NULL) unp_disconnect(unp, unp2); else @@ -865,10 +846,7 @@ uipc_detach(struct socket *so) unp->unp_addr = NULL; if (!unp_pcb_rele(unp)) UNP_PCB_UNLOCK(unp); - if (vp) { - mtx_unlock(vplock); - vrele(vp); - } + maybe_schedule_gc(); switch (so->so_type) {