From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753816AbdJCM7p (ORCPT ); Tue, 3 Oct 2017 08:59:45 -0400 Received: from mx2.suse.de ([195.135.220.15]:45620 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753781AbdJCM7m (ORCPT ); Tue, 3 Oct 2017 08:59:42 -0400 Date: Tue, 3 Oct 2017 14:59:40 +0200 From: Michal Hocko To: Pavel Tatashin Cc: linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org, kasan-dev@googlegroups.com, borntraeger@de.ibm.com, heiko.carstens@de.ibm.com, davem@davemloft.net, willy@infradead.org, ard.biesheuvel@linaro.org, mark.rutland@arm.com, will.deacon@arm.com, catalin.marinas@arm.com, sam@ravnborg.org, mgorman@techsingularity.net, steven.sistare@oracle.com, daniel.m.jordan@oracle.com, bob.picco@oracle.com Subject: Re: [PATCH v9 04/12] sparc64: simplify vmemmap_populate Message-ID: <20171003125940.6d5fyhwx2lkzxn67@dhcp22.suse.cz> References: <20170920201714.19817-1-pasha.tatashin@oracle.com> <20170920201714.19817-5-pasha.tatashin@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170920201714.19817-5-pasha.tatashin@oracle.com> User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed 20-09-17 16:17:06, Pavel Tatashin wrote: > Remove duplicating code by using common functions > vmemmap_pud_populate and vmemmap_pgd_populate. > > Signed-off-by: Pavel Tatashin > Reviewed-by: Steven Sistare > Reviewed-by: Daniel Jordan > Reviewed-by: Bob Picco > Acked-by: David S. Miller Acked-by: Michal Hocko > --- > arch/sparc/mm/init_64.c | 23 ++++++----------------- > 1 file changed, 6 insertions(+), 17 deletions(-) > > diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c > index 310c6754bcaa..99aea4d15a5f 100644 > --- a/arch/sparc/mm/init_64.c > +++ b/arch/sparc/mm/init_64.c > @@ -2651,30 +2651,19 @@ int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend, > vstart = vstart & PMD_MASK; > vend = ALIGN(vend, PMD_SIZE); > for (; vstart < vend; vstart += PMD_SIZE) { > - pgd_t *pgd = pgd_offset_k(vstart); > + pgd_t *pgd = vmemmap_pgd_populate(vstart, node); > unsigned long pte; > pud_t *pud; > pmd_t *pmd; > > - if (pgd_none(*pgd)) { > - pud_t *new = vmemmap_alloc_block(PAGE_SIZE, node); > + if (!pgd) > + return -ENOMEM; > > - if (!new) > - return -ENOMEM; > - pgd_populate(&init_mm, pgd, new); > - } > - > - pud = pud_offset(pgd, vstart); > - if (pud_none(*pud)) { > - pmd_t *new = vmemmap_alloc_block(PAGE_SIZE, node); > - > - if (!new) > - return -ENOMEM; > - pud_populate(&init_mm, pud, new); > - } > + pud = vmemmap_pud_populate(pgd, vstart, node); > + if (!pud) > + return -ENOMEM; > > pmd = pmd_offset(pud, vstart); > - > pte = pmd_val(*pmd); > if (!(pte & _PAGE_VALID)) { > void *block = vmemmap_alloc_block(PMD_SIZE, node); > -- > 2.14.1 -- Michal Hocko SUSE Labs From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Hocko Date: Tue, 03 Oct 2017 12:59:40 +0000 Subject: Re: [PATCH v9 04/12] sparc64: simplify vmemmap_populate Message-Id: <20171003125940.6d5fyhwx2lkzxn67@dhcp22.suse.cz> List-Id: References: <20170920201714.19817-1-pasha.tatashin@oracle.com> <20170920201714.19817-5-pasha.tatashin@oracle.com> In-Reply-To: <20170920201714.19817-5-pasha.tatashin@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org On Wed 20-09-17 16:17:06, Pavel Tatashin wrote: > Remove duplicating code by using common functions > vmemmap_pud_populate and vmemmap_pgd_populate. > > Signed-off-by: Pavel Tatashin > Reviewed-by: Steven Sistare > Reviewed-by: Daniel Jordan > Reviewed-by: Bob Picco > Acked-by: David S. Miller Acked-by: Michal Hocko > --- > arch/sparc/mm/init_64.c | 23 ++++++----------------- > 1 file changed, 6 insertions(+), 17 deletions(-) > > diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c > index 310c6754bcaa..99aea4d15a5f 100644 > --- a/arch/sparc/mm/init_64.c > +++ b/arch/sparc/mm/init_64.c > @@ -2651,30 +2651,19 @@ int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend, > vstart = vstart & PMD_MASK; > vend = ALIGN(vend, PMD_SIZE); > for (; vstart < vend; vstart += PMD_SIZE) { > - pgd_t *pgd = pgd_offset_k(vstart); > + pgd_t *pgd = vmemmap_pgd_populate(vstart, node); > unsigned long pte; > pud_t *pud; > pmd_t *pmd; > > - if (pgd_none(*pgd)) { > - pud_t *new = vmemmap_alloc_block(PAGE_SIZE, node); > + if (!pgd) > + return -ENOMEM; > > - if (!new) > - return -ENOMEM; > - pgd_populate(&init_mm, pgd, new); > - } > - > - pud = pud_offset(pgd, vstart); > - if (pud_none(*pud)) { > - pmd_t *new = vmemmap_alloc_block(PAGE_SIZE, node); > - > - if (!new) > - return -ENOMEM; > - pud_populate(&init_mm, pud, new); > - } > + pud = vmemmap_pud_populate(pgd, vstart, node); > + if (!pud) > + return -ENOMEM; > > pmd = pmd_offset(pud, vstart); > - > pte = pmd_val(*pmd); > if (!(pte & _PAGE_VALID)) { > void *block = vmemmap_alloc_block(PMD_SIZE, node); > -- > 2.14.1 -- Michal Hocko SUSE Labs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f197.google.com (mail-pf0-f197.google.com [209.85.192.197]) by kanga.kvack.org (Postfix) with ESMTP id E4A6F6B0038 for ; Tue, 3 Oct 2017 08:59:43 -0400 (EDT) Received: by mail-pf0-f197.google.com with SMTP id a7so19383703pfj.3 for ; Tue, 03 Oct 2017 05:59:43 -0700 (PDT) Received: from mx1.suse.de (mx2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id 71si9670404pfx.509.2017.10.03.05.59.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Oct 2017 05:59:42 -0700 (PDT) Date: Tue, 3 Oct 2017 14:59:40 +0200 From: Michal Hocko Subject: Re: [PATCH v9 04/12] sparc64: simplify vmemmap_populate Message-ID: <20171003125940.6d5fyhwx2lkzxn67@dhcp22.suse.cz> References: <20170920201714.19817-1-pasha.tatashin@oracle.com> <20170920201714.19817-5-pasha.tatashin@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170920201714.19817-5-pasha.tatashin@oracle.com> Sender: owner-linux-mm@kvack.org List-ID: To: Pavel Tatashin Cc: linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org, kasan-dev@googlegroups.com, borntraeger@de.ibm.com, heiko.carstens@de.ibm.com, davem@davemloft.net, willy@infradead.org, ard.biesheuvel@linaro.org, mark.rutland@arm.com, will.deacon@arm.com, catalin.marinas@arm.com, sam@ravnborg.org, mgorman@techsingularity.net, steven.sistare@oracle.com, daniel.m.jordan@oracle.com, bob.picco@oracle.com On Wed 20-09-17 16:17:06, Pavel Tatashin wrote: > Remove duplicating code by using common functions > vmemmap_pud_populate and vmemmap_pgd_populate. > > Signed-off-by: Pavel Tatashin > Reviewed-by: Steven Sistare > Reviewed-by: Daniel Jordan > Reviewed-by: Bob Picco > Acked-by: David S. Miller Acked-by: Michal Hocko > --- > arch/sparc/mm/init_64.c | 23 ++++++----------------- > 1 file changed, 6 insertions(+), 17 deletions(-) > > diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c > index 310c6754bcaa..99aea4d15a5f 100644 > --- a/arch/sparc/mm/init_64.c > +++ b/arch/sparc/mm/init_64.c > @@ -2651,30 +2651,19 @@ int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend, > vstart = vstart & PMD_MASK; > vend = ALIGN(vend, PMD_SIZE); > for (; vstart < vend; vstart += PMD_SIZE) { > - pgd_t *pgd = pgd_offset_k(vstart); > + pgd_t *pgd = vmemmap_pgd_populate(vstart, node); > unsigned long pte; > pud_t *pud; > pmd_t *pmd; > > - if (pgd_none(*pgd)) { > - pud_t *new = vmemmap_alloc_block(PAGE_SIZE, node); > + if (!pgd) > + return -ENOMEM; > > - if (!new) > - return -ENOMEM; > - pgd_populate(&init_mm, pgd, new); > - } > - > - pud = pud_offset(pgd, vstart); > - if (pud_none(*pud)) { > - pmd_t *new = vmemmap_alloc_block(PAGE_SIZE, node); > - > - if (!new) > - return -ENOMEM; > - pud_populate(&init_mm, pud, new); > - } > + pud = vmemmap_pud_populate(pgd, vstart, node); > + if (!pud) > + return -ENOMEM; > > pmd = pmd_offset(pud, vstart); > - > pte = pmd_val(*pmd); > if (!(pte & _PAGE_VALID)) { > void *block = vmemmap_alloc_block(PMD_SIZE, node); > -- > 2.14.1 -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 From: mhocko@kernel.org (Michal Hocko) Date: Tue, 3 Oct 2017 14:59:40 +0200 Subject: [PATCH v9 04/12] sparc64: simplify vmemmap_populate In-Reply-To: <20170920201714.19817-5-pasha.tatashin@oracle.com> References: <20170920201714.19817-1-pasha.tatashin@oracle.com> <20170920201714.19817-5-pasha.tatashin@oracle.com> Message-ID: <20171003125940.6d5fyhwx2lkzxn67@dhcp22.suse.cz> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed 20-09-17 16:17:06, Pavel Tatashin wrote: > Remove duplicating code by using common functions > vmemmap_pud_populate and vmemmap_pgd_populate. > > Signed-off-by: Pavel Tatashin > Reviewed-by: Steven Sistare > Reviewed-by: Daniel Jordan > Reviewed-by: Bob Picco > Acked-by: David S. Miller Acked-by: Michal Hocko > --- > arch/sparc/mm/init_64.c | 23 ++++++----------------- > 1 file changed, 6 insertions(+), 17 deletions(-) > > diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c > index 310c6754bcaa..99aea4d15a5f 100644 > --- a/arch/sparc/mm/init_64.c > +++ b/arch/sparc/mm/init_64.c > @@ -2651,30 +2651,19 @@ int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend, > vstart = vstart & PMD_MASK; > vend = ALIGN(vend, PMD_SIZE); > for (; vstart < vend; vstart += PMD_SIZE) { > - pgd_t *pgd = pgd_offset_k(vstart); > + pgd_t *pgd = vmemmap_pgd_populate(vstart, node); > unsigned long pte; > pud_t *pud; > pmd_t *pmd; > > - if (pgd_none(*pgd)) { > - pud_t *new = vmemmap_alloc_block(PAGE_SIZE, node); > + if (!pgd) > + return -ENOMEM; > > - if (!new) > - return -ENOMEM; > - pgd_populate(&init_mm, pgd, new); > - } > - > - pud = pud_offset(pgd, vstart); > - if (pud_none(*pud)) { > - pmd_t *new = vmemmap_alloc_block(PAGE_SIZE, node); > - > - if (!new) > - return -ENOMEM; > - pud_populate(&init_mm, pud, new); > - } > + pud = vmemmap_pud_populate(pgd, vstart, node); > + if (!pud) > + return -ENOMEM; > > pmd = pmd_offset(pud, vstart); > - > pte = pmd_val(*pmd); > if (!(pte & _PAGE_VALID)) { > void *block = vmemmap_alloc_block(PMD_SIZE, node); > -- > 2.14.1 -- Michal Hocko SUSE Labs