From nobody Tue Mar 4 15:47:06 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 4Z6g6N2BVQz5qGdn; Tue, 04 Mar 2025 15:47:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6g6L6VXzz42Wj; Tue, 04 Mar 2025 15:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741103226; 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=ISU8kJjHONdAaRvxW7gC8BZrcymf7F/c8W70ElsRbl0=; b=lRa3ov39FfXCQN/Askf743KUH3b5bdw+p+aIXA7dvx4UhtdcBbtfKwj3k41FirTcyGZKPr Iw4ywUfdU6mcsElpDxbZSLkHBinWtqWUEskIFLNTRK7BUdhN60HJoRtXvlBmuD9uxFs3No MT9oDUD536TZubJbvZRO2szY1zrmUdd14YUjRtZVtVuqrBd80UHI4u/MzphfwOBzrm3R9J 7rvboFAGSeb0y2oPFXcQe3lj/hky5x/kfaE3XFmhQ/qRYCfMFyTXVCfO1P3ky+IVQoHD1Y U1j2AYB70jppHprPMdecXSUhKsVkZPLQVyENaB275o2dNt1tvQs0ctkB2xtGfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741103226; a=rsa-sha256; cv=none; b=I900xBpZVbeCjm3BJWxwaTMsVCUhjVhjM5CuqG3h5yw+uIyYfJUxiube0QQcgmSdZyNKcy DyNhnrm3pXucTB6Sugv9TCrvA2gA0lPNf25FqqcOpWU9UKwhMIBLc8TxJJnqUfN6iOPBJl vch/gy+RI/5WOuEKarOLS4DMcAtZRFlh9KvJMsgY/jjSFp3kfSW98X+Ja5iZ8Y7yhiBRmZ 7xAuXYD79kq2emW4IUEh/N4u76Asl1HnmUHJ7Acnwc7rzbMGdB60kSwhg0lvRx1U17SNek gkXygTsKBRAvYqawarhLqZgG/zK8r5+rnzODAztvGuVQSxaP2V1/Xdzg0C952A== 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=1741103226; 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=ISU8kJjHONdAaRvxW7gC8BZrcymf7F/c8W70ElsRbl0=; b=I0Rt2xewoBXm0knrUNRRR11jz2KUKJTX4p4b5jqvhLpWaBgQqQrtuVYxocMDXiTfsWGZvc 39Gxdxt4HKHkUT8dkY+vlG41qF623Liw6WHsAq2OQ4/KpqA8Csu/GY7eD0fB+AslVRgirc ewVXabp8EOaBZlIYEIi8Jy9CU/N0QnTQAVK105H6G8xq2zALxpxpu+xBjRPjzE1o56VSrd X29HxTLjFpMys/gqTVLYYp4Icq5+o5/t0oumC3yyUqqx9Hoo70B7P0n+bw1QlDa4RcXYRi ndqtE2wNSNw9AcIuMus61PUNnGTNazqnTgJkyZednqapuPfCHQlfLSQEN+hcsQ== 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 4Z6g6L65Rpz7xW; Tue, 04 Mar 2025 15:47:06 +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 524Fl6nZ050136; Tue, 4 Mar 2025 15:47:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524Fl69o050133; Tue, 4 Mar 2025 15:47:06 GMT (envelope-from git) Date: Tue, 4 Mar 2025 15:47:06 GMT Message-Id: <202503041547.524Fl69o050133@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: cd4615c223b3 - stable/14 - sound: Simplify locking during device creation 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: cd4615c223b3f4ef1c892b682f57c83eebafde1c Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=cd4615c223b3f4ef1c892b682f57c83eebafde1c commit cd4615c223b3f4ef1c892b682f57c83eebafde1c Author: Christos Margiolis AuthorDate: 2025-02-25 11:44:24 +0000 Commit: Christos Margiolis CommitDate: 2025-03-04 15:46:06 +0000 sound: Simplify locking during device creation The mechanism of acquiring SD_F_BUSY in pcm_init() and releasing it in pcm_register() is a leftover from the previous device creation scheme, where pcm_init() (previously pcm_register()) would create the sysctl nodes, as well as the device node. In this scenario, acquiring SD_F_BUSY was necessary, in order to avoid races in case the device was accessed before it was ready for use. Commit 66f3eb14e955 ("sound: Move sysctl and /dev/dspX creation to pcm_setstatus()") fixed this issue, so we can simplify things now. Only acquire SD_F_BUSY in pcm_addchan(), because chn_init() expects to be called with SD_F_BUSY acquired. While here, move the sndstat_register() call further down to be more robust. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D48482 (cherry picked from commit fd906e47b18f53b09524647bf8431dc6170b8dfd) --- sys/dev/sound/pcm/sound.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 391c8e61dc19..9459b207bba0 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -136,9 +136,9 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) struct snddev_info *d = device_get_softc(dev); struct pcm_channel *ch; - PCM_BUSYASSERT(d); - PCM_LOCK(d); + PCM_WAIT(d); + PCM_ACQUIRE(d); ch = chn_init(d, NULL, cls, dir, devinfo); if (!ch) { device_printf(d->dev, "chn_init(%s, %d, %p) failed\n", @@ -146,6 +146,7 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) PCM_UNLOCK(d); return (ENODEV); } + PCM_RELEASE(d); PCM_UNLOCK(d); return (0); @@ -239,8 +240,6 @@ pcm_setstatus(device_t dev, char *str) if (d->flags & SD_F_REGISTERED) return (EINVAL); - PCM_BUSYASSERT(d); - if (d->playcount == 0 || d->reccount == 0) d->flags |= SD_F_SIMPLEX; @@ -253,17 +252,10 @@ pcm_setstatus(device_t dev, char *str) d->flags |= SD_F_RVCHANS; strlcpy(d->status, str, SND_STATUSLEN); - sndstat_register(dev, d->status); - - PCM_LOCK(d); /* Done, we're ready.. */ d->flags |= SD_F_REGISTERED; - PCM_RELEASE(d); - - PCM_UNLOCK(d); - /* * Create all sysctls once SD_F_REGISTERED is set else * tunable sysctls won't work: @@ -277,6 +269,8 @@ pcm_setstatus(device_t dev, char *str) else if (snd_unit_auto == 1) snd_unit = pcm_best_unit(snd_unit); + sndstat_register(dev, d->status); + return (dsp_make_dev(dev)); } @@ -435,7 +429,6 @@ pcm_register(device_t dev, void *devinfo, int numplay __unused, d->dev = dev; d->lock = snd_mtxcreate(device_get_nameunit(dev), "sound cdev"); cv_init(&d->cv, device_get_nameunit(dev)); - PCM_ACQUIRE_QUICK(d); i = 0; if (resource_int_value(device_get_name(dev), device_get_unit(dev),