{"id":806908,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806908/?format=json","project":{"id":10,"url":"http://patchwork.ozlabs.org/api/1.0/projects/10/?format=json","name":"Linux SPARC Development ","link_name":"sparclinux","list_id":"sparclinux.vger.kernel.org","list_email":"sparclinux@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<1503972142-289376-5-git-send-email-pasha.tatashin@oracle.com>","date":"2017-08-29T02:02:15","name":"[v7,04/11] sparc64: simplify vmemmap_populate","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"0c078a5f0fc69521f1f577e4987c38edab41164b","submitter":{"id":71010,"url":"http://patchwork.ozlabs.org/api/1.0/people/71010/?format=json","name":"Pavel Tatashin","email":"pasha.tatashin@oracle.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/sparclinux/patch/1503972142-289376-5-git-send-email-pasha.tatashin@oracle.com/mbox/","series":[{"id":285,"url":"http://patchwork.ozlabs.org/api/1.0/series/285/?format=json","date":"2017-08-29T02:02:11","name":"complete deferred page initialization","version":7,"mbox":"http://patchwork.ozlabs.org/series/285/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806908/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=sparclinux-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhBp61yq2z9sRm\n\tfor ;\n\tTue, 29 Aug 2017 12:06:38 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751716AbdH2CGQ (ORCPT );\n\tMon, 28 Aug 2017 22:06:16 -0400","from aserp1040.oracle.com ([141.146.126.69]:25867 \"EHLO\n\taserp1040.oracle.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751264AbdH2CDu (ORCPT\n\t); Mon, 28 Aug 2017 22:03:50 -0400","from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71])\n\tby aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with\n\tESMTP id v7T22XcU011014\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=OK); Tue, 29 Aug 2017 02:02:34 GMT","from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75])\n\tby userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id v7T22XBm006917\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=OK); Tue, 29 Aug 2017 02:02:33 GMT","from abhmp0011.oracle.com (abhmp0011.oracle.com [141.146.116.17])\n\tby userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id\n\tv7T22W60012145; Tue, 29 Aug 2017 02:02:32 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:31 -0700"],"From":"Pavel Tatashin ","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,\n\twilly@infradead.org, mhocko@kernel.org, ard.biesheuvel@linaro.org,\n\twill.deacon@arm.com, catalin.marinas@arm.com, sam@ravnborg.org,\n\tmgorman@techsingularity.net, Steven.Sistare@oracle.com,\n\tdaniel.m.jordan@oracle.com, bob.picco@oracle.com","Subject":"[PATCH v7 04/11] sparc64: simplify vmemmap_populate","Date":"Mon, 28 Aug 2017 22:02:15 -0400","Message-Id":"<1503972142-289376-5-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":"userv0021.oracle.com [156.151.31.71]","Sender":"sparclinux-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"sparclinux@vger.kernel.org"},"content":"Remove duplicating code by using common functions\nvmemmap_pud_populate and vmemmap_pgd_populate.\n\nSigned-off-by: Pavel Tatashin \nReviewed-by: Steven Sistare \nReviewed-by: Daniel Jordan \nReviewed-by: Bob Picco \n---\n arch/sparc/mm/init_64.c | 23 ++++++-----------------\n 1 file changed, 6 insertions(+), 17 deletions(-)","diff":"diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c\nindex 12dbba85a2e2..a603d2c9087d 100644\n--- a/arch/sparc/mm/init_64.c\n+++ b/arch/sparc/mm/init_64.c\n@@ -2611,30 +2611,19 @@ int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend,\n \tvstart = vstart & PMD_MASK;\n \tvend = ALIGN(vend, PMD_SIZE);\n \tfor (; vstart < vend; vstart += PMD_SIZE) {\n-\t\tpgd_t *pgd = pgd_offset_k(vstart);\n+\t\tpgd_t *pgd = vmemmap_pgd_populate(vstart, node);\n \t\tunsigned long pte;\n \t\tpud_t *pud;\n \t\tpmd_t *pmd;\n \n-\t\tif (pgd_none(*pgd)) {\n-\t\t\tpud_t *new = vmemmap_alloc_block(PAGE_SIZE, node);\n+\t\tif (!pgd)\n+\t\t\treturn -ENOMEM;\n \n-\t\t\tif (!new)\n-\t\t\t\treturn -ENOMEM;\n-\t\t\tpgd_populate(&init_mm, pgd, new);\n-\t\t}\n-\n-\t\tpud = pud_offset(pgd, vstart);\n-\t\tif (pud_none(*pud)) {\n-\t\t\tpmd_t *new = vmemmap_alloc_block(PAGE_SIZE, node);\n-\n-\t\t\tif (!new)\n-\t\t\t\treturn -ENOMEM;\n-\t\t\tpud_populate(&init_mm, pud, new);\n-\t\t}\n+\t\tpud = vmemmap_pud_populate(pgd, vstart, node);\n+\t\tif (!pud)\n+\t\t\treturn -ENOMEM;\n \n \t\tpmd = pmd_offset(pud, vstart);\n-\n \t\tpte = pmd_val(*pmd);\n \t\tif (!(pte & _PAGE_VALID)) {\n \t\t\tvoid *block = vmemmap_alloc_block(PMD_SIZE, node);\n","prefixes":["v7","04/11"]}