Skip to content

Fix memory leaks with zephyr native drivers #6540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 3 commits into from
Nov 7, 2022
Merged

Fix memory leaks with zephyr native drivers #6540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
355aecc
lib: dma: free dma channels when ref count is 0
ranj063 Nov 6, 2022
df8318f
lib: dma: return NULL when DMA init fails
ranj063 Nov 6, 2022
2f225f8
dai-zephyr: Free DMA config block during reset
ranj063 Nov 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/audio/dai-zephyr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,7 @@ static int dai_reset(struct comp_dev *dev)
dai_dma_release(dev);

dma_sg_free(&config->elem_array);
rfree(dd->z_config->head_block);
rfree(dd->z_config);

if (dd->dma_buffer) {
Expand Down
14 changes: 9 additions & 5 deletions src/lib/dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,25 +110,29 @@ struct dma *dma_get(uint32_t dir, uint32_t cap, uint32_t dev, uint32_t flags)
if (ret < 0) {
tr_err(&dma_tr, "dma_get(): dma-probe failed id = %d, ret = %d",
dmin->plat_data.id, ret);
goto out;
}
}
if (!ret)
dmin->sref++;

dmin->sref++;

tr_info(&dma_tr, "dma_get() ID %d sref = %d busy channels %ld",
dmin->plat_data.id, dmin->sref,
atomic_read(&dmin->num_channels_busy));

out:
k_spin_unlock(&dmin->lock, key);
return dmin;
return !ret ? dmin : NULL;
}

void dma_put(struct dma *dma)
{
k_spinlock_key_t key;

key = k_spin_lock(&dma->lock);
--dma->sref;
if (--dma->sref == 0) {
rfree(dma->chan);
dma->chan = NULL;
}
Copy link
Collaborator

@kv2019i kv2019i Nov 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this, we lose one "dma->chan = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED" worth of memory whenever sref goes to 1->0 and back.


tr_info(&dma_tr, "dma_put(), dma = %p, sref = %d",
dma, dma->sref);
Expand Down