Commit e2172d8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents e75c73ad 94fb9334
...@@ -20,6 +20,13 @@ void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size, ...@@ -20,6 +20,13 @@ void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
{ {
void *vaddr; void *vaddr;
/*
* Don't print a warning when the first allocation attempt fails.
* swiotlb_alloc_coherent() will print a warning when the DMA
* memory allocation ultimately failed.
*/
flags |= __GFP_NOWARN;
vaddr = dma_generic_alloc_coherent(hwdev, size, dma_handle, flags, vaddr = dma_generic_alloc_coherent(hwdev, size, dma_handle, flags,
attrs); attrs);
if (vaddr) if (vaddr)
......
...@@ -531,12 +531,14 @@ static void __init reserve_crashkernel_low(void) ...@@ -531,12 +531,14 @@ static void __init reserve_crashkernel_low(void)
if (ret != 0) { if (ret != 0) {
/* /*
* two parts from lib/swiotlb.c: * two parts from lib/swiotlb.c:
* swiotlb size: user specified with swiotlb= or default. * -swiotlb size: user-specified with swiotlb= or default.
* swiotlb overflow buffer: now is hardcoded to 32k. *
* We round it to 8M for other buffers that * -swiotlb overflow buffer: now hardcoded to 32k. We round it
* may need to stay low too. * to 8M for other buffers that may need to stay low too. Also
* make sure we allocate enough extra low memory so that we
* don't run out of DMA buffers for 32-bit devices.
*/ */
low_size = swiotlb_size_or_default() + (8UL<<20); low_size = max(swiotlb_size_or_default() + (8UL<<20), 256UL<<20);
auto_set = true; auto_set = true;
} else { } else {
/* passed with crashkernel=0,low ? */ /* passed with crashkernel=0,low ? */
......
...@@ -656,7 +656,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size, ...@@ -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); phys_addr_t paddr = map_single(hwdev, 0, size, DMA_FROM_DEVICE);
if (paddr == SWIOTLB_MAP_ERROR) if (paddr == SWIOTLB_MAP_ERROR)
return NULL; goto err_warn;
ret = phys_to_virt(paddr); ret = phys_to_virt(paddr);
dev_addr = phys_to_dma(hwdev, paddr); dev_addr = phys_to_dma(hwdev, paddr);
...@@ -670,7 +670,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size, ...@@ -670,7 +670,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
/* DMA_TO_DEVICE to avoid memcpy in unmap_single */ /* DMA_TO_DEVICE to avoid memcpy in unmap_single */
swiotlb_tbl_unmap_single(hwdev, paddr, swiotlb_tbl_unmap_single(hwdev, paddr,
size, DMA_TO_DEVICE); size, DMA_TO_DEVICE);
return NULL; goto err_warn;
} }
} }
...@@ -678,6 +678,13 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size, ...@@ -678,6 +678,13 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
memset(ret, 0, size); memset(ret, 0, size);
return ret; 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); EXPORT_SYMBOL(swiotlb_alloc_coherent);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment