Skip to contentSkip to conversation

dmapool: push new blocks in ascending order

PATCH In review Keith Busch 6 participants 11 messages Feb 21, 2023 – Feb 28, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dmapool: push new blocks in ascending order

From: Keith Busch <[email protected]>

Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high.

Fixes ced6d06a81fb69 ("dmapool: link blocks across pages")
---
 mm/dmapool.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
mm/dmapool.c +13 -2
index 1920890ff8d3d..a151a21e571b7 100644
@@ -300,7 +300,7 @@ EXPORT_SYMBOL(dma_pool_create);
 static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page)
 {
 	unsigned int next_boundary = pool->boundary, offset = 0;
-	struct dma_block *block;
+	struct dma_block *block, *first = NULL, *last = NULL;
 
 	pool_init_page(pool, page);
 	while (offset + pool->size <= pool->allocation) {
@@ -311,11 +311,22 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page)
 		}
 
 		block = page->vaddr + offset;
-		pool_block_push(pool, block, page->dma + offset);
+		block->dma = page->dma + offset;
+		block->next_block = NULL;
+
+		if (last)
+			last->next_block = block;
+		else
+			first = block;
+		last = block;
+
 		offset += pool->size;
 		pool->nr_blocks++;
 	}
 
+	last->next_block = pool->next_block;
+	pool->next_block = first;
+
 	list_add(&page->page_list, &pool->page_list);
 	pool->nr_pages++;
 }
Signature · 1 line
2.30.2
Tested-by on v1 1/1
#1 lore raw
Quoted 10 lines · Keith Busch

From: Keith Busch <[email protected]>

Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high.

Fixes ced6d06a81fb69 ("dmapool: link blocks across pages")
#2 lore raw
In reply to Keith Busch
Quoted 6 lines · Keith Busch

From: Keith Busch <[email protected]>

Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high.

Who are those users?

Also should we document this behavior somewhere so that it isn't accidentally changed again some time in the future?

#3 lore raw
Quoted 8 lines · Christoph Hellwig
Quoted 6 lines · Keith Busch

From: Keith Busch <[email protected]>

Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high.

Quoted 4 lines

Who are those users?

Also should we document this behavior somewhere so that it isn't accidentally changed again some time in the future?

usb/chipidea/udc.c qh_pool called "ci_hw_qh". My initial thought was dmapool isn't the right API if you need a specific order when allocating from it, but I can't readily test any changes to that driver. Restoring the previous behavior is easy enough.

maintainer
#4 lore raw
Quoted 9 lines · On Tue, 21 Feb 2023 11:07:32 -0700 Keith Busch <[email protected]> wrote:
Quoted 8 lines · Christoph Hellwig
Quoted 6 lines · Keith Busch

From: Keith Busch <[email protected]>

Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high.

Quoted 6 lines
Quoted 4 lines

Who are those users?

Also should we document this behavior somewhere so that it isn't accidentally changed again some time in the future?

usb/chipidea/udc.c qh_pool called "ci_hw_qh".

It would be helpful to know why these users need this side-effect. Did
the drivers break? Or just get slower?

Are those drivers misbehaving by assuming this behavior? Should we
require that they be altered instead of forever constraining the dmapool implementation in this fashion?

#5 lore raw
Quoted 13 lines · Andrew Morton
Quoted 11 lines · On Tue, 21 Feb 2023 11:07:32 -0700 Keith Busch <[email protected]> wrote:
Quoted 10 lines · Christoph Hellwig
Quoted 6 lines · Keith Busch

From: Keith Busch <[email protected]>

Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high.

Who are those users?

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

Also should we document this behavior somewhere so that it isn't accidentally changed again some time in the future?

usb/chipidea/udc.c qh_pool called "ci_hw_qh".

It would be helpful to know why these users need this side-effect. Did
the drivers break? Or just get slower?

The affected driver was reported to be unusable without this behavior.

Quoted 1 line

Are those drivers misbehaving by assuming this behavior? Should we

I do think they're using the wrong API. You you shouldn't use the dmapool if your blocks need to be arranged in a contiguous address order. They should just directly use dma_alloc_coherent() instead.

Quoted 2 lines

require that they be altered instead of forever constraining the dmapool implementation in this fashion?

This change isn't really constraining dmapool where it matters. It's just an unexpected one-time initialization thing.

As far as altering those drivers, I'll reach out to someone on that side for comment (I'm currently not familiar with the affected subsystem).

