From nobody Mon Aug 24 16:29:44 2026 X-Original-To: dev-commits-src-all@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 4hTGbF0B03z6pbTX for ; Mon, 24 Aug 2026 16:29:45 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hTGbD5GGZz40qt for ; Mon, 24 Aug 2026 16:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787588984; 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=Zuo1QTGV9SSJai0kYUg3uCqdOW0sbzhb8pAEq2pzzN0=; b=LQmR9H3FaAO+ddI2pZXrfiKt1NGlhT6ApimM8LS0rX1lztlDxCrYhSvL7sU28spYpl+7fl AMpCQuKIPMTAP1MSz+oRgld/Ja7/aW6vHRZd2dslo78R2OUyCWnoSvD7MschIRPziEhWS5 vgKoXKxp9KQUjXx8W24KkCMMp/B8DAGQ51/1ftfoaPWq4fSekIoCrwhdp8ujLASUh12xsd 5SlZVmpl0wjVMchACVm3xGAImlYqy0m4mbalbIBKs2rR/nirr1f9dlgxuffpS1CCL50XCN 3QsTE4cT1M7zMuUcDR8rGtfC7QIMIANdv+463/Ik8i7FH9awkRmvJ0DZlcQk/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787588984; a=rsa-sha256; cv=none; b=NRewNc6m/T6ezwdWMhBiJ/D+jSPRa73b6fQGcxEe6IeHi93Qe/sWdakO2TFfJ+rCU81NfD +xpvgMzbsu+0I9iI4AlOfhbUSvNtql7L6vU/uadEu5q89QEiUoEEtobxwNjvHGb/Xi3maQ M9eEVYXj7ChjKbVIsxQOvYqtp3IDGILtRua4zdUyJwmemcqeExH4ljFPLdJ7oIZ0WLd5nx 6vQmSvHIcuju3V0Q3i+nXWeMfQQcvngW8Eqaj+KHCbvFEdq8Ma9JfpYo0o3GfjAVH5hPCq MbJZzHY/qIdy7KH+ElHVWv4f4Pz0kXM84foqENc7iwih+n6RX0bwec0Cf9Pw5w== 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=1787588984; 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=Zuo1QTGV9SSJai0kYUg3uCqdOW0sbzhb8pAEq2pzzN0=; b=FAEhbbwACd4AjgW1dWnOhMCT0pGiQ4TO9yeOkVCDvZfnsYz5s+wrAMlIxupJoYLcDmxKaV EQzpS3iNuwQ0faoXO8DNGbFYyJbffBGUviD8SSbU9MvVOFn2UXtQsWHdxowDEgdIV2uXc1 gG58wbMjOxlmXpru7QUfw2u5BTOol7tqfkEl6bOnVhNzx0i4I83BEg+Urde7iDNo5YVcLz baulvb6mDS96gfJitP16AcnGqgSLRKxndjk09tEygVEwfZ4MhfbFrc+8SudkSdk6j3LYcb gSYAJGw3SXVZenMbw441wzejw2WLYWicVe4KDedtUOFmR9DCJnY74f4pSeqNNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTGbD3MlLz19rH for ; Mon, 24 Aug 2026 16:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22622 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 16:29:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9e107eba08b1 - stable/15 - unix: Simplify uipc_detach() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 9e107eba08b162d22435096874852417ba8e9e67 Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 16:29:44 +0000 Message-Id: <6a8c7178.22622.1fa84fd3@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9e107eba08b162d22435096874852417ba8e9e67 commit 9e107eba08b162d22435096874852417ba8e9e67 Author: Mark Johnston AuthorDate: 2026-08-10 14:41:22 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 15:17:53 +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 (cherry picked from commit e27d36e038bf0d681d19a07d3512e0dc5adb20c7) --- 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 963e1cab251b..878aa46dd7cb 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -804,15 +804,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); @@ -824,23 +819,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 @@ -867,10 +848,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) {