[PATCH 0/3 v3] Fix kdump failures with crashkernel=high

[PATCH 0/3 v3] Fix kdump failures with crashkernel=high

[Joerg Roedel]

v2->v3

* Rebased to v4.1-rc6
* Updated changelogs as requested and added outcome of
  previous discussions
* Added more Acked-bys

v1->v2:

* Updated comments based on feedback from Konrad
* Added Acked-bys
* Rebased to v3.19-rc3

Hi,

here is a patch-set to fix failed kdump kernel boots when
the systems was booted with crashkernel=X,high. On those
systems the kernel allocates only 72MiB of low-memory for
DMA buffers, which showed to be too low on some systems.

The problem is that 64MiB of the low-memory is allocated by
swiotlb, leaving 8MB for the page-allocator. But swiotlb
tries to allocate DMA memory from the page-allocator first,
which fails pretty fast in the boot sequence, causing
warnings. This patch-set removes these warnings.

But even the 64MiB for swiotlb are eaten up on some systems,
so that the default of low-memory allocated for the
crash-kernel is increase from 72MB to 256MB (only changing
the defaults, can still be overwritten by crashkernel=X,low).

This number comes from experiments on the affected systems,
128MiB low-memory was still not enough there, thus I set the
value to 256MiB to fix the issues.

Any feedback appreciated.

Thanks,

	Joerg

Joerg Roedel (3):
  swiotlb: Warn on allocation failure in swiotlb_alloc_coherent
  x86, swiotlb: Try coherent allocations with __GFP_NOWARN
  x86, crash: Allocate enough low-mem when crashkernel=high

 arch/x86/kernel/pci-swiotlb.c |  7 +++++++
 arch/x86/kernel/setup.c       |  5 ++++-
 lib/swiotlb.c                 | 11 +++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

-- 
1.9.1

[PATCH 1/3] swiotlb: Warn on allocation failure in swiotlb_alloc_coherent

[Joerg Roedel]

From: Joerg Roedel <jroedel@suse.de>

Print a warning when all allocation tries have been failed
and the function is about to return NULL. This prepares for
calling the function with __GFP_NOWARN to suppress
allocation failure warnings before all fall-backs have
failed.

Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 lib/swiotlb.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 4abda07..e0e9212 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -655,7 +655,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);
@@ -669,7 +669,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;
 		}
 	}
 
@@ -677,6 +677,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);
 
-- 
1.9.1

[PATCH 2/3] x86, swiotlb: Try coherent allocations with __GFP_NOWARN

[Joerg Roedel]

From: Joerg Roedel <jroedel@suse.de>

When we boot a kdump kernel in high memory, there is by
default only 72MB of low memory available. The swiotlb code
takes 64MB of it (by default) so that there are only 8MB
left to allocate from. On systems with many devices this
causes page allocator warnings from dma_generic_alloc_coherent():

systemd-udevd: page allocation failure: order:0, mode:0x280d4
CPU: 0 PID: 197 Comm: systemd-udevd Tainted: G        W       3.12.28-4-default #1
Hardware name: HP ProLiant DL980 G7, BIOS P66 07/30/2012
 ffff8800781335e0 ffffffff8150b1db 00000000000280d4 ffffffff8113af90
 0000000000000000 0000000000000000 ffff88007efdbb00 0000000100000000
 0000000000000000 0000000000000000 0000000000000000 0000000000000001