#6 lore raw
Quoted 30 lines · Keith Busch
Quoted 13 lines · Andrew Morton
Quoted 11 lines · On Tue, 21 Feb 2023 11:07:32 -0700 Keith Busch <[email protected]> wrote:
Quoted 10 lines · Christoph Hellwig
Quoted 6 lines · Keith Busch

From: Keith Busch <[email protected]>

Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high.

Who are those users?

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

Also should we document this behavior somewhere so that it isn't accidentally changed again some time in the future?

usb/chipidea/udc.c qh_pool called "ci_hw_qh".

It would be helpful to know why these users need this side-effect. Did
the drivers break? Or just get slower?

The affected driver was reported to be unusable without this behavior.

Quoted 1 line

Are those drivers misbehaving by assuming this behavior? Should we

I do think they're using the wrong API. You you shouldn't use the dmapool if your blocks need to be arranged in a contiguous address order. They should just directly use dma_alloc_coherent() instead.

Quoted 8 lines
Quoted 2 lines

require that they be altered instead of forever constraining the dmapool implementation in this fashion?

This change isn't really constraining dmapool where it matters. It's just an unexpected one-time initialization thing.

As far as altering those drivers, I'll reach out to someone on that side for comment (I'm currently not familiar with the affected subsystem).

We can always change this driver, I'm fine to do that in-parallel/instead.

The symptom we have is a silent failure absent this change so, I just wonder are we really the _only_ code path that would be affected absent the change in this patch ?

---
bod

maintainer
#7 lore raw
In reply to Keith Busch
Quoted 4 lines · On Tue, 21 Feb 2023 08:54:00 -0800 Keith Busch <[email protected]> wrote:

Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high.

As I understand it, this fixes the only known issues with patch series "dmapool enhancements", v4. So we're good for a merge before 6.3-rc1, yes?

#8 lore raw
Quoted 10 lines · Andrew Morton
Quoted 4 lines · On Tue, 21 Feb 2023 08:54:00 -0800 Keith Busch <[email protected]> wrote:

Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high.

As I understand it, this fixes the only known issues with patch series "dmapool enhancements", v4. So we're good for a merge before 6.3-rc1, yes?

I was going to say "yes", but Guenter is reporting a new error with the original series. I working on that right now.

#9 lore raw
In reply to Andrew Morton
Quoted 10 lines · Andrew Morton
Quoted 4 lines · On Tue, 21 Feb 2023 08:54:00 -0800 Keith Busch <[email protected]> wrote:

Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high.

As I understand it, this fixes the only known issues with patch series "dmapool enhancements", v4. So we're good for a merge before 6.3-rc1, yes?

Okay, I think this is good to go to merge now. My local testing also show this fixes the megaraid issue that Guenter reported on the other thread, so I believe this does indeed fix the only reported issues with the dmapool enhancements.
.

Tested-by on v1 1/1
#10 lore raw
In reply to Keith Busch
Quoted 10 lines · Keith Busch

From: Keith Busch <[email protected]>

Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high.

Fixes ced6d06a81fb69 ("dmapool: link blocks across pages")

This patch fixes the problem I had observed when trying to boot from the megasas SCSI controller on powernv.

Thanks,
Guenter

Quoted 45 lines
---
 mm/dmapool.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
mm/dmapool.c +13 -2
index 1920890ff8d3d..a151a21e571b7 100644
@@ -300,7 +300,7 @@ EXPORT_SYMBOL(dma_pool_create);
 static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page)
 {
 	unsigned int next_boundary = pool->boundary, offset = 0;
-	struct dma_block *block;
+	struct dma_block *block, *first = NULL, *last = NULL;
 
 	pool_init_page(pool, page);
 	while (offset + pool->size <= pool->allocation) {
@@ -311,11 +311,22 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page)
 		}
 
 		block = page->vaddr + offset;
-		pool_block_push(pool, block, page->dma + offset);
+		block->dma = page->dma + offset;
+		block->next_block = NULL;
+
+		if (last)
+			last->next_block = block;
+		else
+			first = block;
+		last = block;
+
 		offset += pool->size;
 		pool->nr_blocks++;
 	}
 
+	last->next_block = pool->next_block;
+	pool->next_block = first;
+
 	list_add(&page->page_list, &pool->page_list);
 	pool->nr_pages++;
 }
Signature · 1 line
2.30.2