From nobody Sun Apr 28 19:49:02 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 4VSH8b0Sg2z5Jr9r; Sun, 28 Apr 2024 19:49:03 +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 4VSH8Z56hpz429v; Sun, 28 Apr 2024 19:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714333742; 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=8HxLDV8iEGr8AtnjG6DQjnd3GVpPLw8UifVdS4W9bGc=; b=KfmD1uSNCP4DblMo53GSltwZxsD438NhDiyvnCwgpsf8JRCvvxyoJT5aWrAAvbExk+x93o wE/qdeeZda7ceA+mu7VE8EP8GgTFtV7BPBk+t8kaM00w9QZ+jSQav9iG0QJSAryGJf+7I3 AeV3GdE5YUsYfoxfDnGZOJR9UUB4ErKEfch3ehfVw/5hDrvoEC0xC0EnrTWeBETbljReZD jpym5UYwDT4OpCL61xwTIaLv0ztjU5SuT7YeWDuRAHnYBnA4aWAFJBHc/5WxZO323Srrbm E46gW35eK07Ofunr51uhXJDo6pw1YNisNaqXrwXxVchsMSOtC3LxmwpF4+DuSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714333742; a=rsa-sha256; cv=none; b=KWkE/v7LZFlXNzRmZlzV0IA3oq343Ex3vYtW/a95LxWU8CECcHrrTqi5JPkZplCtfbqqvT eXYjKhV4yY5lrb7QNGZKuVRGR73dsqpse1AM4TLUmeU3X55d5w1fGoNjJ3U/+VIRxCYmU+ mP16Wz/AUunermvU7kTbrZ/TVJqe25S/KCv85VBLJ3wIgk6TS+YBma/jTxfh3jbD2RogFa E+DJGLBgDLWp2jqVEaGt5mEBqyh7t5xF7EWFsalzEGvz4SB72/MnJ/6Qc6ZEHsl5iHZaW0 qPyOSgVV18C+7J8Y7muValiTxHrCD4iz5FUz8honNBsDDkeghmq5fvNpJazpfw== 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=1714333742; 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=8HxLDV8iEGr8AtnjG6DQjnd3GVpPLw8UifVdS4W9bGc=; b=R3lM8dc67VH997Et69QeUu6e2v+IKYQfBBhfIVTq7Bktj/EdBhZlbjZ1VQTZHPg0RP/8AC azztwxwcIAGPtnjCtZs16Op+7gCDEcPf9lWid4wGom/JfQkIZBV/WucayRE3RT7dUIAafx KrIFUa3tNlmFgs6zqJ8v/0pkx2WmvB0+SGctLypWXf9FMsVrwrmM2J5bRvl9IzJnNgTYO0 U6clrps7XHebvDgoX7ZWI15uliTqwA66wYV/9ZbH3HOtC958zSPlJrPVfz60Mad9wYiVX8 Yr1bFr84LH/smiBKCo78Q7ytx0e4hP5fuKERuCW51eOEaQqnLruhiqQZvWCbKg== 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 4VSH8Z4kwZzdpW; Sun, 28 Apr 2024 19:49:02 +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 43SJn239063300; Sun, 28 Apr 2024 19:49:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SJn2uR063297; Sun, 28 Apr 2024 19:49:02 GMT (envelope-from git) Date: Sun, 28 Apr 2024 19:49:02 GMT Message-Id: <202404281949.43SJn2uR063297@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: fa284525499d - main - 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/main X-Git-Reftype: branch X-Git-Commit: fa284525499d75955525839074bf5968d0923e6b Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=fa284525499d75955525839074bf5968d0923e6b commit fa284525499d75955525839074bf5968d0923e6b Author: Christos Margiolis AuthorDate: 2024-04-28 19:40:52 +0000 Commit: Christos Margiolis CommitDate: 2024-04-28 19:48:24 +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 --- 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);