From nobody Fri Jan 2 17:20:58 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 4djVpR2j12z6Ly1J for ; Fri, 02 Jan 2026 17:21:03 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVpR1CmDz3GNT for ; Fri, 02 Jan 2026 17:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767374463; 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=WnDHfat/TnE7bJc1quwdyrhLiOBl39Km79WWD6J9Afk=; b=a27+FJZzJ29ffAUVezpsXzYbeufc9tW3xWyqG9XZdPuRXs4NvE0MxqPMUXy2Z5vlKk9j2P G98V+qKilzvEXHMZzOtri+dwKaHKSZdYLlZVkDBkzBIZTCpywDQThrgDK1uK/QKBRLR9Tw 3xsD+6FNvWq5IW/Qz1RBvkRIrLNS2TreNXMdvnvnQqFhGqmwpAuGJ27UTW3vWg5Gn99B+F Hc6agYA72abitmPaI1s7Hz3b+p9IqXV7AM9ACiuNsbOmv9EvJIl+P6u5yj3FJqUUAd/LrO 6rd88lK7IH8bnG3504okMO7ihToUdo78psS+FTeLfpstpGRwWE4ojAgJyxmrxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767374463; 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=WnDHfat/TnE7bJc1quwdyrhLiOBl39Km79WWD6J9Afk=; b=DFK4R7gA1yYErKcJiUCNf54HhEvnhVPR3+tE9PrQ4b/q0UVu+A/RNtDP+qsHIpvudJuVbF v3fZYx5t94xd9XPpVHXvievp2Ov1bKKglSIt1UqOQI3RLQU50oG14U9T/6pzUvOhkPkKty JXPO64Sicmix2Qn4ObaesiOTF6CS/uzwqMiktgBKnxTFrvHkMF/2EFVo0h8ZMhthWs4t+T XHK+qphrb0puX7rgo2/RJju0EqIATLTh8Efclh0iNFFHT/eFikJOFEk0f4aLN70hG3wfFU zQJxmpo0z+3KX7hpz7U3FmcARBBDDIBZunHk4qrOOtjgP3SO+Xk+dJYPBx2WuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767374463; a=rsa-sha256; cv=none; b=lUSdM2FX5M5d7mTGBzpZPwv+da2GLg45MAl8xyPsp9iCRoYY1zk/+N7wW7dnPSMHhLuTQf GXXRvQ+8cEHomtCV4aDPNeo3Q4GvII0FdB0uosZXxjpygAPHqNmfwrLEqjBQbXjktys47V QAGbhrdP2t2SB+iLknrVxblwl12RXxLw5M+NCsh8NugyX6g/O0Hl9qFFrrJNAvfsIszQcd GjONmI/+wkKHaTO2SiqUHqDNJJH3KuY+AXaTNdg2Qb4cjyHvMZastiVtIY6e4ZGhuQRoMv xTvuq6Vu6zApbQDMJoIEz3gQ8BBgAPvngLKz92/IQUKLlPZdHV2xYy2qiGB3lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVpR0p4XzBPv for ; Fri, 02 Jan 2026 17:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27998 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 17:20:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: c234740c9d34 - main - snd_uaudio: Do not use pcm_channel->lock to protect uaudio_chan 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c234740c9d34c2b953c6010f6a01b0aca9648c08 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 17:20:58 +0000 Message-Id: <6957fe7a.27998.5f730eec@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c234740c9d34c2b953c6010f6a01b0aca9648c08 commit c234740c9d34c2b953c6010f6a01b0aca9648c08 Author: Christos Margiolis AuthorDate: 2026-01-02 17:20:36 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 17:20:36 +0000 snd_uaudio: Do not use pcm_channel->lock to protect uaudio_chan This is a layering violation, but it also makes the control flow confusing; snd_uaudio(4) should have its own lock to protect its structures. Fixes: 5cc34a83e1 ("Revert "sound: Merge chn_intr() with chn_intr_locked()"") Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54102 --- sys/dev/sound/usb/uaudio.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 86fb5228a990..0987ca12d933 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -232,7 +232,7 @@ struct uaudio_chan { struct pcmchan_caps pcm_cap; /* capabilities */ struct uaudio_chan_alt usb_alt[CHAN_MAX_ALT]; struct snd_dbuf *pcm_buf; - struct mtx *pcm_mtx; /* lock protecting this structure */ + struct mtx lock; /* lock protecting this structure */ struct uaudio_softc *priv_sc; struct pcm_channel *pcm_ch; struct usb_xfer *xfer[UAUDIO_NCHANBUFS + 1]; @@ -1390,9 +1390,9 @@ uaudio_configure_msg_sub(struct uaudio_softc *sc, /* Unsetup prior USB transfers, if any. */ usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); - mtx_lock(chan->pcm_mtx); + mtx_lock(&chan->lock); chan->cur_alt = CHAN_MAX_ALT; - mtx_unlock(chan->pcm_mtx); + mtx_unlock(&chan->lock); /* * The first alternate setting is typically used for @@ -1415,9 +1415,9 @@ uaudio_configure_msg_sub(struct uaudio_softc *sc, return; } - mtx_lock(chan->pcm_mtx); + mtx_lock(&chan->lock); next_alt = chan->set_alt; - mtx_unlock(chan->pcm_mtx); + mtx_unlock(&chan->lock); chan_alt = chan->usb_alt + next_alt; @@ -1474,7 +1474,7 @@ uaudio_configure_msg_sub(struct uaudio_softc *sc, } } if (usbd_transfer_setup(sc->sc_udev, &chan_alt->iface_index, chan->xfer, - chan_alt->usb_cfg, UAUDIO_NCHANBUFS + 1, chan, chan->pcm_mtx)) { + chan_alt->usb_cfg, UAUDIO_NCHANBUFS + 1, chan, &chan->lock)) { DPRINTF("could not allocate USB transfers!\n"); goto error; } @@ -1527,18 +1527,18 @@ uaudio_configure_msg_sub(struct uaudio_softc *sc, #error "Please update code below!" #endif - mtx_lock(chan->pcm_mtx); + mtx_lock(&chan->lock); chan->cur_alt = next_alt; usbd_transfer_start(chan->xfer[0]); usbd_transfer_start(chan->xfer[1]); - mtx_unlock(chan->pcm_mtx); + mtx_unlock(&chan->lock); return; error: usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); - mtx_lock(chan->pcm_mtx); + mtx_lock(&chan->lock); chan->cur_alt = CHAN_MAX_ALT; - mtx_unlock(chan->pcm_mtx); + mtx_unlock(&chan->lock); } static void @@ -2664,7 +2664,7 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b, /* store mutex and PCM channel */ ch->pcm_ch = c; - ch->pcm_mtx = &c->lock; + mtx_init(&ch->lock, "uaudio_chan lock", NULL, MTX_DEF); /* compute worst case buffer */ @@ -2690,10 +2690,6 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b, ch->pcm_buf = b; ch->max_buf = buf_size; - if (ch->pcm_mtx == NULL) { - DPRINTF("ERROR: PCM channels does not have a mutex!\n"); - goto error; - } return (ch); error: @@ -2707,6 +2703,7 @@ uaudio_chan_free(struct uaudio_chan *ch) free(ch->buf, M_DEVBUF); ch->buf = NULL; usbd_transfer_unsetup(ch->xfer, UAUDIO_NCHANBUFS + 1); + mtx_destroy(&ch->lock); ch->num_alt = 0;