From nobody Tue Jul 14 13:52:21 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 4h012f6y5Dz6lls8 for ; Tue, 14 Jul 2026 13:52:26 +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 4h012f4vxBz3GTF for ; Tue, 14 Jul 2026 13:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784037146; 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=cY5Y36N2LI3Z5CW4XrBcUnDwqpECWQ9QNy6bV4k46us=; b=N/Lf5JjSJfFvlAtMkIGAy0bcwB6k11gP6cTXD4uzNI6N4h4urhQAtnv9Kjdd07lCBhxd75 uQq1cX9q01nKJ+BJlBIX3bNWFcYRGWJZZGR7X1c3NBK8lngHEQiy/lkVmVcY6tXpLM3nX8 AcpbbnhIz5H7P+s++fg0yP+7EDdZzKthRr2c5weWwSNEfkLBwDTyGF6y5Pn1iHwku96zN1 OBLijo4y+t5TToCFuu1nHvLRxJBgm7YZ2ip5s/3BLiF0XlqY51AZRWPDzuXV9NmKQesGIt UqPvRWGH+hWlXgjSirV2TRcHg7q7eKOAxEJX1O2MW1Rhhh434pL+74Y/d+U65A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784037146; a=rsa-sha256; cv=none; b=ZTIA1vbQ6PP1TH0vJLnpKG0Deyat/wRxNYTUPT+d7mc7A6/DLRTDSY+yGB+wmmui6rWXYW lnM+h1zPd1wYbiY0Hfsu/q9r0ATCrbuFEuFJkWOOSWbcYn9DHaqfbsqKKvoaDY3JCm6HTj 8x1FfYiTX1wd8VXB2vwll/GrEdRD4Dcr3RS0VqGmUbImLU5/pq3TxBhJ91txalGRJGUrmN /Gs8CVtHTtaoYpH/gSgpU2BdXjuwNx3/meifVk0d7b5GHnlOE92ojQsavpX/B/U+XlTzsU 2ygAyopcxoloV0yr75VGXS2Wwo1ZeAZ0tacMcxItKhmCCThIQawU7uwx9+KhJA== 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=1784037146; 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=cY5Y36N2LI3Z5CW4XrBcUnDwqpECWQ9QNy6bV4k46us=; b=ZvfCvH0MEsr0jkW9pFu1COy1b0gysBsIKymEjNSsUiiu9vnS/txuXpP1HDZByV3pMHBV7W yY0ZmfwSUwna0txMwcLfE9CHWpK+KMFeX9wN57hWWE4KLtWw2iUDD5Y+RkqKRlmT/cZyGb 2gYIFErPCZZS9HHGjCBPcUpGOJ1eZOCiGM5T3MYNZg6i+AELUtenuYnFlV1o3kogT7ENr5 7eOqeyAtKZey5IsKBvUcWFtlw2W2OmcukNBHXSpwnnOhxjYopCyluHguGOBCQRRnugmPP8 BKMdWF4Z8z72j0dRGTrb04Ar3+GkuRyCLjllFS5Z02bB3javScauA50/zHnUBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h012f3bJqznPN for ; Tue, 14 Jul 2026 13:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36b67 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Jul 2026 13:52:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Goran=?utf-8?Q? Meki=C4=87?= From: Christos Margiolis Subject: git: a619438615fb - stable/15 - sound: track kqueue low watermark per-knote for mmaped channels 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a619438615fb6bff50b84541681cc38e55ff78c4 Auto-Submitted: auto-generated Date: Tue, 14 Jul 2026 13:52:21 +0000 Message-Id: <6a563f15.36b67.755d1b26@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a619438615fb6bff50b84541681cc38e55ff78c4 commit a619438615fb6bff50b84541681cc38e55ff78c4 Author: Goran Mekić AuthorDate: 2026-07-06 12:06:17 +0000 Commit: Christos Margiolis CommitDate: 2026-07-14 13:52:12 +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 (cherry picked from commit 24576c39789ca13846b9450155923ee0e377aeb4) --- 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 fbe9f8a04325..60c06e27e41f 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);