From patchwork Fri Jul 6 09:01:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia He X-Patchwork-Id: 10511127 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 31705600CA for ; Fri, 6 Jul 2018 09:02:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 223552858A for ; Fri, 6 Jul 2018 09:02:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 136672858D; Fri, 6 Jul 2018 09:02:19 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 482CA2858A for ; Fri, 6 Jul 2018 09:02:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E01F6B000D; Fri, 6 Jul 2018 05:02:17 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 38EA86B000E; Fri, 6 Jul 2018 05:02:17 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 281046B0010; Fri, 6 Jul 2018 05:02:17 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id DB3B46B000D for ; Fri, 6 Jul 2018 05:02:16 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id y7-v6so4166203plt.17 for ; Fri, 06 Jul 2018 02:02:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=M4lUapXVAyrWXwX+FZXA04S5ONE2QLINrxH7fBNkdn4=; b=hzL44//gG5JuFJOmxGpHyPZctQg/w1+q/TDKNlcamol7Ek++ebPdAHt1TxUQ1eNedq ig9eUhBnZ1U+WeCGQ62kfxojmYZ/nrIVdavYABBD0Vd5ljZw0BGTdgLEtwH5mXZ2d9BQ 3ae7oU5bvs31uCvEKGySCTybOLHfVRjBiClrHkI1QGN1uXsOPqwQGJGfdzOw76NBYvBs P0SrDDgS+Zx4bbieQDplLkvzFK6Pq09Fpj3WJjHLiUHLo3fMXKC2s/ci/u6ENDVuZ/Pv lPGRjDqdU+5tPYo2P1Ns84va7L/OL/2yFu0auA7+eWN2CUZpes45l1QsXfjYoya36uAM BkkA== X-Gm-Message-State: APt69E3+mHRWys75VhKx3cpxOUSQtfGvtULokngTOwBKiV42cmYF4eoA SeqHUtnscUjrpyC8Kkp5TdZEIuwHPwkbD2xqkn5KGSdItPF3sKiHU8TPmt9JFRqZfAaJ0SEiYX1 w+tSkz70FVuR/KLOUzVP8bpw/zZAFB9Yn18AZrhDZzK+CVL/oL0nab8zQF1VnyZL+RKijMkWtuH pNMJCLaXBg78BH7l6ryDcTV3QcakHGxVp4Vy21WTnjbdOxPieltaEVpOPKxRPoHa/Uwm1WvALUq 2FMzbeXysJtQfFBGng+pQUq6A502kNUTmwoC3hwGwtRkTuaMxRIaRgWbZ2OTEMMMEUrXLWPySEB ZYXtMcFPtruVBXqEIVOGgKbiH60QOtfijJKtMQpie5fh0jdVzs6trRExL7PsLbF+zGyWGTiXzn2 4 X-Received: by 2002:a17:902:a24:: with SMTP id 33-v6mr9484162plo.88.1530867736357; Fri, 06 Jul 2018 02:02:16 -0700 (PDT) X-Received: by 2002:a17:902:a24:: with SMTP id 33-v6mr9484042plo.88.1530867735320; Fri, 06 Jul 2018 02:02:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530867735; cv=none; d=google.com; s=arc-20160816; b=sUmaO8iAz96ScOGtfs/b7IL79loS+KXr2D/JUrVZzijaknknjXRwcDk4lIQplssYoK HNJdE/U1u/+BcIudBkE4TDA9dBAK4KJ56btW4/UeyoGnRIyAN3NY9IFO4LPv9V1SrhCb EtKrLZ1U+2PsCltoLhofJH8eWFlJJUTeMGkvQ2qtRNkanURUJPODprBIlWLbGXPsm/K9 eCl5mttarpogzpwJM924TV7pIVcfMNVclBhF1Lnd3pOSgOph7xRGDXnGGTPE+sXUoMYR 2z9H/s/5TRWQEezWpvnN0XIkadAc+vmKI6UXWvdCamguQMoc51c6hRvFJgKypNsM+vpj Rd9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=M4lUapXVAyrWXwX+FZXA04S5ONE2QLINrxH7fBNkdn4=; b=rY9nTblMeuDzu3dlJkyeqWRgauHLExLMjuGwZcgXRAm7Q9kiO0AR+12AulHn7dg1Z7 JCXDX3n0oZT6PLC1X4Fr6CMjYmRioviAxpKJI0rXhXO3fhkZgc+fCoISjSRMtbEftwpn etDSU1YddzLSsrAlqQJtVCKi2EtsA6+53+DMtkFhnyZdc4slVw35Eom0inu+N2tdr26K kzLDQqtFOjjHAKvwdYG9LY75iSzvhwjfkNp8AReASbOAI/qglMGsL9dCLOc0IU3QsJ22 A58FIwey2aDc32FdKyTjkebszzV48+ZfHgx6qGj8K9j+2Sj0DMhJXhC5UR9PBnF0NFLJ 8uPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=nc8xZGY+; spf=pass (google.com: domain of hejianet@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=hejianet@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 43-v6sor2597310pla.129.2018.07.06.02.02.15 for (Google Transport Security); Fri, 06 Jul 2018 02:02:15 -0700 (PDT) Received-SPF: pass (google.com: domain of hejianet@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=nc8xZGY+; spf=pass (google.com: domain of hejianet@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=hejianet@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=M4lUapXVAyrWXwX+FZXA04S5ONE2QLINrxH7fBNkdn4=; b=nc8xZGY+0b4dQuwny4C5+F2zIL4tx/faPKFIBup6gNaTgOncOnvgP8yAbzCG20jNf5 F7F1teQn/HU3hZXqnDq8v893GFhs+l5vcUgmg5ku0itddiGoVFLsGZj3l45x6KbH3hrk bJNi0vM6YLtxutB9/c6gnDECuEDJNLe61RBy7RM3CV17/0T1ZsUVMdIs9ecTEyYjm8Fp iJLKgwr4rI9vXOJHVG4j/GleyaFh2Flt08DXjHxLMNvrAGIBI2Dwwifo76YkdmZrSGQM o2bFtHsnq7c/DxPx+qUeyT+G8hXqPyc9DOXgDD6hjpr1d99DDV6eFGUWuTGLaw2TpmbF uHlg== X-Google-Smtp-Source: AAOMgpebge38W16iV8fxKdN06DKiqJdKQX/qP9xH3yQsxAt16khFrCqZh/2dqIun8DNuHXZZJc7WAA== X-Received: by 2002:a17:902:8d91:: with SMTP id v17-v6mr9654554plo.9.1530867735018; Fri, 06 Jul 2018 02:02:15 -0700 (PDT) Received: from ct7host.localdomain ([38.106.11.25]) by smtp.gmail.com with ESMTPSA id e5-v6sm10837092pgs.59.2018.07.06.02.02.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jul 2018 02:02:14 -0700 (PDT) From: Jia He To: Russell King , Catalin Marinas , Will Deacon , Mark Rutland , Ard Biesheuvel , Andrew Morton , Michal Hocko Cc: Wei Yang , Kees Cook , Laura Abbott , Vladimir Murzin , Philip Derrin , AKASHI Takahiro , James Morse , Steve Capper , Pavel Tatashin , Gioh Kim , Vlastimil Babka , Mel Gorman , Johannes Weiner , Kemi Wang , Petr Tesarik , YASUAKI ISHIMATSU , Andrey Ryabinin , Nikolay Borisov , Daniel Jordan , Daniel Vacek , Eugeniu Rosca , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Jia He Subject: [RESEND PATCH v10 3/6] mm: page_alloc: reduce unnecessary binary search in memblock_next_valid_pfn() Date: Fri, 6 Jul 2018 17:01:12 +0800 Message-Id: <1530867675-9018-4-git-send-email-hejianet@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530867675-9018-1-git-send-email-hejianet@gmail.com> References: <1530867675-9018-1-git-send-email-hejianet@gmail.com> 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: X-Virus-Scanned: ClamAV using ClamSMTP From: Jia He Commit b92df1de5d28 ("mm: page_alloc: skip over regions of invalid pfns where possible") optimized the loop in memmap_init_zone(). But there is still some room for improvement. E.g. if pfn and pfn+1 are in the same memblock region, we can simply pfn++ instead of doing the binary search in memblock_next_valid_pfn. Furthermore, if the pfn is in a gap of two memory region, skip to next region directly if possible. Attached the memblock region information in my server. [ 0.000000] Zone ranges: [ 0.000000] DMA32 [mem 0x0000000000200000-0x00000000ffffffff] [ 0.000000] Normal [mem 0x0000000100000000-0x00000017ffffffff] [ 0.000000] Movable zone start for each node [ 0.000000] Early memory node ranges [ 0.000000] node 0: [mem 0x0000000000200000-0x000000000021ffff] [ 0.000000] node 0: [mem 0x0000000000820000-0x000000000307ffff] [ 0.000000] node 0: [mem 0x0000000003080000-0x000000000308ffff] [ 0.000000] node 0: [mem 0x0000000003090000-0x00000000031fffff] [ 0.000000] node 0: [mem 0x0000000003200000-0x00000000033fffff] [ 0.000000] node 0: [mem 0x0000000003410000-0x00000000034fffff] [ 0.000000] node 0: [mem 0x0000000003500000-0x000000000351ffff] [ 0.000000] node 0: [mem 0x0000000003520000-0x000000000353ffff] [ 0.000000] node 0: [mem 0x0000000003540000-0x0000000003e3ffff] [ 0.000000] node 0: [mem 0x0000000003e40000-0x0000000003e7ffff] [ 0.000000] node 0: [mem 0x0000000003e80000-0x0000000003ecffff] [ 0.000000] node 0: [mem 0x0000000003ed0000-0x0000000003ed5fff] [ 0.000000] node 0: [mem 0x0000000003ed6000-0x0000000006eeafff] [ 0.000000] node 0: [mem 0x0000000006eeb000-0x000000000710ffff] [ 0.000000] node 0: [mem 0x0000000007110000-0x0000000007f0ffff] [ 0.000000] node 0: [mem 0x0000000007f10000-0x0000000007faffff] [ 0.000000] node 0: [mem 0x0000000007fb0000-0x000000000806ffff] [ 0.000000] node 0: [mem 0x0000000008070000-0x00000000080affff] [ 0.000000] node 0: [mem 0x00000000080b0000-0x000000000832ffff] [ 0.000000] node 0: [mem 0x0000000008330000-0x000000000836ffff] [ 0.000000] node 0: [mem 0x0000000008370000-0x000000000838ffff] [ 0.000000] node 0: [mem 0x0000000008390000-0x00000000083a9fff] [ 0.000000] node 0: [mem 0x00000000083aa000-0x00000000083bbfff] [ 0.000000] node 0: [mem 0x00000000083bc000-0x00000000083fffff] [ 0.000000] node 0: [mem 0x0000000008400000-0x000000000841ffff] [ 0.000000] node 0: [mem 0x0000000008420000-0x000000000843ffff] [ 0.000000] node 0: [mem 0x0000000008440000-0x000000000865ffff] [ 0.000000] node 0: [mem 0x0000000008660000-0x000000000869ffff] [ 0.000000] node 0: [mem 0x00000000086a0000-0x00000000086affff] [ 0.000000] node 0: [mem 0x00000000086b0000-0x00000000086effff] [ 0.000000] node 0: [mem 0x00000000086f0000-0x0000000008b6ffff] [ 0.000000] node 0: [mem 0x0000000008b70000-0x0000000008bbffff] [ 0.000000] node 0: [mem 0x0000000008bc0000-0x0000000008edffff] [ 0.000000] node 0: [mem 0x0000000008ee0000-0x0000000008ee0fff] [ 0.000000] node 0: [mem 0x0000000008ee1000-0x0000000008ee2fff] [ 0.000000] node 0: [mem 0x0000000008ee3000-0x000000000decffff] [ 0.000000] node 0: [mem 0x000000000ded0000-0x000000000defffff] [ 0.000000] node 0: [mem 0x000000000df00000-0x000000000fffffff] [ 0.000000] node 0: [mem 0x0000000010800000-0x0000000017feffff] [ 0.000000] node 0: [mem 0x000000001c000000-0x000000001c00ffff] [ 0.000000] node 0: [mem 0x000000001c010000-0x000000001c7fffff] [ 0.000000] node 0: [mem 0x000000001c810000-0x000000007efbffff] [ 0.000000] node 0: [mem 0x000000007efc0000-0x000000007efdffff] [ 0.000000] node 0: [mem 0x000000007efe0000-0x000000007efeffff] [ 0.000000] node 0: [mem 0x000000007eff0000-0x000000007effffff] [ 0.000000] node 0: [mem 0x000000007f000000-0x00000017ffffffff] [ 0.000000] Initmem setup node 0 [mem 0x0000000000200000-0x00000017ffffffff] [ 0.000000] On node 0 totalpages: 25145296 [ 0.000000] DMA32 zone: 16376 pages used for memmap [ 0.000000] DMA32 zone: 0 pages reserved [ 0.000000] DMA32 zone: 1028048 pages, LIFO batch:31 [ 0.000000] Normal zone: 376832 pages used for memmap [ 0.000000] Normal zone: 24117248 pages, LIFO batch:31 Signed-off-by: Jia He Reviewed-by: Pavel Tatashin --- mm/memblock.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index ccad225..84f7fa7 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1140,31 +1140,52 @@ int __init_memblock memblock_set_node(phys_addr_t base, phys_addr_t size, #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ #ifdef CONFIG_HAVE_MEMBLOCK_PFN_VALID +static int early_region_idx __init_memblock = -1; ulong __init_memblock memblock_next_valid_pfn(ulong pfn) { struct memblock_type *type = &memblock.memory; - unsigned int right = type->cnt; - unsigned int mid, left = 0; + struct memblock_region *regions = type->regions; + uint right = type->cnt; + uint mid, left = 0; + ulong start_pfn, end_pfn, next_start_pfn; phys_addr_t addr = PFN_PHYS(++pfn); + /* fast path, return pfn+1 if next pfn is in the same region */ + if (early_region_idx != -1) { + start_pfn = PFN_DOWN(regions[early_region_idx].base); + end_pfn = PFN_DOWN(regions[early_region_idx].base + + regions[early_region_idx].size); + + if (pfn >= start_pfn && pfn < end_pfn) + return pfn; + + early_region_idx++; + next_start_pfn = PFN_DOWN(regions[early_region_idx].base); + + if (pfn >= end_pfn && pfn <= next_start_pfn) + return next_start_pfn; + } + + /* slow path, do the binary searching */ do { mid = (right + left) / 2; - if (addr < type->regions[mid].base) + if (addr < regions[mid].base) right = mid; - else if (addr >= (type->regions[mid].base + - type->regions[mid].size)) + else if (addr >= (regions[mid].base + regions[mid].size)) left = mid + 1; else { - /* addr is within the region, so pfn is valid */ + early_region_idx = mid; return pfn; } } while (left < right); if (right == type->cnt) return -1UL; - else - return PHYS_PFN(type->regions[right].base); + + early_region_idx = right; + + return PHYS_PFN(regions[early_region_idx].base); } EXPORT_SYMBOL(memblock_next_valid_pfn); #endif /*CONFIG_HAVE_MEMBLOCK_PFN_VALID*/