{"id":806919,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806919/?format=json","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.0/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/"},"msgid":"<1503972142-289376-12-git-send-email-pasha.tatashin@oracle.com>","date":"2017-08-29T02:02:22","name":"[v7,11/11] mm: stop zeroing memory during allocation in vmemmap","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"ef88fd8244cc49d62dc757fa6210a3ca479ac8e2","submitter":{"id":71010,"url":"http://patchwork.ozlabs.org/api/1.0/people/71010/?format=json","name":"Pavel Tatashin","email":"pasha.tatashin@oracle.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1503972142-289376-12-git-send-email-pasha.tatashin@oracle.com/mbox/","series":[{"id":286,"url":"http://patchwork.ozlabs.org/api/1.0/series/286/?format=json","date":"2017-08-29T02:02:21","name":"complete deferred page initialization","version":7,"mbox":"http://patchwork.ozlabs.org/series/286/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806919/checks/","tags":{},"headers":{"Return-Path":"<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xhC6v1ltPz9s7f\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 29 Aug 2017 12:21:11 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xhC6v0wYdzDqZ5\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 29 Aug 2017 12:21:11 +1000 (AEST)","from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xhBl46d6PzDqTm\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tTue, 29 Aug 2017 12:04:00 +1000 (AEST)","from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233])\n\tby userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2)\n\twith ESMTP id v7T22etZ022437\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=OK); Tue, 29 Aug 2017 02:02:41 GMT","from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235])\n\tby aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id\n\tv7T22eQr005333\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=OK); Tue, 29 Aug 2017 02:02:40 GMT","from abhmp0011.oracle.com (abhmp0011.oracle.com [141.146.116.17])\n\tby aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id\n\tv7T22ehA011422; Tue, 29 Aug 2017 02:02:40 GMT","from ca-ldom-ol-build-1.us.oracle.com (/10.129.68.23)\n\tby default (Oracle Beehive Gateway v4.0)\n\twith ESMTP ; Mon, 28 Aug 2017 19:02:40 -0700"],"From":"Pavel Tatashin <pasha.tatashin@oracle.com>","To":"linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org,\n\tlinux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org,\n\tlinux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org,\n\tx86@kernel.org, kasan-dev@googlegroups.com, borntraeger@de.ibm.com,\n\theiko.carstens@de.ibm.com, davem@davemloft.net, willy@infradead.org, \n\tmhocko@kernel.org, ard.biesheuvel@linaro.org, will.deacon@arm.com,\n\tcatalin.marinas@arm.com, sam@ravnborg.org, mgorman@techsingularity.net,\n\tSteven.Sistare@oracle.com, daniel.m.jordan@oracle.com,\n\tbob.picco@oracle.com","Subject":"[PATCH v7 11/11] mm: stop zeroing memory during allocation in\n\tvmemmap","Date":"Mon, 28 Aug 2017 22:02:22 -0400","Message-Id":"<1503972142-289376-12-git-send-email-pasha.tatashin@oracle.com>","X-Mailer":"git-send-email 1.7.1","In-Reply-To":"<1503972142-289376-1-git-send-email-pasha.tatashin@oracle.com>","References":"<1503972142-289376-1-git-send-email-pasha.tatashin@oracle.com>","X-Source-IP":"aserv0021.oracle.com [141.146.126.233]","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t<linuxppc-dev.lists.ozlabs.org>","List-Unsubscribe":"<https://lists.ozlabs.org/options/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>","List-Archive":"<http://lists.ozlabs.org/pipermail/linuxppc-dev/>","List-Post":"<mailto:linuxppc-dev@lists.ozlabs.org>","List-Help":"<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>","List-Subscribe":"<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>"},"content":"vmemmap_alloc_block() will no longer zero the block, so zero memory\nat its call sites for everything except struct pages.  Struct page memory\nis zero'd by struct page initialization.\n\nReplace allocators in sprase-vmemmap to use the non-zeroing version. So,\nwe will get the performance improvement by zeroing the memory in parallel\nwhen struct pages are zeroed.\n\nSigned-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>\nReviewed-by: Steven Sistare <steven.sistare@oracle.com>\nReviewed-by: Daniel Jordan <daniel.m.jordan@oracle.com>\nReviewed-by: Bob Picco <bob.picco@oracle.com>\n---\n include/linux/mm.h  | 11 +++++++++++\n mm/sparse-vmemmap.c | 14 +++++++-------\n mm/sparse.c         |  6 +++---\n 3 files changed, 21 insertions(+), 10 deletions(-)","diff":"diff --git a/include/linux/mm.h b/include/linux/mm.h\nindex 0a440ff8f226..fba540aef1da 100644\n--- a/include/linux/mm.h\n+++ b/include/linux/mm.h\n@@ -2456,6 +2456,17 @@ static inline void *vmemmap_alloc_block_buf(unsigned long size, int node)\n \treturn __vmemmap_alloc_block_buf(size, node, NULL);\n }\n \n+static inline void *vmemmap_alloc_block_zero(unsigned long size, int node)\n+{\n+\tvoid *p = vmemmap_alloc_block(size, node);\n+\n+\tif (!p)\n+\t\treturn NULL;\n+\tmemset(p, 0, size);\n+\n+\treturn p;\n+}\n+\n void vmemmap_verify(pte_t *, int, unsigned long, unsigned long);\n int vmemmap_populate_basepages(unsigned long start, unsigned long end,\n \t\t\t       int node);\ndiff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c\nindex c50b1a14d55e..423d4da85a91 100644\n--- a/mm/sparse-vmemmap.c\n+++ b/mm/sparse-vmemmap.c\n@@ -41,7 +41,7 @@ static void * __ref __earlyonly_bootmem_alloc(int node,\n \t\t\t\tunsigned long align,\n \t\t\t\tunsigned long goal)\n {\n-\treturn memblock_virt_alloc_try_nid(size, align, goal,\n+\treturn memblock_virt_alloc_try_nid_raw(size, align, goal,\n \t\t\t\t\t    BOOTMEM_ALLOC_ACCESSIBLE, node);\n }\n \n@@ -56,11 +56,11 @@ void * __meminit vmemmap_alloc_block(unsigned long size, int node)\n \n \t\tif (node_state(node, N_HIGH_MEMORY))\n \t\t\tpage = alloc_pages_node(\n-\t\t\t\tnode, GFP_KERNEL | __GFP_ZERO | __GFP_RETRY_MAYFAIL,\n+\t\t\t\tnode, GFP_KERNEL | __GFP_RETRY_MAYFAIL,\n \t\t\t\tget_order(size));\n \t\telse\n \t\t\tpage = alloc_pages(\n-\t\t\t\tGFP_KERNEL | __GFP_ZERO | __GFP_RETRY_MAYFAIL,\n+\t\t\t\tGFP_KERNEL | __GFP_RETRY_MAYFAIL,\n \t\t\t\tget_order(size));\n \t\tif (page)\n \t\t\treturn page_address(page);\n@@ -188,7 +188,7 @@ pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node)\n {\n \tpmd_t *pmd = pmd_offset(pud, addr);\n \tif (pmd_none(*pmd)) {\n-\t\tvoid *p = vmemmap_alloc_block(PAGE_SIZE, node);\n+\t\tvoid *p = vmemmap_alloc_block_zero(PAGE_SIZE, node);\n \t\tif (!p)\n \t\t\treturn NULL;\n \t\tpmd_populate_kernel(&init_mm, pmd, p);\n@@ -200,7 +200,7 @@ pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node)\n {\n \tpud_t *pud = pud_offset(p4d, addr);\n \tif (pud_none(*pud)) {\n-\t\tvoid *p = vmemmap_alloc_block(PAGE_SIZE, node);\n+\t\tvoid *p = vmemmap_alloc_block_zero(PAGE_SIZE, node);\n \t\tif (!p)\n \t\t\treturn NULL;\n \t\tpud_populate(&init_mm, pud, p);\n@@ -212,7 +212,7 @@ p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node)\n {\n \tp4d_t *p4d = p4d_offset(pgd, addr);\n \tif (p4d_none(*p4d)) {\n-\t\tvoid *p = vmemmap_alloc_block(PAGE_SIZE, node);\n+\t\tvoid *p = vmemmap_alloc_block_zero(PAGE_SIZE, node);\n \t\tif (!p)\n \t\t\treturn NULL;\n \t\tp4d_populate(&init_mm, p4d, p);\n@@ -224,7 +224,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)\n {\n \tpgd_t *pgd = pgd_offset_k(addr);\n \tif (pgd_none(*pgd)) {\n-\t\tvoid *p = vmemmap_alloc_block(PAGE_SIZE, node);\n+\t\tvoid *p = vmemmap_alloc_block_zero(PAGE_SIZE, node);\n \t\tif (!p)\n \t\t\treturn NULL;\n \t\tpgd_populate(&init_mm, pgd, p);\ndiff --git a/mm/sparse.c b/mm/sparse.c\nindex 7b4be3fd5cac..0e315766ad11 100644\n--- a/mm/sparse.c\n+++ b/mm/sparse.c\n@@ -441,9 +441,9 @@ void __init sparse_mem_maps_populate_node(struct page **map_map,\n \t}\n \n \tsize = PAGE_ALIGN(size);\n-\tmap = memblock_virt_alloc_try_nid(size * map_count,\n-\t\t\t\t\t  PAGE_SIZE, __pa(MAX_DMA_ADDRESS),\n-\t\t\t\t\t  BOOTMEM_ALLOC_ACCESSIBLE, nodeid);\n+\tmap = memblock_virt_alloc_try_nid_raw(size * map_count,\n+\t\t\t\t\t      PAGE_SIZE, __pa(MAX_DMA_ADDRESS),\n+\t\t\t\t\t      BOOTMEM_ALLOC_ACCESSIBLE, nodeid);\n \tif (map) {\n \t\tfor (pnum = pnum_begin; pnum < pnum_end; pnum++) {\n \t\t\tif (!present_section_nr(pnum))\n","prefixes":["v7","11/11"]}