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 X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EAB7C43463 for ; Fri, 18 Sep 2020 09:07:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5B11208DB for ; Fri, 18 Sep 2020 09:07:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726543AbgIRJHJ (ORCPT ); Fri, 18 Sep 2020 05:07:09 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:38860 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725874AbgIRJHH (ORCPT ); Fri, 18 Sep 2020 05:07:07 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 88B488C1D3F7D245D2D1; Fri, 18 Sep 2020 17:07:04 +0800 (CST) Received: from [10.174.176.220] (10.174.176.220) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Fri, 18 Sep 2020 17:06:38 +0800 Subject: Re: [PATCH v12 3/9] x86: kdump: use macro CRASH_ADDR_LOW_MAX in functions reserve_crashkernel[_low]() To: Baoquan He References: <20200907134745.25732-1-chenzhou10@huawei.com> <20200907134745.25732-4-chenzhou10@huawei.com> <20200918072526.GD25604@MiWiFi-R3L-srv> CC: , , , , , , , , , , , , , , , , , , , , , , From: chenzhou Message-ID: <14e22d92-1601-fc1c-a1c8-e3936d63db42@huawei.com> Date: Fri, 18 Sep 2020 17:06:37 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.176.220] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Catalin, On 2020/9/18 16:59, chenzhou wrote: > Hi Baoquan, > > On 2020/9/18 15:25, Baoquan He wrote: >> Hi, >> >> On 09/07/20 at 09:47pm, Chen Zhou wrote: >>> To make the functions reserve_crashkernel[_low]() as generic, >>> replace some hard-coded numbers with macro CRASH_ADDR_LOW_MAX. >>> >>> Signed-off-by: Chen Zhou >>> --- >>> arch/x86/kernel/setup.c | 11 ++++++----- >>> 1 file changed, 6 insertions(+), 5 deletions(-) >>> >>> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c >>> index d7fd90c52dae..71a6a6e7ca5b 100644 >>> --- a/arch/x86/kernel/setup.c >>> +++ b/arch/x86/kernel/setup.c >>> @@ -430,7 +430,7 @@ static int __init reserve_crashkernel_low(void) >>> unsigned long total_low_mem; >>> int ret; >>> >>> - total_low_mem = memblock_mem_size(1UL << (32 - PAGE_SHIFT)); >>> + total_low_mem = memblock_mem_size(CRASH_ADDR_LOW_MAX >> PAGE_SHIFT); >> Just note that the replacement has been done in another patch from Mike >> Rapoport, partially. He seems to have done reserve_crashkernel_low() >> part, there's one left in reserve_crashkernel(), you might want to check >> that. >> >> Mike's patch which is from a patchset has been merged into Andrew's next >> tree. >> >> commit 6e50f7672ffa362e9bd4bc0c0d2524ed872828c5 >> Author: Mike Rapoport >> Date: Wed Aug 26 15:22:32 2020 +1000 >> >> x86/setup: simplify reserve_crashkernel() As Baoquan said, some functions have been changed in the next tree, if i need to rebase on top of the next tree. Thanks, Chen Zhou > Yeah, the function reserve_crashkernel() has been changed in the next tree. > Thanks for your review and reminder. > > Thanks, > Chen Zhou >>> >>> /* crashkernel=Y,low */ >>> ret = parse_crashkernel_low(boot_command_line, total_low_mem, &low_size, &base); >>> @@ -451,7 +451,7 @@ static int __init reserve_crashkernel_low(void) >>> return 0; >>> } >>> >>> - low_base = memblock_find_in_range(CRASH_ALIGN, 1ULL << 32, low_size, CRASH_ALIGN); >>> + low_base = memblock_find_in_range(CRASH_ALIGN, CRASH_ADDR_LOW_MAX, low_size, CRASH_ALIGN); >>> if (!low_base) { >>> pr_err("Cannot reserve %ldMB crashkernel low memory, please try smaller size.\n", >>> (unsigned long)(low_size >> 20)); >>> @@ -504,8 +504,9 @@ static void __init reserve_crashkernel(void) >>> if (!crash_base) { >>> /* >>> * Set CRASH_ADDR_LOW_MAX upper bound for crash memory, >>> - * crashkernel=x,high reserves memory over 4G, also allocates >>> - * 256M extra low memory for DMA buffers and swiotlb. >>> + * crashkernel=x,high reserves memory over CRASH_ADDR_LOW_MAX, >>> + * also allocates 256M extra low memory for DMA buffers >>> + * and swiotlb. >>> * But the extra memory is not required for all machines. >>> * So try low memory first and fall back to high memory >>> * unless "crashkernel=size[KMG],high" is specified. >>> @@ -539,7 +540,7 @@ static void __init reserve_crashkernel(void) >>> return; >>> } >>> >>> - if (crash_base >= (1ULL << 32) && reserve_crashkernel_low()) { >>> + if (crash_base >= CRASH_ADDR_LOW_MAX && reserve_crashkernel_low()) { >>> memblock_free(crash_base, crash_size); >>> return; >>> } >>> -- >>> 2.20.1 >>> >> . >>