ALSA: More abstracition of memory alloc helpers
cover ALSA: More abstracition of memory alloc helpers
Hi,
this is a patch set for the code cleanup and refactoring around the ALSA core memory allocation helpers. It begins with a cleanup of the non-used code, then followed by the refacotoring with the new ops, finally moved the memory-specific mmap handling code from PCM to the core memalloc.
Takashi
===
Takashi Iwai (5):
ALSA: trident: Drop shadow TLB pointer table
ALSA: core: Drop snd_sgbuf_get_ptr()
ALSA: core: Abstract memory alloc helpers
ALSA: core: Move mmap handler into memalloc ops
ALSA: core: Add continuous and vmalloc mmap ops
include/sound/memalloc.h | 83 +----- include/sound/pcm.h | 19 -- sound/core/memalloc.c | 444 +++++++++++++++++++---------- sound/core/memalloc_local.h | 19 ++ sound/core/pcm_local.h | 5 - sound/core/pcm_memory.c | 21 -- sound/core/pcm_native.c | 39 +-- sound/core/sgbuf.c | 90 ++++-- sound/pci/trident/trident.h | 1 - sound/pci/trident/trident_main.c | 11 +- sound/pci/trident/trident_memory.c | 53 ++-- 11 files changed, 405 insertions(+), 380 deletions(-) create mode 100644 sound/core/memalloc_local.h
Signature · 1 line
2.26.2
PATCH 1/5 ALSA: trident: Drop shadow TLB pointer table
The shadow TLB pointer table is allocated and set up, but never really used any longer by the driver. Let's drop it.
Since this is the only user of snd_pcm_sgbuf_get_ptr(), we can clean up the API after this change.
--- sound/pci/trident/trident.h | 1 - sound/pci/trident/trident_main.c | 11 +------ sound/pci/trident/trident_memory.c | 53 +++++++++--------------------- 3 files changed, 17 insertions(+), 48 deletions(-)
sound/pci/trident/trident.h +0 -1
@@ -251,7 +251,6 @@ struct snd_trident_memblk_arg {struct snd_trident_tlb {__le32 *entries;/* 16k-aligned TLB table */ dma_addr_t entries_dmaaddr;/* 16k-aligned PCI address to TLB table */ -unsigned long * shadow_entries;/* shadow entries with virtual addresses */ struct snd_dma_buffer buffer;struct snd_util_memhdr * memhdr;/* page allocation list */ struct snd_dma_buffer silent_page;
sound/pci/trident/trident_main.c +1 -10
@@ -3331,12 +3331,6 @@ static int snd_trident_tlb_alloc(struct snd_trident *trident) } trident->tlb.entries = (__le32 *)ALIGN ((unsigned long )trident->tlb.buffer.area,SNDRV_TRIDENT_MAX_PAGES *4 ); trident->tlb.entries_dmaaddr =ALIGN (trident->tlb.buffer.addr,SNDRV_TRIDENT_MAX_PAGES *4 ); -/* allocate shadow TLB page table (virtual addresses) */ - trident->tlb.shadow_entries = -vmalloc (array_size (SNDRV_TRIDENT_MAX_PAGES , -sizeof (unsigned long ))); -if (!trident->tlb.shadow_entries) -return -ENOMEM ;/* allocate and setup silent page and initialise TLB entries */ if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &trident->pci->dev,
@@ -3345,10 +3339,8 @@ static int snd_trident_tlb_alloc(struct snd_trident *trident)return -ENOMEM ; }memset (trident->tlb.silent_page.area,0 ,SNDRV_TRIDENT_PAGE_SIZE ); -for (i =0 ; i <SNDRV_TRIDENT_MAX_PAGES ; i++) { +for (i =0 ; i <SNDRV_TRIDENT_MAX_PAGES ; i++) trident->tlb.entries[i] =cpu_to_le32 (trident->tlb.silent_page.addr & ~(SNDRV_TRIDENT_PAGE_SIZE -1 )); - trident->tlb.shadow_entries[i] = (unsigned long )trident->tlb.silent_page.area; - }/* use emu memory block manager code to manage tlb page allocation */ trident->tlb.memhdr =snd_util_memhdr_new (SNDRV_TRIDENT_PAGE_SIZE *SNDRV_TRIDENT_MAX_PAGES );
@@ -3665,7 +3657,6 @@ static int snd_trident_free(struct snd_trident *trident)snd_util_memhdr_free (trident->tlb.memhdr);if (trident->tlb.silent_page.area)snd_dma_free_pages (&trident->tlb.silent_page); -vfree (trident->tlb.shadow_entries);snd_dma_free_pages (&trident->tlb.buffer); }pci_release_regions (trident->pci);
sound/pci/trident/trident_memory.c +16 -37
138 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 2/5 ALSA: core: Drop snd_sgbuf_get_ptr()
In reply to Takashi Iwaisnd_sgbuf_get_ptr() and its sibling snd_pcm_sgbuf_get_ptr() are no longer used by any drivers. Let's drop them.
--- include/sound/memalloc.h | 19 ------------------- include/sound/pcm.h | 11 ----------- 2 files changed, 30 deletions(-)
include/sound/memalloc.h +0 -19
@@ -103,19 +103,6 @@ static inline dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab, return addr + offset % PAGE_SIZE; } -/* -* return the virtual address at the corresponding offset -*/ -static inline void *snd_sgbuf_get_ptr (struct snd_dma_buffer *dmab, -size_t offset) -{ -struct snd_sg_buf *sgbuf = dmab->private_data; - -if (!sgbuf) -return dmab->area + offset; -return sgbuf->table[offset >>PAGE_SHIFT ].buf + offset %PAGE_SIZE ; -} -unsigned int snd_sgbuf_get_chunk_size (struct snd_dma_buffer *dmab,unsigned int ofs,unsigned int size);#else
@@ -126,12 +113,6 @@ static inline dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab, return dmab->addr + offset; } -static inline void *snd_sgbuf_get_ptr (struct snd_dma_buffer *dmab, -size_t offset) -{ -return dmab->area + offset; -} -#define snd_sgbuf_get_chunk_size (dmab, ofs, size) (size)#endif /* CONFIG_SND_DMA_SGBUF */
include/sound/pcm.h +0 -11
@@ -1272,17 +1272,6 @@ snd_pcm_sgbuf_get_addr(struct snd_pcm_substream *substream, unsigned int ofs)return snd_sgbuf_get_addr (snd_pcm_get_dma_buf (substream), ofs); } -/** -* snd_pcm_sgbuf_get_ptr - Get the virtual address at the corresponding offset -* @substream: PCM substream -* @ofs: byte offset -*/ -static inline void * -snd_pcm_sgbuf_get_ptr (struct snd_pcm_substream *substream,unsigned int ofs) -{ -return snd_sgbuf_get_ptr (snd_pcm_get_dma_buf (substream), ofs); -} -/** * snd_pcm_sgbuf_get_chunk_size - Compute the max size that fits within the * contig. page from the given size
Signature · 1 line
2.26.2
PATCH 3/5 ALSA: core: Abstract memory alloc helpers
In reply to Takashi IwaiThis patch introduces the ops table to each memory allocation type (SNDRV_DMA_TYPE_XXX) and abstract the handling for the better code management. Then we get separate the page allocation, release and other tasks for each type, especially for the SG buffer.
Each buffer type has now callbacks in the struct snd_malloc_ops, and the common helper functions call those ops accordingly. The former inline code that is specific to SG-buffer is moved into the local sgbuf.c, and we can simplify the PCM code without details of memory handling.
--- include/sound/memalloc.h | 61 +----- include/sound/pcm.h | 8 - sound/core/memalloc.c | 391 ++++++++++++++++++++++-------------- sound/core/memalloc_local.h | 18 ++ sound/core/pcm_local.h | 5 - sound/core/pcm_memory.c | 21 -- sound/core/pcm_native.c | 20 +- sound/core/sgbuf.c | 90 ++++++--- 8 files changed, 328 insertions(+), 286 deletions(-) create mode 100644 sound/core/memalloc_local.h
include/sound/memalloc.h +6 -55
@@ -9,9 +9,8 @@#ifndef __SOUND_MEMALLOC_H#define __SOUND_MEMALLOC_H -#include <asm/page.h> -struct device ; +struct page ;/* * buffer device info
@@ -64,59 +63,6 @@ static inline unsigned int snd_sgbuf_aligned_pages(size_t size)return (size +PAGE_SIZE -1 ) >>PAGE_SHIFT ; } -#ifdef CONFIG_SND_DMA_SGBUF -/* -* Scatter-Gather generic device pages -*/ -void *snd_malloc_sgbuf_pages (struct device *device, -size_t size,struct snd_dma_buffer *dmab, -size_t *res_size); -int snd_free_sgbuf_pages (struct snd_dma_buffer *dmab); - -struct snd_sg_page { -void *buf; -dma_addr_t addr; -}; - -struct snd_sg_buf { -int size;/* allocated byte size */ -int pages;/* allocated pages */ -int tblsize;/* allocated table size */ -struct snd_sg_page *table;/* address table */ -struct page **page_table;/* page table (for vmap/vunmap) */ -struct device *dev; -}; - -/* -* return the physical address at the corresponding offset -*/ -static inline dma_addr_t snd_sgbuf_get_addr (struct snd_dma_buffer *dmab, -size_t offset) -{ -struct snd_sg_buf *sgbuf = dmab->private_data; -dma_addr_t addr; - -if (!sgbuf) -return dmab->addr + offset; - addr = sgbuf->table[offset >>PAGE_SHIFT ].addr; - addr &= ~((dma_addr_t )PAGE_SIZE -1 ); -return addr + offset %PAGE_SIZE ; -} - -unsigned int snd_sgbuf_get_chunk_size (struct snd_dma_buffer *dmab, -unsigned int ofs,unsigned int size); -#else -/* non-SG versions */ -static inline dma_addr_t snd_sgbuf_get_addr (struct snd_dma_buffer *dmab, -size_t offset) -{ -return dmab->addr + offset; -} - -#define snd_sgbuf_get_chunk_size (dmab, ofs, size) (size) - -#endif /* CONFIG_SND_DMA_SGBUF */ -/* allocate/release a buffer */ int snd_dma_alloc_pages (int type,struct device *dev,size_t size,struct snd_dma_buffer *dmab);
@@ -124,5 +70,10 @@ int snd_dma_alloc_pages_fallback(int type, struct device *dev, size_t size, struct snd_dma_buffer *dmab);void snd_dma_free_pages (struct snd_dma_buffer *dmab); +dma_addr_t snd_sgbuf_get_addr (struct snd_dma_buffer *dmab,size_t offset); +struct page *snd_sgbuf_get_page (struct snd_dma_buffer *dmab,size_t offset); +unsigned int snd_sgbuf_get_chunk_size (struct snd_dma_buffer *dmab, +unsigned int ofs,unsigned int size); +#endif /* __SOUND_MEMALLOC_H */
include/sound/pcm.h +0 -8
@@ -1253,14 +1253,6 @@ static inline int snd_pcm_lib_alloc_vmalloc_32_buffer#define snd_pcm_get_dma_buf (substream) ((substream)->runtime->dma_buffer_p) -#ifdef CONFIG_SND_DMA_SGBUF -/* -* SG-buffer handling -*/ -#define snd_pcm_substream_sgbuf (substream) \ - snd_pcm_get_dma_buf(substream)->private_data -#endif /* SND_DMA_SGBUF */ -/** * snd_pcm_sgbuf_get_addr - Get the DMA address at the corresponding offset * @substream: PCM substream
sound/core/memalloc.c +244 -147
432 lines not on this page · raw message
sound/core/memalloc_local.h new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0-only +#ifndef __MEMALLOC_LOCAL_H +#define __MEMALLOC_LOCAL_H + +struct snd_malloc_ops { +int (*alloc)(struct snd_dma_buffer *dmab,size_t size); +void (*free)(struct snd_dma_buffer *dmab); +dma_addr_t (*get_addr)(struct snd_dma_buffer *dmab,size_t offset); +struct page *(*get_page)(struct snd_dma_buffer *dmab,size_t offset); +unsigned int (*get_chunk_size)(struct snd_dma_buffer *dmab, +unsigned int ofs,unsigned int size); +}; + +#ifdef CONFIG_SND_DMA_SGBUF +extern const struct snd_malloc_ops snd_dma_sg_ops; +#endif + +#endif /* __MEMALLOC_LOCAL_H */
sound/core/pcm_local.h +0 -5
@@ -65,11 +65,6 @@ void __snd_pcm_xrun(struct snd_pcm_substream *substream);void snd_pcm_group_init (struct snd_pcm_group *group);void snd_pcm_sync_stop (struct snd_pcm_substream *substream,bool sync_irq); -#ifdef CONFIG_SND_DMA_SGBUF -struct page *snd_pcm_sgbuf_ops_page (struct snd_pcm_substream *substream, -unsigned long offset); -#endif -#define PCM_RUNTIME_CHECK (sub) snd_BUG_ON(!(sub) || !(sub)->runtime)/* loop over all PCM substreams */
sound/core/pcm_memory.c +0 -21
@@ -337,27 +337,6 @@ void snd_pcm_set_managed_buffer_all(struct snd_pcm *pcm, int type, }EXPORT_SYMBOL (snd_pcm_set_managed_buffer_all); -#ifdef CONFIG_SND_DMA_SGBUF -/* -* snd_pcm_sgbuf_ops_page - get the page struct at the given offset -* @substream: the pcm substream instance -* @offset: the buffer offset -* -* Used as the page callback of PCM ops. -* -* Return: The page struct at the given buffer offset. %NULL on failure. -*/ -struct page *snd_pcm_sgbuf_ops_page (struct snd_pcm_substream *substream,unsigned long offset) -{ -struct snd_sg_buf *sgbuf =snd_pcm_substream_sgbuf (substream); - -unsigned int idx = offset >>PAGE_SHIFT ; -if (idx >= (unsigned int )sgbuf->pages) -return NULL ; -return sgbuf->page_table[idx]; -} -#endif /* CONFIG_SND_DMA_SGBUF */ -/** * snd_pcm_lib_malloc_pages - allocate the DMA buffer * @substream: the substream to allocate the DMA buffer to
sound/core/pcm_native.c +1 -19
@@ -3644,24 +3644,6 @@ static int snd_pcm_mmap_control(struct snd_pcm_substream *substream, struct file }#endif /* coherent mmap */ -static inline struct page * -snd_pcm_default_page_ops (struct snd_pcm_substream *substream,unsigned long ofs) -{ -void *vaddr = substream->runtime->dma_area + ofs; - -switch (substream->dma_buffer.dev.type) { -#ifdef CONFIG_SND_DMA_SGBUF -case SNDRV_DMA_TYPE_DEV_SG : -case SNDRV_DMA_TYPE_DEV_UC_SG : -return snd_pcm_sgbuf_ops_page (substream, ofs); -#endif /* CONFIG_SND_DMA_SGBUF */ -case SNDRV_DMA_TYPE_VMALLOC : -return vmalloc_to_page (vaddr); -default : -return virt_to_page (vaddr); - } -} -/* * fault callback for mmapping a RAM page */
@@ -3683,7 +3665,7 @@ static vm_fault_t snd_pcm_mmap_data_fault(struct vm_fault *vmf)if (substream->ops->page) page = substream->ops->page (substream, offset);else - page =snd_pcm_default_page_ops (substream, offset); + page =snd_sgbuf_get_page (snd_pcm_get_dma_buf (substream), offset);if (!page)return VM_FAULT_SIGBUS ;get_page (page);
sound/core/sgbuf.c +59 -31
155 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 4/5 ALSA: core: Move mmap handler into memalloc ops
In reply to Takashi IwaiThis patch moves the mmap handling code into the common memalloc handler. It allows us to reduce the memory-type specific code in PCM code gracefully.
--- include/sound/memalloc.h | 3 +++ sound/core/memalloc.c | 36 ++++++++++++++++++++++++++++++++++++ sound/core/memalloc_local.h | 1 + sound/core/pcm_native.c | 19 +++---------------- 4 files changed, 43 insertions(+), 16 deletions(-)
include/sound/memalloc.h +3 -0
@@ -11,6 +11,7 @@struct device ;struct page ; +struct vm_area_struct ;/* * buffer device info
@@ -69,6 +70,8 @@ int snd_dma_alloc_pages(int type, struct device *dev, size_t size,int snd_dma_alloc_pages_fallback (int type,struct device *dev,size_t size,struct snd_dma_buffer *dmab);void snd_dma_free_pages (struct snd_dma_buffer *dmab); +int snd_dma_buffer_mmap (struct snd_dma_buffer *dmab, +struct vm_area_struct *area);dma_addr_t snd_sgbuf_get_addr (struct snd_dma_buffer *dmab,size_t offset);struct page *snd_sgbuf_get_page (struct snd_dma_buffer *dmab,size_t offset);
sound/core/memalloc.c +36 -0
@@ -127,6 +127,23 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab) }EXPORT_SYMBOL (snd_dma_free_pages); +/** +* snd_dma_buffer_mmap - perform mmap of the given DMA buffer +* @dmab: buffer allocation information +* @area: VM area information +*/ +int snd_dma_buffer_mmap (struct snd_dma_buffer *dmab, +struct vm_area_struct *area) +{ +const struct snd_malloc_ops *ops =snd_dma_get_ops (dmab); + +if (ops && ops->mmap) +return ops->mmap (dmab, area); +else +return -ENOENT ; +} +EXPORT_SYMBOL (snd_dma_buffer_mmap); +/** * snd_sgbuf_get_addr - return the physical address at the corresponding offset * @dmab: buffer allocation information
@@ -283,9 +300,20 @@ static void snd_dma_iram_free(struct snd_dma_buffer *dmab) gen_pool_free(pool, (unsigned long)dmab->area, dmab->bytes); } +static int snd_dma_iram_mmap (struct snd_dma_buffer *dmab, +struct vm_area_struct *area) +{ + area->vm_page_prot =pgprot_writecombine (area->vm_page_prot); +return remap_pfn_range (area, area->vm_start, + dmab->addr >>PAGE_SHIFT , + area->vm_end - area->vm_start, + area->vm_page_prot); +} +static const struct snd_malloc_ops snd_dma_iram_ops = { .alloc = snd_dma_iram_alloc, .free = snd_dma_iram_free, + .mmap = snd_dma_iram_mmap, };#endif /* CONFIG_GENERIC_ALLOCATOR */
@@ -320,9 +348,17 @@ static void snd_dma_dev_free(struct snd_dma_buffer *dmab) dma_free_coherent(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); } +static int snd_dma_dev_mmap (struct snd_dma_buffer *dmab, +struct vm_area_struct *area) +{ +return dma_mmap_coherent (dmab->dev.dev, area, + dmab->area, dmab->addr, dmab->bytes); +} +static const struct snd_malloc_ops snd_dma_dev_ops = { .alloc = snd_dma_dev_alloc, .free = snd_dma_dev_free, + .mmap = snd_dma_dev_mmap, };#endif /* CONFIG_HAS_DMA */
sound/core/memalloc_local.h +1 -0
@@ -9,6 +9,7 @@ struct snd_malloc_ops {struct page *(*get_page)(struct snd_dma_buffer *dmab,size_t offset);unsigned int (*get_chunk_size)(struct snd_dma_buffer *dmab,unsigned int ofs,unsigned int size); +int (*mmap)(struct snd_dma_buffer *dmab,struct vm_area_struct *area); };#ifdef CONFIG_SND_DMA_SGBUF
sound/core/pcm_native.c +3 -16
@@ -3700,22 +3700,9 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream, struct vm_area_struct *area) { area->vm_flags |=VM_DONTEXPAND |VM_DONTDUMP ; -#ifdef CONFIG_GENERIC_ALLOCATOR -if (substream->dma_buffer.dev.type ==SNDRV_DMA_TYPE_DEV_IRAM ) { - area->vm_page_prot =pgprot_writecombine (area->vm_page_prot); -return remap_pfn_range (area, area->vm_start, - substream->dma_buffer.addr >>PAGE_SHIFT , - area->vm_end - area->vm_start, area->vm_page_prot); - } -#endif /* CONFIG_GENERIC_ALLOCATOR */ -if (IS_ENABLED (CONFIG_HAS_DMA ) && !substream->ops->page && - (substream->dma_buffer.dev.type ==SNDRV_DMA_TYPE_DEV || - substream->dma_buffer.dev.type ==SNDRV_DMA_TYPE_DEV_UC )) -return dma_mmap_coherent (substream->dma_buffer.dev.dev, - area, - substream->runtime->dma_area, - substream->runtime->dma_addr, - substream->runtime->dma_bytes); +if (!substream->ops->page && + !snd_dma_buffer_mmap (snd_pcm_get_dma_buf (substream), area)) +return 0 ;/* mmap with fault handler */ area->vm_ops = &snd_pcm_vm_ops_data_fault;return 0 ;
Signature · 1 line
2.26.2
PATCH 5/5 ALSA: core: Add continuous and vmalloc mmap ops
In reply to Takashi IwaiThe mmap of continuous pages and vmalloc'ed pages are relatively easily done in a shot with the existing helper functions. Implement the mmap ops for those types, so that the mmap works without relying on the page fault handling.
--- sound/core/memalloc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
sound/core/memalloc.c +17 -0
@@ -211,9 +211,19 @@ static void snd_dma_continuous_free(struct snd_dma_buffer *dmab)free_pages_exact (dmab->area, dmab->bytes); } +static int snd_dma_continuous_mmap (struct snd_dma_buffer *dmab, +struct vm_area_struct *area) +{ +return remap_pfn_range (area, area->vm_start, + dmab->addr >>PAGE_SHIFT , + area->vm_end - area->vm_start, + area->vm_page_prot); +} +static const struct snd_malloc_ops snd_dma_continuous_ops = { .alloc = snd_dma_continuous_alloc, .free = snd_dma_continuous_free, + .mmap = snd_dma_continuous_mmap, };/*
@@ -232,6 +242,12 @@ static void snd_dma_vmalloc_free(struct snd_dma_buffer *dmab)vfree (dmab->area); } +static int snd_dma_vmalloc_mmap (struct snd_dma_buffer *dmab, +struct vm_area_struct *area) +{ +return remap_vmalloc_range (area, dmab->area,0 ); +} +static dma_addr_t snd_dma_vmalloc_get_addr (struct snd_dma_buffer *dmab,size_t offset) {
@@ -259,6 +275,7 @@ snd_dma_vmalloc_get_chunk_size(struct snd_dma_buffer *dmab,static const struct snd_malloc_ops snd_dma_vmalloc_ops = { .alloc = snd_dma_vmalloc_alloc, .free = snd_dma_vmalloc_free, + .mmap = snd_dma_vmalloc_mmap, .get_addr = snd_dma_vmalloc_get_addr, .get_page = snd_dma_vmalloc_get_page, .get_chunk_size = snd_dma_vmalloc_get_chunk_size,
Signature · 1 line
2.26.2