dma-direct: fix zone selection after an unaddressable CMA allocation

Browse source

The new dma_alloc_contiguous hides if we allocate CMA or regular
pages, and thus fails to retry a ZONE_NORMAL allocation if the CMA
allocation succeeds but isn't addressable.  That means we either fail
outright or dip into a small zone that might not succeed either.

Thanks to Hillf Danton for debugging this issue.

Fixes: b1d2dc009d ("dma-contiguous: add dma_{alloc,free}_contiguous() helpers")
Reported-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>

...

This commit is contained in:

Christoph Hellwig 2019-08-20 11:45:49 +09:00

parent 936376f88f

commit 90ae409f9e

4 changed files with 15 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/iommu/dma-iommu.c

View file

5

include/linux/dma-contiguous.h

View file

8

kernel/dma/contiguous.c

View file

10

kernel/dma/direct.c

View file