Re: git: e254ef87a30b - main - sound: Merge chn_intr() with chn_intr_locked()

From: Roman Bogorodskiy <novel_at_freebsd.org>
Date: Sun, 23 Nov 2025 06:54:47 UTC
  Christos Margiolis wrote:

> The branch main has been updated by christos:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06
> 
> commit e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06
> Author:     Christos Margiolis <christos@FreeBSD.org>
> AuthorDate: 2025-11-21 16:14:28 +0000
> Commit:     Christos Margiolis <christos@FreeBSD.org>
> CommitDate: 2025-11-21 16:14:47 +0000
> 
>     sound: Merge chn_intr() with chn_intr_locked()
>     
>     There is no scenario where chn_intr() is called with the channel lock
>     already held.
>     
>     No functional change intended.
>     
>     Sponsored by:   The FreeBSD Foundation
>     MFC after:      1 week
>     Reviewed by:    kib, markj
>     Differential Revision:  https://reviews.freebsd.org/D53854
> ---
>  sys/dev/sound/pcm/channel.c | 20 ++------------------
>  sys/dev/sound/pcm/channel.h |  1 -
>  2 files changed, 2 insertions(+), 19 deletions(-)

With this change my system panics as soon as I start firefox:

panic: _mtx_lock_sleep: recursed on non-recursive mutex dsp2.play.0 @ /usr/src/sys/dev/sound/pcm/channel.c:586

Things work fine again with this commit reverted.

Roman