Call Trace:
  dump_trace+0x7d/0x2d0
  show_stack_log_lvl+0x94/0x170
  show_stack+0x21/0x50
  dump_stack+0x41/0x51
  warn_alloc_failed+0xf0/0x160
  __alloc_pages_slowpath+0x72f/0x796
  __alloc_pages_nodemask+0x1ea/0x210
  dma_generic_alloc_coherent+0x96/0x140
  x86_swiotlb_alloc_coherent+0x1c/0x50
  ttm_dma_pool_alloc_new_pages+0xab/0x320 [ttm]
  ttm_dma_populate+0x3ce/0x640 [ttm]
  ttm_tt_bind+0x36/0x60 [ttm]
  ttm_bo_handle_move_mem+0x55f/0x5c0 [ttm]
  ttm_bo_move_buffer+0x105/0x130 [ttm]
  ttm_bo_validate+0xc1/0x130 [ttm]
  ttm_bo_init+0x24b/0x400 [ttm]
  radeon_bo_create+0x16c/0x200 [radeon]
  radeon_ring_init+0x11e/0x2b0 [radeon]
  r100_cp_init+0x123/0x5b0 [radeon]
  r100_startup+0x194/0x230 [radeon]
  r100_init+0x223/0x410 [radeon]
  radeon_device_init+0x6af/0x830 [radeon]
  radeon_driver_load_kms+0x89/0x180 [radeon]
  drm_get_pci_dev+0x121/0x2f0 [drm]
  local_pci_probe+0x39/0x60
  pci_device_probe+0xa9/0x120
  driver_probe_device+0x9d/0x3d0
  __driver_attach+0x8b/0x90
  bus_for_each_dev+0x5b/0x90
  bus_add_driver+0x1f8/0x2c0
  driver_register+0x5b/0xe0
  do_one_initcall+0xf2/0x1a0
  load_module+0x1207/0x1c70
  SYSC_finit_module+0x75/0xa0
  system_call_fastpath+0x16/0x1b
  0x7fac533d2788

After these warnings the code enters a fall-back path and
allocated directly from the swiotlb aperture in the end.
So remove these warnings as this is not a fatal error.

Acked-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 arch/x86/kernel/pci-swiotlb.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index 77dd0ad..6d6894c 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. The swiotlb_alloc_coherent() function will print a
+         * warning when the allocation of DMA memory ultimatly failed.
+	 */
+	flags |= __GFP_NOWARN;
+
 	vaddr = dma_generic_alloc_coherent(hwdev, size, dma_handle, flags,
 					   attrs);
 	if (vaddr)
-- 
1.9.1

[PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Joerg Roedel]

From: Joerg Roedel <jroedel@suse.de>

When the crashkernel is loaded above 4GiB in memory the
first kernel only allocates 72MiB of low-memory for the DMA
requirements of the second kernel. On systems with many
devices this is not enough and causes device driver
initialization errors and failed crash dumps. Testing by
SUSE and Redhat have shown that 256MiB is a good default
value for now and the discussion has agreed on this value as
well. So set this default value to 256MiB to make sure there
is enough memory available for DMA.

Acked-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 arch/x86/kernel/setup.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index d74ac33..a09f368 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -535,8 +535,11 @@ static void __init reserve_crashkernel_low(void)
 		 *	swiotlb overflow buffer: now is 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 memory
+		 *		low memory so that we don't run out of DMA
+		 *		buffers for 32bit 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 ? */
-- 
1.9.1

Re: [PATCH 0/3 v3] Fix kdump failures with crashkernel=high

[Borislav Petkov]

On Fri, Jun 05, 2015 at 12:29:59PM +0200, Joerg Roedel wrote:
> v2->v3
> 
> * Rebased to v4.1-rc6
> * Updated changelogs as requested and added outcome of
>   previous discussions
> * Added more Acked-bys
> 
> v1->v2:
> 
> * Updated comments based on feedback from Konrad
> * Added Acked-bys
> * Rebased to v3.19-rc3
> 
> Hi,
> 
> here is a patch-set to fix failed kdump kernel boots when
> the systems was booted with crashkernel=X,high. On those
> systems the kernel allocates only 72MiB of low-memory for
> DMA buffers, which showed to be too low on some systems.
> 
> The problem is that 64MiB of the low-memory is allocated by
> swiotlb, leaving 8MB for the page-allocator. But swiotlb
> tries to allocate DMA memory from the page-allocator first,
> which fails pretty fast in the boot sequence, causing
> warnings. This patch-set removes these warnings.
> 
> But even the 64MiB for swiotlb are eaten up on some systems,
> so that the default of low-memory allocated for the
> crash-kernel is increase from 72MB to 256MB (only changing
> the defaults, can still be overwritten by crashkernel=X,low).
> 
> This number comes from experiments on the affected systems,
> 128MiB low-memory was still not enough there, thus I set the
> value to 256MiB to fix the issues.
> 
> Any feedback appreciated.
> 
> Thanks,
> 
> 	Joerg
> 
> Joerg Roedel (3):
>   swiotlb: Warn on allocation failure in swiotlb_alloc_coherent
>   x86, swiotlb: Try coherent allocations with __GFP_NOWARN
>   x86, crash: Allocate enough low-mem when crashkernel=high
> 
>  arch/x86/kernel/pci-swiotlb.c |  7 +++++++
>  arch/x86/kernel/setup.c       |  5 ++++-
>  lib/swiotlb.c                 | 11 +++++++++--
>  3 files changed, 20 insertions(+), 3 deletions(-)

Looks simple enough, all applied, thanks.

hpa, Ingo, any concerns?

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

Re: [PATCH 0/3 v3] Fix kdump failures with crashkernel=high

[Borislav Petkov]

On Fri, Jun 05, 2015 at 12:29:59PM +0200, Joerg Roedel wrote:
> v2->v3
> 
> * Rebased to v4.1-rc6
> * Updated changelogs as requested and added outcome of
>   previous discussions
> * Added more Acked-bys
> 
> v1->v2:
> 
> * Updated comments based on feedback from Konrad
> * Added Acked-bys
> * Rebased to v3.19-rc3
> 
> Hi,
> 
> here is a patch-set to fix failed kdump kernel boots when
> the systems was booted with crashkernel=X,high. On those
> systems the kernel allocates only 72MiB of low-memory for
> DMA buffers, which showed to be too low on some systems.
> 
> The problem is that 64MiB of the low-memory is allocated by
> swiotlb, leaving 8MB for the page-allocator. But swiotlb
> tries to allocate DMA memory from the page-allocator first,
> which fails pretty fast in the boot sequence, causing
> warnings. This patch-set removes these warnings.
> 
> But even the 64MiB for swiotlb are eaten up on some systems,
> so that the default of low-memory allocated for the
> crash-kernel is increase from 72MB to 256MB (only changing
> the defaults, can still be overwritten by crashkernel=X,low).
> 
> This number comes from experiments on the affected systems,
> 128MiB low-memory was still not enough there, thus I set the
> value to 256MiB to fix the issues.
> 
> Any feedback appreciated.
> 
> Thanks,
> 
> 	Joerg
> 
> Joerg Roedel (3):
>   swiotlb: Warn on allocation failure in swiotlb_alloc_coherent
>   x86, swiotlb: Try coherent allocations with __GFP_NOWARN
>   x86, crash: Allocate enough low-mem when crashkernel=high
> 
>  arch/x86/kernel/pci-swiotlb.c |  7 +++++++
>  arch/x86/kernel/setup.c       |  5 ++++-
>  lib/swiotlb.c                 | 11 +++++++++--
>  3 files changed, 20 insertions(+), 3 deletions(-)

Looks simple enough, all applied, thanks.

hpa, Ingo, any concerns?

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH 0/3 v3] Fix kdump failures with crashkernel=high

[Ingo Molnar]

* Borislav Petkov <bp@alien8.de> wrote:

> > Joerg Roedel (3):
> >   swiotlb: Warn on allocation failure in swiotlb_alloc_coherent
> >   x86, swiotlb: Try coherent allocations with __GFP_NOWARN
> >   x86, crash: Allocate enough low-mem when crashkernel=high
> > 
> >  arch/x86/kernel/pci-swiotlb.c |  7 +++++++
> >  arch/x86/kernel/setup.c       |  5 ++++-
> >  lib/swiotlb.c                 | 11 +++++++++--
> >  3 files changed, 20 insertions(+), 3 deletions(-)
> 
> Looks simple enough, all applied, thanks.
> 
> hpa, Ingo, any concerns?

Modulo a couple of typos it all looks sane.

Thanks,

	Ingo

Re: [PATCH 0/3 v3] Fix kdump failures with crashkernel=high

[Ingo Molnar]

* Borislav Petkov <bp@alien8.de> wrote:

> > Joerg Roedel (3):
> >   swiotlb: Warn on allocation failure in swiotlb_alloc_coherent
> >   x86, swiotlb: Try coherent allocations with __GFP_NOWARN
> >   x86, crash: Allocate enough low-mem when crashkernel=high
> > 
> >  arch/x86/kernel/pci-swiotlb.c |  7 +++++++
> >  arch/x86/kernel/setup.c       |  5 ++++-
> >  lib/swiotlb.c                 | 11 +++++++++--
> >  3 files changed, 20 insertions(+), 3 deletions(-)
> 
> Looks simple enough, all applied, thanks.
> 
> hpa, Ingo, any concerns?

Modulo a couple of typos it all looks sane.

Thanks,

	Ingo

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH 0/3 v3] Fix kdump failures with crashkernel=high

[Borislav Petkov]

