From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B0FFC3DA60 for ; Thu, 18 Jul 2024 12:12:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:From:References:CC:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pjmfYEDGpGd2m1FMSIeJso6kRU/bCXeQcEaN3yRnwAI=; b=26YPsg6tG4zS9M hb888bSX/zrVAtcUo5mCX/B5tMHTv3Qg5L/aDR/sA1wdzxTaAtqzxLVY0cGzaVH87VER4/hyhRmij M8daMBOlIesWAFmPZMp8/a2zKHioS7uORv5Cf4nzayPvNUa3RcA8iuCW0clJQUHrgfFf2wDmyASNf LhCMW0JcQ/r+YW1FkdF6JaKbSnIx2W9nZp2uKa1UMNsmhEEZqa7hcYzkhchtxSnVFGyM82TjCRKEr f3dFajkQ8JMBKwMSNu1U2edLLIIRlhrUUhlPOTfH4iAu7ozlgzvxYcZel3/Wm+bI8C/O7JGjmJDG2 YmamhT7gY1ps4RjYmQvg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUPzW-0000000Gw6U-04tz; Thu, 18 Jul 2024 12:12:10 +0000 Received: from szxga02-in.huawei.com ([45.249.212.188]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUPz5-0000000Gvxa-2eaa; Thu, 18 Jul 2024 12:11:45 +0000 Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4WPs7T1x7fzdjDQ; Thu, 18 Jul 2024 20:09:57 +0800 (CST) Received: from kwepemi100008.china.huawei.com (unknown [7.221.188.57]) by mail.maildlp.com (Postfix) with ESMTPS id 7FA0B180087; Thu, 18 Jul 2024 20:11:41 +0800 (CST) Received: from [10.67.109.254] (10.67.109.254) by kwepemi100008.china.huawei.com (7.221.188.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 18 Jul 2024 20:11:40 +0800 Message-ID: <42e69f31-44da-0525-0a79-8d4b5f3e4c57@huawei.com> Date: Thu, 18 Jul 2024 20:11:39 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.2.0 Subject: Re: [PATCH v3 1/3] crash: Fix x86_32 crash memory reserve dead loop bug Content-Language: en-US To: Baoquan He CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , References: <20240718035444.2977105-1-ruanjinjie@huawei.com> <20240718035444.2977105-2-ruanjinjie@huawei.com> From: Jinjie Ruan In-Reply-To: X-Originating-IP: [10.67.109.254] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemi100008.china.huawei.com (7.221.188.57) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240718_051144_061072_346B2CA0 X-CRM114-Status: GOOD ( 20.43 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On 2024/7/18 19:10, Baoquan He wrote: > On 07/18/24 at 11:54am, Jinjie Ruan wrote: >> On x86_32 Qemu machine with 1GB memory, the cmdline "crashkernel=1G,high" >> will cause system stall as below: >> >> ACPI: Reserving FACP table memory at [mem 0x3ffe18b8-0x3ffe192b] >> ACPI: Reserving DSDT table memory at [mem 0x3ffe0040-0x3ffe18b7] >> ACPI: Reserving FACS table memory at [mem 0x3ffe0000-0x3ffe003f] >> ACPI: Reserving APIC table memory at [mem 0x3ffe192c-0x3ffe19bb] >> ACPI: Reserving HPET table memory at [mem 0x3ffe19bc-0x3ffe19f3] >> ACPI: Reserving WAET table memory at [mem 0x3ffe19f4-0x3ffe1a1b] >> 143MB HIGHMEM available. >> 879MB LOWMEM available. >> mapped low ram: 0 - 36ffe000 >> low ram: 0 - 36ffe000 >> (stall here) >> >> The reason is that the CRASH_ADDR_LOW_MAX is equal to CRASH_ADDR_HIGH_MAX >> on x86_32, the first high crash kernel memory reservation will fail, then >> go into the "retry" loop and never came out as below. >> >> -> reserve_crashkernel_generic() and high is true >> -> alloc at [CRASH_ADDR_LOW_MAX, CRASH_ADDR_HIGH_MAX] fail >> -> alloc at [0, CRASH_ADDR_LOW_MAX] fail and repeatedly >> (because CRASH_ADDR_LOW_MAX = CRASH_ADDR_HIGH_MAX). >> >> Fix it by prevent crashkernel=,high from being parsed successfully on 32bit >> system with a architecture-defined macro. >> >> After this patch, the 'crashkernel=,high' for 32bit system can't succeed, >> and it has no chance to call reserve_crashkernel_generic(), therefore this >> issue on x86_32 is solved. >> >> Fixes: 9c08a2a139fe ("x86: kdump: use generic interface to simplify crashkernel reservation code") >> Signed-off-by: Jinjie Ruan >> Signed-off-by: Baoquan He > > Just adding my Suggested-by is fine. If multiple people cooperate on one > patch, the Co-developed-by tag is needed. As a maintainer, I prefer to > have the Suggested-by tag in this case. OK, thank you very much! > >> Tested-by: Jinjie Ruan > > You can't add Tested-by tag for your own patch. When you post patch, > testing it is your obligation. > > Other than these tag adding concerns, this patch looks good to me. You > can post v4 to update and add my: Thank you, I'll fix it next version. > > Acked-by: Baoquan He > >> --- >> v3: >> - Fix it as Baoquan suggested. >> - Update the commit message. >> v2: >> - Peel off the other two patches. >> - Update the commit message and fix tag. >> --- >> arch/arm64/include/asm/crash_reserve.h | 2 ++ >> arch/riscv/include/asm/crash_reserve.h | 2 ++ >> arch/x86/include/asm/crash_reserve.h | 1 + >> kernel/crash_reserve.c | 2 +- >> 4 files changed, 6 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm64/include/asm/crash_reserve.h b/arch/arm64/include/asm/crash_reserve.h >> index 4afe027a4e7b..bf362c1a612f 100644 >> --- a/arch/arm64/include/asm/crash_reserve.h >> +++ b/arch/arm64/include/asm/crash_reserve.h >> @@ -7,4 +7,6 @@ >> >> #define CRASH_ADDR_LOW_MAX arm64_dma_phys_limit >> #define CRASH_ADDR_HIGH_MAX (PHYS_MASK + 1) >> + >> +#define HAVE_ARCH_CRASHKERNEL_RESERVATION_HIGH >> #endif >> diff --git a/arch/riscv/include/asm/crash_reserve.h b/arch/riscv/include/asm/crash_reserve.h >> index 013962e63587..8d7a8fc1d459 100644 >> --- a/arch/riscv/include/asm/crash_reserve.h >> +++ b/arch/riscv/include/asm/crash_reserve.h >> @@ -7,5 +7,7 @@ >> #define CRASH_ADDR_LOW_MAX dma32_phys_limit >> #define CRASH_ADDR_HIGH_MAX memblock_end_of_DRAM() >> >> +#define HAVE_ARCH_CRASHKERNEL_RESERVATION_HIGH >> + >> extern phys_addr_t memblock_end_of_DRAM(void); >> #endif >> diff --git a/arch/x86/include/asm/crash_reserve.h b/arch/x86/include/asm/crash_reserve.h >> index 7835b2cdff04..24c2327f9a16 100644 >> --- a/arch/x86/include/asm/crash_reserve.h >> +++ b/arch/x86/include/asm/crash_reserve.h >> @@ -26,6 +26,7 @@ extern unsigned long swiotlb_size_or_default(void); >> #else >> # define CRASH_ADDR_LOW_MAX SZ_4G >> # define CRASH_ADDR_HIGH_MAX SZ_64T >> +#define HAVE_ARCH_CRASHKERNEL_RESERVATION_HIGH >> #endif >> >> # define DEFAULT_CRASH_KERNEL_LOW_SIZE crash_low_size_default() >> diff --git a/kernel/crash_reserve.c b/kernel/crash_reserve.c >> index 5b2722a93a48..c5213f123e19 100644 >> --- a/kernel/crash_reserve.c >> +++ b/kernel/crash_reserve.c >> @@ -306,7 +306,7 @@ int __init parse_crashkernel(char *cmdline, >> /* crashkernel=X[@offset] */ >> ret = __parse_crashkernel(cmdline, system_ram, crash_size, >> crash_base, NULL); >> -#ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION >> +#ifdef HAVE_ARCH_CRASHKERNEL_RESERVATION_HIGH >> /* >> * If non-NULL 'high' passed in and no normal crashkernel >> * setting detected, try parsing crashkernel=,high|low. >> -- >> 2.34.1 >> > > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv