From nobody Fri Nov 20 09:49:04 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 4jW9XK3VTlz71TK6 for ; Fri, 20 Nov 2026 09:49:05 +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 4jW9XK0zZdz4q9K for ; Fri, 20 Nov 2026 09:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795168145; 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=uGfcACezbu9Eg7hLRaAMmbzaW/KNwyrBo8vDmX6zJoI=; b=Uyi2liJS+Wr6i436FWkmS6B9EY03A2x0vvbgTjUxg4pmJaypKiVXzNm9xnjQFCXyK5LwNF CcgbYlHhmaoy46RRbpFlhth5AWTOagWglNIpiDd0JBP2ak0nz3nG9f5obvubr3Mkv9rkXt YSzoD+O2rKfUW+Ff5SGmDuVAv/tgsc5v2DIt0Wod0SPNGeuCRCxcstREhkSxI+zrcAt4sZ 1ePay2jgei2pSxU2aSLEyRi0Jx5gbfoZMjNjblG3n81G/pZ5wEM5SRr23KuMTOTy3+oUMk jcoE6USz5MGU2ZEeVfC1W58bYTmRgYEZu/GrQx/7TP7GmQQQAiNs/Ezd7owvqA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795168145; b=RK1fkoY11fQ7aqv6zqMWMtbfJV1o2P7WTamgiPqNC6as2HkkAAiCsGH1sonJfqIgwiANA6 DwdEeYTYtnMU1JSEq/+H331tj58R46QCIfwT3yjY3EN7Z0N2ddoOVtnwQYiMC0x5wFvqxg Mq//t7tFFGBD05iEo6yBcD5eicPLBpfxAvuTYY2FWvxHV3R1CSd49QLe6zPTxtvhj/wnB3 q3mHWgLOkY8bWgnL5w12RlAUhqeg9JbJJk8g6cuPKRWG0SejYbPr2KdfJamnZahBR0mbeQ XnzpDN57hWoZM2PsyBIwbECqdVMEtV/kbK2pJgPRTVharOf1h+A+l2RxG1MRQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795168145; 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=uGfcACezbu9Eg7hLRaAMmbzaW/KNwyrBo8vDmX6zJoI=; b=ISPUdC2oCg9JsoG5CQ1urTfmcf3v9rYYQfdKw8Fy1XK4TNLszeyv3tkS4bYRrSlGqf8GBp 3GASYgNhSp0tRsAqIViF1qabt1RWLL5ypald/4UGZt1egglmmoBEjnkpA1zCULJNK1VBRa ReavEAyhF5VDnOADIpCOy/SeNKgY+sdAkhDb+J8C61YveQGJnenEb24lc/SIVp3Nu4bUiC KjhkIqynKlqMfqTuiFO+3Sx3yHcxFy3DXJxrNcsFpNUYbADuK44mID+hMvOIdOyjoxgWjI LyCVKrLFNUzH5P059gwMxCeheQqDdxfsSXhEK1AE1epaHuP9wRgZsX45k+K9rg== 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 4jW9XJ70L5zk2j for ; Fri, 20 Nov 2026 09:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 16a64 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Nov 2026 09:49:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 5541489df676 - stable/15 - snd_dummy: Do not use dummy_chan_io() as mpu401's interrupt handler 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 5541489df676c9723cac2d665bb4e6705cc3ce53 Auto-Submitted: auto-generated Date: Fri, 20 Nov 2026 09:49:04 +0000 Message-Id: <6b001790.16a64.1d114e95@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5541489df676c9723cac2d665bb4e6705cc3ce53 commit 5541489df676c9723cac2d665bb4e6705cc3ce53 Author: Christos Margiolis AuthorDate: 2026-11-10 13:02:13 +0000 Commit: Christos Margiolis CommitDate: 2026-11-20 09:46:39 +0000 snd_dummy: Do not use dummy_chan_io() as mpu401's interrupt handler dummy_chan_io() runs with sc->lock held, but mpu401 calls its handler from a callout with no mutex associated with it, so writing to the MIDI device node caused a panic. Give mpu401 its own handler, and leave MIDI to mpu401's timer instead of the PCM callout. Fixes: e963472ef853 ("snd_dummy: Initial MIDI support") Sponsored by: The FreeBSD Foundation (cherry picked from commit c8d1c94741231d95964b91910880769019478854) --- sys/dev/sound/dummy.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 7b456884040e..47bd0c825561 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -98,9 +98,6 @@ dummy_chan_io(void *arg) struct dummy_chan *ch; int i = 0; - if (sc->mpu_intr) - (sc->mpu_intr)(sc->mpu); - if (sc->stopped) return; @@ -324,6 +321,15 @@ dummy_mpu_uninit(struct mpu401 *arg, void *cookie) return (0); } +static void +dummy_mpu_intr(void *arg) +{ + struct dummy_softc *sc = arg; + + if (sc->mpu_intr != NULL) + (sc->mpu_intr)(sc->mpu); +} + static kobj_method_t dummy_mpu_methods[] = { KOBJMETHOD(mpufoi_read, dummy_mpu_read), KOBJMETHOD(mpufoi_write, dummy_mpu_write), @@ -393,7 +399,7 @@ dummy_attach(device_t dev) */ make_dev_alias(sc->info.dsp_dev, "dsp.dummy"); - sc->mpu = mpu401_init(&dummy_mpu_class, sc, dummy_chan_io, + sc->mpu = mpu401_init(&dummy_mpu_class, sc, dummy_mpu_intr, &sc->mpu_intr); if (sc->mpu == NULL) return (ENXIO);