Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752794AbbFHHuX (ORCPT ); Mon, 8 Jun 2015 03:50:23 -0400 Received: from mail.skyhub.de ([78.46.96.112]:54005 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752266AbbFHHt6 (ORCPT ); Mon, 8 Jun 2015 03:49:58 -0400 From: Borislav Petkov To: Ingo Molnar Cc: LKML Subject: [PATCH 3/3] x86/crash: Allocate enough low memory when crashkernel=high Date: Mon, 8 Jun 2015 09:49:55 +0200 Message-Id: <1433749795-5796-4-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1433749795-5796-1-git-send-email-bp@alien8.de> References: <1433749795-5796-1-git-send-email-bp@alien8.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2444 Lines: 63 From: Joerg Roedel 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 Acked-by: Baoquan He Cc: Baoquan He Cc: Dave Young Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Jörg Rödel Cc: Thomas Gleixner Cc: Vivek Goyal Cc: kexec@lists.infradead.org Cc: x86-ml Link: http://lkml.kernel.org/r/1433500202-25531-4-git-send-email-joro@8bytes.org [ Reflow comment. ] Signed-off-by: Borislav Petkov --- arch/x86/kernel/setup.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d74ac33290ae..5a697e56634c 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -531,12 +531,15 @@ 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 ? */ -- 2.3.5 -- 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/