From nobody Fri Nov 21 16:14:58 2025 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 4dCgKZ6WKfz6HQHQ for ; Fri, 21 Nov 2025 16:14:58 +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 4dCgKZ5N7nz3xwm for ; Fri, 21 Nov 2025 16:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741698; 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=kv+Zm7OeW0vDfDo3J2NXp4NVIUja/oNefstysuDlFz8=; b=SH59ByBNcSkeo7wFrT/s4olzHllQC31+OwLmzpdXcWtawrgqHeSG4kLL/aKcZqdobb+Cgr IKj7rg+WX6PVtQAFHIu2BD6qYCT1mTq43FaCS0LQtzMIjCkZej72m6dI6gpxVUUDNxqO+j Ue5DWEZi3WzBh7YJVvPbzR5PaKqVh2PqczZWiulHyr6Db7b/rsfCiPL+LbYU2/77xKrVIX ndP4cs+oNQtuV19LIXXFFrAPvj0qxpRfUH/IdMSagOnOzy8ff6KEtBl87wtkuuH8oj/ICn WufFdbdJyUgt5wWIYxlEGSo+po5obgbEm+oBjYfOEwYqi/YWG9S8Ny3zox9gwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741698; 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=kv+Zm7OeW0vDfDo3J2NXp4NVIUja/oNefstysuDlFz8=; b=GkPr1cOe8M4XmjHbDHwA1w5Z7UYKPcXqIUvm6rBnGmjachHJlUI4ZudrN6Y5ckjMUvOHEW 2gr1WDu5bGfviB2GH9KUWdqdjkrP6noGfiBi/9uV9i3vkNbqAS2CgC9qRIyK0ZtYcBXp+K bZBfSKd4DePdeFEogaQfgavXH5oKMDAoFRIPGuYzib1iYidNzsPfXrxCsklGcco6Q7ZEs6 xZBz0T+UugDohNH0dJke/P4YevDKoLrsGkSSf8yIJJg1b7S9h4kjMp79dN/cjovx3Gnw73 4NeyLMOzpcPCnLqJo0FqcmKHaXmaZtBRy8PtrLavhUDS79P5MgDWEqWCjZRejA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741698; a=rsa-sha256; cv=none; b=CDl/Q3k6Y3yqQo7d4Fenn6zTGdKFurLwrp3uMfy4IH6XCgxUrqWOVMO5AU3wZKjw1LYY6F opBfZ/a8Ztp0zZXZmmuxjhiVe+eTT9rE+yujDEVNDaiSfqatU2w0r16zTVFrR3e9PNvky9 Wt31bVJJP8HeKFKhj7CrHulmQo4p+tJquRLKRSHU1y0A7cSbb9EaDKTLTtSO/NT+X8Wyv3 hHGyun/DRSglajfBoIMpSjKG5MWue5VbLUYbJw0N4SWnCXezGrOFINQ0mK2DtioBytZb9k +QAIIHsmRj06lRusHUfGIqjLZz73EZEHwGQ3m7AgKc8M1kpjsXXC6enSrGjVNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKZ4XZhz3H3 for ; Fri, 21 Nov 2025 16:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3750e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:14:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: b4c32d67d40a - main - sound: Simplify logic in dsp_io_ops() 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: b4c32d67d40a862620aa3e565ed0cb9ad59f1e60 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:14:58 +0000 Message-Id: <69209002.3750e.6a18edee@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b4c32d67d40a862620aa3e565ed0cb9ad59f1e60 commit b4c32d67d40a862620aa3e565ed0cb9ad59f1e60 Author: Christos Margiolis AuthorDate: 2025-11-21 16:14:13 +0000 Commit: Christos Margiolis CommitDate: 2025-11-21 16:14:13 +0000 sound: Simplify logic in dsp_io_ops() Use CHN_LOCK()/CHN_UNLOCK() directly, instead of dsp_lock_chans()/dsp_unlock_chans(). These functions are useful when we want to potentially lock both channels. Here we know which channel we are locking, so we can just lock it directly. This way we get rid of the prio variable as well. Related to runpid again, there is no reason to assign it when CHN_F_RUNNING is not set. channel->pid (as well as channel->comm) is always assigned in dsp_chn_alloc(). Get rid of runpid. I do not see how we can end up with channel->pid (td->td_proc->p_pid) not matching buf->uio_td->td_proc->p_pid. Also improve errno values. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53736 --- sys/dev/sound/pcm/dsp.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 1ae090f252c2..cb8b5414973c 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -464,8 +464,7 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) struct snddev_info *d; struct pcm_channel *ch; int (*chn_io)(struct pcm_channel *, struct uio *); - int prio, ret; - pid_t runpid; + int ret; d = priv->sc; if (!DSP_REGISTERED(d)) @@ -475,37 +474,27 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) switch (buf->uio_rw) { case UIO_READ: - prio = FREAD; ch = priv->rdch; chn_io = chn_read; break; case UIO_WRITE: - prio = FWRITE; ch = priv->wrch; chn_io = chn_write; break; } - - runpid = buf->uio_td->td_proc->p_pid; - - dsp_lock_chans(priv, prio); - - if (ch == NULL || !(ch->flags & CHN_F_BUSY)) { - if (priv->rdch != NULL || priv->wrch != NULL) - dsp_unlock_chans(priv, prio); + if (ch == NULL) { PCM_GIANT_EXIT(d); - return (EBADF); + return (ENXIO); } + CHN_LOCK(ch); - if (ch->flags & (CHN_F_MMAP | CHN_F_DEAD) || - (ch->flags & CHN_F_RUNNING && ch->pid != runpid)) { - dsp_unlock_chans(priv, prio); + if (!(ch->flags & CHN_F_BUSY) || + (ch->flags & (CHN_F_MMAP | CHN_F_DEAD))) { + CHN_UNLOCK(ch); PCM_GIANT_EXIT(d); - return (EINVAL); - } else if (!(ch->flags & CHN_F_RUNNING)) { + return (ENXIO); + } else if (!(ch->flags & CHN_F_RUNNING)) ch->flags |= CHN_F_RUNNING; - ch->pid = runpid; - } /* * chn_read/write must give up channel lock in order to copy bytes @@ -517,8 +506,7 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) ch->inprog--; CHN_BROADCAST(&ch->cv); - - dsp_unlock_chans(priv, prio); + CHN_UNLOCK(ch); PCM_GIANT_LEAVE(d);