On Sun, Jun 07, 2015 at 03:41:36PM +0200, Ingo Molnar wrote:
> Modulo a couple of typos it all looks sane.

Ah yes, I caught a few while applying. I'll send you the final result
tomorrow.

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

Re: [PATCH 0/3 v3] Fix kdump failures with crashkernel=high

[Borislav Petkov]

On Sun, Jun 07, 2015 at 03:41:36PM +0200, Ingo Molnar wrote:
> Modulo a couple of typos it all looks sane.

Ah yes, I caught a few while applying. I'll send you the final result
tomorrow.

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

[tip:x86/kdump] swiotlb: Warn on allocation failure in swiotlb_alloc_coherent()

[tip-bot for Joerg Roedel]

Commit-ID:  94cc81f9a8f995923e35e2db936741dd62d18350
Gitweb:     http://git.kernel.org/tip/94cc81f9a8f995923e35e2db936741dd62d18350
Author:     Joerg Roedel <jroedel@suse.de>
AuthorDate: Wed, 10 Jun 2015 17:49:40 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 11 Jun 2015 08:28:38 +0200

swiotlb: Warn on allocation failure in swiotlb_alloc_coherent()

Print a warning when all allocation tries have been failed
and the function is about to return NULL.

This prepares for calling the function with __GFP_NOWARN to
suppress allocation failure warnings before all fall-backs
have failed - which we'll do to improve kdump behavior.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Baoquan He <bhe@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jörg Rödel <joro@8bytes.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: kexec@lists.infradead.org
Link: http://lkml.kernel.org/r/1433500202-25531-2-git-send-email-joro@8bytes.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 lib/swiotlb.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 3c365ab..42e192d 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);
 

[tip:x86/kdump] x86/swiotlb: Try coherent allocations with __GFP_NOWARN

[tip-bot for Joerg Roedel]

Commit-ID:  186dfc9d69b96a38ec6ec654127dba4432184494
Gitweb:     http://git.kernel.org/tip/186dfc9d69b96a38ec6ec654127dba4432184494
Author:     Joerg Roedel <jroedel@suse.de>
AuthorDate: Wed, 10 Jun 2015 17:49:41 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 11 Jun 2015 08:28:38 +0200

x86/swiotlb: Try coherent allocations with __GFP_NOWARN

When we boot a kdump kernel in high memory, there is by
default only 72MB of low memory available. The swiotlb code
takes 64MB of it (by default) so that there are only 8MB
left to allocate from. On systems with many devices this
causes page allocator warnings from
dma_generic_alloc_coherent():

  systemd-udevd: page allocation failure: order:0, mode:0x280d4
  CPU: 0 PID: 197 Comm: systemd-udevd Tainted: G        W
  3.12.28-4-default #1 Hardware name: HP ProLiant DL980 G7, BIOS
  P66 07/30/2012  ffff8800781335e0 ffffffff8150b1db 00000000000280d4 ffffffff8113af90
   0000000000000000 0000000000000000 ffff88007efdbb00 0000000100000000
   0000000000000000 0000000000000000 0000000000000000 0000000000000001
  Call Trace:
    dump_trace+0x7d/0x2d0
    show_stack_log_lvl+0x94/0x170
    show_stack+0x21/0x50
    dump_stack+0x41/0x51
    warn_alloc_failed+0xf0/0x160
    __alloc_pages_slowpath+0x72f/0x796
    __alloc_pages_nodemask+0x1ea/0x210
    dma_generic_alloc_coherent+0x96/0x140
    x86_swiotlb_alloc_coherent+0x1c/0x50
    ttm_dma_pool_alloc_new_pages+0xab/0x320 [ttm]
    ttm_dma_populate+0x3ce/0x640 [ttm]
    ttm_tt_bind+0x36/0x60 [ttm]
    ttm_bo_handle_move_mem+0x55f/0x5c0 [ttm]
    ttm_bo_move_buffer+0x105/0x130 [ttm]
    ttm_bo_validate+0xc1/0x130 [ttm]
    ttm_bo_init+0x24b/0x400 [ttm]
    radeon_bo_create+0x16c/0x200 [radeon]
    radeon_ring_init+0x11e/0x2b0 [radeon]
    r100_cp_init+0x123/0x5b0 [radeon]
    r100_startup+0x194/0x230 [radeon]
    r100_init+0x223/0x410 [radeon]
    radeon_device_init+0x6af/0x830 [radeon]
    radeon_driver_load_kms+0x89/0x180 [radeon]
    drm_get_pci_dev+0x121/0x2f0 [drm]
    local_pci_probe+0x39/0x60
    pci_device_probe+0xa9/0x120
    driver_probe_device+0x9d/0x3d0
    __driver_attach+0x8b/0x90
    bus_for_each_dev+0x5b/0x90
    bus_add_driver+0x1f8/0x2c0
    driver_register+0x5b/0xe0
    do_one_initcall+0xf2/0x1a0
    load_module+0x1207/0x1c70
    SYSC_finit_module+0x75/0xa0
    system_call_fastpath+0x16/0x1b
    0x7fac533d2788

