Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
接近 2 年 前同步成功

通知 169
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 e87aa773 编写于 作者: M Matthew Wilcox
浏览文件
操作

dmapool: Fix style problems 

Run Lindent and fix all issues reported by checkpatch.pl
Signed-off-by: NMatthew Wilcox <willy@linux.intel.com>
上级 141e9d4b
隐藏空白更改
内联 并排
Showing with 142 addition and 146 deletion
mm/dmapool.c
浏览文件 @ e87aa773
...@@ -15,32 +15,32 @@ ...@@ -15,32 +15,32 @@
* This should probably be sharing the guts of the slab allocator. * This should probably be sharing the guts of the slab allocator.
*/ */
struct dma_pool { /* the pool */ struct dma_pool { /* the pool */
struct list_head page_list; struct list_head page_list;
spinlock_t lock; spinlock_t lock;
size_t blocks_per_page; size_t blocks_per_page;
size_t size; size_t size;
struct device *dev; struct device *dev;
size_t allocation; size_t allocation;
char name [32]; char name[32];
wait_queue_head_t waitq; wait_queue_head_t waitq;
struct list_head pools; struct list_head pools;
}; };
struct dma_page { /* cacheable header for 'allocation' bytes */ struct dma_page { /* cacheable header for 'allocation' bytes */
struct list_head page_list; struct list_head page_list;
void *vaddr; void *vaddr;
dma_addr_t dma; dma_addr_t dma;
unsigned in_use; unsigned in_use;
unsigned long bitmap [0]; unsigned long bitmap[0];
}; };
#define POOL_TIMEOUT_JIFFIES ((100 /* msec */ * HZ) / 1000) #define POOL_TIMEOUT_JIFFIES ((100 /* msec */ * HZ) / 1000)
static DEFINE_MUTEX (pools_lock); static DEFINE_MUTEX(pools_lock);
static ssize_t static ssize_t
show_pools (struct device *dev, struct device_attribute *attr, char *buf) show_pools(struct device *dev, struct device_attribute *attr, char *buf)
{ {
unsigned temp; unsigned temp;
unsigned size; unsigned size;
...@@ -67,9 +67,9 @@ show_pools (struct device *dev, struct device_attribute *attr, char *buf) ...@@ -67,9 +67,9 @@ show_pools (struct device *dev, struct device_attribute *attr, char *buf)
/* per-pool info, no real statistics yet */ /* per-pool info, no real statistics yet */
temp = scnprintf(next, size, "%-16s %4u %4Zu %4Zu %2u\n", temp = scnprintf(next, size, "%-16s %4u %4Zu %4Zu %2u\n",
pool->name, pool->name,
blocks, pages * pool->blocks_per_page, blocks, pages * pool->blocks_per_page,
pool->size, pages); pool->size, pages);
size -= temp; size -= temp;
next += temp; next += temp;
} }
...@@ -77,7 +77,8 @@ show_pools (struct device *dev, struct device_attribute *attr, char *buf) ...@@ -77,7 +77,8 @@ show_pools (struct device *dev, struct device_attribute *attr, char *buf)
return PAGE_SIZE - size; return PAGE_SIZE - size;
} }
static DEVICE_ATTR (pools, S_IRUGO, show_pools, NULL);
static DEVICE_ATTR(pools, S_IRUGO, show_pools, NULL);
/** /**
* dma_pool_create - Creates a pool of consistent memory blocks, for dma. * dma_pool_create - Creates a pool of consistent memory blocks, for dma.
...@@ -100,11 +101,10 @@ static DEVICE_ATTR (pools, S_IRUGO, show_pools, NULL); ...@@ -100,11 +101,10 @@ static DEVICE_ATTR (pools, S_IRUGO, show_pools, NULL);
* addressing restrictions on individual DMA transfers, such as not crossing * addressing restrictions on individual DMA transfers, such as not crossing
* boundaries of 4KBytes. * boundaries of 4KBytes.
*/ */
struct dma_pool * struct dma_pool *dma_pool_create(const char *name, struct device *dev,
dma_pool_create (const char *name, struct device *dev, size_t size, size_t align, size_t allocation)
size_t size, size_t align, size_t allocation)
{ {
struct dma_pool *retval; struct dma_pool *retval;
if (align == 0) if (align == 0)
align = 1; align = 1;
...@@ -122,81 +122,79 @@ dma_pool_create (const char *name, struct device *dev, ...@@ -122,81 +122,79 @@ dma_pool_create (const char *name, struct device *dev,
allocation = size; allocation = size;
else else
allocation = PAGE_SIZE; allocation = PAGE_SIZE;
// FIXME: round up for less fragmentation /* FIXME: round up for less fragmentation */
} else if (allocation < size) } else if (allocation < size)
return NULL; return NULL;
if (!(retval = kmalloc_node (sizeof *retval, GFP_KERNEL, dev_to_node(dev)))) if (!
(retval =
kmalloc_node(sizeof *retval, GFP_KERNEL, dev_to_node(dev))))
return retval; return retval;
strlcpy (retval->name, name, sizeof retval->name); strlcpy(retval->name, name, sizeof retval->name);
retval->dev = dev; retval->dev = dev;
INIT_LIST_HEAD (&retval->page_list); INIT_LIST_HEAD(&retval->page_list);
spin_lock_init (&retval->lock); spin_lock_init(&retval->lock);
retval->size = size; retval->size = size;
retval->allocation = allocation; retval->allocation = allocation;
retval->blocks_per_page = allocation / size; retval->blocks_per_page = allocation / size;
init_waitqueue_head (&retval->waitq); init_waitqueue_head(&retval->waitq);
if (dev) { if (dev) {
int ret; int ret;
mutex_lock(&pools_lock); mutex_lock(&pools_lock);
if (list_empty (&dev->dma_pools)) if (list_empty(&dev->dma_pools))
ret = device_create_file (dev, &dev_attr_pools); ret = device_create_file(dev, &dev_attr_pools);
else else
ret = 0; ret = 0;
/* note: not currently insisting "name" be unique */ /* note: not currently insisting "name" be unique */
if (!ret) if (!ret)
list_add (&retval->pools, &dev->dma_pools); list_add(&retval->pools, &dev->dma_pools);
else { else {
kfree(retval); kfree(retval);
retval = NULL; retval = NULL;
} }
mutex_unlock(&pools_lock); mutex_unlock(&pools_lock);
} else } else
INIT_LIST_HEAD (&retval->pools); INIT_LIST_HEAD(&retval->pools);
return retval; return retval;
} }
EXPORT_SYMBOL(dma_pool_create);
static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags)
static struct dma_page *
pool_alloc_page (struct dma_pool *pool, gfp_t mem_flags)
{ {
struct dma_page *page; struct dma_page *page;
int mapsize; int mapsize;
mapsize = pool->blocks_per_page; mapsize = pool->blocks_per_page;
mapsize = (mapsize + BITS_PER_LONG - 1) / BITS_PER_LONG; mapsize = (mapsize + BITS_PER_LONG - 1) / BITS_PER_LONG;
mapsize *= sizeof (long); mapsize *= sizeof(long);
page = kmalloc(mapsize + sizeof *page, mem_flags); page = kmalloc(mapsize + sizeof *page, mem_flags);
if (!page) if (!page)
return NULL; return NULL;
page->vaddr = dma_alloc_coherent (pool->dev, page->vaddr = dma_alloc_coherent(pool->dev,
pool->allocation, pool->allocation,
&page->dma, &page->dma, mem_flags);
mem_flags);
if (page->vaddr) { if (page->vaddr) {
memset (page->bitmap, 0xff, mapsize); // bit set == free memset(page->bitmap, 0xff, mapsize); /* bit set == free */
#ifdef CONFIG_DEBUG_SLAB #ifdef CONFIG_DEBUG_SLAB
memset (page->vaddr, POOL_POISON_FREED, pool->allocation); memset(page->vaddr, POOL_POISON_FREED, pool->allocation);
#endif #endif
list_add (&page->page_list, &pool->page_list); list_add(&page->page_list, &pool->page_list);
page->in_use = 0; page->in_use = 0;
} else { } else {
kfree (page); kfree(page);
page = NULL; page = NULL;
} }
return page; return page;
} }
static inline int is_page_busy(int blocks, unsigned long *bitmap)
static inline int
is_page_busy (int blocks, unsigned long *bitmap)
{ {
while (blocks > 0) { while (blocks > 0) {
if (*bitmap++ != ~0UL) if (*bitmap++ != ~0UL)
...@@ -206,20 +204,18 @@ is_page_busy (int blocks, unsigned long *bitmap) ...@@ -206,20 +204,18 @@ is_page_busy (int blocks, unsigned long *bitmap)
return 0; return 0;
} }
static void static void pool_free_page(struct dma_pool *pool, struct dma_page *page)
pool_free_page (struct dma_pool *pool, struct dma_page *page)
{ {
dma_addr_t dma = page->dma; dma_addr_t dma = page->dma;
#ifdef CONFIG_DEBUG_SLAB #ifdef CONFIG_DEBUG_SLAB
memset (page->vaddr, POOL_POISON_FREED, pool->allocation); memset(page->vaddr, POOL_POISON_FREED, pool->allocation);
#endif #endif
dma_free_coherent (pool->dev, pool->allocation, page->vaddr, dma); dma_free_coherent(pool->dev, pool->allocation, page->vaddr, dma);
list_del (&page->page_list); list_del(&page->page_list);
kfree (page); kfree(page);
} }
/** /**
* dma_pool_destroy - destroys a pool of dma memory blocks. * dma_pool_destroy - destroys a pool of dma memory blocks.
* @pool: dma pool that will be destroyed * @pool: dma pool that will be destroyed
...@@ -228,36 +224,37 @@ pool_free_page (struct dma_pool *pool, struct dma_page *page) ...@@ -228,36 +224,37 @@ pool_free_page (struct dma_pool *pool, struct dma_page *page)
* Caller guarantees that no more memory from the pool is in use, * Caller guarantees that no more memory from the pool is in use,
* and that nothing will try to use the pool after this call. * and that nothing will try to use the pool after this call.
*/ */
void void dma_pool_destroy(struct dma_pool *pool)
dma_pool_destroy (struct dma_pool *pool)
{ {
mutex_lock(&pools_lock); mutex_lock(&pools_lock);
list_del (&pool->pools); list_del(&pool->pools);
if (pool->dev && list_empty (&pool->dev->dma_pools)) if (pool->dev && list_empty(&pool->dev->dma_pools))
device_remove_file (pool->dev, &dev_attr_pools); device_remove_file(pool->dev, &dev_attr_pools);
mutex_unlock(&pools_lock); mutex_unlock(&pools_lock);
while (!list_empty (&pool->page_list)) { while (!list_empty(&pool->page_list)) {
struct dma_page *page; struct dma_page *page;
page = list_entry (pool->page_list.next, page = list_entry(pool->page_list.next,
struct dma_page, page_list); struct dma_page, page_list);
if (is_page_busy (pool->blocks_per_page, page->bitmap)) { if (is_page_busy(pool->blocks_per_page, page->bitmap)) {
if (pool->dev) if (pool->dev)
dev_err(pool->dev, "dma_pool_destroy %s, %p busy\n", dev_err(pool->dev,
"dma_pool_destroy %s, %p busy\n",
pool->name, page->vaddr); pool->name, page->vaddr);
else else
printk (KERN_ERR "dma_pool_destroy %s, %p busy\n", printk(KERN_ERR
pool->name, page->vaddr); "dma_pool_destroy %s, %p busy\n",
pool->name, page->vaddr);
/* leak the still-in-use consistent memory */ /* leak the still-in-use consistent memory */
list_del (&page->page_list); list_del(&page->page_list);
kfree (page); kfree(page);
} else } else
pool_free_page (pool, page); pool_free_page(pool, page);
} }
kfree (pool); kfree(pool);
} }
EXPORT_SYMBOL(dma_pool_destroy);
/** /**
* dma_pool_alloc - get a block of consistent memory * dma_pool_alloc - get a block of consistent memory
...@@ -269,73 +266,72 @@ dma_pool_destroy (struct dma_pool *pool) ...@@ -269,73 +266,72 @@ dma_pool_destroy (struct dma_pool *pool)
* and reports its dma address through the handle. * and reports its dma address through the handle.
* If such a memory block can't be allocated, null is returned. * If such a memory block can't be allocated, null is returned.
*/ */
void * void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,
dma_pool_alloc (struct dma_pool *pool, gfp_t mem_flags, dma_addr_t *handle) dma_addr_t *handle)
{ {
unsigned long flags; unsigned long flags;
struct dma_page *page; struct dma_page *page;
int map, block; int map, block;
size_t offset; size_t offset;
void *retval; void *retval;
restart: restart:
spin_lock_irqsave (&pool->lock, flags); spin_lock_irqsave(&pool->lock, flags);
list_for_each_entry(page, &pool->page_list, page_list) { list_for_each_entry(page, &pool->page_list, page_list) {
int i; int i;
/* only cachable accesses here ... */ /* only cachable accesses here ... */
for (map = 0, i = 0; for (map = 0, i = 0;
i < pool->blocks_per_page; i < pool->blocks_per_page; i += BITS_PER_LONG, map++) {
i += BITS_PER_LONG, map++) { if (page->bitmap[map] == 0)
if (page->bitmap [map] == 0)
continue; continue;
block = ffz (~ page->bitmap [map]); block = ffz(~page->bitmap[map]);
if ((i + block) < pool->blocks_per_page) { if ((i + block) < pool->blocks_per_page) {
clear_bit (block, &page->bitmap [map]); clear_bit(block, &page->bitmap[map]);
offset = (BITS_PER_LONG * map) + block; offset = (BITS_PER_LONG * map) + block;
offset *= pool->size; offset *= pool->size;
goto ready; goto ready;
} }
} }
} }
if (!(page = pool_alloc_page (pool, GFP_ATOMIC))) { page = pool_alloc_page(pool, GFP_ATOMIC);
if (!page) {
if (mem_flags & __GFP_WAIT) { if (mem_flags & __GFP_WAIT) {
DECLARE_WAITQUEUE (wait, current); DECLARE_WAITQUEUE(wait, current);
__set_current_state(TASK_INTERRUPTIBLE); __set_current_state(TASK_INTERRUPTIBLE);
add_wait_queue (&pool->waitq, &wait); add_wait_queue(&pool->waitq, &wait);
spin_unlock_irqrestore (&pool->lock, flags); spin_unlock_irqrestore(&pool->lock, flags);
schedule_timeout (POOL_TIMEOUT_JIFFIES); schedule_timeout(POOL_TIMEOUT_JIFFIES);
remove_wait_queue (&pool->waitq, &wait); remove_wait_queue(&pool->waitq, &wait);
goto restart; goto restart;
} }
retval = NULL; retval = NULL;
goto done; goto done;
} }
clear_bit (0, &page->bitmap [0]); clear_bit(0, &page->bitmap[0]);
offset = 0; offset = 0;
ready: ready:
page->in_use++; page->in_use++;
retval = offset + page->vaddr; retval = offset + page->vaddr;
*handle = offset + page->dma; *handle = offset + page->dma;
#ifdef CONFIG_DEBUG_SLAB #ifdef CONFIG_DEBUG_SLAB
memset (retval, POOL_POISON_ALLOCATED, pool->size); memset(retval, POOL_POISON_ALLOCATED, pool->size);
#endif #endif
done: done:
spin_unlock_irqrestore (&pool->lock, flags); spin_unlock_irqrestore(&pool->lock, flags);
return retval; return retval;
} }
EXPORT_SYMBOL(dma_pool_alloc);
static struct dma_page *pool_find_page(struct dma_pool *pool, dma_addr_t dma)
static struct dma_page *
pool_find_page (struct dma_pool *pool, dma_addr_t dma)
{ {
unsigned long flags; unsigned long flags;
struct dma_page *page; struct dma_page *page;
spin_lock_irqsave (&pool->lock, flags); spin_lock_irqsave(&pool->lock, flags);
list_for_each_entry(page, &pool->page_list, page_list) { list_for_each_entry(page, &pool->page_list, page_list) {
if (dma < page->dma) if (dma < page->dma)
continue; continue;
...@@ -343,12 +339,11 @@ pool_find_page (struct dma_pool *pool, dma_addr_t dma) ...@@ -343,12 +339,11 @@ pool_find_page (struct dma_pool *pool, dma_addr_t dma)
goto done; goto done;
} }
page = NULL; page = NULL;
done: done:
spin_unlock_irqrestore (&pool->lock, flags); spin_unlock_irqrestore(&pool->lock, flags);
return page; return page;
} }
/** /**
* dma_pool_free - put block back into dma pool * dma_pool_free - put block back into dma pool
* @pool: the dma pool holding the block * @pool: the dma pool holding the block
...@@ -358,20 +353,21 @@ pool_find_page (struct dma_pool *pool, dma_addr_t dma) ...@@ -358,20 +353,21 @@ pool_find_page (struct dma_pool *pool, dma_addr_t dma)
* Caller promises neither device nor driver will again touch this block * Caller promises neither device nor driver will again touch this block
* unless it is first re-allocated. * unless it is first re-allocated.
*/ */
void void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma)
dma_pool_free (struct dma_pool *pool, void *vaddr, dma_addr_t dma)
{ {
struct dma_page *page; struct dma_page *page;
unsigned long flags; unsigned long flags;
int map, block; int map, block;
if ((page = pool_find_page(pool, dma)) == NULL) { page = pool_find_page(pool, dma);
if (!page) {
if (pool->dev) if (pool->dev)
dev_err(pool->dev, "dma_pool_free %s, %p/%lx (bad dma)\n", dev_err(pool->dev,
pool->name, vaddr, (unsigned long) dma); "dma_pool_free %s, %p/%lx (bad dma)\n",
pool->name, vaddr, (unsigned long)dma);
else else
printk (KERN_ERR "dma_pool_free %s, %p/%lx (bad dma)\n", printk(KERN_ERR "dma_pool_free %s, %p/%lx (bad dma)\n",
pool->name, vaddr, (unsigned long) dma); pool->name, vaddr, (unsigned long)dma);
return; return;
} }
...@@ -383,37 +379,42 @@ dma_pool_free (struct dma_pool *pool, void *vaddr, dma_addr_t dma) ...@@ -383,37 +379,42 @@ dma_pool_free (struct dma_pool *pool, void *vaddr, dma_addr_t dma)
#ifdef CONFIG_DEBUG_SLAB #ifdef CONFIG_DEBUG_SLAB
if (((dma - page->dma) + (void *)page->vaddr) != vaddr) { if (((dma - page->dma) + (void *)page->vaddr) != vaddr) {
if (pool->dev) if (pool->dev)
dev_err(pool->dev, "dma_pool_free %s, %p (bad vaddr)/%Lx\n", dev_err(pool->dev,
pool->name, vaddr, (unsigned long long) dma); "dma_pool_free %s, %p (bad vaddr)/%Lx\n",
pool->name, vaddr, (unsigned long long)dma);
else else
printk (KERN_ERR "dma_pool_free %s, %p (bad vaddr)/%Lx\n", printk(KERN_ERR
pool->name, vaddr, (unsigned long long) dma); "dma_pool_free %s, %p (bad vaddr)/%Lx\n",
pool->name, vaddr, (unsigned long long)dma);
return; return;
} }
if (page->bitmap [map] & (1UL << block)) { if (page->bitmap[map] & (1UL << block)) {
if (pool->dev) if (pool->dev)
dev_err(pool->dev, "dma_pool_free %s, dma %Lx already free\n", dev_err(pool->dev,
"dma_pool_free %s, dma %Lx already free\n",
pool->name, (unsigned long long)dma); pool->name, (unsigned long long)dma);
else else
printk (KERN_ERR "dma_pool_free %s, dma %Lx already free\n", printk(KERN_ERR
pool->name, (unsigned long long)dma); "dma_pool_free %s, dma %Lx already free\n",
pool->name, (unsigned long long)dma);
return; return;
} }
memset (vaddr, POOL_POISON_FREED, pool->size); memset(vaddr, POOL_POISON_FREED, pool->size);
#endif #endif
spin_lock_irqsave (&pool->lock, flags); spin_lock_irqsave(&pool->lock, flags);
page->in_use--; page->in_use--;
set_bit (block, &page->bitmap [map]); set_bit(block, &page->bitmap[map]);
if (waitqueue_active (&pool->waitq)) if (waitqueue_active(&pool->waitq))
wake_up (&pool->waitq); wake_up(&pool->waitq);
/* /*
* Resist a temptation to do * Resist a temptation to do
* if (!is_page_busy(bpp, page->bitmap)) pool_free_page(pool, page); * if (!is_page_busy(bpp, page->bitmap)) pool_free_page(pool, page);
* Better have a few empty pages hang around. * Better have a few empty pages hang around.
*/ */
spin_unlock_irqrestore (&pool->lock, flags); spin_unlock_irqrestore(&pool->lock, flags);
} }
EXPORT_SYMBOL(dma_pool_free);
/* /*
* Managed DMA pool * Managed DMA pool
...@@ -458,6 +459,7 @@ struct dma_pool *dmam_pool_create(const char *name, struct device *dev, ...@@ -458,6 +459,7 @@ struct dma_pool *dmam_pool_create(const char *name, struct device *dev,
return pool; return pool;
} }
EXPORT_SYMBOL(dmam_pool_create);
/** /**
* dmam_pool_destroy - Managed dma_pool_destroy() * dmam_pool_destroy - Managed dma_pool_destroy()
...@@ -472,10 +474,4 @@ void dmam_pool_destroy(struct dma_pool *pool) ...@@ -472,10 +474,4 @@ void dmam_pool_destroy(struct dma_pool *pool)
dma_pool_destroy(pool); dma_pool_destroy(pool);
WARN_ON(devres_destroy(dev, dmam_pool_release, dmam_pool_match, pool)); WARN_ON(devres_destroy(dev, dmam_pool_release, dmam_pool_match, pool));
} }
EXPORT_SYMBOL(dmam_pool_destroy);
EXPORT_SYMBOL (dma_pool_create);
EXPORT_SYMBOL (dma_pool_destroy);
EXPORT_SYMBOL (dma_pool_alloc);
EXPORT_SYMBOL (dma_pool_free);
EXPORT_SYMBOL (dmam_pool_create);
EXPORT_SYMBOL (dmam_pool_destroy);
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或