From nobody Sat Jul 06 18:24:20 2024 X-Original-To: dev-commits-src-main@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 4WGf105WVhz5PMHT; Sat, 06 Jul 2024 18:24:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WGf102kdfz54ZH; Sat, 6 Jul 2024 18:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720290260; 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=Yx5KRZ/lDSZR4klCEABzwzPNhsdyuSVjnm0Tw+cic6Q=; b=T6iz7NhQ+tSjohr8xYUWoqzf/6bjpY/vex0YS9QFmOVjmFf39dXZvCZWHH7HgPor10z3GR Fv5qGPAB0OlkkXFiNHEUIawwnkQCl7HkQ8zsb/RT7ovlkgBkevzBSYaIeW7vpo0F8sJjOL wqIE5Omq9Tai1xaFXUkuH5qf6N//FXHkDvQEI/93IPYibygeEst6zDceui/uJKcpp/Sf9A LDahLcXhj3u5PYfRW+BHLjy5E0EZNrHuqmjhqjW2e4l4gFPKRc35Zti50DwulUNQVMJlq+ YaphvPDT/aDAj97YOBZXcqY3e/8QR2oO2zj9s8/zlFgC4YibTDr4T1xp6JrqtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720290260; a=rsa-sha256; cv=none; b=XdkMggbHYWVEqJrDdtAERRSohrw/QI+XcyVGTtpK5N8PVh63F3Xb+8sQ/yP7uRZMNMpH+G DAKwzGBDYUUAcrvt+QOSVA+pyxURImZW9azx3C6EK1VCRWM/9y0qgVoP9GICTiPstvEgNU OQ8xpfeafEw4Z7eR3vxNUFoo28UmeN5dcajUzxpAwVYXyw1RA8T0CMHMGlO6W6w5JUcJQa yx+VqlrSBpGo1FLod7osz3b1KTY16UU5+GCWm92MKYSZQ9snApnqJNhGYVEJDmMURaiyB8 q4Htk4jxbRvs66o4eilWZWgTQF2Wz6OSHoD6WQ0ts9q+yX6ga4/i8PD/Dm67Xg== 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=1720290260; 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=Yx5KRZ/lDSZR4klCEABzwzPNhsdyuSVjnm0Tw+cic6Q=; b=ZRUbpymxSjr+4EMz/cg/k8JM90QJCXDwtbhNEDANwsuAWCFJaAnoAxX6AcAN6BTsQMzXej OrB24mfx6jYo9LpQjJyxn7ubjWQPqgnb2Xz89EWCDDYNaSLhKz6cDGHCdZiby56+ABqKSf xcFHFzwIIHQApXIb21VRlJ5SaNx495kTp1EeRiQ/Dpyl/TrOKoAQNMokLNZMX3OJ51R1TA u6L7KENgsFCT46NRWNcVw6fvcldG74IEjtTKqdHVlLbQ4A8SujOYP4BZ5iQ969SbjExidt up+EwEs+xDEcVtsW3cQQ0OaXo+m7V5FImK/zhSDE556zEXWCYxAI7dDy87jh/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WGf102LlTzqwC; Sat, 6 Jul 2024 18:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 466IOKer091129; Sat, 6 Jul 2024 18:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 466IOK3K091126; Sat, 6 Jul 2024 18:24:20 GMT (envelope-from git) Date: Sat, 6 Jul 2024 18:24:20 GMT Message-Id: <202407061824.466IOK3K091126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e850bd36dfda - main - sound: Add missing CHN_[UN]LOCKs in sndstat List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: e850bd36dfda98608432d2459800627d16119fec Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e850bd36dfda98608432d2459800627d16119fec commit e850bd36dfda98608432d2459800627d16119fec Author: Christos Margiolis AuthorDate: 2024-07-06 18:23:22 +0000 Commit: Christos Margiolis CommitDate: 2024-07-06 18:23:22 +0000 sound: Add missing CHN_[UN]LOCKs in sndstat In sndstat_build_sound4_nvlist(), if we have INVARIANTS or SND_DIAGNOSTIC enabled, we will hit a lock assertion panic when we call CHN_GETVOLUME(). Also lock the channel in the sndstat_prepare_pcm() loop for good measure. Fixes: bbca3a75bb41 ("sound: Include sound(4) channel information in sndstat nvlist") Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D45898 --- sys/dev/sound/pcm/sndstat.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 5b770810d19b..753531f3694e 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -456,6 +456,8 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) goto done; } + CHN_LOCK(c); + nvlist_add_string(cdi, SNDST_DSPS_SOUND4_CHAN_NAME, c->name); nvlist_add_string(cdi, SNDST_DSPS_SOUND4_CHAN_PARENTCHAN, c->parentchannel != NULL ? c->parentchannel->name : ""); @@ -537,6 +539,8 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) sbuf_printf(&sb, "%s]", (c->direction == PCMDIR_REC) ? "userland" : "hardware"); + CHN_UNLOCK(c); + sbuf_finish(&sb); nvlist_add_string(cdi, SNDST_DSPS_SOUND4_CHAN_FEEDERCHAIN, sbuf_data(&sb)); @@ -1230,6 +1234,8 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) KASSERT(c->bufhard != NULL && c->bufsoft != NULL, ("hosed pcm channel setup")); + CHN_LOCK(c); + sbuf_printf(s, "\n\t"); sbuf_printf(s, "%s[%s]: ", @@ -1321,6 +1327,8 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) } sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC) ? "userland" : "hardware"); + + CHN_UNLOCK(c); } return (0);