After these warnings the code enters a fall-back path and
allocated directly from the swiotlb aperture in the end.
So remove these warnings as this is not a fatal error.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
[ Simplify, reflow comment. ]
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Baoquan He <bhe@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jörg Rödel <joro@8bytes.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: kexec@lists.infradead.org
Link: http://lkml.kernel.org/r/1433500202-25531-3-git-send-email-joro@8bytes.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/pci-swiotlb.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index 77dd0ad..adf0392 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)

[tip:x86/kdump] x86/crash: Allocate enough low memory when crashkernel=high

[tip-bot for Joerg Roedel]

Commit-ID:  94fb9334182284e8e7e4bcb9125c25dc33af19d4
Gitweb:     http://git.kernel.org/tip/94fb9334182284e8e7e4bcb9125c25dc33af19d4
Author:     Joerg Roedel <jroedel@suse.de>
AuthorDate: Wed, 10 Jun 2015 17:49:42 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 11 Jun 2015 08:28:39 +0200

x86/crash: Allocate enough low memory when crashkernel=high

When the crash kernel is loaded above 4GiB in memory, the
first kernel allocates only 72MiB of low-memory for the DMA
requirements of the second kernel. On systems with many
devices this is not enough and causes device driver
initialization errors and failed crash dumps. Testing by
SUSE and Redhat has shown that 256MiB is a good default
value for now and the discussion has lead to this value as
well. So set this default value to 256MiB to make sure there
is enough memory available for DMA.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
[ Reflow comment. ]
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Baoquan He <bhe@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jörg Rödel <joro@8bytes.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: kexec@lists.infradead.org
Link: http://lkml.kernel.org/r/1433500202-25531-4-git-send-email-joro@8bytes.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/setup.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index d74ac33..cba8288 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 ? */

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Baoquan He]

On 02/13/15 at 11:28pm, Joerg Roedel wrote:
> Hi Baoquan,
> 
> On Fri, Feb 13, 2015 at 11:34:38PM +0800, Baoquan He wrote:
> > Conclusively, I like 256M since the testing data showed it's sufficient
> > now and should be save for a long time.
> 
> Thanks, I am fine with 256MB too, so can I have your Acked-by on this
> series? I will rebase and resend it then after the merge window in the
> hope it gets queued.

Sure. Have acked it in reply to cover letter, feel free to add my
Acked-by in your resend.

Thanks a lot!

Thanks
Baoquan

> 
> 
> 	Joerg
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Joerg Roedel]

Hi Baoquan,

On Fri, Feb 13, 2015 at 11:34:38PM +0800, Baoquan He wrote:
> Conclusively, I like 256M since the testing data showed it's sufficient
> now and should be save for a long time.

Thanks, I am fine with 256MB too, so can I have your Acked-by on this
series? I will rebase and resend it then after the merge window in the
hope it gets queued.


	Joerg

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Baoquan He]

On 02/09/15 at 01:20pm, Joerg Roedel wrote:
> Hi Baoquan,
> 
> On Wed, Feb 04, 2015 at 03:10:20PM +0100, Joerg Roedel wrote:
> > That makes sense. I also asked the customer to test intermediate values,
> > we already know that it works with 256MB but also that 128MB are not
> > enough. I will report back when I have the results of the intermediate
> > values in 32MB steps.
> 
> I got the results from the customer, and it turns out that a value of
> 192MB is sufficient to make the kdump succeed. It fails with 128MB and
> 160MB. 
> 
> So I think we can settle in 192MB for now. What do you think?

Hi Joerg,

Sorry for late reply.

