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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 E93D2C3A5A2 for ; Tue, 10 Sep 2019 08:59:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 BB38620863 for ; Tue, 10 Sep 2019 08:59:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="W5qpmIqV"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=preh.de header.i=@preh.de header.b="etlO9jET" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB38620863 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=preh.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=mgjB5ksR045YOHXRBO1pHmzzCPWoFizPqb3AlvAi21o=; b=W5qpmIqVM9/9tG 2+Rj4/R6/am3vG3qciMWXbcSssQd5vl/GdsH4wOLUjNffTC0pOZXmwkck7/5e9iafMZMZr6TaOQwG G7fnfun3c7OL4NgM9pPDnvznxTb8+r/kW9NAk1+Gu2ajlUdujJb4b13MuREH5K14aL15n6U6TV2YT aFfviwXZ8u1vBP4RCgzx/fKrtLUYYFa4vWT+Ffo4sa00JkJi+kl8Z/bRWptOM0N2alc4mHmGt8tpm +ZVzs9Jfr5NvVaepq0/kqPR5GIha4fczz6/QRHOslSGkCHIGvJ5dhosSxTv9iKJr1jNWo8Yw1+OOA i7lO8lLRezTs8j6FkHlQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i7bzi-0000gV-0X; Tue, 10 Sep 2019 08:59:26 +0000 Received: from mail01.preh.com ([80.149.130.22]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i7bze-0000Wo-Dh for linux-arm-kernel@lists.infradead.org; Tue, 10 Sep 2019 08:59:24 +0000 From: Hubert Ralf To: "linux-arm-kernel@lists.infradead.org" Subject: [PATCH] aarch64/mm: speedup memory initialisation Thread-Topic: [PATCH] aarch64/mm: speedup memory initialisation Thread-Index: AQHVZ7YAP7sn04V7oEKvWrPakQZn3w== Date: Tue, 10 Sep 2019 08:59:07 +0000 Message-ID: <20190910085822.27072-1-ralf.hubert@preh.de> Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-exclaimer-md-config: 142fe46c-4d13-4ac1-9970-1f36f118897a x-tm-snts-smtp: 29A4DFD2463991CF26566DF8F9750910A5F115C5AF61C40ABB217900848476AE2000:8 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; d=preh.de; s=key1; c=relaxed/relaxed; h=from:to:cc:subject:date:message-id:content-type:mime-version; bh=Wbh/ZDD+k16MN3jriSAmSRjpZIsvAL2B86WzIuGKZCg=; b=etlO9jET/5k+Jl8l9mY5AIlGWfPaWTXgfhmDB9WPJRuUAPPYIZYupUy85UuSf9WP9hyCwI9U+j5D AEYkU0PQ25enEVwqnX9Hb3/gLbLU7iaJ0vc9zubAGeoS507P/3d6ZiaeECEs9+n6OOWHXSyTR2Ye vTUty3dBSZWUI+FJkS5oBKopSN+ZNBRWBJ5kY7NwmOmmv8AvG8fqUtKhfVnqg63K84M48/eE4rC0 mvAa58mPiNdO+qBgJUaePcyIhLxA7F4SGt88vSrIqEFgxWQFJ7oYK5epMoIGcT+pzNX7n15ZaAjs Ja4eUR0LkdKsGXW3FIiLlq9PTl4pBMWtPdEevA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190910_015922_804300_DCF409B1 X-CRM114-Status: GOOD ( 10.52 ) 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: Hubert Ralf Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On ARM64 memmap_init_zone is used during bootmem_init, which iterates over all pages in the memory starting at the lowest address until the highest address is reached. On arm64 this ends up in searching a memmory region containing for each single page between lowest and highest available physicall address. Having a sparse memory system there may be some big holes in the memory map. For each page in this holes a lookup is done, which is implemented as a binary search on the available memory blocks. Adding a memmap_init for aarch64 to do the init only for the available memory areas reduces the time needed for initialising memory on startup. On a Renesas R-CAR M3 based system with a total hole of 20GB bootmem_init execution time is reduced from 378ms to 84ms. Signed-off-by: Ralf Hubert --- arch/arm64/include/asm/pgtable.h | 7 +++++++ arch/arm64/mm/init.c | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index e09760ece844..8c6eefc08b0b 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -298,6 +298,13 @@ static inline int pte_same(pte_t pte_a, pte_t pte_b) return (lhs == rhs); } +#ifdef CONFIG_SPARSEMEM +/* arch mem_map init routine is needed due to holes in a memmap */ +# define __HAVE_ARCH_MEMMAP_INIT + void memmap_init(unsigned long size, int nid, unsigned long zone, + unsigned long start_pfn); +#endif /* CONFIG_SPARSEMEM */ + /* * Huge pte definitions. */ diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index f3c795278def..206b28310872 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -250,6 +250,30 @@ int pfn_valid(unsigned long pfn) } EXPORT_SYMBOL(pfn_valid); +#ifdef CONFIG_SPARSEMEM +void __meminit +memmap_init(unsigned long size, int nid, unsigned long zone, + unsigned long start_pfn) +{ + struct memblock_region *reg; + + for_each_memblock(memory, reg) { + unsigned long start = memblock_region_memory_base_pfn(reg); + unsigned long end = memblock_region_memory_end_pfn(reg); + + if (start < start_pfn) + start = start_pfn; + if (end > start_pfn + size) + end = start_pfn + size; + + if (start < end) { + memmap_init_zone(end - start, nid, zone, start, + MEMMAP_EARLY, NULL); + } + } +} +#endif /* CONFIG_SPARSEMEM */ + static phys_addr_t memory_limit = PHYS_ADDR_MAX; /* -- 2.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel