From nobody Tue Feb 25 11:48:22 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 4Z2G872xTTz5pjm5; Tue, 25 Feb 2025 11:48:23 +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 4Z2G8654LTz3kZ2; Tue, 25 Feb 2025 11:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740484102; 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=DxA0Vi/aHMmz6l3M2U9N6TKBeXiqZ3jT/nMDr6UHrqc=; b=V84J91ZDHCud+J6l9HLBjISwbzmZpD2NM+3/2dzBdywktCpllNS3PIdwCijsI6V0+v9GbJ 62Y58QytKWC9+H89vzUCTybQWOWs5SmFVWo9WcQMJnCK3QnOaouBeUQBf9d6kxlKJVAS1m Q6ZGKdSjN5QKzmiGIsC3SiioJqWqUbl/IsMThh8JyAU6hQJTQz/LmzVzeop5WDHSgdNYZN 8GU/HFdEErf2xlUTTi0MleEo6NGx5Gw/90rZ5IEuFfLmuDfcbwbHh1kCRlO1x8JUkOKqdz 30dZQqainxulAJjGF+hXwh0WopTbRf7SK9MfknfcB9Bm24tk/S1b+pFVwRr3uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740484102; a=rsa-sha256; cv=none; b=CaFnM9A6SQlE1Q2lV+weEYP5gHG+zPycFDJGm+NWs6zlRZ9WxPbsfUZblaRiZpXWXgSrDu Hf+KG9LwFl4S0EEcdKzoCC9qziMfGjv3Ay3yY3xAnvW5cr5rmj6pn1JgyZWlVbdypNT78D 1P40f8zJN0sPoYAjdsN3QCfosXy0bILnEGCrRjydkXWGXCJIyrg8fJm22T7x7y7SZi3m0t d+9KIfViDD2PX24KtDlN8XdjV3HY0jxAgx6bBslrTE+GZQ5ku1SIEFSyFDm+oWpBDFITEM r1QEp6CcQHUwwHdezBjnu7rEOIcXWef+pFNvyt5nVV2y6ZwZrP0Rqg9kmunPHQ== 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=1740484102; 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=DxA0Vi/aHMmz6l3M2U9N6TKBeXiqZ3jT/nMDr6UHrqc=; b=GrdQgjkBrlMhk53GVk2kto5F03DdUrfu3pGDXR8n6LnYWJOrUZa0+1E//zZ4vW36ljy88Z Cp6F4h1XVmakUbF0kbOteepWilf2jQurw1ripLyGmZbBpNVR0qlSyNuJBLnehZXRacL3EI 9lu/h93yntW9ZrYmMbgkuPyrCRE6UC4pTaUZuWLKCiafemchJbu93oeFXgh92G4AO9a0pN GCDy0s/IXgYhw8eYjhfhdzCeZ7lWVn7N1kQ8kjbfcIJxhVQ4hUqdfkGN0cMCp+F+2o/anH BFna8H/jiOJmdbpE5feft8dY+gWoWatUWZnsDnHgNDXzacoP6p/CK/h6ROH6AQ== 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 4Z2G864dJ6z94L; Tue, 25 Feb 2025 11:48:22 +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 51PBmM0p051137; Tue, 25 Feb 2025 11:48:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51PBmMcO051134; Tue, 25 Feb 2025 11:48:22 GMT (envelope-from git) Date: Tue, 25 Feb 2025 11:48:22 GMT Message-Id: <202502251148.51PBmMcO051134@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: fd906e47b18f - main - sound: Simplify locking during device creation 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: fd906e47b18f53b09524647bf8431dc6170b8dfd Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=fd906e47b18f53b09524647bf8431dc6170b8dfd commit fd906e47b18f53b09524647bf8431dc6170b8dfd Author: Christos Margiolis AuthorDate: 2025-02-25 11:44:24 +0000 Commit: Christos Margiolis CommitDate: 2025-02-25 11:44:24 +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 --- 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 c0934dde7718..3e76626f5c57 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); @@ -388,7 +389,6 @@ pcm_init(device_t dev, void *devinfo) 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), @@ -428,8 +428,6 @@ pcm_register(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; @@ -442,17 +440,10 @@ pcm_register(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: @@ -466,6 +457,8 @@ pcm_register(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)); }