History

dmapool: remove checks for dev == NULL

dmapool originally tried to support pools without a device because dma_alloc_coherent() supports allocations without a device. But nobody ended up using dma pools without a device, and trying to do so will result in an oops. So remove the checks for pool->dev == NULL since they are unneeded bloat. [kbusch@kernel.org: add check for null dev on create] Link: https://lkml.kernel.org/r/20230126215125.4069751-3-kbusch@meta.com Fixes: 2d55c16c0c54 ("dmapool: create/destroy cleanup") Signed-off-by: Tony Battersby <tonyb@cybernetics.com> Signed-off-by: Keith Busch <kbusch@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Cc: Matthew Wilcox <willy@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Tony Battersby committed 3 years ago

Commit 67a540c1 parent 418d5c91 file · +14 −31Browse files

Unified · Split

mm/dmapool.c+14−31
@@ -134,6 +134,9 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, · 133 unmodified lines
134 size_t allocation;134 size_t allocation;
135 bool empty = false;135 bool empty = false;
136 136
137 if (!dev)
138 return NULL;
139
137 if (align == 0)140 if (align == 0)
138 align = 1;141 align = 1;
139 else if (align & (align - 1))142 else if (align & (align - 1))
@@ -275,7 +278,7 @@ void dma_pool_destroy(struct dma_pool *pool) · 135 unmodified lines
275 mutex_lock(&pools_reg_lock);278 mutex_lock(&pools_reg_lock);
276 mutex_lock(&pools_lock);279 mutex_lock(&pools_lock);
277 list_del(&pool->pools);280 list_del(&pool->pools);
278 if (pool->dev && list_empty(&pool->dev->dma_pools))281 if (list_empty(&pool->dev->dma_pools))
279 empty = true;282 empty = true;
280 mutex_unlock(&pools_lock);283 mutex_unlock(&pools_lock);
281 if (empty)284 if (empty)
@@ -284,12 +287,8 @@ void dma_pool_destroy(struct dma_pool *pool) · 2 unmodified lines
284 287
285 list_for_each_entry_safe(page, tmp, &pool->page_list, page_list) {288 list_for_each_entry_safe(page, tmp, &pool->page_list, page_list) {
286 if (is_page_busy(page)) {289 if (is_page_busy(page)) {
287 if (pool->dev)290 dev_err(pool->dev, "%s %s, %p busy\n", __func__,
288 dev_err(pool->dev, "%s %s, %p busy\n", __func__,291 pool->name, page->vaddr);
289 pool->name, page->vaddr);
290 else
291 pr_err("%s %s, %p busy\n", __func__,
292 pool->name, page->vaddr);
293 /* leak the still-in-use consistent memory */292 /* leak the still-in-use consistent memory */
294 list_del(&page->page_list);293 list_del(&page->page_list);
295 kfree(page);294 kfree(page);
@@ -351,12 +350,8 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, · 55 unmodified lines
351 for (i = sizeof(page->offset); i < pool->size; i++) {350 for (i = sizeof(page->offset); i < pool->size; i++) {
352 if (data[i] == POOL_POISON_FREED)351 if (data[i] == POOL_POISON_FREED)
353 continue;352 continue;
354 if (pool->dev)353 dev_err(pool->dev, "%s %s, %p (corrupted)\n",
355 dev_err(pool->dev, "%s %s, %p (corrupted)\n",354 __func__, pool->name, retval);
356 __func__, pool->name, retval);
357 else
358 pr_err("%s %s, %p (corrupted)\n",
359 __func__, pool->name, retval);
360 355
361 /*356 /*
362 * Dump the first 4 bytes even if they are not357 * Dump the first 4 bytes even if they are not
@@ -411,12 +406,8 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) · 48 unmodified lines
411 page = pool_find_page(pool, dma);406 page = pool_find_page(pool, dma);
412 if (!page) {407 if (!page) {
413 spin_unlock_irqrestore(&pool->lock, flags);408 spin_unlock_irqrestore(&pool->lock, flags);
414 if (pool->dev)409 dev_err(pool->dev, "%s %s, %p/%pad (bad dma)\n",
415 dev_err(pool->dev, "%s %s, %p/%pad (bad dma)\n",410 __func__, pool->name, vaddr, &dma);
416 __func__, pool->name, vaddr, &dma);
417 else
418 pr_err("%s %s, %p/%pad (bad dma)\n",
419 __func__, pool->name, vaddr, &dma);
420 return;411 return;
421 }412 }
422 413
@@ -426,12 +417,8 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) · 3 unmodified lines
426#ifdef DMAPOOL_DEBUG417#ifdef DMAPOOL_DEBUG
427 if ((dma - page->dma) != offset) {418 if ((dma - page->dma) != offset) {
428 spin_unlock_irqrestore(&pool->lock, flags);419 spin_unlock_irqrestore(&pool->lock, flags);
429 if (pool->dev)420 dev_err(pool->dev, "%s %s, %p (bad vaddr)/%pad\n",
430 dev_err(pool->dev, "%s %s, %p (bad vaddr)/%pad\n",421 __func__, pool->name, vaddr, &dma);
431 __func__, pool->name, vaddr, &dma);
432 else
433 pr_err("%s %s, %p (bad vaddr)/%pad\n",
434 __func__, pool->name, vaddr, &dma);
435 return;422 return;
436 }423 }
437 {424 {
@@ -442,12 +429,8 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) · 4 unmodified lines
442 continue;429 continue;
443 }430 }
444 spin_unlock_irqrestore(&pool->lock, flags);431 spin_unlock_irqrestore(&pool->lock, flags);
445 if (pool->dev)432 dev_err(pool->dev, "%s %s, dma %pad already free\n",
446 dev_err(pool->dev, "%s %s, dma %pad already free\n",433 __func__, pool->name, &dma);
447 __func__, pool->name, &dma);
448 else
449 pr_err("%s %s, dma %pad already free\n",
450 __func__, pool->name, &dma);
451 return;434 return;
452 }435 }
453 }436 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t