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=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 9BBEEC433E3 for ; Tue, 18 Aug 2020 15:20:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5544B2076E for ; Tue, 18 Aug 2020 15:20:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="W7/1L7PM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5544B2076E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D63DA8D0023; Tue, 18 Aug 2020 11:20:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D12648D001B; Tue, 18 Aug 2020 11:20:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB35A8D0023; Tue, 18 Aug 2020 11:20:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0100.hostedemail.com [216.40.44.100]) by kanga.kvack.org (Postfix) with ESMTP id A41678D001B for ; Tue, 18 Aug 2020 11:20:05 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 5532A181AEF21 for ; Tue, 18 Aug 2020 15:20:05 +0000 (UTC) X-FDA: 77164049970.29.body48_4e0797b27020 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id CD45218033770 for ; Tue, 18 Aug 2020 15:19:23 +0000 (UTC) X-HE-Tag: body48_4e0797b27020 X-Filterd-Recvd-Size: 6877 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Tue, 18 Aug 2020 15:19:23 +0000 (UTC) Received: from aquarius.haifa.ibm.com (nesher1.haifa.il.ibm.com [195.110.40.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BA0A22076E; Tue, 18 Aug 2020 15:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597763962; bh=yru9/NdH9RLPoFs58u4GN0nY+Sogzjweg/tWDL+BinU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W7/1L7PMB6ny+R6Ja3ZTgt7DiZrj2MhEUn1Baeko2Ljpt+IgAAd0BIY0K5+ddrHdy 0Cgsg9BHQIzldcepANhUopKY4V4j0vt9l3455AzJkS/6oRvNjT5K9fhzbiyGqh3U1M mGXqQ6IOdYEbV7nbtMhzb+zOAQWJlqo2RxTvK8bI= From: Mike Rapoport To: Andrew Morton Cc: Andy Lutomirski , Baoquan He , Benjamin Herrenschmidt , Borislav Petkov , Catalin Marinas , Christoph Hellwig , Daniel Axtens , Dave Hansen , Emil Renner Berthing , Ingo Molnar , Hari Bathini , Marek Szyprowski , Max Filippov , Michael Ellerman , Michal Simek , Mike Rapoport , Mike Rapoport , Palmer Dabbelt , Paul Mackerras , Paul Walmsley , Peter Zijlstra , Russell King , Stafford Horne , Thomas Gleixner , Will Deacon , Yoshinori Sato , clang-built-linux@googlegroups.com, iommu@lists.linux-foundation.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-xtensa@linux-xtensa.org, linuxppc-dev@lists.ozlabs.org, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, uclinux-h8-devel@lists.sourceforge.jp, x86@kernel.org, Ingo Molnar Subject: [PATCH v3 14/17] x86/setup: simplify reserve_crashkernel() Date: Tue, 18 Aug 2020 18:16:31 +0300 Message-Id: <20200818151634.14343-15-rppt@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200818151634.14343-1-rppt@kernel.org> References: <20200818151634.14343-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: CD45218033770 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Mike Rapoport * Replace magic numbers with defines * Replace memblock_find_in_range() + memblock_reserve() with memblock_phys_alloc_range() * Stop checking for low memory size in reserve_crashkernel_low(). The allocation from limited range will anyway fail if there is no enough memory, so there is no need for extra traversal of memblock.memory Signed-off-by: Mike Rapoport Acked-by: Ingo Molnar Reviewed-by: Baoquan He --- arch/x86/kernel/setup.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 2cac39ade2e3..52e83ba607b3 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -420,13 +420,13 @@ static int __init reserve_crashkernel_low(void) { #ifdef CONFIG_X86_64 unsigned long long base, low_base =3D 0, low_size =3D 0; - unsigned long total_low_mem; + unsigned long low_mem_limit; int ret; =20 - total_low_mem =3D memblock_mem_size(1UL << (32 - PAGE_SHIFT)); + low_mem_limit =3D min(memblock_phys_mem_size(), CRASH_ADDR_LOW_MAX); =20 /* crashkernel=3DY,low */ - ret =3D parse_crashkernel_low(boot_command_line, total_low_mem, &low_si= ze, &base); + ret =3D parse_crashkernel_low(boot_command_line, low_mem_limit, &low_si= ze, &base); if (ret) { /* * two parts from kernel/dma/swiotlb.c: @@ -444,23 +444,17 @@ static int __init reserve_crashkernel_low(void) return 0; } =20 - low_base =3D memblock_find_in_range(0, 1ULL << 32, low_size, CRASH_ALIG= N); + low_base =3D memblock_phys_alloc_range(low_size, CRASH_ALIGN, 0, CRASH_= ADDR_LOW_MAX); if (!low_base) { pr_err("Cannot reserve %ldMB crashkernel low memory, please try smalle= r size.\n", (unsigned long)(low_size >> 20)); return -ENOMEM; } =20 - ret =3D memblock_reserve(low_base, low_size); - if (ret) { - pr_err("%s: Error reserving crashkernel low memblock.\n", __func__); - return ret; - } - - pr_info("Reserving %ldMB of low memory at %ldMB for crashkernel (System= low RAM: %ldMB)\n", + pr_info("Reserving %ldMB of low memory at %ldMB for crashkernel (low RA= M limit: %ldMB)\n", (unsigned long)(low_size >> 20), (unsigned long)(low_base >> 20), - (unsigned long)(total_low_mem >> 20)); + (unsigned long)(low_mem_limit >> 20)); =20 crashk_low_res.start =3D low_base; crashk_low_res.end =3D low_base + low_size - 1; @@ -504,13 +498,13 @@ static void __init reserve_crashkernel(void) * unless "crashkernel=3Dsize[KMG],high" is specified. */ if (!high) - crash_base =3D memblock_find_in_range(CRASH_ALIGN, - CRASH_ADDR_LOW_MAX, - crash_size, CRASH_ALIGN); + crash_base =3D memblock_phys_alloc_range(crash_size, + CRASH_ALIGN, CRASH_ALIGN, + CRASH_ADDR_LOW_MAX); if (!crash_base) - crash_base =3D memblock_find_in_range(CRASH_ALIGN, - CRASH_ADDR_HIGH_MAX, - crash_size, CRASH_ALIGN); + crash_base =3D memblock_phys_alloc_range(crash_size, + CRASH_ALIGN, CRASH_ALIGN, + CRASH_ADDR_HIGH_MAX); if (!crash_base) { pr_info("crashkernel reservation failed - No suitable area found.\n")= ; return; @@ -518,19 +512,13 @@ static void __init reserve_crashkernel(void) } else { unsigned long long start; =20 - start =3D memblock_find_in_range(crash_base, - crash_base + crash_size, - crash_size, 1 << 20); + start =3D memblock_phys_alloc_range(crash_size, SZ_1M, crash_base, + crash_base + crash_size); if (start !=3D crash_base) { pr_info("crashkernel reservation failed - memory is in use.\n"); return; } } - ret =3D memblock_reserve(crash_base, crash_size); - if (ret) { - pr_err("%s: Error reserving crashkernel memblock.\n", __func__); - return; - } =20 if (crash_base >=3D (1ULL << 32) && reserve_crashkernel_low()) { memblock_free(crash_base, crash_size); --=20 2.26.2