From nobody Sun Aug 16 02:46:21 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 4hN0hy6NHDz6pGqj for ; Sun, 16 Aug 2026 02:46:26 +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 4hN0hy3Rktz3dbt for ; Sun, 16 Aug 2026 02:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786848386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9zU1SdzBO4l7uY2hVgxU76ec1LDlXQm1yfWDz00cwfk=; b=xq2wG99uDoxI4YazKw0yDRb6H7ZBSa8PzmrS8TsnWqy3phwUxly/WqETAsM8lBTZUKXq92 kBfQ/R4/ijvNTr1JuCYcunWjH2ioZ6XbygMD5PC/5Vu4njbgGHyILlq9IZaLg53271/89/ i/5THzGQEDmFHm8uWUacyekfc33qp00EDagkK3GvVZcnkj2fEh1np/LL8Kbcuzs3auFW1Y DaHb/vCyW0FnCMmu84r8bGnJiEjC/O4SUXf5iEcCz4yBu4a1iTzDog2y+d1wR1o97X4yUR W8S1JEF6jcdrCJUJGUFpNnwfoYCWnIzgmQZ8dBnW2ThgohWG+0m2jTmVStPOkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786848386; a=rsa-sha256; cv=none; b=CT/eOacxT5rKvk+8TnZ69DVU3b60ARFamrZHoWAJBzZWeQDhrH48L3W5wHT+tBJnSryeK6 dApRYhMYc2w6qIXU1AF6rVEM6+PTRfAb6GlyMvfjTsKa38rcSpgk+uNb5kHDC0lz6shbPi JElbSfsLPhGz5gZXoHQJabQEz2RkjBdJ9ckePvo8kDreXjJMQOjdYwBXcAc3hvpIfun38V vzAR16fFClhi834bIo6mf6XJP9dDmOe+r7Ibg/8LL2smdNkF1U5X//XJUDWvhqa84CwPyw 99U9uZ4NPZOJ+GrsdZ3JZqwN57pPNFTp5p5cMThaEaugRz2j8T0OHvOFSQ2i8w== 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=1786848386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9zU1SdzBO4l7uY2hVgxU76ec1LDlXQm1yfWDz00cwfk=; b=p1CO/oMPi5L2TfkvKa7hSyH+7rpFZonDYW8nIHLULD3qlhQVlsRWmcx3sBw00U60bOyS22 qG87lwGniLIZrwqHvvUJChBKPDzx9zZDUF68C0cYDV4owRxQCvFYN4XsIHRlC+dR5snSqd WIeAtd8WAavajNyCuv5CJlshMOO1x+dEczSfP+2DQ1NN11zfAtVJ2fEOR0gYd3WqOCO8a9 h01qyADPxsGN/4ON6pRTMvjR/kwDD1cNd1M7iE8vwilovMj/+b0XM03HfaFwMotOrEgUII ip5fljOES11VKDy/YAcWAW64b9P3wX3UVx2MPZwfVEp94irUBI+yNvjhkafg5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hN0hy1ySXz17sW for ; Sun, 16 Aug 2026 02:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45312 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 16 Aug 2026 02:46:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Konstantin Belousov Subject: git: eab97e63f4df - stable/15 - kqueue: avoid closing a file under the knlist lock 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 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: eab97e63f4dfa24a251bf23165059a2aa7f0ccf1 Auto-Submitted: auto-generated Date: Sun, 16 Aug 2026 02:46:21 +0000 Message-Id: <6a81247d.45312.607c3b2b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eab97e63f4dfa24a251bf23165059a2aa7f0ccf1 commit eab97e63f4dfa24a251bf23165059a2aa7f0ccf1 Author: Abdelkader Boudih AuthorDate: 2026-08-07 22:57:07 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-16 02:41:16 +0000 kqueue: avoid closing a file under the knlist lock (cherry picked from commit 4c4bad4421fb1a300178767f71215cc5f5e0bfb6) --- sys/kern/kern_event.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 3990c2366ab4..62c449e59f68 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2793,6 +2793,7 @@ knlist_cleardel(struct knlist *knl, struct thread *td, int islocked, int killkn) { struct knote *kn, *kn2; struct kqueue *kq; + bool dropped; KASSERT(!knl->kl_autodestroy, ("cleardel for autodestroy %p", knl)); if (islocked) @@ -2809,6 +2810,7 @@ knlist_cleardel(struct knlist *knl, struct thread *td, int islocked, int killkn) * freed or converted to one-shot, as the attached subject is * essentially disappearing. */ + dropped = false; SLIST_FOREACH_SAFE(kn, &knl->kl_list, kn_selnext, kn2) { kq = kn->kn_kq; KQ_LOCK(kq); @@ -2820,7 +2822,11 @@ knlist_cleardel(struct knlist *knl, struct thread *td, int islocked, int killkn) if (killkn) { kn_enter_flux(kn); KQ_UNLOCK(kq); + knl->kl_unlock(knl->kl_lockarg); knote_drop_detached(kn, td); + knl->kl_lock(knl->kl_lockarg); + dropped = true; + break; } else { /* Make sure cleared knotes disappear soon */ kn->kn_flags |= EV_EOF | EV_ONESHOT; @@ -2828,6 +2834,8 @@ knlist_cleardel(struct knlist *knl, struct thread *td, int islocked, int killkn) } kq = NULL; } + if (dropped) + continue; if (SLIST_EMPTY(&knl->kl_list)) break;