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=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 0CD14C43464 for ; Fri, 18 Sep 2020 09:01:36 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9E506206CA for ; Fri, 18 Sep 2020 09:01:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="3NMeceR9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E506206CA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iHoftusaMu1LNf/y49bNY4e106+S6JZjh2rE/tgtQ+w=; b=3NMeceR9poI7KAD2tM+6pkbAf KKdexlyBW8U1HhzVVERmQKstdDpjtsujyhztE3cS1LdOvKb3yBMqlHlxYlvTVlDvE0GpES198dIzR g1B5CzGPt60R46j4U24j2cVbunb7n4kEfsvPYzxlp19q1wZW2UA5Eooy2uqzJTRkKJOG7+/nFwAWQ PE2wHBZP/fxXyCCzyqO94om/XqLb2Xuz/dEg63U2XPOhsSj7xPXB3HWXmkAzF2m9Ei+rf9e66mP6J I+tsqPZZ9ETvg3bJHs2vXZ7pPt8NwBcLr0EYTYWhq1nafcJabVaAJm4zZwXNRy+VyDks6gAehwHF1 a+BkmctOQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kJCFQ-0006MT-NP; Fri, 18 Sep 2020 09:00:04 +0000 Received: from szxga05-in.huawei.com ([45.249.212.191] helo=huawei.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kJCFN-0006LA-9d; Fri, 18 Sep 2020 09:00:02 +0000 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 92FA38072DD805E457D2; Fri, 18 Sep 2020 16:59:57 +0800 (CST) Received: from [10.174.176.220] (10.174.176.220) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Fri, 18 Sep 2020 16:59:48 +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> From: chenzhou Message-ID: Date: Fri, 18 Sep 2020 16:59:47 +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: <20200918072526.GD25604@MiWiFi-R3L-srv> X-Originating-IP: [10.174.176.220] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200918_050001_652397_C1C9D8EE X-CRM114-Status: GOOD ( 19.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wangkefeng.wang@huawei.com, linux-doc@vger.kernel.org, catalin.marinas@arm.com, bhsharma@redhat.com, huawei.libin@huawei.com, guohanjun@huawei.com, will@kernel.org, corbet@lwn.net, rppt@linux.ibm.com, mingo@redhat.com, dyoung@redhat.com, John.P.donnelly@oracle.com, arnd@arndb.de, xiexiuqi@huawei.com, horms@verge.net.au, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, james.morse@arm.com, prabhakar.pkin@gmail.com, nsaenzjulienne@suse.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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() 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 >> > . > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel