From nobody Tue Jun 30 06:24:31 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 4gqCmP13psz6jcSk for ; Tue, 30 Jun 2026 06:24:37 +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 4gqCmP0RQ3z3FmZ for ; Tue, 30 Jun 2026 06:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782800677; 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=az18BZ39u59Nh+LhQPl9QXf1GHU7bebdS6b/cK5Kklk=; b=keYUryJWMBI5h6KZMXG10L4DSSLocBFKg6m7DmaFiSsSmhDC1aPq13J2O8Mwwqh2MPSvOh udLqBB5Invpfg4iOtNmCc3E8Gaub49M6iPt0euhQiqrz3uQEtSJIaZMplqAuGcSigTE/aJ WoBp3ANJXS0Lf4hSMXrZCTtFDRADf1Rfeo0OBmm3BEedE8QpC/v5uv/a0gZk9qnhKtKymf GyoNlQU6SdOCcS3qyHhKGZ6neSqAa5TmpO3H7NNjd3fNFzcORHhpqkpNGuWmzu3pAfgDH1 bD52J6UDkPRId+NgX272CYYorNevDhYDG1sa4JQU1mBRostSpg7q9wHzi91xfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782800677; a=rsa-sha256; cv=none; b=IuoCsQM//MMuaRWJc9wc2b1MPMNM0wwjXJTotcEs+gwk8UzFdG/CPqgG/0eeoZAZ2PqxPq zZ0yRa3SCQsTRdsZrkqb704GZA6fEoq+bCTz1NFKMfNQk7I32mqAfknxJLwI+ueRBw8ZWD 8/IXYDMGNk/D/rysJV32UZnG+YAXH4HuHOkAbxj7behF3SknxmIWEjFyuQrW0MNCg24Cvz m5RoAyBu65OdMZS4vzg6xAciJvNbnKUQS0Jc4+4Np8hhAmtrnLQ+alQhpVjFWah3Auja1+ iR4Z8MsaLDrnZgIuZev/5Vs6Svi6MYSJnK4ojAcbYIRXWlPXAkOAfW99jCcQXA== 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=1782800677; 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=az18BZ39u59Nh+LhQPl9QXf1GHU7bebdS6b/cK5Kklk=; b=Z1hoFHckiAEeWNKdqAQpiMCJ2yg50+T7FksMHLoN2HlpmU7Ml4n3Yup2IaRZFOzo5w4qPX sgqq5LxjVzJNl+Jbt76Ik31KG66/Icj3LDA+iZ90fs1yMoHa0jweFTxPjSpT/YtTzy2w6c w2pMSvjs9o5saPK1U043elWsqXvBTnuW8j6PAlKEbMtrPG8MtkiHTWI0sfY7QGKkpuzJep c4bvKjxJLyuyDJC8CDt/dK7neWMUuT39IY3/pceXtC2M4uJQCrPEDaGoZktvpYupW2Be8K 6JNWDUuJkzlra7uFSc0axAzYCgFdqms5tiikWwjbY6e+FI/TgDl8zyp8n7qwfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqCmN6dWczYNZ for ; Tue, 30 Jun 2026 06:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 204fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 06:24:31 +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: 0665d5b9d38a - stable/15 - sound: Start each channel individually 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: 0665d5b9d38a0b45db50a38244dfe17b8fefebee Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 06:24:31 +0000 Message-Id: <6a43611f.204fb.dc9b002@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0665d5b9d38a0b45db50a38244dfe17b8fefebee commit 0665d5b9d38a0b45db50a38244dfe17b8fefebee Author: Goran Mekić AuthorDate: 2026-06-17 10:34:05 +0000 Commit: Christos Margiolis CommitDate: 2026-06-30 06:23:40 +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 (cherry picked from commit 47ae0a869c7db693ffb1ac058d63dcb79c4e68a8) --- 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 471db6524aa2..f32446570374 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2733,16 +2733,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); }