From nobody Mon Apr 29 10:43:47 2024 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 4VSg0z38Vvz5J3cp; Mon, 29 Apr 2024 10:43:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSg0z1yz2z4pgf; Mon, 29 Apr 2024 10:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714387427; 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=HYrvza0nfT02JZS3tCJtgk5bqWx70bF09hPHs+m5x0Q=; b=N26OcE+NiiTe4hHiKKa/lOCxa7KxXwtnxPhyNuYGVh4KEMoKUSWKFa5+n1i0vLVskkM7Fv I1kNR/3IpIaIqoLGA7l8Xp7Ewnf6iFKbiqP9NmvGJ3USLi/aP7hER52agLXM5Jcpk9NJGT e3cCN1/xkQzQmLHmAHVXsrEuIPjG0DPkiQOH3vMzsF0cs+9tEmHuYcveO9KbUUQqKGrSY6 dnOyThJWgTktK850OYK/uqy1lApIi6WZi4TzWgxkh/e4ogMp/O1Afs58Q/Hs1ZdV+eC0iu T+iC4E+f3i5p4sgJEd3hScNiBHRgn70yckXZJdvzGgISmOCJLiO7t+s0nV/N+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714387427; a=rsa-sha256; cv=none; b=BlRZoueAb8vk3X5b6gK4vaRXzsUk0bqbr+g67jjPCj7PfTRj5QneuG6HVisL5swAjElWxB 0h+1Tdnqk+hxruvY1KMp11d17K8OezIsnf8OYeXV41EuGxAlnk1rJ3xy+xUspHK+LBsoo/ plDEouhG9UGcE7EtFLyRfU9O+Xp9cVLnUlXy65pfuE2uop47WmITDMUVbdEKgVdkg0/Wy9 siIKxc9UTlq21hwfDhrpTxL7wm/fNK0XnGP9UTA7oLBDZFyf9wKbYh9O3VRpGwsuA4UJBD QmUkNN/iEwKiBhOJI/7ZbRptdGBJ8Awqz1ATgQri1/5v2SE2fIjCOxgM+Iu3yw== 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=1714387427; 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=HYrvza0nfT02JZS3tCJtgk5bqWx70bF09hPHs+m5x0Q=; b=CDVbrCm6joy1hVlUdo6P/FMJNwAuz/QeWs2g3Hg3+E80ZMpiF8oEDEjlXR4XOXAIyXgu0C grPD6UCUIPrqWutLEHtajyhe19yqIxX2KN20HQlGqhy6jGryk4OMuq8z94RYGdOoP+SsdW E3O51CCx8TYzSCtXQ0ZWAreKYMQbq/MSZsERLSOGtTz/oZsTTS8EDmPOY/mJT+e/2qdnr5 YLeokh1DX/IeljPzM9sPnfLjJ4xrIoPn8OeKFOt7X8SO5LFRMYcWWKyYm0gE4hBf8fAcOd VuXUqhPDL4dq6srHsVapKuHyB8CGMr/UrAOayzragRsNQilVYixYhrKjLrhW9Q== 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 4VSg0z1SqBz14XD; Mon, 29 Apr 2024 10:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43TAhlNB088497; Mon, 29 Apr 2024 10:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TAhlg3088494; Mon, 29 Apr 2024 10:43:47 GMT (envelope-from git) Date: Mon, 29 Apr 2024 10:43:47 GMT Message-Id: <202404291043.43TAhlg3088494@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 33e0f0cd6ba8 - stable/14 - sound: Assert that we do not enter chn_sleep() with CHN_F_SLEEPING 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 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/14 X-Git-Reftype: branch X-Git-Commit: 33e0f0cd6ba8496f469d6616a0367d85025be523 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=33e0f0cd6ba8496f469d6616a0367d85025be523 commit 33e0f0cd6ba8496f469d6616a0367d85025be523 Author: Christos Margiolis AuthorDate: 2024-04-28 19:40:52 +0000 Commit: Christos Margiolis CommitDate: 2024-04-29 10:43:31 +0000 sound: Assert that we do not enter chn_sleep() with CHN_F_SLEEPING Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44959 (cherry picked from commit fa284525499d75955525839074bf5968d0923e6b) --- sys/dev/sound/pcm/channel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index cf9239839aca..1527d5ea3d2c 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -332,6 +332,8 @@ chn_sleep(struct pcm_channel *c, int timeout) int ret; CHN_LOCKASSERT(c); + KASSERT((c->flags & CHN_F_SLEEPING) == 0, + ("%s(): entered with CHN_F_SLEEPING", __func__)); if (c->flags & CHN_F_DEAD) return (EINVAL);