So that machine need eat memory between 160M and 192M. Then how about
setting it as 256M? Since 192M seems very close to the brink, and
setting it larger can keep enough space to extend for increasing dma
device on larger machines, otherwise this value could be increased soon.

Wasting some low memory is better than kdump kernel can't bootup
caused by not enough low memory. If someone grudge the low mem they can
specify crashkernel=size,low manually.

Conclusively, I like 256M since the testing data showed it's sufficient
now and should be save for a long time.

Thanks
Baoquan

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Joerg Roedel]

Hi Baoquan,

On Wed, Feb 04, 2015 at 03:10:20PM +0100, Joerg Roedel wrote:
> That makes sense. I also asked the customer to test intermediate values,
> we already know that it works with 256MB but also that 128MB are not
> enough. I will report back when I have the results of the intermediate
> values in 32MB steps.

I got the results from the customer, and it turns out that a value of
192MB is sufficient to make the kdump succeed. It fails with 128MB and
160MB. 

So I think we can settle in 192MB for now. What do you think?

Regards,

	Joerg

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Joerg Roedel]

Hi Baoquan,

On Sun, Feb 01, 2015 at 04:41:03PM +0800, Baoquan He wrote:
> Before I said 256M may not be a good value, that's because in your patch
> cover you said this number comes from experiments on the affected
> systems, and 128M was still not enough, then you set it to 256M. This
> may be a little rush. I think the step size to increase should be 32M,
> after all previously people only take 64M and 8M, enlarge it on a step
> size of 128M only one time, it can't be seen as patient and careful.
> If it failed on 224M but succeed on 256M, then 256M may be not enough.
> I would like to say 32M is better, then we can make a good evaluate.

That makes sense. I also asked the customer to test intermediate values,
we already know that it works with 256MB but also that 128MB are not
enough. I will report back when I have the results of the intermediate
values in 32MB steps.

Thanks,

	Joerg
	

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Baoquan He]

On 01/26/15 at 01:07pm, Joerg Roedel wrote:
> Hi Baoquan,
> 
> thanks for your reply.
> 
> On Fri, Jan 23, 2015 at 04:44:53PM +0800, Baoquan He wrote:
> > 2) increase low-mem when crashkernel=high. But we have to be careful to
> > do this. We implement crashkernel=high not only for the unhappiness
> > crashkernel reservation is limited below 4G, but dma/dma32 memory space
> > is precious on some systems. If set crashkernel=high still too much low
> > memory has to be reserved by default, it's important to find the
> > balance. So if we have to increase the default low-mem, how much memory
> > is enough, why 256M?  why not 128M/192M/320M/384M?  And if 256M works
> > on your system, what if another person say it does't work because there
> > are more devices on his system?
> > 
> > Anyway, I understand the requirement, but we need find out how much
> > memory can satisfy most of systems.
> 
> Yes, I totally agree that it is tough to find a good default here. I
> used 256MB because this is what was required on the system the  failed
> kdumps were reported on.
> 
> But probably we can agree that 72MB is not enough (given that 64MB are
> taken away by swiotlb already), and increase it to a value we think by
> now is sufficient for most systems.

Yeah, and I got report from user about this issue too. It should be
fixed. Like I said, the 1st suggestion mainly will goes to the area of
initramfs making tools, currently maybe dracut which is used widely.
This may cause many changes. Hence increasing low mem is a better idea.

Before I said 256M may not be a good value, that's because in your patch
cover you said this number comes from experiments on the affected
systems, and 128M was still not enough, then you set it to 256M. This
may be a little rush. I think the step size to increase should be 32M,
after all previously people only take 64M and 8M, enlarge it on a step
size of 128M only one time, it can't be seen as patient and careful.
If it failed on 224M but succeed on 256M, then 256M may be not enough.
I would like to say 32M is better, then we can make a good evaluate.

I will ask user reported this issue to help test and see what value will
be satisfy their system.

Anyway, I think this patch is helpful and necessary.

> 
> Btw, the issue was also reported on machines with only a few devices,
> the reason there is that device drivers allocate more dma memory by
> default on intilization. Maybe we should handle that as a driver
> regression in the future, forcing them to allocate more dma-memory
> on-demand and not on initialization.

Yeah, agree. In that case it shoube be handled as a regression.


Thanks
Baoquan

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Borislav Petkov]

