From patchwork Mon Jul 16 17:44:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Tatashin X-Patchwork-Id: 10527373 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 2A4DD6037E for ; Mon, 16 Jul 2018 17:45:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16FA228421 for ; Mon, 16 Jul 2018 17:45:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B33928DEF; Mon, 16 Jul 2018 17:45:17 +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,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY 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 B9FBB28421 for ; Mon, 16 Jul 2018 17:45:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F8566B000E; Mon, 16 Jul 2018 13:45:12 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3D4EA6B0010; Mon, 16 Jul 2018 13:45:12 -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 247286B0266; Mon, 16 Jul 2018 13:45:12 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-it0-f70.google.com (mail-it0-f70.google.com [209.85.214.70]) by kanga.kvack.org (Postfix) with ESMTP id F0EE66B000E for ; Mon, 16 Jul 2018 13:45:11 -0400 (EDT) Received: by mail-it0-f70.google.com with SMTP id k204-v6so641270ite.1 for ; Mon, 16 Jul 2018 10:45:11 -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:subject:date:message-id :in-reply-to:references; bh=7t7F+kI406v/SCiDy8NUkpqH+t2+sZ/cokropNI+ghM=; b=eDXSGQyS0pqMdgYEsyYujKQddXn1j0r+CFzjA6CKtNXy/PtPNFwMLizf1Zvqsgw8dF iO1b3JYVOT9J9yCl59qKEg/o5blqzifkjb8lEs48f82UtMzaU5qk32GJIqG57FU7VwaC pi28wJ4sM6WFWrJoAgNKuhZMCzZzYW50FXI9CtiL+WI+hK5J5Od3Owa2MK/WD5i0FbZJ IghoKCBwfTrO+n2iB5G1pF/bgbLnsKYEyhFBFUItS05IegHJm9mkGtWAy0ySeWJSejB9 CB+lOmSrAuV7Z31lT6CqAcOCoRO4KyWu/LR12f/bECV01Ioab/SU417nrlghv5bX/Myp /C8g== X-Gm-Message-State: AOUpUlH5OTuiQfq8bP8rPohOzwH2WsOPKkLwFnZ/y6ksFPCQa7vyzb5I Ts7TGovmqTrUDJyvyNhRTzQ5OODqUlfFAq5GxeGx3nuA76EtP20IJ7tzUm6EI/Iihq/ZffrxXbp 09hDITdZBff1gWhsrGs/wM66KB2zpsmRBijM37nZCWkgbMUlZcw1zJzQuaU/7Cg3mgg== X-Received: by 2002:a6b:f418:: with SMTP id i24-v6mr42031747iog.34.1531763111781; Mon, 16 Jul 2018 10:45:11 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdDrN3i4Hy3jE1T3Ifv5lnvbhX3vwkL/Sa7G45o70SLpznCHlBR7ybEAyn2ZJK4FRvCGmQy X-Received: by 2002:a6b:f418:: with SMTP id i24-v6mr42031700iog.34.1531763111089; Mon, 16 Jul 2018 10:45:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531763111; cv=none; d=google.com; s=arc-20160816; b=lLMmcoPtJoAF1cWvadv/tFQJ220BJahpL0LI0vxkBfCx6llJIbTSZ/7XT5OO2/9se8 ZwHLy1jlu4F2+7PdKwqnWnGk5dAhaXZ1k3mSZhyktaLSHAIZSjow16AuzZhLZ3kUOLTx qoqNTEqqWL1epWVfbp2mX4Yv7YhDWQqww3QyTl7VBpBagXhPCEPWsZQp2nSkj/c4NC9D SKYDu9lYj9N/pZXd3x76tyJIYRG49HXq45NE5DnnXeIm2sEKP0M+/tJZSw9NI+Nw4b5U LHsbr5PJPEIFWO8lBoHlQHuYKygVvXnr0dz2QGiyVYL20UnwTRcWq7Nh6FFUSC+wCCKR D/LQ== 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:to:from :dkim-signature:arc-authentication-results; bh=7t7F+kI406v/SCiDy8NUkpqH+t2+sZ/cokropNI+ghM=; b=vPU5P3qaq2fLl3pj8yqnWdbU40SeFl/r2SGN9Pd8UvWR1bfqQ8ijcMLrya0JwxM+zC yyPVetDNmJDcd2yGtw18W2Mk19aovyqZ/aJcvz3MtBcGHFFd0zZgTlGzOiBRWceeg/N/ BXv4TK/PwOnNU6+bLdDFabpkQtxJZ3YH+WdKAjGKD7zXteQe4NZI/nBKoYFDhb2ZxYIB Se0s7YJ7J6QqEELuWZBImUYM54daOP8nqeTlLUiMbuUoS6w57q6DT+pRtVz37/fwrB/N szzqPQZLEqyhG360PTXUOIt3H72RKR+ud38rhSr6BaFOxfrjERj4ln663COdkXdLCS10 Kqlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=iwM6nd5G; spf=pass (google.com: domain of pasha.tatashin@oracle.com designates 156.151.31.86 as permitted sender) smtp.mailfrom=pasha.tatashin@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from userp2130.oracle.com (userp2130.oracle.com. [156.151.31.86]) by mx.google.com with ESMTPS id x197-v6si5128498iod.49.2018.07.16.10.45.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jul 2018 10:45:11 -0700 (PDT) Received-SPF: pass (google.com: domain of pasha.tatashin@oracle.com designates 156.151.31.86 as permitted sender) client-ip=156.151.31.86; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=iwM6nd5G; spf=pass (google.com: domain of pasha.tatashin@oracle.com designates 156.151.31.86 as permitted sender) smtp.mailfrom=pasha.tatashin@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w6GHi0p2166871; Mon, 16 Jul 2018 17:45:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=7t7F+kI406v/SCiDy8NUkpqH+t2+sZ/cokropNI+ghM=; b=iwM6nd5GkWmpBXpDulNee5+/me8PQdVfthaRr/0zmJQ+OVDlQTxmhYwWr6pSOZJIJwhM 9Q1hgEzJc3ta0hprOsNs9IZzXgeqQCkFpoVxw6muFgsbPVciFQvTSqyLqPMBOUr3K2aM +kXdCuzSaPmMvOYns8I6PNZDJP13/ZYChRjv2enYWXrnI3tCrPJ5crtNSP+9tL3SOV36 8FlgSEGY6lF+IFWMnjCEK1YSCTg/fZz37Yqx6JDyapdgABdWIyCvZzLef2EjOMwIhMHi GfhbD3pfT0ahG6ZqPl3m2nUkcMT7dQrEDOprIjKsUF09kBeABbKtMSRv5esFE2nK+fGe cA== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2130.oracle.com with ESMTP id 2k7a3t5hh3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Jul 2018 17:45:02 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w6GHj1r5001979 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Jul 2018 17:45:01 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w6GHj0vI025791; Mon, 16 Jul 2018 17:45:00 GMT Received: from localhost.localdomain (/73.69.118.222) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 16 Jul 2018 10:45:00 -0700 From: Pavel Tatashin To: steven.sistare@oracle.com, daniel.m.jordan@oracle.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, mhocko@suse.com, linux-mm@kvack.org, dan.j.williams@intel.com, jack@suse.cz, jglisse@redhat.com, jrdr.linux@gmail.com, bhe@redhat.com, gregkh@linuxfoundation.org, vbabka@suse.cz, richard.weiyang@gmail.com, dave.hansen@intel.com, rientjes@google.com, mingo@kernel.org, osalvador@techadventures.net, pasha.tatashin@oracle.com, abdhalee@linux.vnet.ibm.com, mpe@ellerman.id.au Subject: [PATCH v6 3/5] mm/sparse: move buffer init/fini to the common place Date: Mon, 16 Jul 2018 13:44:45 -0400 Message-Id: <20180716174447.14529-4-pasha.tatashin@oracle.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180716174447.14529-1-pasha.tatashin@oracle.com> References: <20180716174447.14529-1-pasha.tatashin@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8956 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807160202 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 Now, that both variants of sparse memory use the same buffers to populate memory map, we can move sparse_buffer_init()/sparse_buffer_fini() to the common place. Signed-off-by: Pavel Tatashin --- include/linux/mm.h | 3 --- mm/sparse-vmemmap.c | 2 -- mm/sparse.c | 14 +++++++------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index a83d3e0e66d4..99d8c50adef6 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2655,9 +2655,6 @@ void sparse_mem_maps_populate_node(struct page **map_map, unsigned long map_count, int nodeid); -unsigned long __init section_map_size(void); -void sparse_buffer_init(unsigned long size, int nid); -void sparse_buffer_fini(void); void *sparse_buffer_alloc(unsigned long size); struct page *sparse_mem_map_populate(unsigned long pnum, int nid, struct vmem_altmap *altmap); diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index b05c7663c640..cd15f3d252c3 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -270,7 +270,6 @@ void __init sparse_mem_maps_populate_node(struct page **map_map, unsigned long pnum; int nr_consumed_maps = 0; - sparse_buffer_init(section_map_size() * map_count, nodeid); for (pnum = pnum_begin; pnum < pnum_end; pnum++) { if (!present_section_nr(pnum)) continue; @@ -282,5 +281,4 @@ void __init sparse_mem_maps_populate_node(struct page **map_map, pr_err("%s: sparsemem memory map backing failed some memory will not be available\n", __func__); } - sparse_buffer_fini(); } diff --git a/mm/sparse.c b/mm/sparse.c index db4867b62fff..20ca292d8f11 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -401,14 +401,14 @@ static void __init sparse_early_usemaps_alloc_node(void *data, } #ifdef CONFIG_SPARSEMEM_VMEMMAP -unsigned long __init section_map_size(void) +static unsigned long __init section_map_size(void) { return ALIGN(sizeof(struct page) * PAGES_PER_SECTION, PMD_SIZE); } #else -unsigned long __init section_map_size(void) +static unsigned long __init section_map_size(void) { return PAGE_ALIGN(sizeof(struct page) * PAGES_PER_SECTION); } @@ -433,10 +433,8 @@ void __init sparse_mem_maps_populate_node(struct page **map_map, unsigned long map_count, int nodeid) { unsigned long pnum; - unsigned long size = section_map_size(); int nr_consumed_maps = 0; - sparse_buffer_init(size * map_count, nodeid); for (pnum = pnum_begin; pnum < pnum_end; pnum++) { if (!present_section_nr(pnum)) continue; @@ -447,14 +445,13 @@ void __init sparse_mem_maps_populate_node(struct page **map_map, pr_err("%s: sparsemem memory map backing failed some memory will not be available\n", __func__); } - sparse_buffer_fini(); } #endif /* !CONFIG_SPARSEMEM_VMEMMAP */ static void *sparsemap_buf __meminitdata; static void *sparsemap_buf_end __meminitdata; -void __init sparse_buffer_init(unsigned long size, int nid) +static void __init sparse_buffer_init(unsigned long size, int nid) { WARN_ON(sparsemap_buf); /* forgot to call sparse_buffer_fini()? */ sparsemap_buf = @@ -464,7 +461,7 @@ void __init sparse_buffer_init(unsigned long size, int nid) sparsemap_buf_end = sparsemap_buf + size; } -void __init sparse_buffer_fini(void) +static void __init sparse_buffer_fini(void) { unsigned long size = sparsemap_buf_end - sparsemap_buf; @@ -494,8 +491,11 @@ static void __init sparse_early_mem_maps_alloc_node(void *data, unsigned long map_count, int nodeid) { struct page **map_map = (struct page **)data; + + sparse_buffer_init(section_map_size() * map_count, nodeid); sparse_mem_maps_populate_node(map_map, pnum_begin, pnum_end, map_count, nodeid); + sparse_buffer_fini(); } #else static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum)