ALSA: memalloc: Use DMA API for x86 WC page allocations, too
PATCH 1/2 ALSA: memalloc: Use DMA API for x86 WC page allocations, too
The memalloc helper used a house-made code for allocation of WC pages on x86, since the standard DMA API doesn't cover it well. Meanwhile, the manually allocated pages won't work together with IOMMU, resulting in faults, so we should switch to the DMA API in that case, instead.
This patch tries to switch back to DMA API for WC pages on x86, but with some additional tweaks that are missing.
--- sound/core/memalloc.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-)
sound/core/memalloc.c +17 -18
@@ -492,40 +492,39 @@ static const struct snd_malloc_ops snd_dma_dev_ops = {*/ /* x86-specific allocations */ #ifdef CONFIG_SND_DMA_SGBUF -static void *snd_dma_wc_alloc (struct snd_dma_buffer *dmab,size_t size) -{ -return do_alloc_pages (dmab->dev.dev, size, &dmab->addr, true); -} - -static void snd_dma_wc_free (struct snd_dma_buffer *dmab) -{ -do_free_pages (dmab->area, dmab->bytes, true); -} - -static int snd_dma_wc_mmap (struct snd_dma_buffer *dmab, -struct vm_area_struct *area) -{ - area->vm_page_prot =pgprot_writecombine (area->vm_page_prot); -return snd_dma_continuous_mmap (dmab, area); -} +#define x86_fallback (dmab) (!get_dma_ops(dmab->dev.dev))#else +#define x86_fallback (dmab) false +#endif +static void *snd_dma_wc_alloc (struct snd_dma_buffer *dmab,size_t size) { +if (x86_fallback (dmab)) +return do_alloc_pages (dmab->dev.dev, size, &dmab->addr, true);return dma_alloc_wc (dmab->dev.dev, size, &dmab->addr,DEFAULT_GFP ); }static void snd_dma_wc_free (struct snd_dma_buffer *dmab) { +if (x86_fallback (dmab)) { +do_free_pages (dmab->area, dmab->bytes, true); +return ; + }dma_free_wc (dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); }static int snd_dma_wc_mmap (struct snd_dma_buffer *dmab,struct vm_area_struct *area) { +#ifdef CONFIG_SND_DMA_SGBUF +if (x86_fallback (dmab)) { + area->vm_page_prot =pgprot_writecombine (area->vm_page_prot); +return snd_dma_continuous_mmap (dmab, area); + } +#endif return dma_mmap_wc (dmab->dev.dev, area, dmab->area, dmab->addr, dmab->bytes); } -#endif /* CONFIG_SND_DMA_SGBUF */ static const struct snd_malloc_ops snd_dma_wc_ops = { .alloc = snd_dma_wc_alloc,
@@ -548,7 +547,7 @@ static void *snd_dma_noncontig_alloc(struct snd_dma_buffer *dmab, size_t size) sgt =dma_alloc_noncontiguous (dmab->dev.dev, size, dmab->dev.dir,DEFAULT_GFP ,0 );#ifdef CONFIG_SND_DMA_SGBUF -if (!sgt && !get_dma_ops (dmab->dev.dev)) +if (!sgt &&x86_fallback (dmab))return snd_dma_sg_fallback_alloc (dmab, size);#endif if (!sgt)
Signature · 1 line
2.43.0
PATCH 2/2 ALSA: memalloc: Let IOMMU handle S/G primarily
The recent changes in IOMMU made the non-contiguous page allocations as default, hence we can simply use the standard DMA allocation for the S/G pages as well. In this patch, we simplify the code by trying the standard DMA allocation at first, instead of dma_alloc_noncontiguous().
For the case without IOMMU, we still need to manage the S/G pages manually, so we keep the same fallback routines like before.
The fallback types (SNDRV_DMA_TYPE_DEV_SG_FALLBACK & co) are dropped / folded into SNDRV_DMA_TYPE_DEV_SG and co now. The allocation via the standard DMA call overrides the type accordingly, hence we don't have to have extra fallback types any longer. OTOH, SNDRV_DMA_TYPE_DEV_SG is no longer an alias but became its own type back again.
Note that this patch requires another prerequisite fix for memmalloc helper to use the DMA API for WC pages on x86.
--- include/sound/memalloc.h | 7 +-- sound/core/memalloc.c | 107 ++++++++++++--------------------------- 2 files changed, 34 insertions(+), 80 deletions(-)
include/sound/memalloc.h +1 -6
@@ -42,17 +42,12 @@ struct snd_dma_device {#define SNDRV_DMA_TYPE_NONCONTIG 8/* non-coherent SG buffer */ #define SNDRV_DMA_TYPE_NONCOHERENT 9/* non-coherent buffer */ #ifdef CONFIG_SND_DMA_SGBUF -#define SNDRV_DMA_TYPE_DEV_SG SNDRV_DMA_TYPE_NONCONTIG +#define SNDRV_DMA_TYPE_DEV_SG 3/* S/G pages */ #define SNDRV_DMA_TYPE_DEV_WC_SG 6/* SG write-combined */ #else #define SNDRV_DMA_TYPE_DEV_SG SNDRV_DMA_TYPE_DEV/* no SG-buf support */ #define SNDRV_DMA_TYPE_DEV_WC_SG SNDRV_DMA_TYPE_DEV_WC#endif -/* fallback types, don't use those directly */ -#ifdef CONFIG_SND_DMA_SGBUF -#define SNDRV_DMA_TYPE_DEV_SG_FALLBACK 10 -#define SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK 11 -#endif /* * info for buffer allocation
sound/core/memalloc.c +33 -74
172 lines not on this page · raw message
Signature · 1 line
2.43.0