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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 804A7C433E2 for ; Wed, 1 Jul 2020 22:14:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 38423207F5 for ; Wed, 1 Jul 2020 22:14:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MOfdzvph" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38423207F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0F9828D0059; Wed, 1 Jul 2020 18:14:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0AAE28D0056; Wed, 1 Jul 2020 18:14:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3F4D8D0059; Wed, 1 Jul 2020 18:14:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0059.hostedemail.com [216.40.44.59]) by kanga.kvack.org (Postfix) with ESMTP id CA7838D0056 for ; Wed, 1 Jul 2020 18:14:51 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 8C4D8824805A for ; Wed, 1 Jul 2020 22:14:51 +0000 (UTC) X-FDA: 76990912782.21.lamp69_2e0a5a226e84 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 64880180442C2 for ; Wed, 1 Jul 2020 22:14:51 +0000 (UTC) X-HE-Tag: lamp69_2e0a5a226e84 X-Filterd-Recvd-Size: 7529 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Wed, 1 Jul 2020 22:14:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593641690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=xoqk9QTtScU+aPGKHoCc+VNYKEEQhDvkQeRwCbimQV8=; b=MOfdzvph6dtBkqFZ+B9H4fFiZ4e2eJvfEAv9JNA8rQtmk1rTlw4omIlBe2mwhMefwO4AP9 2Kmt615l3xKUqNUYWujBtn0o4qYwRiqS+LTpuT00krP5p0hpCNsdJvAsrWZwFe1xegfdxY F/p3SLaQudHGRnz7SLOQT59ELEKRusU= Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-319-1a78C-LMOPKwMfQjQt3r1A-1; Wed, 01 Jul 2020 18:14:48 -0400 X-MC-Unique: 1a78C-LMOPKwMfQjQt3r1A-1 Received: by mail-pj1-f71.google.com with SMTP id j17so16429926pjy.8 for ; Wed, 01 Jul 2020 15:14:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xoqk9QTtScU+aPGKHoCc+VNYKEEQhDvkQeRwCbimQV8=; b=W1oxfLCtXZA8kFHGw5hKGldCROcekKY5Gg8hs6STXGkzI3LTxiI8dXDqIETfUuub3O jZOfEJ9iM+3SnKQmeBQTwKX0rTv7Rxj/O6htPPXSrWvEe4Mn1WccPsPkhKXqROCv+xfl gHDyFN+fWYz/mZomzEx3Wykmz5IK5vFdm36XoabNCpmqY3bpjOdeorb7XEGPPg6q1oBk 39Ps9cJTSakkxYh30FrXQJ8z4+0kAJu8+DZiN9ANsCL0NcfNwn6AHSXcM7T0GwVR46my pvf4asLN2vyod+3MO7HLhxe9cHfLMaD09i8i2V+PYg7FqI/SRjJCZ3pg7PQrosio933J GfWA== X-Gm-Message-State: AOAM533c/doJpd6r3cqnK3N/mvTYvsYDgHw+pEmHI1LsUKfGfHp8NQjB FaZyu6TKQfMjFPFY1Axm61tMS8IVVlzh5rkw/nXhyetS3JjeTL2b6qkhAOz29Z3ZYDdWO3fWpD7 +u6TJaJd7eCE= X-Received: by 2002:a17:902:148:: with SMTP id 66mr23151063plb.308.1593641687735; Wed, 01 Jul 2020 15:14:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSel1QkbgREE+b1y+g1hJfoMILEzByCbKnUpkCkK6gLrD4a7/08WiZHMyUAY4DMfVWE25z8w== X-Received: by 2002:a17:902:148:: with SMTP id 66mr23151046plb.308.1593641687475; Wed, 01 Jul 2020 15:14:47 -0700 (PDT) Received: from localhost ([110.227.183.4]) by smtp.gmail.com with ESMTPSA id h6sm6973231pfg.25.2020.07.01.15.14.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jul 2020 15:14:47 -0700 (PDT) From: Bhupesh Sharma To: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org Cc: bhsharma@redhat.com, bhupesh.linux@gmail.com, Johannes Weiner , Michal Hocko , Vladimir Davydov , James Morse , Mark Rutland , Will Deacon , Catalin Marinas , linux-kernel@vger.kernel.org, kexec@lists.infradead.org Subject: [PATCH 2/2] arm64: Allocate crashkernel always in ZONE_DMA Date: Thu, 2 Jul 2020 03:44:20 +0530 Message-Id: <1593641660-13254-3-git-send-email-bhsharma@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1593641660-13254-1-git-send-email-bhsharma@redhat.com> References: <1593641660-13254-1-git-send-email-bhsharma@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=bhsharma@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 64880180442C2 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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: commit bff3b04460a8 ("arm64: mm: reserve CMA and crashkernel in ZONE_DMA32") allocates crashkernel for arm64 in the ZONE_DMA32. However as reported by Prabhakar, this breaks kdump kernel booting in ThunderX2 like arm64 systems. I have noticed this on another ampere arm64 machine. The OOM log in the kdump kernel looks like this: [ 0.240552] DMA: preallocated 128 KiB GFP_KERNEL pool for atomic allocations [ 0.247713] swapper/0: page allocation failure: order:1, mode:0xcc1(GFP_KERNEL|GFP_DMA), nodemask=(null),cpuset=/,mems_allowed=0 <..snip..> [ 0.274706] Call trace: [ 0.277170] dump_backtrace+0x0/0x208 [ 0.280863] show_stack+0x1c/0x28 [ 0.284207] dump_stack+0xc4/0x10c [ 0.287638] warn_alloc+0x104/0x170 [ 0.291156] __alloc_pages_slowpath.constprop.106+0xb08/0xb48 [ 0.296958] __alloc_pages_nodemask+0x2ac/0x2f8 [ 0.301530] alloc_page_interleave+0x20/0x90 [ 0.305839] alloc_pages_current+0xdc/0xf8 [ 0.309972] atomic_pool_expand+0x60/0x210 [ 0.314108] __dma_atomic_pool_init+0x50/0xa4 [ 0.318504] dma_atomic_pool_init+0xac/0x158 [ 0.322813] do_one_initcall+0x50/0x218 [ 0.326684] kernel_init_freeable+0x22c/0x2d0 [ 0.331083] kernel_init+0x18/0x110 [ 0.334600] ret_from_fork+0x10/0x18 This patch limits the crashkernel allocation to the first 1GB of the RAM accessible (ZONE_DMA), as otherwise we might run into OOM issues when crashkernel is executed, as it might have been originally allocated from either a ZONE_DMA32 memory or mixture of memory chunks belonging to both ZONE_DMA and ZONE_DMA32. Fixes: bff3b04460a8 ("arm64: mm: reserve CMA and crashkernel in ZONE_DMA32") Cc: Johannes Weiner Cc: Michal Hocko Cc: Vladimir Davydov Cc: James Morse Cc: Mark Rutland Cc: Will Deacon Cc: Catalin Marinas Cc: cgroups@vger.kernel.org Cc: linux-mm@kvack.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: kexec@lists.infradead.org Reported-by: Prabhakar Kushwaha Signed-off-by: Bhupesh Sharma --- arch/arm64/mm/init.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 1e93cfc7c47a..02ae4d623802 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -91,8 +91,15 @@ static void __init reserve_crashkernel(void) crash_size = PAGE_ALIGN(crash_size); if (crash_base == 0) { - /* Current arm64 boot protocol requires 2MB alignment */ - crash_base = memblock_find_in_range(0, arm64_dma32_phys_limit, + /* Current arm64 boot protocol requires 2MB alignment. + * Also limit the crashkernel allocation to the first + * 1GB of the RAM accessible (ZONE_DMA), as otherwise we + * might run into OOM issues when crashkernel is executed, + * as it might have been originally allocated from + * either a ZONE_DMA32 memory or mixture of memory + * chunks belonging to both ZONE_DMA and ZONE_DMA32. + */ + crash_base = memblock_find_in_range(0, arm64_dma_phys_limit, crash_size, SZ_2M); if (crash_base == 0) { pr_warn("cannot allocate crashkernel (size:0x%llx)\n", @@ -101,6 +108,11 @@ static void __init reserve_crashkernel(void) } } else { /* User specifies base address explicitly. */ + if (crash_base + crash_size > arm64_dma_phys_limit) { + pr_warn("cannot reserve crashkernel: region is allocatable only in ZONE_DMA range\n"); + return; + } + if (!memblock_is_region_memory(crash_base, crash_size)) { pr_warn("cannot reserve crashkernel: region is not memory\n"); return; -- 2.7.4