From nobody Mon Apr 13 04:01:51 2026 X-Original-To: dev-commits-src-branches@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 4fvDHg272Hz6YCS6 for ; Mon, 13 Apr 2026 04:01:51 +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 4fvDHg1V5Qz3w2d for ; Mon, 13 Apr 2026 04:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052911; 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=6890horTUeO+dlW7ppsFWA6tygoq/508SIDnmAbdPe8=; b=iZoZ4BeT/NyB5tH7LTLAybRJxwBuMD0QO525tKOr9DN6XiFwdky+QK04hcc4pSVFwQ3qVA 14T6uIaZQ2AMn0JqOLg3IOLSGZLLnrgN71neRCMegc1VZAOHMTMhr5Tx06L03Os+ho2O3e jxj405XpBNdNkOwN1noXhfZJ9TRcZIDlRSGg06yFxebJQ2fsIjj1wSpm1N1+0QQS6dB6FA 4jShg9+uvZqV5DazY0Vcy/AYORMGFtop+IBR2olvnihnVyCQr/QIiv4iznWm7FH2P4bI7G Ahg4PA79GZdqcMSF1+PrYwt+VJWCuN80HPDkMGSM3w26zoG81LFmgiNx0L/phA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776052911; a=rsa-sha256; cv=none; b=OAQ/LewnGmihNjdFUyyEjkWBWhIshF9TSD/Ro9WfpSlGFgRcsvzHH3pfRZkPKi9syFzKE+ ptqwb8V0famVo7KBBgvNCE/ZBxUPI7trMcUEkdpWvbIaFcguSgDKvhkrVe2Mo25pLDeOoL /0UZrzfKQruuSyqz6fyojM1yLBRGKdu8+TDGsynpKZRIvSfBxLyI4h12LCj71sdhSzCjed xvSEV4jgmnDxxNdLo05yKlna5aRwfitTGpmsvu8YLtECGxr3g/noWfZwHCp/QUtSPWWaEq 54OpC1vcOKaBx6w3oq4+G3cxKreHN7xUTQXPbnLtgEXzrgxz4ZIHW86+ApXfmw== 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=1776052911; 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=6890horTUeO+dlW7ppsFWA6tygoq/508SIDnmAbdPe8=; b=YWDPfUS7Wb0YhaYW8ZB1h4MRxGVmGQsf4cpCKoAXLjabCADLn6s4ZSO/sJwG3X5xo5QNja r2YhAVSXdc5z8CgautKjKn07DeXwzANWgGy7J/nQGsDait8UXCQ+NltI8uVAZb13VCiKum KMeCorOntPUS0BBeJKtfxql8QwVDr9Wky8zQnjLdM10e+drxbBiVdhvoq20xNeSya8zbsS OK+CjIKx7BH7ChA/gnJcTVgs9zmV7bp3ePz8YhQzALPigBqW93GDWoe8o0WbUwf8JtwHbv OpORst1Tv14umfcGmEKmjcKMFa+4xw4uniQgbD0bgkVh1eE4HkKchRjpnqjgaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvDHg13SSznCL for ; Mon, 13 Apr 2026 04:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bfec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:01:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: f30a8cff5171 - stable/15 - kqueue: avoid a possible fork-deadlock List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: f30a8cff5171864e7f46d49ca41574606a3d5f1e Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:01:51 +0000 Message-Id: <69dc6aaf.1bfec.5f779388@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f30a8cff5171864e7f46d49ca41574606a3d5f1e commit f30a8cff5171864e7f46d49ca41574606a3d5f1e Author: Kyle Evans AuthorDate: 2026-04-01 22:30:48 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 03:12:24 +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. Reviewed by: kib, markj (cherry picked from commit 14d0baf2e89202cec3f9cb03a573372ccbc568b2) --- 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 245a18738d86..2d7df3da58bb 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -3155,7 +3155,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);