From nobody Mon Jul 27 23:14:55 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 4h8Dvh0RL4z6m2lC for ; Mon, 27 Jul 2026 23:14:56 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h8Dvg6JXjz3MxC for ; Mon, 27 Jul 2026 23:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785194095; 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=t/k/fo4qsHMgH0c7BnKlBqwaEHKBA1iC0Qm6kx+AqMI=; b=QgoIkBZmji4d1umDEGzP/du4OgLWuf2ctyLwAi/sZOxIKGlzS0HLDj9YPMxoCu9Ge8QRwD DnbHh6/2DzmiKdu/qDlrlA/5tBHpAcl7vro/AOamJwpwCJdxOzdq0n4jT1qzczmKBqSu3P 9ErI4NBecP/MleAuoJDjlp7VYXgjNDdU2mAwwReAAAqfN8PY6n3BEVNQLpKCK3b9LjrtDg KCjIEBqcZLIr3pGZtFrQuvleh7H8P0p8OS1DdIsDshIH2U1jZABX9OLn9MIcMbHVzAyBlZ fduDFjqDPthVYI1ElKS2BaGEkwIXzNNEjWh6qwVMbscGA446s5BnuOCKrR42GA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785194095; a=rsa-sha256; cv=none; b=Wp3BqL0Vss1Pj1S2f7zL+bMunYWiuVebHIlFZ3hbjCdaUSkU6NHWnaQpVKcSptkerSotDB Hv2fgCskp/EQvXSEPHSkAjiiJmqM4ghQcY80FbcboSeaGiFfgXMFWWAyEiMMEecsRHcl4J /Pay9vETnN7cP03fGQmULru8VCBb8L4rhRupuGv7VGlfVPThIaTDJ3VL+7Bh+LB5H+NNDN 7MAA25wTsAR2iDktGG3EU86os29xY4lEjev9ZEhjI/XW29RWUjkKhZbJnU3euAbjXIDGlk DDzEeWJq/a8D4I3HeHT7+cSnh1XdfDTaXLCCFNvt6O9lwu+MrYGHylxUvsqqtw== 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=1785194095; 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=t/k/fo4qsHMgH0c7BnKlBqwaEHKBA1iC0Qm6kx+AqMI=; b=M6d/W3NQi56Wa4BVKO6KZXxvxHjjihM8j841JUIqstd8QrjJ43sleogn/+LWMiGE1E+zKw kxcN00MFregA089weZGZFGKy1j6b9ERByTbl6rDY0UkhIeH+DqU1q/xlu368+JMalk2SNT ROZJA2IqebIgWvUApPdLsUoohOHQwW6U+4kYjTDwaodvAVO2dX7GJO/Fu55oVdSBd071q2 bsASnmiymboi+DAXURJVTY1TpIgIAy1eg18QMTM/TF/Y2aeNo8KxK76woY+npQDzCqFVjD a90pxIMilbJyB4C0DdgEDfjzkhoi2YIjQGZvSZnmSr667AkdHCXl9xOKldt+dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8Dvg54l7z1SBg for ; Mon, 27 Jul 2026 23:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32351 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 23:14:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1f4b0ea4f3eb - main - kqueue: Add a helper macro for sleeping on in-flux 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f4b0ea4f3eb1b8a885eff8bd0d332156f0c3e1f Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 23:14:55 +0000 Message-Id: <6a67e66f.32351.45a31bd3@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f4b0ea4f3eb1b8a885eff8bd0d332156f0c3e1f commit 1f4b0ea4f3eb1b8a885eff8bd0d332156f0c3e1f Author: Mark Johnston AuthorDate: 2026-07-27 23:12:16 +0000 Commit: Mark Johnston CommitDate: 2026-07-27 23:12:16 +0000 kqueue: Add a helper macro for sleeping on in-flux knotes Other in-flux operations are implemented by this set of macros, so we should do the same for sleeping. No functional change intended. Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58443 --- sys/kern/kern_event.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 23e9d309f74c..60c3b18a07eb 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -257,6 +257,14 @@ SYSCTL_UINT(_kern, OID_AUTO, kq_calloutmax, CTLFLAG_RW, wakeup((kq)); \ } \ } while (0) +#define KQ_FLUX_SLEEP_WMESG(kq, kn, flags, wmesg) do { \ + KASSERT((kn)->kn_kq == (kq), \ + ("%s: knote %p not on kqueue %p", __func__, kn, kq)); \ + (kq)->kq_state |= KQ_FLUXWAIT; \ + msleep((kq), &(kq)->kq_lock, PSOCK | (flags), (wmesg), 0); \ +} while (0) +#define KQ_FLUX_SLEEP(kq, kn, flags) \ + KQ_FLUX_SLEEP_WMESG(kq, kn, flags, "kqfluxwt") #define KQ_UNLOCK_FLUX(kq) do { \ KQ_FLUX_WAKEUP(kq); \ mtx_unlock(&(kq)->kq_lock); \ @@ -1789,8 +1797,7 @@ findkn: FILEDESC_XUNLOCK(td->td_proc->p_fd); filedesc_unlock = 0; } - kq->kq_state |= KQ_FLUXWAIT; - msleep(kq, &kq->kq_lock, PSOCK | PDROP, "kqflxwt", 0); + KQ_FLUX_SLEEP(kq, kn, PDROP); if (fp != NULL) { fdrop(fp, td); fp = NULL; @@ -2187,9 +2194,7 @@ retry: influx = 0; KQ_FLUX_WAKEUP(kq); } - kq->kq_state |= KQ_FLUXWAIT; - error = msleep(kq, &kq->kq_lock, PSOCK, - "kqflxwt", 0); + KQ_FLUX_SLEEP(kq, kn, 0); continue; } @@ -2423,8 +2428,7 @@ kqueue_drain(struct kqueue *kq, struct thread *td) for (i = 0; i < kq->kq_knlistsize; i++) { while ((kn = SLIST_FIRST(&kq->kq_knlist[i])) != NULL) { if (kn_in_flux(kn)) { - kq->kq_state |= KQ_FLUXWAIT; - msleep(kq, &kq->kq_lock, PSOCK, "kqclo1", 0); + KQ_FLUX_SLEEP_WMESG(kq, kn, 0, "kqclo1"); continue; } kn_enter_flux(kn); @@ -2437,9 +2441,8 @@ kqueue_drain(struct kqueue *kq, struct thread *td) for (i = 0; i <= kq->kq_knhashmask; i++) { while ((kn = SLIST_FIRST(&kq->kq_knhash[i])) != NULL) { if (kn_in_flux(kn)) { - kq->kq_state |= KQ_FLUXWAIT; - msleep(kq, &kq->kq_lock, PSOCK, - "kqclo2", 0); + KQ_FLUX_SLEEP_WMESG(kq, kn, 0, + "kqclo2"); continue; } kn_enter_flux(kn); @@ -2834,8 +2837,7 @@ knlist_cleardel(struct knlist *knl, struct thread *td, int islocked, int killkn) KQ_LOCK(kq); KASSERT(kn_in_flux(kn), ("knote removed w/o list lock")); knl->kl_unlock(knl->kl_lockarg); - kq->kq_state |= KQ_FLUXWAIT; - msleep(kq, &kq->kq_lock, PSOCK | PDROP, "kqkclr", 0); + KQ_FLUX_SLEEP_WMESG(kq, kn, PDROP, "kqkclr"); kq = NULL; knl->kl_lock(knl->kl_lockarg); } @@ -2881,8 +2883,7 @@ knote_fdclose(struct thread *td, int fd) * the case that it's in the process of being * dropped anyways. */ - kq->kq_state |= KQ_FLUXWAIT; - msleep(kq, &kq->kq_lock, PSOCK, "kqflxwt", 0); + KQ_FLUX_SLEEP(kq, kn, 0); continue; } kn_enter_flux(kn); @@ -2946,8 +2947,7 @@ knote_drop_detached(struct knote *kn, struct thread *td) kn, kn->kn_influx)); if (kn->kn_influx == 1) break; - kq->kq_state |= KQ_FLUXWAIT; - msleep(kq, &kq->kq_lock, PSOCK, "kqflxwt", 0); + KQ_FLUX_SLEEP(kq, kn, 0); } MPASS(kn->kn_kq == kq);