From patchwork Mon May 21 10:15:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 10414575 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 2FD8C60365 for ; Mon, 21 May 2018 10:16:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20D5628763 for ; Mon, 21 May 2018 10:16:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 156D028782; Mon, 21 May 2018 10:16:20 +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=-2.9 required=2.0 tests=BAYES_00, 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 9EC4228763 for ; Mon, 21 May 2018 10:16:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 979DE6B000A; Mon, 21 May 2018 06:16:18 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8FF546B000C; Mon, 21 May 2018 06:16:18 -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 7C6906B000D; Mon, 21 May 2018 06:16:18 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk0-f197.google.com (mail-qk0-f197.google.com [209.85.220.197]) by kanga.kvack.org (Postfix) with ESMTP id 510586B000A for ; Mon, 21 May 2018 06:16:18 -0400 (EDT) Received: by mail-qk0-f197.google.com with SMTP id o97-v6so3849517qkh.14 for ; Mon, 21 May 2018 03:16:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=fUErk9A1kV9B9P2GpK4h+oDEDkFLGxdeRu3Gmdk6yho=; b=sVw8ud8Z6NqTeKCGqyk3crtHHkPxmhWdLhVAyho0F/JI9F0UW9VOT3kMdCgEbPklHf /ZcupADepaPo6+nBOe7oPTJqTALh+Nn/Hra6Hd+AFE48X3Ptjy3WBubHv8wdTHlA1Ov6 GdTGrTgxvIwHasPkJZi6sTN+RLwv9wrLFBSVkegHi0ZcUfEfUoPnPoVfqEQHum3TORPO 7hC8FdyAE52ePO3N6Zsw8sR0TBQ/o9P3tI3rbfnD6Rk3QfD+Z9YPrIWRZn3p3cLl14qN MOJy+iwr4HgcpRd3D1RsajDG8jhEXav9XRGVlpk8sX8BW6VLVGQNuN0rTKWYuuAQmYXV 6Ung== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of bhe@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: ALKqPwfQbA4Jd17K4+avlpeTisOgmvQfjDJP0g/1wLtdoBrd+6AFfCmL 9vsyGkFvq37xS3gQLNv14brOBy8rBQX3YmXVD/lHoWcZQDqaNSKDrYisf5jm+yvsAmSrjxu7VfY 4pswSWf0FdfDqU07OvvN5S3peB7lIBe+G3Ed2OUcoTOiJqoqOebhzWcUoFksZsv1ksw== X-Received: by 2002:a37:8146:: with SMTP id c67-v6mr16536310qkd.313.1526897778138; Mon, 21 May 2018 03:16:18 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpZazBPpevJa0NdhTvPnILdRkBbwApUsK70xvXdK9kXJ4dQgEc6HFPQK1QxAAke0iBn26EL X-Received: by 2002:a37:8146:: with SMTP id c67-v6mr16536279qkd.313.1526897777246; Mon, 21 May 2018 03:16:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526897777; cv=none; d=google.com; s=arc-20160816; b=D/112SD5EZ29BXYUMLtre57jtyyeWux8OQ8ablqnI0THQu/q7K3q084HEzlgTvPcn5 CptqpCNwaoDIWVgDAYCDFGxtQEGUPiP385Nx4Cn4HAuVH7VK0m1DILYsr9Tqb83PmAg7 SuJ1S/dLAYoxpqfM5rRYj/yJOfZGO9I502K8EMQwEEkvyuT0J+Uk+9ThRUwykuD2JW9B osyzkcS4xI4xi85LBB8R+bQ84p68moZ5+hzi+vvLc+yZgQ5+ykBYQGuFzr3iA7twT0OF x3UVoOWacHeXcKDwvvBaFarcbNqnkirB7uwFzWfEBdTuUd7Mtme3+W0+b5W6lzdY/byi Eg7A== 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 :arc-authentication-results; bh=fUErk9A1kV9B9P2GpK4h+oDEDkFLGxdeRu3Gmdk6yho=; b=v2iuh4Dny1tO8WTjkN3ecDM5r0aW2Ede1sQHFaCqATG4WyohkH+TMpkQ81WuDGpICO wqilTskIw9dYyHBr5YS0XUpsJ55f4DLmMUsHr2WOlN6d3HbahVGN4UCh2LCKzSQBgS+7 902iHbR8NHmjZPPLb9rIzTMuXHWwZLqlVr6Xkcpd8PcXWtDtTYCPfMhnEK5CVmC7ygfu e4smULaoYp++q0d5OofEyOa8js+XoQFkCzXZlP1RMddOXqxRuHydkDa9jYWRAfKVAIj2 BzuRGk+ZrTGv9j+j2HYiZ7E+wH0xibq+mBsb7HD680JRhttxHl1XwqEoplK98Mfk71FP C8SA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of bhe@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx3-rdu2.redhat.com. [66.187.233.73]) by mx.google.com with ESMTPS id t2-v6si4752208qvk.130.2018.05.21.03.16.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 May 2018 03:16:17 -0700 (PDT) Received-SPF: pass (google.com: domain of bhe@redhat.com designates 66.187.233.73 as permitted sender) client-ip=66.187.233.73; Authentication-Results: mx.google.com; spf=pass (google.com: domain of bhe@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E8BBF81FE15B; Mon, 21 May 2018 10:16:16 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-8-17.pek2.redhat.com [10.72.8.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4525F2024CBD; Mon, 21 May 2018 10:16:12 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, dave.hansen@intel.com, pagupta@redhat.com Cc: linux-mm@kvack.org, kirill.shutemov@linux.intel.com, Baoquan He Subject: [PATCH v4 3/4] mm/sparse: Add a new parameter 'data_unit_size' for alloc_usemap_and_memmap Date: Mon, 21 May 2018 18:15:54 +0800 Message-Id: <20180521101555.25610-4-bhe@redhat.com> In-Reply-To: <20180521101555.25610-1-bhe@redhat.com> References: <20180521101555.25610-1-bhe@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 21 May 2018 10:16:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 21 May 2018 10:16:16 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'bhe@redhat.com' RCPT:'' 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 It's used to pass the size of map data unit into alloc_usemap_and_memmap, and is preparation for next patch. Signed-off-by: Baoquan He --- mm/sparse.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mm/sparse.c b/mm/sparse.c index 3d697292be08..4a58f8809542 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -491,10 +491,12 @@ void __weak __meminit vmemmap_populate_print_last(void) /** * alloc_usemap_and_memmap - memory alloction for pageblock flags and vmemmap * @map: usemap_map for pageblock flags or mmap_map for vmemmap + * @unit_size: size of map unit */ static void __init alloc_usemap_and_memmap(void (*alloc_func) (void *, unsigned long, unsigned long, - unsigned long, int), void *data) + unsigned long, int), void *data, + int data_unit_size) { unsigned long pnum; unsigned long map_count; @@ -571,7 +573,8 @@ void __init sparse_init(void) if (!usemap_map) panic("can not allocate usemap_map\n"); alloc_usemap_and_memmap(sparse_early_usemaps_alloc_node, - (void *)usemap_map); + (void *)usemap_map, + sizeof(usemap_map[0])); #ifdef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER size2 = sizeof(struct page *) * NR_MEM_SECTIONS; @@ -579,7 +582,8 @@ void __init sparse_init(void) if (!map_map) panic("can not allocate map_map\n"); alloc_usemap_and_memmap(sparse_early_mem_maps_alloc_node, - (void *)map_map); + (void *)map_map, + sizeof(map_map[0])); #endif for_each_present_section_nr(0, pnum) {