Skip to content

Commit 9d8e536

Browse files
committed
ALSA: memalloc: Try dma_alloc_noncontiguous() at first
The latest fix for the non-contiguous memalloc helper changed the allocation method for a non-IOMMU system to use only the fallback allocator. This should have worked, but it caused a problem sometimes when too many non-contiguous pages are allocated that can't be treated by HD-audio controller. As a quirk workaround, go back to the original strategy: use dma_alloc_noncontiguous() at first, and apply the fallback only when it fails, but only for non-IOMMU case. We'll need a better fix in the fallback code as well, but this workaround should paper over most cases. Fixes: 9736a32 ("ALSA: memalloc: Don't fall back for SG-buffer with IOMMU") Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Link: https://lore.kernel.org/r/CAHk-=wgSH5ubdvt76gNwa004ooZAEJL_1Q-Fyw5M2FDdqL==dg@mail.gmail.com Link: https://lore.kernel.org/r/20221112084718.3305-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 9a5523f commit 9d8e536

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

sound/core/memalloc.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,18 +542,17 @@ static void *snd_dma_noncontig_alloc(struct snd_dma_buffer *dmab, size_t size)
542542
struct sg_table *sgt;
543543
void *p;
544544

545+
sgt = dma_alloc_noncontiguous(dmab->dev.dev, size, dmab->dev.dir,
546+
DEFAULT_GFP, 0);
545547
#ifdef CONFIG_SND_DMA_SGBUF
546-
if (!get_dma_ops(dmab->dev.dev)) {
548+
if (!sgt && !get_dma_ops(dmab->dev.dev)) {
547549
if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC_SG)
548550
dmab->dev.type = SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK;
549551
else
550552
dmab->dev.type = SNDRV_DMA_TYPE_DEV_SG_FALLBACK;
551553
return snd_dma_sg_fallback_alloc(dmab, size);
552554
}
553555
#endif
554-
555-
sgt = dma_alloc_noncontiguous(dmab->dev.dev, size, dmab->dev.dir,
556-
DEFAULT_GFP, 0);
557556
if (!sgt)
558557
return NULL;
559558

0 commit comments

Comments
 (0)