From nobody Wed Nov 18 10:24:35 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 4jTyQD2Zr8z71J8W for ; Wed, 18 Nov 2026 10:24:36 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTyQC6dGdz4fh0 for ; Wed, 18 Nov 2026 10:24:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794997476; 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=pG8fH/MQ1vhWUE0HaPWlnQSK9nVa2cjIjSfytfnyGd0=; b=BY4pk7spt6/ZCEHnFCzp4JjAaYdpbQxhO8BiF101lKhYah9F/7csJ9eD3brDCed7+n/lWW 7X8gAABb9pWolyvlaQBOUxY3T+n4fA8/92/u6nyqiTvyhYTPnPRO5c6U2AwjivxksCfVA1 zRBrtmNC+do8qF9PR6E9LKEC5KRyixQPtttiXbEfl5qwiiCi5/V7IiwLH+Nn3czKke9dEu r9hb7fpwCSngURKEb9b8PR6iY7ymVQ+NI2JUudaDhcTN5F8xHeXKLEJ6zLDecHzQ7OenZS cKtg5jYh7ExHgkMGeStuWY/XiH8nJT5SihZpIF2Aw/8RinoJyFswDS9H1XTbeA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794997476; b=tzMhy53TWdKCoTysY+P+MkBCPSApOpx6F2dkK+VmJmvoy+hJvqy6bQWbxK2zeAAWIQiDel shzmZUfc+BRMfrahYs/V9cSac4ftFk9QSAaops1rmr6sClBXzPfmjxHjMK4Z+9/IwjD1Qj xCMKfW3hAexbxYkr+D8U+iTHU420VevkYhTOjJltlo6DHMlYhwqq7CVBCwDRzhWxZp8y42 Mk+q+gVclZuP1DfsCAbe/AoZQ46fMzwDQr8coL6DHmH/2NAoG8ZGpSG7RhPdhSu40PRRQL d8cGTtsmpE9MGF8jiuO4egKJV4OyLs2qhU/9ZAWVo51diqWW5se6UTdoKgsH8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794997476; 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=pG8fH/MQ1vhWUE0HaPWlnQSK9nVa2cjIjSfytfnyGd0=; b=aw85xZ3SUmdMujOLWlwXU2FBxdcULFmzV3jUsUkQJq40uuQltJezfMJWIADetv6cgJo/rD nhLng1F52p+grQrj6lLEET82BhtKFn8C3roa33VN68Cy+iusDSLpLilvCSqwQCCy2rqz/1 OKLpK2GrmpTKzjs1W8BSMqyX6NxX3kg0MEbI5bb3FCI6WdhXJWql2QP0nhvnxKkUegXFYe XB5+ydsGPea+4rvsW4Q1YmvUQ06MkEwKerTsS2yMso0YyVlav/BnZMIJ+qfQirSYkTGdpe be49/8tMdKrVUzD5mFTTMHpzGgmcVcCG5w/XvqqIQH23FgtoGE/pVtodVmxALw== 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 4jTyQC5f7lz1PKQ for ; Wed, 18 Nov 2026 10:24:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ed8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Nov 2026 10:24:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 0cb05a9270ac - main - snd_maestro3: Do not hold sc_lock across the hwvol handlers List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: 0cb05a9270ac06a5eef7d3cca9c1ddb3247bf63f Auto-Submitted: auto-generated Date: Wed, 18 Nov 2026 10:24:35 +0000 Message-Id: <6afd7ce3.3ed8.16cc0ec5@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0cb05a9270ac06a5eef7d3cca9c1ddb3247bf63f commit 0cb05a9270ac06a5eef7d3cca9c1ddb3247bf63f Author: Christos Margiolis AuthorDate: 2026-11-18 10:18:44 +0000 Commit: Christos Margiolis CommitDate: 2026-11-18 10:18:44 +0000 snd_maestro3: Do not hold sc_lock across the hwvol handlers mixer_hwvol_*() can end up taking sound(4)'s channel lock through mixer_set_softpcmvol() or mixer_set_eq(). m3_pchan_trigger() takes sc_lock with the channel lock already held, which can cause a LOR. Drop sc_lock for the duration of the hwvol handlers, as snd_uaudio(4) does for the same reason. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D60464 --- sys/dev/sound/pci/maestro3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index 6003dde5b41c..aee95444f7ee 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -1122,6 +1122,7 @@ m3_intr(void *p) uint8_t event; event = m3_rd_1(sc, HW_VOL_COUNTER_MASTER); + M3_UNLOCK(sc); switch (event) { case 0x99: mixer_hwvol_mute(sc->dev); @@ -1137,6 +1138,7 @@ m3_intr(void *p) default: device_printf(sc->dev, "Unknown HWVOL event\n"); } + M3_LOCK(sc); m3_wr_1(sc, HW_VOL_COUNTER_MASTER, 0x88); }