On Mon, Jan 26, 2015 at 01:40:06PM +0100, Joerg Roedel wrote:
> Yes. Given that we have no data about what would work on most
> systems, we can only change the value to a number that fixes know
> problems and then act on possible regressions caused by the change (and
> that change is pretty easy to revert if needed).

... and I think we can safely concentrate on kdump-specific usage anyway
and de-prioritize the others. Like not adding in the radeon module to
initramfs and such. I don't think we want to show a funky graphic while
dumping the first kernel.

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Joerg Roedel]

On Mon, Jan 26, 2015 at 01:20:17PM +0100, Borislav Petkov wrote:
> On Mon, Jan 26, 2015 at 01:11:42PM +0100, Joerg Roedel wrote:
> > Or we solve it in user-space by some more cleverness in creating the
> > kernel command-line for crashkernel=high.
> 
> I'd say, we should try to do as much as possible automatically.

Thats hard to do, without any information about the driver needs we only
have the amount of devices in the system to base any heuristic on.

> > But besides that, I think the first two patches of this set make sense
> > anyway. I understand that the third one is debatable.
> 
> Right, but since they fix a real problem, maybe we should take them now
> until a better fix is done? Yes, no?

Yes. Given that we have no data about what would work on most
systems, we can only change the value to a number that fixes know
problems and then act on possible regressions caused by the change (and
that change is pretty easy to revert if needed).


	Joerg

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Borislav Petkov]

On Mon, Jan 26, 2015 at 01:11:42PM +0100, Joerg Roedel wrote:
> Well, there is no easy way. But we could collect information from the
> loaded drivers on boot about how many dma-memory they allocate and base
> our allocation on that.

That sounds like a nifty idea to me.

> Or we solve it in user-space by some more cleverness in creating the
> kernel command-line for crashkernel=high.

I'd say, we should try to do as much as possible automatically.

> But besides that, I think the first two patches of this set make sense
> anyway. I understand that the third one is debatable.

Right, but since they fix a real problem, maybe we should take them now
until a better fix is done? Yes, no?

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Joerg Roedel]

On Fri, Jan 23, 2015 at 06:02:43PM +0100, Borislav Petkov wrote:
> On Tue, Jan 06, 2015 at 03:51:14PM +0100, Joerg Roedel wrote:
> > From: Joerg Roedel <jroedel@suse.de>
> > 
> > When the crashkernel is loaded above 4GiB in memory the
> > first kernel only allocates 72MiB of low-memory for the DMA
> > requirements of the second kernel. On systems with many
> > devices this is not enough and causes device driver
> > initialization errors and failed crash dumps. Set this
> > default value to 256MiB to make sure there is enough memory
> 
> This upper limit of 256 looks arbitrary. Are we going to raise it a
> couple of years from now if it becomes insufficient then?

Yes, it is arbitrary. I am open for suggestions on what might be a
proper value to satisfy most systems.

> It probably won't be easy but is there some more reliable way to
> allocate enough memory for DMA on a say per-system basis or whatever...?
> Probably not but let me ask it anyway.

Well, there is no easy way. But we could collect information from the
loaded drivers on boot about how many dma-memory they allocate and base
our allocation on that. Or we solve it in user-space by some more
cleverness in creating the kernel command-line for crashkernel=high.

But besides that, I think the first two patches of this set make sense
anyway. I understand that the third one is debatable.


	Joerg

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Joerg Roedel]

Hi Baoquan,

thanks for your reply.

On Fri, Jan 23, 2015 at 04:44:53PM +0800, Baoquan He wrote:
> 2) increase low-mem when crashkernel=high. But we have to be careful to
> do this. We implement crashkernel=high not only for the unhappiness
> crashkernel reservation is limited below 4G, but dma/dma32 memory space
> is precious on some systems. If set crashkernel=high still too much low
> memory has to be reserved by default, it's important to find the
> balance. So if we have to increase the default low-mem, how much memory
> is enough, why 256M?  why not 128M/192M/320M/384M?  And if 256M works
> on your system, what if another person say it does't work because there
> are more devices on his system?
> 
> Anyway, I understand the requirement, but we need find out how much
> memory can satisfy most of systems.

Yes, I totally agree that it is tough to find a good default here. I
used 256MB because this is what was required on the system the  failed
kdumps were reported on.

But probably we can agree that 72MB is not enough (given that 64MB are
taken away by swiotlb already), and increase it to a value we think by
now is sufficient for most systems.

