From nobody Wed Apr 1 22:33:30 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 4fmKWt1h3Vz6YfH7 for ; Wed, 01 Apr 2026 22:33:30 +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 4fmKWt14yzz3wdk for ; Wed, 01 Apr 2026 22:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775082810; 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=Zjv3Su9c1mLsrnuewd6wLGfq/O6WR3YoncU5HNQbioA=; b=McIXdckcbuenTq/i0P/h7GQzLFfAK5Hw85gkf8o/at4i4VWlHR0BrOZ/pEAKYRHXWTTUZx uE862dr0ehh9GULOTYJ8iLpf/XqNbjnF98YiINuQt4fM8+Adqbq4uAqREk4/rK6JG+iR8j bV3sLDK/wXDHtCwPbnLUux/tlCHH/4Z2e9pMCZOPCT6M/vq9GGJq5POgplzhavjY2vlJYP PRj4NTy3JM/XDaEIGgJfRtoLezmiLohXltNOyJJkYCDG4o3PQ54Ci3BASkOAbkISCDKp/9 SPF+yi7B+5n9sBKf1dLaJMob37h0C06+0z26GaLVBOiF9al7cxSU8I4uoE5etQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775082810; a=rsa-sha256; cv=none; b=eS/uD8Mx4qpp0w4qyyIzsbBrS/dk+JBBaoBUecuWyUtgbnzUIbT0wvDjUmz0aiRv3uYoTD AIfGm6qU67KsPSkvCm68H6bYLIiMWa402hxXl8pitvH5nJhsreBIMJDVqVMrmG6pkrank3 2LTejxCWom6YzZW4h9Vc3qQkk9yFmp0iZY6lt5eNzdbOP+r3Tt47qjSzt8ywx0lSzdk1Th UciOIOldttYl91Pu8A9xKhSY1ir6xKMw0KCPmHNnA1B0BTyviQ2WdZNn/jD0HrX9iOMR3H WBx6bUk4dwMKOVpOB+T3LsI/1bMUXCKwat3ZUyOh4biTExGBVebdbcI9KyIiIw== 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=1775082810; 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=Zjv3Su9c1mLsrnuewd6wLGfq/O6WR3YoncU5HNQbioA=; b=lyludNIfX3KPLj0n1rprnA2rEOksvEPKkRb1rgzk7crWbMzuUDwiGK0l5up9LQPAvmKgvC L0X0MnFzpIwz2yoB1UuQC3JLGHOP3JPATv4tLiClG0jMMiSRn6MPMvc6CsNKpzEAq+VCP9 dCawc6GfC1pUnqDTXRLOq9G8aRnlr52BPQF+87sfhshpXTT5+1CygJ9GPJuUxjzFeUepoC 4H9NC3J3OgaZ1X5hDAN0uep4ZNCi5FiaB8fDH2zyxxFAiLoUfE7eunTEbEz6rGnmIDbV7y Y6RU8/j11bSn1mRN2CuvUhe9Y6Sl9lW2yEpRCNTg0wgrYswCTsxiJFkrCDOKYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmKWt0fQjzbfD for ; Wed, 01 Apr 2026 22:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 448b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Apr 2026 22:33:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 14d0baf2e892 - main - kqueue: avoid a possible fork-deadlock 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14d0baf2e89202cec3f9cb03a573372ccbc568b2 Auto-Submitted: auto-generated Date: Wed, 01 Apr 2026 22:33:30 +0000 Message-Id: <69cd9d3a.448b1.4720b683@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=14d0baf2e89202cec3f9cb03a573372ccbc568b2 commit 14d0baf2e89202cec3f9cb03a573372ccbc568b2 Author: Kyle Evans AuthorDate: 2026-04-01 22:30:48 +0000 Commit: Kyle Evans CommitDate: 2026-04-01 22:30:48 +0000 kqueue: avoid a possible fork-deadlock kqueue_fork_copy() is likely to have transitioned at least one knote through a flux state, so we should check whether we need to wake anything up on the way out to avoid a possible deadlock. This was a part of D56210, but we'll close the review with the next commit. Fixes: b11289f87123f ("kqueuex(2): add KQUEUE_CPONFORK") Reviewed by: kib, markj --- sys/kern/kern_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 2cdc37b710e6..6af53cf6cd91 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -3147,7 +3147,7 @@ kqueue_fork_copy(struct filedesc *fdp, struct file *fp, struct file *fp1, } kqueue_release(kq, 1); kq1->kq_forksrc = NULL; - KQ_UNLOCK(kq); + KQ_UNLOCK_FLUX(kq); knote_free(marker); return (error);