From nobody Thu Apr 09 08:25:46 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 4frtL23spBz6YkW7 for ; Thu, 09 Apr 2026 08:25:46 +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 4frtL23Hmjz3CNJ for ; Thu, 09 Apr 2026 08:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775723146; 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=3cnzPxUdOY81+BVo+bwbcSAO2eMikDHWsyZVJW7GTvM=; b=wFcxgJCjhH5wtsTcuHEdbhuqW14gJohXpXKCTYIy/946W2otkkS1dDi6DdPvN9TVvwLh6S OgKkgr5zLpFDBKqBXFijTXhLo6wDqU8TitWmM4ljcrslfnszpR3EbIK2ddQZlv/LJ5O7na 68KZRMg+j2y2ZMNgL+8VeGfm+ZZ3dkRjmQqmYMCJosqagriPZ5APNwRk+3d9da0T1dRHDV e2CVC/l5mhw+J63YJDkGIBqedOUHvzPDQRCnpFFxzyMJeUvC9FMsJzYdeN8OJ97WKc+bcl +mZEsh+/o7nIBreLuzZYYxNWXvB3pmR/q4vrBdxcY6M7r8J4ylRz86aGnBHAEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775723146; a=rsa-sha256; cv=none; b=RJXtc9wxj6mgBSlchNLa7jOWnwVRyVeN0ppvXAA5mIGVvA1TylxQLqO+68JNjbajSqe8rn 16In9kvMiTMMuUNBvW0ItfhpRR19jbxaKwPoPvvI+Iefpbf7XmvDoHbrSP6ozqMbRQ3Wru RV1HC6JeIEg+n2bPgKJ8PJaElv89hnJNn+owD2NQgNmn3vLYSJkCbx1ibpwyRGCy+18v4c Ae3pmnHEmsSqsXmS7F6oh7NREibKhvslA2We8wyRhL+2Xkg9xn70mcolpp3tiB8MnV7Duj 5NwIZ01Wf0F6KHpDqmp2+bydIJvlXmAh8EafTnWlkYwygHg6qAR+7mLKt/dtJg== 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=1775723146; 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=3cnzPxUdOY81+BVo+bwbcSAO2eMikDHWsyZVJW7GTvM=; b=ZSRz4t6bFMKnHCm+TZvll65z2iaQXoYHj33v1I1rIvXkXYp+HrnM2kUIOzb3xDtXcfHlyF a18fDHAJnDU9arRUTBb+6XzZciQMarVeWeDQgiEFsSVApZ/S11knpJ7nH22D8/heHqVHhg iMh6pYkcidKAB1uMgfv/Rhp/tDpm/1PgOFAlyTqRO6nxlZTPZ2VPLQWTtqCIR3MB5QYxDB VWfNBOYI1386R2S54zjbsFJCctplyESda7tNs04Y16fdVlCILJdqCGve9dPty4YZ0ixuqF 4kPAzd5CCfK2gRTG+AR8jderI5JUEqbRU+6jgreLY31epXGShKQ8C6AVMnBwHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frtL22Hlcz14dH for ; Thu, 09 Apr 2026 08:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40780 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 08:25:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5b4d2229f788 - stable/15 - kqueue: assert that kqueue knote lists own the knotes 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5b4d2229f788502359be39135073c606af444251 Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 08:25:46 +0000 Message-Id: <69d7628a.40780.828a533@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5b4d2229f788502359be39135073c606af444251 commit 5b4d2229f788502359be39135073c606af444251 Author: Konstantin Belousov AuthorDate: 2026-03-31 09:13:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-08 18:22:39 +0000 kqueue: assert that kqueue knote lists own the knotes (cherry picked from commit 51db69c14fb1a1c2dc807695e6f564d498d33d5a) --- 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 e8e670d39d09..2bb965f3e5e4 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1740,9 +1740,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) { @@ -1768,10 +1770,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; + } } } @@ -2862,6 +2866,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); @@ -2910,6 +2915,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 @@ -3086,6 +3092,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); @@ -3119,6 +3126,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++) { @@ -3230,6 +3238,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) @@ -3240,6 +3249,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)