Btw, the issue was also reported on machines with only a few devices,
the reason there is that device drivers allocate more dma memory by
default on intilization. Maybe we should handle that as a driver
regression in the future, forcing them to allocate more dma-memory
on-demand and not on initialization.


	Joerg

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Borislav Petkov]

On Tue, Jan 06, 2015 at 03:51:14PM +0100, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@suse.de>
> 
> When the crashkernel is loaded above 4GiB in memory the
> first kernel only allocates 72MiB of low-memory for the DMA
> requirements of the second kernel. On systems with many
> devices this is not enough and causes device driver
> initialization errors and failed crash dumps. Set this
> default value to 256MiB to make sure there is enough memory

This upper limit of 256 looks arbitrary. Are we going to raise it a
couple of years from now if it becomes insufficient then?

It probably won't be easy but is there some more reliable way to
allocate enough memory for DMA on a say per-system basis or whatever...?
Probably not but let me ask it anyway.

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

Re: [PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Baoquan He]

Hi Joerg,

Yeah, it does happen if too many devices. I guess the reason no reports
come to us on rhel is we always use a auto mechsanism. We always try to
allocate from below 896M, if failed try below 4G, if failed try above
4G.

This could be solved in 2 ways:

1) We could optimize the distro shell scripts which build the initramfs
for kdump. Only include those devices which are necessary in kdump
kernel. E.g for net dump only that NIC which connect to dump target will
be brought up, this can decrease the dma memory requirement.

2) increase low-mem when crashkernel=high. But we have to be careful to
do this. We implement crashkernel=high not only for the unhappiness
crashkernel reservation is limited below 4G, but dma/dma32 memory space
is precious on some systems. If set crashkernel=high still too much low
memory has to be reserved by default, it's important to find the
balance. So if we have to increase the default low-mem, how much memory
is enough, why 256M?  why not 128M/192M/320M/384M?  And if 256M works
on your system, what if another person say it does't work because there
are more devices on his system?

Anyway, I understand the requirement, but we need find out how much
memory can satisfy most of systems.


Thanks
Baoquan

On 01/06/15 at 03:51pm, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@suse.de>
> 
> When the crashkernel is loaded above 4GiB in memory the
> first kernel only allocates 72MiB of low-memory for the DMA
> requirements of the second kernel. On systems with many
> devices this is not enough and causes device driver
> initialization errors and failed crash dumps. Set this
> default value to 256MiB to make sure there is enough memory
> available for DMA.
> 
> Signed-off-by: Joerg Roedel <jroedel@suse.de>
> ---
>  arch/x86/kernel/setup.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index ab4734e..d6e6a6d 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -536,8 +536,11 @@ static void __init reserve_crashkernel_low(void)
>  		 *	swiotlb overflow buffer: now is 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 memory
> +		 *		low memory so that we don't run out of DMA
> +		 *		buffers for 32bit 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 ? */
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Joerg Roedel]

From: Joerg Roedel <jroedel@suse.de>

When the crashkernel is loaded above 4GiB in memory the
first kernel only allocates 72MiB of low-memory for the DMA
requirements of the second kernel. On systems with many
devices this is not enough and causes device driver
initialization errors and failed crash dumps. Set this
default value to 256MiB to make sure there is enough memory
available for DMA.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 arch/x86/kernel/setup.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index ab4734e..d6e6a6d 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -536,8 +536,11 @@ static void __init reserve_crashkernel_low(void)
 		 *	swiotlb overflow buffer: now is 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 memory
+		 *		low memory so that we don't run out of DMA
+		 *		buffers for 32bit 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 ? */
-- 
1.9.1

[PATCH 3/3] x86, crash: Allocate enough low-mem when crashkernel=high

[Joerg Roedel]

From: Joerg Roedel <jroedel@suse.de>

When the crashkernel is loaded above 4GiB in memory the
first kernel only allocates 72MiB of low-memory for the DMA
requirements of the second kernel. On systems with many
devices this is not enough and causes device driver
initialization errors and failed crash dumps. Set this
default value to 256MiB to make sure there is enough memory
available for DMA.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 arch/x86/kernel/setup.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index ab08aa2..1227e30 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -536,8 +536,11 @@ static void __init reserve_crashkernel_low(void)
 		 *	swiotlb overflow buffer: now is 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 memory
+		 *		low memory so that we don't run out of DMA
+		 *		buffers for 32bit 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 ? */
-- 
1.9.1