imrcpan/freebsd
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-10-28 11:25:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

snd_hdsp*: malloc(9) with M_WAITOK

Browse Source 
Perform the allocations outside the lock section so that we can use
M_WAITOK. Holding the lock here is actually not really necessary and we
could just as well remove it, but keep it for consistency.

Sponsored by:	The FreeBSD Foundation
MFC after:	1 month
Reviewed by:	kib
Differential Revision:	https://reviews.freebsd.org/D59079
This commit is contained in:
Christos Margiolis committed 2026-08-22 15:48:50 +03:00
1 parent f4d953bea7
commit b5c1ab6c8f
2 files changed
+30 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sys/dev/sound/pci/hdsp-pcm.c
+15 -2
View File
@@ -676,10 +676,13 @@ hdspchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b,
struct sc_pcminfo *scp;
struct sc_chinfo *ch;
struct sc_info *sc;
struct pcmchan_caps *caps;
uint32_t *data;
int num;
scp = devinfo;
sc = scp->sc;
caps = malloc(sizeof(struct pcmchan_caps), M_HDSP, M_WAITOK);
mtx_lock(&sc->lock);
num = scp->chnum;
@@ -704,7 +707,7 @@ hdspchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b,
SND_FORMAT(AFMT_S32_LE, hdsp_port_slot_count(ch->ports, 192000), 0);
ch->cap_fmts[3] = 0;
ch->caps = malloc(sizeof(struct pcmchan_caps), M_HDSP, M_NOWAIT);
ch->caps = caps;
*(ch->caps) = (struct pcmchan_caps) {32000, 192000, ch->cap_fmts, 0};
/* HDSP 9652 does not support quad speed sample rates. */
@@ -715,7 +718,6 @@ hdspchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b,
/* Allocate maximum buffer size. */
ch->size = HDSP_CHANBUF_SIZE * hdsp_port_slot_count_max(ch->ports);
ch->data = malloc(ch->size, M_HDSP, M_NOWAIT);
ch->position = 0;
ch->buffer = b;
@@ -726,6 +728,17 @@ hdspchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b,
mtx_unlock(&sc->lock);
/*
* It is safe to access ch->size here without holding the lock, because
* 1) as of now, ch->size is written only once, here, and 2) ch's
* lifetime is equal to scp's lifetime so it cannot go away yet.
*/
data = malloc(ch->size, M_HDSP, M_WAITOK);
mtx_lock(&sc->lock);
ch->data = data;
mtx_unlock(&sc->lock);
if (sndbuf_setup(ch->buffer, ch->data, ch->size) != 0) {
device_printf(scp->dev, "Can't setup sndbuf.\n");
hdspchan_free(obj, ch);
sys/dev/sound/pci/hdspe-pcm.c
+15 -2
View File
@@ -670,10 +670,13 @@ hdspechan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b,
struct sc_pcminfo *scp;
struct sc_chinfo *ch;
struct sc_info *sc;
struct pcmchan_caps *caps;
uint32_t *data;
int num;
scp = devinfo;
sc = scp->sc;
caps = malloc(sizeof(struct pcmchan_caps), M_HDSPE, M_WAITOK);
mtx_lock(&sc->lock);
num = scp->chnum;
@@ -697,12 +700,11 @@ hdspechan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b,
ch->cap_fmts[2] =
SND_FORMAT(AFMT_S32_LE, hdspe_channel_count(ch->ports, 8), 0);
ch->cap_fmts[3] = 0;
ch->caps = malloc(sizeof(struct pcmchan_caps), M_HDSPE, M_NOWAIT);
ch->caps = caps;
*(ch->caps) = (struct pcmchan_caps) {32000, 192000, ch->cap_fmts, 0};
/* Allocate maximum buffer size. */
ch->size = HDSPE_CHANBUF_SIZE * hdspe_channel_count(ch->ports, 8);
ch->data = malloc(ch->size, M_HDSPE, M_NOWAIT);
ch->position = 0;
ch->buffer = b;
@@ -713,6 +715,17 @@ hdspechan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b,
mtx_unlock(&sc->lock);
/*
* It is safe to access ch->size here without holding the lock, because
* 1) as of now, ch->size is written only once, here, and 2) ch's
* lifetime is equal to scp's lifetime so it cannot go away yet.
*/
data = malloc(ch->size, M_HDSPE, M_WAITOK);
mtx_lock(&sc->lock);
ch->data = data;
mtx_unlock(&sc->lock);
if (sndbuf_setup(ch->buffer, ch->data, ch->size) != 0) {
device_printf(scp->dev, "Can't setup sndbuf.\n");
hdspechan_free(obj, ch);