From nobody Mon Jul 6 12:07:46 2026 X-Original-To: dev-commits-src-main@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 4gv35g4dJjz6jQsq for ; Mon, 06 Jul 2026 12:07:51 +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 4gv35g2KKpz3dmn for ; Mon, 06 Jul 2026 12:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783339671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2URxEV44CDFVbLuYQpmNtgo9+g+dcxTIze+U/lViGvs=; b=ZGb7NDZJjVnyUfyHXqmOpv+RvHmgFX50IVAapN8e5oDPCgiGv0TkanntWwlUXolHOXokg4 hrrqkHrQMgGkUNRfB3Lv3qHDdsgjCfeieRdO3vf/17NM5tvSpguuTGaGPkp1QPXuvMXdPc zEkJTnod0bYg0GcH8Xod8uGH6jUpJ0DmTe2j7Jz/e1I0hwiwbHk9CDgnwxL9amKH0Nkc6X hy6HAmkKvL1lyxTVdxpfDRc51owGK8J8pRXAkpaJN7XajUr4HYuOwuBV1aIsEOY7mf8RAW AioH9BT+i5AikxjVDh/NZ2NuJyGC7DbELKXQ+g5P+k78zh2GEitXyhTlz1jyNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783339671; a=rsa-sha256; cv=none; b=P+W6Yr0tMXYxooRrfJK6GOYcpXWF0FCBXtFCaoH0iQjloxdsjOvLYhWgEFPmTD3TBTAIXC HPAWpEI7rclWPYIP7x45FEP8t8PWUQX185alyef0/imRNx9p9cxMcf7Ll6zi1bXbimfmiw 4R/FWowyP2QeHHlrpITdrl0KQNNJB/rzvdq/QjZZnzb71D6y/qR6uMgnsxGhklkNAIUHQy aOjkrkkof5zO+VjQSp0UwVnOp2RS15xwAmHl17PYfZeyHU6DUUEu5M7efDGq0M7im2DbQr 3d++vWNLHCod2QE7XzDwkfLa5KthFX/kVPrIJUpC2LzHNWdwvEuZAy/P+pg9VQ== 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=1783339671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2URxEV44CDFVbLuYQpmNtgo9+g+dcxTIze+U/lViGvs=; b=Rw/xo28iIVEAxfh/gJe/3w6047k/dQLTn7E08ijLL0jt00xkNmGnNK47flfBVHVpicRKS+ zNklebsTI3SgC0uWjKqGM0HqYj8BEbgENkY9D6ISH+kyeWnRBX/TE/5X6d9td/qhiyqb+i cHasV8Pnyy4DEhR1xlfh8/boSn4BNqgOg5Nu0DXGwmF3QUBejtCSvPsd6KH2vYr0FNla/J kogk165yvvXplKBp1t0F4B1Kt6mdujEswpq1ICvI1bDa+q6H1sIs1580h0HbLLL3WesZOM rDcJSWc+D8KVgOHrB47M+vgqaKfD4NvUHfflL5rGtpfycIUwqEkhj+Ihf1uHBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gv35g1HrHz13vG for ; Mon, 06 Jul 2026 12:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 396fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 12:07:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Goran=?utf-8?Q? Meki=C4=87?= From: Christos Margiolis Subject: git: 24576c39789c - main - sound: track kqueue low watermark per-knote for mmaped channels List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24576c39789ca13846b9450155923ee0e377aeb4 Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 12:07:46 +0000 Message-Id: <6a4b9a92.396fb.7198c2aa@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=24576c39789ca13846b9450155923ee0e377aeb4 commit 24576c39789ca13846b9450155923ee0e377aeb4 Author: Goran Mekić AuthorDate: 2026-07-06 12:06:17 +0000 Commit: Christos Margiolis CommitDate: 2026-07-06 12:07:41 +0000 sound: track kqueue low watermark per-knote for mmaped channels Use kn->kn_sdata to track the last bs->total value for each knote attached to an mmaped channel. An event is delivered only when the total byte counter has advanced by at least c->lw since the last delivery. After delivery kn_sdata is updated to the current total. Each knote tracks its own watermark independently, so multiple knotes attached to the same mmaped channel all receive events correctly. Non-mmap channels keep the existing level-triggered behavior via chn_polltrigger(). MFC after: 1 week Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D57833 --- sys/dev/sound/pcm/channel.c | 14 +++++++++----- sys/dev/sound/pcm/channel.h | 2 +- sys/dev/sound/pcm/dsp.c | 14 +++++++++++++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index a0ee16a14386..40a08d48fb21 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -270,11 +270,15 @@ chn_lockdestroy(struct pcm_channel *c) /** * @brief Determine channel is ready for I/O * + * @param ref_total for mmaped channels, the previous byte counter + * * snapshot from which to compute the delta to + * * bufsoft->total; ignored for non-mmaped channels. + * * @retval 1 = ready for I/O * @retval 0 = not ready for I/O */ int -chn_polltrigger(struct pcm_channel *c) +chn_polltrigger(struct pcm_channel *c, u_int64_t ref_total) { struct snd_dbuf *bs = c->bufsoft; u_int delta; @@ -282,10 +286,10 @@ chn_polltrigger(struct pcm_channel *c) CHN_LOCKASSERT(c); if (c->flags & CHN_F_MMAP) { - if (bs->prev_total < c->lw) + if (ref_total < c->lw) delta = c->lw; else - delta = bs->total - bs->prev_total; + delta = bs->total - ref_total; } else { if (c->direction == PCMDIR_PLAY) delta = sndbuf_getfree(bs); @@ -316,7 +320,7 @@ chn_wakeup(struct pcm_channel *c) if (CHN_EMPTY(c, children.busy)) { KNOTE_LOCKED(&bs->sel.si_note, 0); - if (SEL_WAITING(&bs->sel) && chn_polltrigger(c)) + if (SEL_WAITING(&bs->sel) && chn_polltrigger(c, bs->prev_total)) selwakeuppri(&bs->sel, PRIBIO); CHN_BROADCAST(&c->intr_cv); } else { @@ -830,7 +834,7 @@ chn_poll(struct pcm_channel *c, int ev, struct thread *td) } ret = 0; - if (chn_polltrigger(c)) { + if (chn_polltrigger(c, bs->prev_total)) { chn_pollreset(c); ret = ev; } else diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 6fa4338dce4a..c7f5bf93b8e5 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -260,7 +260,7 @@ int chn_read(struct pcm_channel *c, struct uio *buf); u_int32_t chn_start(struct pcm_channel *c, int force); int chn_sync(struct pcm_channel *c, int threshold); int chn_flush(struct pcm_channel *c); -int chn_polltrigger(struct pcm_channel *c); +int chn_polltrigger(struct pcm_channel *c, u_int64_t ref_total); int chn_poll(struct pcm_channel *c, int ev, struct thread *td); char *chn_mkname(char *buf, size_t len, struct pcm_channel *c); diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 8bb07d87fac9..da8bf485bc9b 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -3010,7 +3010,13 @@ dsp_kqevent(struct knote *kn, long hint) return (1); } kn->kn_data = 0; - if (chn_polltrigger(ch)) { + /* + * For mmaped channels pass the knote's own reference point so the + * low watermark is tracked per-knote. Non-mmaped channels ignore + * the reference and fire based on the current amount of ready/free + * data in the buffer, so all knotes see the same live state. + */ + if (chn_polltrigger(ch, (u_int64_t)kn->kn_sdata)) { if (kn->kn_filter == EVFILT_READ) { kn->kn_data = sndbuf_getready(ch->bufsoft); if (ch->flags & CHN_F_MMAP) @@ -3025,6 +3031,7 @@ dsp_kqevent(struct knote *kn, long hint) kn->kn_kevent.ext[0] = sndbuf_getready(ch->bufsoft) / ch->bufsoft->align; } kn->kn_kevent.ext[1] = ch->xruns; + kn->kn_sdata = ch->bufsoft->total; } return (kn->kn_data > 0); @@ -3070,6 +3077,11 @@ dsp_kqfilter(struct cdev *dev, struct knote *kn) knlist_add(&ch->bufsoft->sel.si_note, kn, 1); CHN_UNLOCK(ch); kn->kn_hook = ch; + /* + * Start tracking from the current position so the first event + * fires after c->lw additional bytes have been transferred. + */ + kn->kn_sdata = ch->bufsoft->prev_total; } else err = EINVAL; PCM_GIANT_LEAVE(d);