From nobody Fri May 29 15:27:12 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 4gRnKF3r4yz6fj50 for ; Fri, 29 May 2026 15:27:13 +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 4gRnKF0Kwwz47ts for ; Fri, 29 May 2026 15:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780068433; 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=gU0Zuv4/+Hu1TJP3DUMpHzY/6DD6Uj/ihVLsTu0y9NU=; b=TzpXEWck5WGpnfcdxlwyb2J3k0fK31lCF9EWVStoWg44pwaEREj7AopD64hKwH+3T5Bbda v01yg3p1EFnKPUfR0Pzao4Mq7nEmNqZUd4F/D/Fb3nkkIE8/n/zLeVSqfnV1zS0Ndt7VKj QJAhCIpM7SXW4qUdbC8dMRS+u3vd2q1HboJBiXHNif1fpgWQi9dBksg8UsvoEYnF5RhpOh yhc4PRuPUfRIVOw2VpUQ3aMtd0ZyI2ckShyf/GhfqOHJlaOyuzwxCv8eYJWPaVzx+9ON3Y adKN/tyOcbFtfhBCDCsbr+PL+M4L/wq/Oh4bSE307+3Tb4EqVoxjUGkFM/BCAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780068433; a=rsa-sha256; cv=none; b=Jpj7lxYNUZmx2gqmd9hGw3Ju0CfYBUU6TkX5PKqmtEOWzWWES2/vDknLZtPuGf8f7Jy2ql Fewwrgss459+29fuYjaB3FvD0uFucbL/0nFd9EQgUeE0EsZuvtYrwmFlArvYQ2CKA50R0W ibhcOw5Geb/UOytCkLBoK437pY1lqjAPsbHsEXTVg4uRWJz9N0wHKPLFV0UT1+7ESxzVbn k5Z2wRECFTD/HcahxIGPWe5TvK2c7UYXTYcWks/1PktNAV75KUlYBpG/De/x8s+1OLR8Ui y6T8fbzDD12A6efY6wwptUSt7lAsi8sQ4KRosfP35KMlGoWDWzZOBu3LNIb6bQ== 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=1780068433; 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=gU0Zuv4/+Hu1TJP3DUMpHzY/6DD6Uj/ihVLsTu0y9NU=; b=ADrelwyvx5BSJwjOxt3JwABFrHnzcfwaxx65FLhjanN6ob4i7DtnczOcEBWDeYu4RaQ3OC v/eLkBbYzC+gMr8BwgksfEj6/3Pw2rmgdgQ9SWwNMZZX6JSebEWniy/M7JvrJI1smiRjzn w2ukUF6L5jeQw+nMCK36MqAspvmaXL69k/hXvL1MM3nJH5T+cB1qu+pV69ZiyOTe/8w4aa 7L9IdZdr0B/qcKxxn8H86IOBNg9woJig2vRAKEhdVxwPJKdbetBMaXV4BxehB2hkWCjmEz xpajn6ECdX4xDqxiytWPjJ8I1uSs1Rc+6ODjf8RbJpIcVTDNfYKQuPTbq2b/qA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRnKD6T4wzfnw for ; Fri, 29 May 2026 15:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3118a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 15:27:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: ShengYi Hung Subject: git: f27c7705c6a3 - stable/14 - sound: Fix lock order reversal in dsp_poll() 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f27c7705c6a37a3c2fbb4bae32bb1e2cc88b86d0 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 15:27:12 +0000 Message-Id: <6a19b050.3118a.5abde7bb@gitrepo.freebsd.org> The branch stable/14 has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=f27c7705c6a37a3c2fbb4bae32bb1e2cc88b86d0 commit f27c7705c6a37a3c2fbb4bae32bb1e2cc88b86d0 Author: ShengYi Hung AuthorDate: 2026-05-15 08:43:47 +0000 Commit: ShengYi Hung CommitDate: 2026-05-29 15:26:38 +0000 sound: Fix lock order reversal in dsp_poll() chn_poll() may hold both rdch and wrch channel locks while calling chn_trigger(rdch). chn_trigger() switches the lock order from "channel -> dsp dev" to "dsp dev -> channel" by temporarily dropping the channel lock before acquiring the dsp lock. However, only rdch was unlocked during the transition while wrch remained locked. Since wrch is also a channel lock and witness had already established the lock order requirement: dsp dev -> channel witness reports a lock order reversal when pcm_lock() is acquired while wrch is still held. Avoid holding rdch and wrch simultaneously during chn_trigger() lock-order switching by only keeping the channel locks when needed. The issue can be reliably reproduced by starting pipewire, pipewire-pulse, and pavucontrol. Reviewed by: christos MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57009 (cherry picked from commit 776584319fb4d66cdb1c2f91bed154dfe6a74e5e) --- sys/dev/sound/pcm/dsp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index fe5576baf017..1856a348ac12 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -1908,24 +1908,25 @@ dsp_poll(struct cdev *i_dev, int events, struct thread *td) ret = 0; - dsp_lock_chans(priv, FREAD | FWRITE); wrch = priv->wrch; rdch = priv->rdch; if (wrch != NULL && !(wrch->flags & CHN_F_DEAD)) { + CHN_LOCK(wrch); e = (events & (POLLOUT | POLLWRNORM)); if (e) ret |= chn_poll(wrch, e, td); + CHN_UNLOCK(wrch); } if (rdch != NULL && !(rdch->flags & CHN_F_DEAD)) { + CHN_LOCK(rdch); e = (events & (POLLIN | POLLRDNORM)); if (e) ret |= chn_poll(rdch, e, td); + CHN_UNLOCK(rdch); } - dsp_unlock_chans(priv, FREAD | FWRITE); - PCM_GIANT_LEAVE(d); return (ret);