ALSA: Remove memory accounting in memalloc helper
PATCH 1/2 ALSA: Remove memory accounting in memalloc helper
It's almost superfluous, and doesn't help much for real uses. Let's reduce the layer size.
Signed-off-by Takashi Iwai <[email protected]>
--- sound/core/memalloc.c | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-)
sound/core/memalloc.c +2 -29
@@ -63,18 +63,6 @@ struct snd_mem_list {* */ -static long snd_allocated_pages;/* holding the number of allocated pages */ - -static inline void inc_snd_pages (int order) -{ - snd_allocated_pages +=1 << order; -} - -static inline void dec_snd_pages (int order) -{ - snd_allocated_pages -=1 << order; -} -/** * snd_malloc_pages - allocate pages with the given size * @size: the size to allocate in bytes
@@ -87,7 +75,6 @@ static inline void dec_snd_pages(int order)void *snd_malloc_pages (size_t size,gfp_t gfp_flags) {int pg; -void *res;if (WARN_ON (!size))return NULL ;
@@ -95,9 +82,7 @@ void *snd_malloc_pages(size_t size, gfp_t gfp_flags)return NULL ; gfp_flags |= __GFP_COMP;/* compound page lets parts be mapped */ pg =get_order (size); -if ((res = (void *)__get_free_pages (gfp_flags, pg)) !=NULL ) -inc_snd_pages (pg); -return res; +return (void *)__get_free_pages (gfp_flags, pg); }/**
@@ -114,7 +99,6 @@ void snd_free_pages(void *ptr, size_t size)if (ptr ==NULL )return ; pg =get_order (size); -dec_snd_pages (pg);free_pages ((unsigned long ) ptr, pg); }
@@ -129,7 +113,6 @@ void snd_free_pages(void *ptr, size_t size)static void *snd_malloc_dev_pages (struct device *dev,size_t size,dma_addr_t *dma) {int pg; -void *res;gfp_t gfp_flags;if (WARN_ON (!dma))
@@ -139,11 +122,7 @@ static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *d | __GFP_COMP /* compound page lets parts be mapped */ | __GFP_NORETRY/* don't trigger OOM-killer */ | __GFP_NOWARN;/* no stack trace print - this call is non-critical */ - res =dma_alloc_coherent (dev,PAGE_SIZE << pg, dma, gfp_flags); -if (res !=NULL ) -inc_snd_pages (pg); - -return res; +return dma_alloc_coherent (dev,PAGE_SIZE << pg, dma, gfp_flags); }/* free the coherent DMA pages */
@@ -155,7 +134,6 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,if (ptr ==NULL )return ; pg =get_order (size); -dec_snd_pages (pg);dma_free_coherent (dev,PAGE_SIZE << pg, ptr, dma); }
@@ -432,14 +410,11 @@ static struct proc_dir_entry *snd_mem_proc;static int snd_mem_proc_read (struct seq_file *seq,void *offset) { -long pages = snd_allocated_pages >> (PAGE_SHIFT -12 );struct snd_mem_list *mem;int devno;static char *types[] = {"UNKNOWN" ,"CONT" ,"DEV" ,"DEV-SG" };mutex_lock (&list_mutex); -seq_printf (seq,"pages : %li bytes (%li pages per %likB)\n" , - pages *PAGE_SIZE , pages,PAGE_SIZE /1024 ); devno =0 ;list_for_each_entry (mem, &mem_list_head, list) { devno++;
@@ -581,8 +556,6 @@ static void __exit snd_mem_exit(void) {remove_proc_entry (SND_MEM_PROC_FILE ,NULL );free_all_reserved_pages (); -if (snd_allocated_pages >0 ) -printk (KERN_ERR "snd-malloc: Memory leak? pages not freed = %li\n" , snd_allocated_pages); }
Signature · 1 line
1.8.5.2
PATCH 2/2 ALSA: Remove memory reservation code from memalloc helper
Nowadays we have CMA for obtaining the contiguous memory pages efficiently. Let's kill the old kludge for reserving the memory pages for large buffers. It was rarely useful (only for preserving pages among module reloading or a little help by an early boot scripting), used only by a couple of drivers, and yet it gives too much ugliness than its benefit.
Signed-off-by Takashi Iwai <[email protected]>
--- include/sound/memalloc.h | 7 -- include/sound/pcm.h | 1 - sound/core/memalloc.c | 264 -------------------------------------------- sound/core/pcm_memory.c | 19 +--- sound/pci/es1968.c | 28 +++-- sound/pci/rme9652/hdsp.c | 10 +- sound/pci/rme9652/rme9652.c | 10 +- 7 files changed, 18 insertions(+), 321 deletions(-)
include/sound/memalloc.h +0 -7
@@ -149,13 +149,6 @@ 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); -/* buffer-preservation managements */ - -#define snd_dma_pci_buf_id (pci) (((unsigned int)(pci)->vendor << 16) | (pci)->device) - -size_t snd_dma_get_reserved_buf (struct snd_dma_buffer *dmab,unsigned int id); -int snd_dma_reserve_buf (struct snd_dma_buffer *dmab,unsigned int id); -/* basic memory allocation functions */ void *snd_malloc_pages (size_t size,gfp_t gfp_flags);void snd_free_pages (void *ptr,size_t size);
include/sound/pcm.h +0 -1
@@ -381,7 +381,6 @@ struct snd_pcm_substream {struct pm_qos_request latency_pm_qos_req;/* pm_qos request */ size_t buffer_bytes_max;/* limit ring buffer size */ struct snd_dma_buffer dma_buffer; -unsigned int dma_buf_id;size_t dma_max;/* -- hardware operations -- */ const struct snd_pcm_ops *ops;
sound/core/memalloc.c +0 -264
281 lines not on this page · raw message
sound/core/pcm_memory.c +1 -18
@@ -53,15 +53,6 @@ static int preallocate_pcm_pages(struct snd_pcm_substream *substream, size_t sizstruct snd_dma_buffer *dmab = &substream->dma_buffer;int err; -/* already reserved? */ -if (snd_dma_get_reserved_buf (dmab, substream->dma_buf_id) >0 ) { -if (dmab->bytes >= size) -return 0 ;/* yes */ -/* no, free the reserved block */ -snd_dma_free_pages (dmab); - dmab->bytes =0 ; - } - do { if ((err = snd_dma_alloc_pages(dmab->dev.type, dmab->dev.dev, size, dmab)) < 0) {
@@ -82,10 +73,7 @@ static void snd_pcm_lib_preallocate_dma_free(struct snd_pcm_substream *substream {if (substream->dma_buffer.area ==NULL )return ; -if (substream->dma_buf_id) -snd_dma_reserve_buf (&substream->dma_buffer, substream->dma_buf_id); -else -snd_dma_free_pages (&substream->dma_buffer); +snd_dma_free_pages (&substream->dma_buffer); substream->dma_buffer.area =NULL ; }
@@ -260,11 +248,6 @@ static int snd_pcm_lib_preallocate_pages1(struct snd_pcm_substream *substream,* * Do pre-allocation for the given DMA buffer type. * -* When substream->dma_buf_id is set, the function tries to look for -* the reserved buffer, and the buffer is not freed but reserved at -* destruction time. The dma_buf_id must be unique for all systems -* (in the same DMA buffer type) e.g. using snd_dma_pci_buf_id(). -* * Return: Zero if successful, or a negative error code on failure. */ int snd_pcm_lib_preallocate_pages(struct snd_pcm_substream *substream,
sound/pci/es1968.c +13 -15
@@ -1422,7 +1422,7 @@ static void snd_es1968_free_dmabuf(struct es1968 *chip)if (! chip->dma.area)return ; -snd_dma_reserve_buf (&chip->dma,snd_dma_pci_buf_id (chip->pci)); +snd_dma_free_pages (&chip->dma);while ((p = chip->buf_list.next) != &chip->buf_list) { struct esm_memory *chunk = list_entry(p, struct esm_memory, list);list_del (p);
@@ -1438,20 +1438,18 @@ snd_es1968_init_dmabuf(struct es1968 *chip) chip->dma.dev.type =SNDRV_DMA_TYPE_DEV ; chip->dma.dev.dev =snd_dma_pci_data (chip->pci); -if (!snd_dma_get_reserved_buf (&chip->dma,snd_dma_pci_buf_id (chip->pci))) { - err =snd_dma_alloc_pages_fallback (SNDRV_DMA_TYPE_DEV , -snd_dma_pci_data (chip->pci), - chip->total_bufsize, &chip->dma); -if (err <0 || ! chip->dma.area) { -snd_printk (KERN_ERR "es1968: can't allocate dma pages for size %d\n" , - chip->total_bufsize); -return -ENOMEM ; - } -if ((chip->dma.addr + chip->dma.bytes -1 ) & ~((1 <<28 ) -1 )) { -snd_dma_free_pages (&chip->dma); -snd_printk (KERN_ERR "es1968: DMA buffer beyond 256MB.\n" ); -return -ENOMEM ; - } + err =snd_dma_alloc_pages_fallback (SNDRV_DMA_TYPE_DEV , +snd_dma_pci_data (chip->pci), + chip->total_bufsize, &chip->dma); +if (err <0 || ! chip->dma.area) { +snd_printk (KERN_ERR "es1968: can't allocate dma pages for size %d\n" , + chip->total_bufsize); +return -ENOMEM ; + } +if ((chip->dma.addr + chip->dma.bytes -1 ) & ~((1 <<28 ) -1 )) { +snd_dma_free_pages (&chip->dma); +snd_printk (KERN_ERR "es1968: DMA buffer beyond 256MB.\n" ); +return -ENOMEM ; }INIT_LIST_HEAD (&chip->buf_list);
sound/pci/rme9652/hdsp.c +2 -8
@@ -584,10 +584,6 @@ static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_buffer { dmab->dev.type =SNDRV_DMA_TYPE_DEV ; dmab->dev.dev =snd_dma_pci_data (pci); -if (snd_dma_get_reserved_buf (dmab,snd_dma_pci_buf_id (pci))) { -if (dmab->bytes >= size) -return 0 ; - }if (snd_dma_alloc_pages (SNDRV_DMA_TYPE_DEV ,snd_dma_pci_data (pci), size, dmab) <0 )return -ENOMEM ;
@@ -596,10 +592,8 @@ static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_bufferstatic void snd_hammerfall_free_buffer (struct snd_dma_buffer *dmab,struct pci_dev *pci) { -if (dmab->area) { - dmab->dev.dev =NULL ;/* make it anonymous */ -snd_dma_reserve_buf (dmab,snd_dma_pci_buf_id (pci)); - } +if (dmab->area) +snd_dma_free_pages (dmab); }
sound/pci/rme9652/rme9652.c +2 -8
@@ -294,10 +294,6 @@ static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_buffer { dmab->dev.type =SNDRV_DMA_TYPE_DEV ; dmab->dev.dev =snd_dma_pci_data (pci); -if (snd_dma_get_reserved_buf (dmab,snd_dma_pci_buf_id (pci))) { -if (dmab->bytes >= size) -return 0 ; - }if (snd_dma_alloc_pages (SNDRV_DMA_TYPE_DEV ,snd_dma_pci_data (pci), size, dmab) <0 )return -ENOMEM ;
@@ -306,10 +302,8 @@ static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_bufferstatic void snd_hammerfall_free_buffer (struct snd_dma_buffer *dmab,struct pci_dev *pci) { -if (dmab->area) { - dmab->dev.dev =NULL ;/* make it anonymous */ -snd_dma_reserve_buf (dmab,snd_dma_pci_buf_id (pci)); - } +if (dmab->area) +snd_dma_free_pages (dmab); }
Signature · 1 line
1.8.5.2