Merge branch 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 kdump updates from Ingo Molnar: "Three kdump robustness related improvements (Joerg Roedel)" * 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/crash: Allocate enough low memory when crashkernel=high x86/swiotlb: Try coherent allocations with __GFP_NOWARN swiotlb: Warn on allocation failure in swiotlb_alloc_coherent()
This commit is contained in:
+9
-2
@@ -656,7 +656,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
|
||||
*/
|
||||
phys_addr_t paddr = map_single(hwdev, 0, size, DMA_FROM_DEVICE);
|
||||
if (paddr == SWIOTLB_MAP_ERROR)
|
||||
return NULL;
|
||||
goto err_warn;
|
||||
|
||||
ret = phys_to_virt(paddr);
|
||||
dev_addr = phys_to_dma(hwdev, paddr);
|
||||
@@ -670,7 +670,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
|
||||
/* DMA_TO_DEVICE to avoid memcpy in unmap_single */
|
||||
swiotlb_tbl_unmap_single(hwdev, paddr,
|
||||
size, DMA_TO_DEVICE);
|
||||
return NULL;
|
||||
goto err_warn;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -678,6 +678,13 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
|
||||
memset(ret, 0, size);
|
||||
|
||||
return ret;
|
||||
|
||||
err_warn:
|
||||
pr_warn("swiotlb: coherent allocation failed for device %s size=%zu\n",
|
||||
dev_name(hwdev), size);
|
||||
dump_stack();
|
||||
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(swiotlb_alloc_coherent);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user