Page MenuHomeFreeBSD
Differential D47322

sound: Move sysctl and /dev/dspX creation to pcm_setstatus()
ClosedPublic
Actions

Authored by christos on Oct 28 2024, 10:30 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Feb 24, 11:49 PM
Unknown Object (File)
Sat, Feb 22, 2:26 PM
Unknown Object (File)
Sat, Feb 22, 1:41 PM
Unknown Object (File)
Sat, Feb 22, 1:40 PM
Unknown Object (File)
Feb 16 2025, 11:44 AM
Unknown Object (File)
Feb 4 2025, 9:12 AM
Unknown Object (File)
Feb 1 2025, 5:24 PM
Unknown Object (File)
Jan 26 2025, 12:24 PM
View All 21 Files
Subscribers
imp

Details

Reviewers
markj
emaste
dev_submerge.ch
Commits
rG00c066cd575d: sound: Move sysctl and /dev/dspX creation to pcm_setstatus()
rG66f3eb14e955: sound: Move sysctl and /dev/dspX creation to pcm_setstatus()
Summary

Create the sysctl and /dev/dsp* nodes in pcm_setstatus(), which is
responsible for finalizing the device initialization, instead of doing
this in the middle of the initialization.

For the sysctl creation specifically, move them into pcm_sysinit(),
since this is where we create the rest of the sysctl nodes anyway.

A side effect of this change is, that we avoid the possibility of racing
in between pcm_register() and pcm_setstatus() by accessing /dev/dspX or
the sysctls within that window.

Sponsored by: The FreeBSD Foundation
MFC after: 1 week

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
sys/
dev/
sound/
pcm/
22 lines

Diff 145954

View Options

sys/dev/sound/pcm/sound.c

Show First 20 Lines • Show All 310 Lines • ▼ Show 20 Linespcm_setstatus(device_t dev, char *str)
if (snd_unit_auto < 0) if (snd_unit_auto < 0)
snd_unit_auto = (snd_unit < 0) ? 1 : 0; snd_unit_auto = (snd_unit < 0) ? 1 : 0;
if (snd_unit < 0 || snd_unit_auto > 1) if (snd_unit < 0 || snd_unit_auto > 1)
snd_unit = device_get_unit(dev); snd_unit = device_get_unit(dev);
else if (snd_unit_auto == 1) else if (snd_unit_auto == 1)
snd_unit = pcm_best_unit(snd_unit); snd_unit = pcm_best_unit(snd_unit);
return (0); return (dsp_make_dev(dev));
} }
uint32_t uint32_t
pcm_getflags(device_t dev) pcm_getflags(device_t dev)
{ {
struct snddev_info *d = device_get_softc(dev); struct snddev_info *d = device_get_softc(dev);
return d->flags; return d->flags;
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Lines
static void static void
pcm_sysinit(device_t dev) pcm_sysinit(device_t dev)
{ {
struct snddev_info *d = device_get_softc(dev); struct snddev_info *d = device_get_softc(dev);
u_int8_t mode; u_int8_t mode;
mode = pcm_mode_init(d); mode = pcm_mode_init(d);
sysctl_ctx_init(&d->play_sysctl_ctx);
d->play_sysctl_tree = SYSCTL_ADD_NODE(&d->play_sysctl_ctx,
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "play",
CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "playback channels node");
sysctl_ctx_init(&d->rec_sysctl_ctx);
d->rec_sysctl_tree = SYSCTL_ADD_NODE(&d->rec_sysctl_ctx,
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rec",
CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "recording channels node");
/* XXX: a user should be able to set this with a control tool, the /* XXX: a user should be able to set this with a control tool, the
sysadmin then needs min+max sysctls for this */ sysadmin then needs min+max sysctls for this */
SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
OID_AUTO, "buffersize", CTLFLAG_RD, &d->bufsz, 0, "allocated buffer size"); OID_AUTO, "buffersize", CTLFLAG_RD, &d->bufsz, 0, "allocated buffer size");
SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
"bitperfect", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, d, "bitperfect", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, d,
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Linespcm_register(device_t dev, void *devinfo, int numplay, int numrec)
CHN_INIT(d, channels.pcm); CHN_INIT(d, channels.pcm);
CHN_INIT(d, channels.pcm.busy); CHN_INIT(d, channels.pcm.busy);
CHN_INIT(d, channels.pcm.opened); CHN_INIT(d, channels.pcm.opened);
/* XXX This is incorrect, but lets play along for now. */ /* XXX This is incorrect, but lets play along for now. */
if ((numplay == 0 || numrec == 0) && numplay != numrec) if ((numplay == 0 || numrec == 0) && numplay != numrec)
d->flags |= SD_F_SIMPLEX; d->flags |= SD_F_SIMPLEX;
sysctl_ctx_init(&d->play_sysctl_ctx);
d->play_sysctl_tree = SYSCTL_ADD_NODE(&d->play_sysctl_ctx,
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "play",
CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "playback channels node");
sysctl_ctx_init(&d->rec_sysctl_ctx);
d->rec_sysctl_tree = SYSCTL_ADD_NODE(&d->rec_sysctl_ctx,
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rec",
CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "recording channels node");
if (numplay > 0 || numrec > 0) if (numplay > 0 || numrec > 0)
d->flags |= SD_F_AUTOVCHAN; d->flags |= SD_F_AUTOVCHAN;
sndstat_register(dev, d->status); sndstat_register(dev, d->status);
return (dsp_make_dev(dev)); return (0);
} }
int int
pcm_unregister(device_t dev) pcm_unregister(device_t dev)
{ {
struct snddev_info *d; struct snddev_info *d;
struct pcm_channel *ch; struct pcm_channel *ch;
▲ Show 20 Lines • Show All 299 Lines • Show Last 20 Lines