From patchwork Tue Mar 28 06:50:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 9648229 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B0DB601E9 for ; Tue, 28 Mar 2017 06:51:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B637283A6 for ; Tue, 28 Mar 2017 06:51:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F100283E8; Tue, 28 Mar 2017 06:51:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2DA5D283A6 for ; Tue, 28 Mar 2017 06:51:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=vHoNUvdl6GZdsNkG3owFJweurHDVt3orbiSrLG4sZoY=; b=eDYwPo2NDMTpGW1Slf3VOoGMx1 S7wzM+meYzGBctN8EiHasur9jdWF4antLMB89UWk+BOSaYDly0vIYpeq6RNI+Y50hBUtZBRvMkHhd 8bjS4JQx00AMXjtTl7mrM4BLBGvPLD8N3HpmdbRdm9zeXyPT1gV82xOeo4dRIJjGf5F54zSB0blXM 5LaowqO+4rc4k7o4pt1q3YvXif8MItW7cWAPdYVnWPiaXrx7t4OB5DNlAVDvv4QtCeWkxHyjy7CC8 sV+kQPuETCxRbkNEYqpXvudWtc1DesfeSxKtc/CSzJWWLcwwSk7oub1kGFT8bwBL5ebc99Y3xOeAw Tdz2ITDw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cskyJ-0006IZ-Pi; Tue, 28 Mar 2017 06:51:15 +0000 Received: from mail-pg0-x229.google.com ([2607:f8b0:400e:c05::229]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cskvf-0002KK-6x for linux-arm-kernel@lists.infradead.org; Tue, 28 Mar 2017 06:48:39 +0000 Received: by mail-pg0-x229.google.com with SMTP id g2so63076978pge.3 for ; Mon, 27 Mar 2017 23:48:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bj69Hygp+lKobopqOBB4eEOH3pQONBP6XHk/PlOgBlM=; b=diT79foaIHi9Q/OqUIzs/b3TZDRLv5rT4ZPv5kqXr8Ye/D+3th+hyNmSU0Zlac+k1v sAmBIAofpQIV19PjKT6s/qDXUj9Rcwl01mbQz5MnY/M+GGHJ1JFEpnz1vpRvNHbCs8YI 67WxE/xCZ7G8irr18ssLmDHGZdj9MXsbqJhxE= 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=bj69Hygp+lKobopqOBB4eEOH3pQONBP6XHk/PlOgBlM=; b=ISBD7F3AYoWwN3yduaQ3wAamHWT/AKRV6fPkfDc/F+bCqBs1tyvNPK6DlCCV/XOAPy dYfwKRgqtvHwfe5nofqlzLIgv20Y9IdZPpC+UKnRsGP68+8DkLT+UJfERI+iE+ROEftF 0mKDbfP6BOEkWrfYSfMYAXfV+sckM1c2b3sJm+hW3ChBsMWqi5UeD7wxx5rsedGb9SZE zPyIC52ynVE7mnc//xI1MWMOT7go/WCXY86d8vkIySsmuZu9+h4enSrNS/Pl615wDL3U qr4nIwF8V6koDuqrszoR4io9725kat1S8Ag8z0rYiwKUz/vmLekf28I9Rn9iiSGq4QMp gqjw== X-Gm-Message-State: AFeK/H23G+5UrRIpK/XOyVwiJHHxTdHHpVqs3cul0xtRYkPCJv6gY1Vuykq+rIXsDMsm+lTc X-Received: by 10.99.94.198 with SMTP id s189mr28650085pgb.211.1490683689591; Mon, 27 Mar 2017 23:48:09 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id b14sm4904215pfh.114.2017.03.27.23.48.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2017 23:48:09 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, akpm@linux-foundation.org Subject: [PATCH v34 02/14] memblock: add memblock_cap_memory_range() Date: Tue, 28 Mar 2017 15:50:33 +0900 Message-Id: <20170328065033.15966-2-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170328064831.15894-1-takahiro.akashi@linaro.org> References: <20170328064831.15894-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170327_234831_705903_5A53545E X-CRM114-Status: GOOD ( 14.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, panand@redhat.com, ard.biesheuvel@linaro.org, geoff@infradead.org, dwmw2@infradead.org, AKASHI Takahiro , kexec@lists.infradead.org, linux-mm@kvack.org, james.morse@arm.com, bauerman@linux.vnet.ibm.com, sgoel@codeaurora.org, dyoung@redhat.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add memblock_cap_memory_range() which will remove all the memblock regions except the memory range specified in the arguments. In addition, rework is done on memblock_mem_limit_remove_map() to re-implement it using memblock_cap_memory_range(). This function, like memblock_mem_limit_remove_map(), will not remove memblocks with MEMMAP_NOMAP attribute as they may be mapped and accessed later as "device memory." See the commit a571d4eb55d8 ("mm/memblock.c: add new infrastructure to address the mem limit issue"). This function is used, in a succeeding patch in the series of arm64 kdump suuport, to limit the range of usable memory, or System RAM, on crash dump kernel. (Please note that "mem=" parameter is of little use for this purpose.) Signed-off-by: AKASHI Takahiro Reviewed-by: Will Deacon Acked-by: Catalin Marinas Acked-by: Dennis Chen Cc: linux-mm@kvack.org Cc: Andrew Morton Reviewed-by: Ard Biesheuvel --- include/linux/memblock.h | 1 + mm/memblock.c | 44 +++++++++++++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index e82daffcfc44..4ce24a376262 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -336,6 +336,7 @@ phys_addr_t memblock_mem_size(unsigned long limit_pfn); phys_addr_t memblock_start_of_DRAM(void); phys_addr_t memblock_end_of_DRAM(void); void memblock_enforce_memory_limit(phys_addr_t memory_limit); +void memblock_cap_memory_range(phys_addr_t base, phys_addr_t size); void memblock_mem_limit_remove_map(phys_addr_t limit); bool memblock_is_memory(phys_addr_t addr); int memblock_is_map_memory(phys_addr_t addr); diff --git a/mm/memblock.c b/mm/memblock.c index 2f4ca8104ea4..b049c9b2dba8 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1543,11 +1543,37 @@ void __init memblock_enforce_memory_limit(phys_addr_t limit) (phys_addr_t)ULLONG_MAX); } +void __init memblock_cap_memory_range(phys_addr_t base, phys_addr_t size) +{ + int start_rgn, end_rgn; + int i, ret; + + if (!size) + return; + + ret = memblock_isolate_range(&memblock.memory, base, size, + &start_rgn, &end_rgn); + if (ret) + return; + + /* remove all the MAP regions */ + for (i = memblock.memory.cnt - 1; i >= end_rgn; i--) + if (!memblock_is_nomap(&memblock.memory.regions[i])) + memblock_remove_region(&memblock.memory, i); + + for (i = start_rgn - 1; i >= 0; i--) + if (!memblock_is_nomap(&memblock.memory.regions[i])) + memblock_remove_region(&memblock.memory, i); + + /* truncate the reserved regions */ + memblock_remove_range(&memblock.reserved, 0, base); + memblock_remove_range(&memblock.reserved, + base + size, (phys_addr_t)ULLONG_MAX); +} + void __init memblock_mem_limit_remove_map(phys_addr_t limit) { - struct memblock_type *type = &memblock.memory; phys_addr_t max_addr; - int i, ret, start_rgn, end_rgn; if (!limit) return; @@ -1558,19 +1584,7 @@ void __init memblock_mem_limit_remove_map(phys_addr_t limit) if (max_addr == (phys_addr_t)ULLONG_MAX) return; - ret = memblock_isolate_range(type, max_addr, (phys_addr_t)ULLONG_MAX, - &start_rgn, &end_rgn); - if (ret) - return; - - /* remove all the MAP regions above the limit */ - for (i = end_rgn - 1; i >= start_rgn; i--) { - if (!memblock_is_nomap(&type->regions[i])) - memblock_remove_region(type, i); - } - /* truncate the reserved regions */ - memblock_remove_range(&memblock.reserved, max_addr, - (phys_addr_t)ULLONG_MAX); + memblock_cap_memory_range(0, max_addr); } static int __init_memblock memblock_search(struct memblock_type *type, phys_addr_t addr)