From nobody Wed Apr 1 22:33:32 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 4fmKWw5PNbz6YfPp for ; Wed, 01 Apr 2026 22:33:32 +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 4fmKWw2XBYz3x62 for ; Wed, 01 Apr 2026 22:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775082812; 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=ZcwY+q99ctHE0xS+Dsw6PZgJ4Uk0Fx96VcW8YGEV4YY=; b=k/9V1Re3bF2WVFZ3MMIKdtfhjcwKF2+if7N1R0CUy1z+eUIn1QTy/ybmpl8MGF8K4UOGh/ 17wo308zlbYo7vIzbCPOCD/rUr2VY5VKZ2ErD7R7hXrSKNsOTCLL7dquwhiYg5FUk7Yiuv 38xJBM4r/XIHNbZSAAjus/z6UJWtH8q/IRO5JAoC8Q/mwPXoZRoMubuE+tj5ttqIyK73sW F99BX3aOwrtcs7laTNe6YzXQsw3EAkiRrUDSGf2QIqtSf6e086qtxFd6DOllkDR/966lr+ 12Vh2ZQJNKXK3Hv7yGFZURG1/7QU4tHjHWqITdn7SW5NsgWNEhHBeTFIIfa3qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775082812; a=rsa-sha256; cv=none; b=NnsCpLXxckFcuCx2VP1c6w0+VfoKedfR6grimZ8NN5f6TWCxfUGXjfTPKvCA4Nr0nPZgoW TzHSwbrB6zX9NWfuqRWRDAyAdbr2fFegXXn7sRKFViUvLxGqHgSjnwJJ5Bn5/xGBORWJgY SnOnGV2x8ydzFUV8DmnFAB8AOfznL4NS/N6m8kYuudnx273o9x8P0a8LqU3bBHB1MElCUa ghQdXzi8pzz1lVjMwae3CDSiumN4J0XeBZyz3qx+wkNFDVWaHrNa5JxlXrXX7S3PIxW2hj DwPTnQoZ1XS6dOr7OW3GHJxcO74TaLmTxYNazqZ7l3fbmnEHhTAkW1AjMzyFbw== 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=1775082812; 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=ZcwY+q99ctHE0xS+Dsw6PZgJ4Uk0Fx96VcW8YGEV4YY=; b=EXQv+G4nKy22WPfiINgvzXGcz45kPQhlGrf1C/d9zqPdgfDUIPFvwsfivPKH74fjoJvny7 m7jTq0eOogsUebIfcp8zwNxKHAdXWke0KtOSKkFbuzlg54nEka9U+EMEOUzNydXHoOupfo raZXSk/PpAvpE24B5HrN+x1av73ZHDZLPQ+Dgh2hGG5ZKCY+seT26Bum+IRA5HRcqBFFiF x66/5f3zWVgBXFFnaPbF+9SDhkOc7AQF7POn9WayZgXbffW1u2eTOWU8UznJ9LTHw4hA05 hmcXtHCGw7GR9YlwjnJXxBUeddO+EwLAlE01RHkluSyhgLiLBH0CNTAB3/w+GQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmKWw1kvFzbkl for ; Wed, 01 Apr 2026 22:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44f60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Apr 2026 22:33:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 306c9049c642 - main - kqueue: add some kn_knlist assertions around knlist_(add|remove) 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: 306c9049c642da6a59a5dc088589605a9aa38b87 Auto-Submitted: auto-generated Date: Wed, 01 Apr 2026 22:33:32 +0000 Message-Id: <69cd9d3c.44f60.71c64195@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=306c9049c642da6a59a5dc088589605a9aa38b87 commit 306c9049c642da6a59a5dc088589605a9aa38b87 Author: Kyle Evans AuthorDate: 2026-04-01 22:30:48 +0000 Commit: Kyle Evans CommitDate: 2026-04-01 22:30:48 +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 Differential Revision: https://reviews.freebsd.org/D56211 --- 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 485123989319..deb23ae96f9a 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2617,6 +2617,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); @@ -2639,6 +2641,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);