Date: Mon, 13 Apr 2026 14:43:22 +0000 From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: cdd2a1d19ad3 - stable/14 - kqueue: add some kn_knlist assertions around knlist_(add|remove) Message-ID: <69dd010a.1a104.13be1720@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=cdd2a1d19ad3e9c62a12b78512522ca972bbd0e2 commit cdd2a1d19ad3e9c62a12b78512522ca972bbd0e2 Author: Kyle Evans <kevans@FreeBSD.org> AuthorDate: 2026-04-01 22:30:48 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> CommitDate: 2026-04-13 14:43:15 +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 df509e7a8492..4e7ad058e144 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2461,6 +2461,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); @@ -2483,6 +2485,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);home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69dd010a.1a104.13be1720>