From nobody Wed Jun 17 10:52:49 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 4ggLKz3TMsz6h8HV for ; Wed, 17 Jun 2026 10:52:55 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ggLKy74L5z3QqT for ; Wed, 17 Jun 2026 10:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781693575; 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=db92OdfliZNSLH3eExCDpZKXo0X70NvzhyEpiC30rXE=; b=OMwJbRHq6HXO0fT4+qI4P3mCpKRTMlc1lljoVwpQfsLbsoTFnjMMe+wVB3ekatDZcU3PBk SwFHPcGNg4hXs5NMCItldhNGpnosLllia6/ZIlyV4RanDkHEXUkfJk9VNZRCPPLXXHqkmw L6txtfBUDmMqr2qWJiuGZpW5zfP2Z1+5GIkiJHgqsX2pYU089DP/By76FriucJaysWDJEu KlixR5/BxzL5Zk00Mt6Nk8WORvXYbJxkW1Wp63gXvzqP0OqgatWwZsM3D8h8lG79Y/HzEV KJHQBV9SG5Susd4N3HVAGPcJqor7tgptWD2SHuZS3/Nt4jxAqvHRN1WXEw6Lqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781693575; a=rsa-sha256; cv=none; b=n8D9pIBJuWhvY7e1TVlOQdsa1g9fSHlsza6hL9Yaik6duhYe0KuNztg/iOGtp3LohVJdZ2 4LVv/SarhUw1eBK3ps5U9rlxQDJAY1VdnrhUZ3uCrkJFhm4l1me3dn4WvjyF0DhMXHoAmQ H02JUurwb8ZxGODbrg0MXrkwPfYmxVE+3/sgW8MznOlvI+ANpZZxUXyun0l91JtgyX16ME Ix3BkZ16YmG7HEX/eJcgD1+It796GwkDvhrSXrXNKf6cf7XP4rLa8NjDylcW/aw+uY+dye O1FNVK2RddhUckKkML6n9LaddjpMScwpowbBfv524hAX+Or1TVGaQ+KErKxR/Q== 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=1781693575; 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=db92OdfliZNSLH3eExCDpZKXo0X70NvzhyEpiC30rXE=; b=Y1uCd3AGZpglyQo6QM1V8iG7SmNdVEXe/aomzmNbc1deXKdp0AbBvyjh534b4TjwkWzc6T eHUwSGgzyNvZv6wQtrxQ6GVlcuIxZdUXlkpSE8wPL0bbyo486pReDNqKGoFpBErNwYy0E0 vwlGHIhs6OzAZ9ek0c3n8YpwIRbzsG58oXh5xbKLQNEWTXpi8FQkLe1mv7i5NQxMiio94w 60Gexcw2IUBSYQEkPopiNsmM7Gm61AKvrYqj0bucX6exazZWwzLyyNCIkUN9sGauS+Y95Y NcKv2HqzcASRdD0bqOT5oVy5ts1ZkwMts0ay2Cjy80dgbymkb3wEP/HS310Z6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ggLKy6Wf8z16tj for ; Wed, 17 Jun 2026 10:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bbd0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 17 Jun 2026 10:52:49 +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: 47ae0a869c7d - main - sound: Start each channel individually 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: 47ae0a869c7db693ffb1ac058d63dcb79c4e68a8 Auto-Submitted: auto-generated Date: Wed, 17 Jun 2026 10:52:49 +0000 Message-Id: <6a327c81.1bbd0.3aad8c2b@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=47ae0a869c7db693ffb1ac058d63dcb79c4e68a8 commit 47ae0a869c7db693ffb1ac058d63dcb79c4e68a8 Author: Goran Mekić AuthorDate: 2026-06-17 10:34:05 +0000 Commit: Christos Margiolis CommitDate: 2026-06-17 10:34:45 +0000 sound: Start each channel individually Unlock all members before starting any of them. Holding multiple channel locks while calling chn_start() on a virtual channel can trigger the parent, which acquires PCM_LOCK() while other virtual channels are still locked -- a lock order reversal. Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D57399 --- sys/dev/sound/pcm/dsp.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 05fdc18e31f8..1fa665b6b6cf 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2742,16 +2742,29 @@ dsp_oss_syncstart(int sg_id) /* Proceed only if no errors encountered. */ if (ret == 0) { - /* Launch channels */ - while ((sm = SLIST_FIRST(&sg->members)) != NULL) { - SLIST_REMOVE_HEAD(&sg->members, link); + /* + * Unlock all members before starting any of them. + * Holding multiple channel locks while calling chn_start() + * on a virtual channel can trigger the parent, which + * acquires PCM_LOCK() while other virtual channels are + * still locked -- a lock order reversal. + */ + SLIST_FOREACH(sm, &sg->members, link) { + sm->ch->sm = NULL; + sm->ch->flags &= ~CHN_F_NOTRIGGER; + CHN_UNLOCK(sm->ch); + } + /* + * Start each channel individually, then remove it from + * the sync group and free its member structure. + */ + while ((sm = SLIST_FIRST(&sg->members)) != NULL) { c = sm->ch; - c->sm = NULL; + CHN_LOCK(c); chn_start(c, 1); - c->flags &= ~CHN_F_NOTRIGGER; CHN_UNLOCK(c); - + SLIST_REMOVE_HEAD(&sg->members, link); free(sm, M_DEVBUF); }