Commit 00d61e3e8c12d5f395b167856d2b3c430816afb0
Committed by
Jens Axboe
1 parent
0e81a8ae37
Exists in
master
and in
39 other branches
Fix bounce setting for 64-bit
Looking a bit closer into this regression the reason this can't be right is that dma_addr common default is BLK_BOUNCE_HIGH and most machines have less than 4G. So if you do: if (b_pfn <= (min_t(u64, 0xffffffff, BLK_BOUNCE_HIGH) >> PAGE_SHIFT)) dma = 1 that will translate to: if (BLK_BOUNCE_HIGH <= BLK_BOUNCE_HIGH) dma = 1 So for 99% of hardware this will trigger unnecessary GFP_DMA allocations and isa pooling operations. Also note how the 32bit code still does b_pfn < blk_max_low_pfn. I guess this is what you were looking after. I didn't verify but as far as I can tell, this will stop the regression with isa dma operations at boot for 99% of blkdev/memory combinations out there and I guess this fixes the setups with >4G of ram and 32bit pci cards as well (this also retains symmetry with the 32bit code). Signed-off-by: Andrea Arcangeli <andrea@qumranet.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
block/blk-settings.c
... | ... | @@ -140,7 +140,7 @@ |
140 | 140 | /* Assume anything <= 4GB can be handled by IOMMU. |
141 | 141 | Actually some IOMMUs can handle everything, but I don't |
142 | 142 | know of a way to test this here. */ |
143 | - if (b_pfn <= (min_t(u64, 0xffffffff, BLK_BOUNCE_HIGH) >> PAGE_SHIFT)) | |
143 | + if (b_pfn < (min_t(u64, 0x100000000UL, BLK_BOUNCE_HIGH) >> PAGE_SHIFT)) | |
144 | 144 | dma = 1; |
145 | 145 | q->bounce_pfn = max_low_pfn; |
146 | 146 | #else |