3 files changed, 23 insertions, 7 deletions

diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index 77dd0ad58be4..adf0392d549a 100644
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -20,6 +20,13 @@ void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
 {
         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,
                                            attrs);
         if (vaddr)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index d74ac33290ae..cba828892790 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -531,12 +531,14 @@ static void __init reserve_crashkernel_low(void)
         if (ret != 0) {
                 /*
                  * two parts from lib/swiotlb.c:
-                 *      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
-                 *              may need to stay low too.
+                 * -swiotlb size: user-specified with swiotlb= or default.
+                 *
+                 * -swiotlb overflow buffer: now hardcoded to 32k. We round it
+                 * 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;
         } else {
                 /* passed with crashkernel=0,low ? */
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 3c365ab6cf5f..42e192decbfd 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -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);