From nobody Mon Sep 15 17:44:21 2025 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 4cQXTd4W8Rz67hbs; Mon, 15 Sep 2025 17:44:21 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQXTd3rP3z3vvN; Mon, 15 Sep 2025 17:44:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757958261; 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=xViwxX4DzWYCmkSyvv42RXiEWLAoN2gaaCNoWLMSXVs=; b=VnMxJ1YTGiuU8YN7Yzb1NWl0Ia6eTffxA9Vwg8O6pXRPk5rgwxdfY4I/2gkz8FvB1UBAqh 70zZUBLYQXXquVjERzBcoFohLj5zFnrYTa3lbPRZWlc65pI0vVxJJEjr+ihUxMwG6DjY0B o/64e0bjuyfvlMbT/msbPJAFflj0H3SPMTsuI6uTPMLG2GmPBH/OePeW5Lf8f1103p7KEy aRtbJ0mt2IL5YelehGvQEY0XeQwWqcYEiaOaNImL14/4+4ssr0Xz+MjZewWj8eYlM1ox7p YAtm6eZ4O8GaF9nrAYmJGZHyeiGVKFYpGifbTBVkT/TNSLdJHIKK6+7NgJHUCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757958261; 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=xViwxX4DzWYCmkSyvv42RXiEWLAoN2gaaCNoWLMSXVs=; b=pCNhgnxX+onFI7bT8jPGk/iUZH7bfsI2JbVWBbD4JpY56rDTaocAf2vwujgbeYmQ2xa6Id +Yaj9CWdbl6sPl68XK9HwcFp0XeQxRl8JQO3JdIccwtaFcLkLV24QyNuDaA5cvBjvgqIoa a0ZSgusoCXBApKNQnOicSMxdOIUUE2lmLrFkbt81UXFGpef+DO9ETAUIaK0inqqucYtQCr irNlwdFOBgvKwfYLLaqPZrjTcz+yjtJTcfrH/fEa2pc/xoUHZVKNuO+wss95CumNRGtfQQ hw+YBrxZ8rRHrBCUxWxYCYC7w2oECEwjWACG6onQIoxkDKS/HlLOn754n4+zLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757958261; a=rsa-sha256; cv=none; b=hiEhLA/eIEcAPpZMCtOXNlX8C6NFa+THt9Z5GGg1NFx1Zoz4eySNNQcwMRE+3OWEpKZWLp I1yNLS3TY8Q50SnIMyjgbdEf2rnjALiyl7Dk1H5QwV7KB2RQG3iESYqdStgTM/7tXVDBNG 2UtyQxx4DFJA8+N+2Pfl6Ejqlo2gAdpsN4ZufUeaVdcHdPWqQWY8oowhyCbJ9q1i4vPOSr M2pIJlm7TiBXtiFE79mSOr4DA0oyipaq7iAc0dyFS/+c0jVJEWNRoVFjWEzOlepQKtovp1 u8TTlTPWQvPDQkZ40Q4jKQ999SJqQMsoYWAOlOmNGDz8biPub3eDmGp+4DO3aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQXTd3J8Tz13tG; Mon, 15 Sep 2025 17:44:21 +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 58FHiL3P086057; Mon, 15 Sep 2025 17:44:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FHiLZg086054; Mon, 15 Sep 2025 17:44:21 GMT (envelope-from git) Date: Mon, 15 Sep 2025 17:44:21 GMT Message-Id: <202509151744.58FHiLZg086054@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: e8b5025c3880 - main - sound: Honor CHN_F_NBIO 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: e8b5025c3880b04c1c2139fe73b65fbd6deb41d4 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e8b5025c3880b04c1c2139fe73b65fbd6deb41d4 commit e8b5025c3880b04c1c2139fe73b65fbd6deb41d4 Author: Damjan Jovanovic AuthorDate: 2025-09-15 17:42:41 +0000 Commit: Christos Margiolis CommitDate: 2025-09-15 17:42:41 +0000 sound: Honor CHN_F_NBIO If the device is opened with O_NONBLOCK, even though we check for it in order to set CHN_F_NBIO, the subsequent chn_reset() calls will clear all flags, except those set in CHN_F_RESET, which does not include CHN_F_NBIO. Add CHN_F_NBIO to CHN_F_RESET. Additionally, because primary channels can be reused, make sure we do not unintentionally keep CHN_F_NBIO set if the channel is re-opened, but without O_NONBLOCK. PR: 289441 MFC after: 2 days Reviewed by: christos, markj Differential Revision: https://reviews.freebsd.org/D52493 --- sys/dev/sound/pcm/channel.h | 2 +- sys/dev/sound/pcm/dsp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index fab182b22774..9ad21d219001 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -408,7 +408,7 @@ enum { #define CHN_F_RESET (CHN_F_BUSY | CHN_F_DEAD | \ CHN_F_VIRTUAL | CHN_F_HAS_VCHAN | \ - CHN_F_VCHAN_DYNAMIC | \ + CHN_F_VCHAN_DYNAMIC | CHN_F_NBIO | \ CHN_F_PASSTHROUGH | CHN_F_EXCLUSIVE) #define CHN_F_MMAP_INVALID (CHN_F_DEAD | CHN_F_RUNNING) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index aa6ad4a59778..da38f52021ae 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -299,7 +299,7 @@ dsp_close(void *data) CHN_LOCK(rdch); chn_abort(rdch); /* won't sleep */ rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | - CHN_F_DEAD | CHN_F_EXCLUSIVE); + CHN_F_DEAD | CHN_F_EXCLUSIVE | CHN_F_NBIO); chn_reset(rdch, 0, 0); chn_release(rdch); if (rdch->flags & CHN_F_VIRTUAL) { @@ -323,7 +323,7 @@ dsp_close(void *data) CHN_LOCK(wrch); chn_flush(wrch); /* may sleep */ wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | - CHN_F_DEAD | CHN_F_EXCLUSIVE); + CHN_F_DEAD | CHN_F_EXCLUSIVE | CHN_F_NBIO); chn_reset(wrch, 0, 0); chn_release(wrch); if (wrch->flags & CHN_F_VIRTUAL) {