From nobody Thu Apr 2 02:41:11 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 4fmR1h0hyyz6WMNP for ; Thu, 02 Apr 2026 02:41:12 +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 4fmR1g6pXWz3JYt for ; Thu, 02 Apr 2026 02:41:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775097672; 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=eKjUBpvXh8NpzJ7hNrBn7dypXx4KKpUrrBfl9l0pztE=; b=SBZdrOLl6UhP6078JdLEF9j9hM6ktx/zPEK8DBTznSph3P5gbsYZUe4EcXbvVhgfND7eG5 sXdC+Sjizoefl/Zfh1FPkJtmfVFQz2aWDD9NSU4UlOvvlgak+9uELW3d213iWU1R5Gd67T 0j2k9ImX/bIHM3reLkA1KzVat8/4+TS3Ei4LRabLLdlcu5Hf0lfI9erZRJa1mOf/WfmnKN kPP3tr9Wj/sIS0A9S6WBC4IbMdqDOStwhLaOtxkn+YZsegmszPkexMUbSVDT54TZBkq1z7 qAAL2mydPtSkwRSk7hAH/yqSKemWyKdGw3mP9KPqC0aWSNkbTp9uUTGNU2tdUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775097672; a=rsa-sha256; cv=none; b=Cl4RlbtJ4i4rS/tvYQ/IUY1uJw0AZGD3DRc4KEaDLGD1z2zSa6ovbv/UYv3CR63yA+KLwF RcIwOq9AUDJqGcD72cXbYeH7uUBaMGWrOSKmGSL8mftkr2b5sMCfqDbhpw/M7V5Wass71i 3vLXKku/gFsqPFGQkrBDY5boiUowZ+CH94Ea04Z1i0fEwznKmC6MJQNm4IZHeIjy+lY2ss UuLzhujpMA+ZsjVly2pNnegXgr0YeReaDKmoacRgGRkRhiIFZf2JA86BwtT2CDKkO4EynU sWv2HeArnySML/e+SCqD0EcYAU5/TUjlcD/k6JNW+Lvy20nAySuyrqdLmJEqhQ== 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=1775097672; 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=eKjUBpvXh8NpzJ7hNrBn7dypXx4KKpUrrBfl9l0pztE=; b=c+atdq0K6a0Fl2u4fWx08CzPSHIenC+g9Wff7adJcfpF5zZ257ZMcQXvflZPHT1FzoijkR W+pAcz7EPdg3hd1IS1Dej/+CDEd9FV6k9S331ZI9UKy2YMybw77RFiM1iD/08UQTz2rJjJ sT80UJX3S7fctGZlZy/NmVUZhEt/KEKQDw3weCVCIPRRqKn6piQOZ4mRV3OihDOFjnZROZ +5mrW4ugb0UxoVqa2J5vVXEEJudJLwpOFlrf/5qJTOIyG1b9qxbQPlvrZuHIdvl37jFlXF WkGACHVFvLwNqqbmzUg4pYxvnftdh0X5JD92SMBNd2U0l67+698nnpfEYMtwcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmR1g6Lkhzk2v for ; Thu, 02 Apr 2026 02:41:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3708d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 02:41:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 51db69c14fb1 - main - kqueue: assert that kqueue knote lists own the knotes 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51db69c14fb1a1c2dc807695e6f564d498d33d5a Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 02:41:11 +0000 Message-Id: <69cdd747.3708d.7de3587c@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=51db69c14fb1a1c2dc807695e6f564d498d33d5a commit 51db69c14fb1a1c2dc807695e6f564d498d33d5a Author: Konstantin Belousov AuthorDate: 2026-03-31 09:13:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-02 02:20:05 +0000 kqueue: assert that kqueue knote lists own the knotes Reviewed by: kevans, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56212 --- sys/kern/kern_event.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index deb23ae96f9a..f3723783146a 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1739,9 +1739,11 @@ findkn: KQ_LOCK(kq); if (kev->ident < kq->kq_knlistsize) { - SLIST_FOREACH(kn, &kq->kq_knlist[kev->ident], kn_link) + SLIST_FOREACH(kn, &kq->kq_knlist[kev->ident], kn_link) { + MPASS(kn->kn_kq == kq); if (kev->filter == kn->kn_filter) break; + } } } else { if ((kev->flags & EV_ADD) == EV_ADD) { @@ -1767,10 +1769,12 @@ findkn: list = &kq->kq_knhash[ KN_HASH((u_long)kev->ident, kq->kq_knhashmask)]; - SLIST_FOREACH(kn, list, kn_link) + SLIST_FOREACH(kn, list, kn_link) { + MPASS(kn->kn_kq == kq); if (kev->ident == kn->kn_id && kev->filter == kn->kn_filter) break; + } } } @@ -2882,6 +2886,7 @@ knote_attach(struct knote *kn, struct kqueue *kq) KASSERT(kn_in_flux(kn), ("knote %p not marked influx", kn)); KQ_OWNED(kq); + MPASS(kn->kn_kq == kq); if ((kq->kq_state & KQ_CLOSING) != 0) return (EBADF); @@ -2930,6 +2935,7 @@ knote_drop_detached(struct knote *kn, struct thread *td) msleep(kq, &kq->kq_lock, PSOCK, "kqflxwt", 0); } + MPASS(kn->kn_kq == kq); if (kn->kn_fop->f_isfd) list = &kq->kq_knlist[kn->kn_id]; else @@ -3106,6 +3112,7 @@ kqueue_fork_copy_list(struct klist *knlist, struct knote *marker, KQ_OWNED(kq); kn = SLIST_FIRST(knlist); while (kn != NULL) { + MPASS(kn->kn_kq == kq); if ((kn->kn_status & KN_DETACHED) != 0 || (kn_in_flux(kn) && (kn->kn_status & KN_SCAN) == 0)) { kn = SLIST_NEXT(kn, kn_link); @@ -3139,6 +3146,7 @@ kqueue_fork_copy(struct filedesc *fdp, struct file *fp, struct file *fp1, kq = kq1->kq_forksrc; marker = knote_alloc(M_WAITOK); marker->kn_status = KN_MARKER; + marker->kn_kq = kq; KQ_LOCK(kq); for (i = 0; i < kq->kq_knlistsize; i++) { @@ -3250,6 +3258,7 @@ kern_proc_kqueue_report(struct sbuf *s, struct proc *p, int kq_fd, KQ_LOCK(kq); for (i = 0; i < kq->kq_knlistsize; i++) { SLIST_FOREACH(kn, &kq->kq_knlist[i], kn_link) { + MPASS(kn->kn_kq == kq); error = kern_proc_kqueue_report_one(s, p, kq_fd, kq, kn, compat32); if (error != 0) @@ -3260,6 +3269,7 @@ kern_proc_kqueue_report(struct sbuf *s, struct proc *p, int kq_fd, goto out; for (i = 0; i <= kq->kq_knhashmask; i++) { SLIST_FOREACH(kn, &kq->kq_knhash[i], kn_link) { + MPASS(kn->kn_kq == kq); error = kern_proc_kqueue_report_one(s, p, kq_fd, kq, kn, compat32); if (error != 0)