From nobody Mon Apr 13 04:01:52 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 4fvDHj3y5jz6YCKN for ; Mon, 13 Apr 2026 04:01:53 +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 4fvDHh50qzz3w9m for ; Mon, 13 Apr 2026 04:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052912; 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=UXTlvMPEIbAO/PxrBb9w/XMNk43AR9ut0anRkwrd85w=; b=vin7H3v0lgxdLOEcwm9SjxRmycVgLvtpxv55yhJuThoos7zZbffTpUMNb6f7rs9cBoJJ/J VBnsMgiBMfVcP5KA4xGPYWNqTI/Rfownn5BweAnPoBKepeoCsYLnr0hp//ub4cUL1q7RgM u3EBkWqqM0QNOEAkvlD9X4284WFQs9cO2UNQcJN8wS0/nTfiR6YdfBZ3j1xkkAiU5/WERI KIYKGF3Yj8ZoaE1z7t8vN7sbGgj1zAzAOlBA+VT/ffHPZRgdWN6zgeJNMFkuo1pxgsWKTH Q/Nhewi/cbJDzWT0/+996Gnm7/LKV/5Juw52kZ46e2JLf/mO50OLgXhba3M/Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776052912; a=rsa-sha256; cv=none; b=m0bsgyiWHqo0mON0Yxkl8gvQxsTAmIwmv2tuKI1pffoYxQHAUARGJY2cIVsV4UIOjP2H1y dv5TLXH8i/SyoisZ/LI0QH5K4OaMQL6mCbvu0qZx0fzWZLrxiwEMiAf0uwCt84h9GfjG24 pznkFUcp477/k9TqcUX/FWSpGRCR2SGWiHr8ViAnG+NnhVfGj+Hh+s9F4xyzSitP7Z7uki OFG9GvE6ZrjyJAXAHNxSlx981NxWWJWvTCQDYw+16SEOTpHpU9ukqe0ydOBO04Rh3kO915 QVmU4fqQqDphwTPRoP2AlxMD/SR3pTsgI8QkBB7NT4Y50q5zNlR9j3GMV79vgw== 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=1776052912; 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=UXTlvMPEIbAO/PxrBb9w/XMNk43AR9ut0anRkwrd85w=; b=s1SUKYXFWJfF901awxYzEdOJr4qtxar8m/LtkJ9q2RotBqmCvItsOjk2KgAY2jofqlGgNJ FJkJuxdKVrSkpjaU79UfhmdmI6SDmb/k/Ai3OMVVMi6W+efFXeRnmTWlLRuEUEH+NYivaW haxDupzdb8w4dlC1zGQu//ntITx4qZ9BCLtw5VlMQivTknl768uZG6jN2oSX7Hbw6RJIWn EXCT1koFNPQPEmeIimV3ZjmbuqxWOAjHBWFBfpY7Glz6m/cdbqwkZ8e3WlocFZuQzRBS63 Q6zFUUrTn8dKkZIQoXJp7LcJw76WhInuSn9tw3K+1nSKBl1sXD5IOD+e9Pnnfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvDHh1tNhznXD for ; Mon, 13 Apr 2026 04:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e208 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:01:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: d02c54533aa4 - stable/15 - kqueue: add some kn_knlist assertions around knlist_(add|remove) 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: d02c54533aa49980ad3e8b984d9af4ec835d9adc Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:01:52 +0000 Message-Id: <69dc6ab0.1e208.9d30c33@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d02c54533aa49980ad3e8b984d9af4ec835d9adc commit d02c54533aa49980ad3e8b984d9af4ec835d9adc Author: Kyle Evans AuthorDate: 2026-04-01 22:30:48 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 03:12:29 +0000 kqueue: add some kn_knlist assertions around knlist_(add|remove) We currently assert that kn_status is accurate, but there's more room for error. Neither of these are very likely, but currently we'd blow up in SLIST*() macros instead of providing more obvious diagnostics. It's perhaps only worth testing these because knlist_remove() requires getting logic across both f_attach() and f_detach() correct. Reviewed by: kib, markj (cherry picked from commit 306c9049c642da6a59a5dc088589605a9aa38b87) --- sys/kern/kern_event.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 2d7df3da58bb..915d34ac1695 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2619,6 +2619,8 @@ knlist_add(struct knlist *knl, struct knote *kn, int islocked) KASSERT(kn_in_flux(kn), ("knote %p not in flux", kn)); KASSERT((kn->kn_status & KN_DETACHED) != 0, ("knote %p was not detached", kn)); + KASSERT(kn->kn_knlist == NULL, + ("knote %p was already on knlist %p", kn, kn->kn_knlist)); if (!islocked) knl->kl_lock(knl->kl_lockarg); SLIST_INSERT_HEAD(&knl->kl_list, kn, kn_selnext); @@ -2641,6 +2643,8 @@ knlist_remove_kq(struct knlist *knl, struct knote *kn, int knlislocked, KASSERT(kqislocked || kn_in_flux(kn), ("knote %p not in flux", kn)); KASSERT((kn->kn_status & KN_DETACHED) == 0, ("knote %p was already detached", kn)); + KASSERT(kn->kn_knlist == knl, + ("knote %p was not on knlist %p", kn, knl)); if (!knlislocked) knl->kl_lock(knl->kl_lockarg); SLIST_REMOVE(&knl->kl_list, kn, knote, kn_selnext);