From: Oliver O'Halloran <oohall@gmail.com> To: linuxppc-dev@lists.ozlabs.org Cc: bsingharora@gmail.com, arbab@linux.vnet.ibm.com, linux-nvdimm@lists.01.org Subject: [PATCH 4/9] powerpc/mm: Reshuffle vmemmap_free() Date: Wed, 12 Apr 2017 03:42:28 +1000 [thread overview] Message-ID: <20170411174233.21902-5-oohall@gmail.com> (raw) In-Reply-To: <20170411174233.21902-1-oohall@gmail.com> Removes an indentation level and shuffles some code around to make the following patch cleaner. No functional changes. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- arch/powerpc/mm/init_64.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index ec84b31c6c86..f8124edb6ffa 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -234,12 +234,15 @@ static unsigned long vmemmap_list_free(unsigned long start) void __ref vmemmap_free(unsigned long start, unsigned long end) { unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift; + unsigned long page_order = get_order(page_size); start = _ALIGN_DOWN(start, page_size); pr_debug("vmemmap_free %lx...%lx\n", start, end); for (; start < end; start += page_size) { + struct page *page = pfn_to_page(addr >> PAGE_SHIFT); + unsigned int nr_pages; unsigned long addr; /* @@ -251,29 +254,29 @@ void __ref vmemmap_free(unsigned long start, unsigned long end) continue; addr = vmemmap_list_free(start); - if (addr) { - struct page *page = pfn_to_page(addr >> PAGE_SHIFT); - - if (PageReserved(page)) { - /* allocated from bootmem */ - if (page_size < PAGE_SIZE) { - /* - * this shouldn't happen, but if it is - * the case, leave the memory there - */ - WARN_ON_ONCE(1); - } else { - unsigned int nr_pages = - 1 << get_order(page_size); - while (nr_pages--) - free_reserved_page(page++); - } - } else - free_pages((unsigned long)(__va(addr)), - get_order(page_size)); - - vmemmap_remove_mapping(start, page_size); + if (!addr) + continue; + + page = pfn_to_page(addr >> PAGE_SHIFT); + nr_pages = 1 << page_order; + + if (PageReserved(page)) { + /* allocated from bootmem */ + if (page_size < PAGE_SIZE) { + /* + * this shouldn't happen, but if it is + * the case, leave the memory there + */ + WARN_ON_ONCE(1); + } else { + while (nr_pages--) + free_reserved_page(page++); + } + } else { + free_pages((unsigned long)(__va(addr)), page_order); } + + vmemmap_remove_mapping(start, page_size); } } #endif -- 2.9.3 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID (diff)
From: Oliver O'Halloran <oohall@gmail.com> To: linuxppc-dev@lists.ozlabs.org Cc: arbab@linux.vnet.ibm.com, bsingharora@gmail.com, linux-nvdimm@lists.01.org, Oliver O'Halloran <oohall@gmail.com> Subject: [PATCH 4/9] powerpc/mm: Reshuffle vmemmap_free() Date: Wed, 12 Apr 2017 03:42:28 +1000 [thread overview] Message-ID: <20170411174233.21902-5-oohall@gmail.com> (raw) In-Reply-To: <20170411174233.21902-1-oohall@gmail.com> Removes an indentation level and shuffles some code around to make the following patch cleaner. No functional changes. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- arch/powerpc/mm/init_64.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index ec84b31c6c86..f8124edb6ffa 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -234,12 +234,15 @@ static unsigned long vmemmap_list_free(unsigned long start) void __ref vmemmap_free(unsigned long start, unsigned long end) { unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift; + unsigned long page_order = get_order(page_size); start = _ALIGN_DOWN(start, page_size); pr_debug("vmemmap_free %lx...%lx\n", start, end); for (; start < end; start += page_size) { + struct page *page = pfn_to_page(addr >> PAGE_SHIFT); + unsigned int nr_pages; unsigned long addr; /* @@ -251,29 +254,29 @@ void __ref vmemmap_free(unsigned long start, unsigned long end) continue; addr = vmemmap_list_free(start); - if (addr) { - struct page *page = pfn_to_page(addr >> PAGE_SHIFT); - - if (PageReserved(page)) { - /* allocated from bootmem */ - if (page_size < PAGE_SIZE) { - /* - * this shouldn't happen, but if it is - * the case, leave the memory there - */ - WARN_ON_ONCE(1); - } else { - unsigned int nr_pages = - 1 << get_order(page_size); - while (nr_pages--) - free_reserved_page(page++); - } - } else - free_pages((unsigned long)(__va(addr)), - get_order(page_size)); - - vmemmap_remove_mapping(start, page_size); + if (!addr) + continue; + + page = pfn_to_page(addr >> PAGE_SHIFT); + nr_pages = 1 << page_order; + + if (PageReserved(page)) { + /* allocated from bootmem */ + if (page_size < PAGE_SIZE) { + /* + * this shouldn't happen, but if it is + * the case, leave the memory there + */ + WARN_ON_ONCE(1); + } else { + while (nr_pages--) + free_reserved_page(page++); + } + } else { + free_pages((unsigned long)(__va(addr)), page_order); } + + vmemmap_remove_mapping(start, page_size); } } #endif -- 2.9.3
next prev parent reply other threads:[~2017-04-11 17:43 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-11 17:42 ZONE_DEVICE and pmem API support for powerpc Oliver O'Halloran 2017-04-11 17:42 ` Oliver O'Halloran 2017-04-11 17:42 ` [PATCH 1/9] mm/huge_memory: Use zap_deposited_table() more Oliver O'Halloran 2017-04-11 17:42 ` Oliver O'Halloran 2017-04-11 17:42 ` Oliver O'Halloran 2017-04-12 5:44 ` Aneesh Kumar K.V 2017-04-12 5:44 ` Aneesh Kumar K.V 2017-04-18 21:35 ` David Rientjes 2017-04-18 21:35 ` David Rientjes 2017-04-11 17:42 ` [PATCH 2/9] mm/huge_memory: Deposit a pgtable for DAX PMD faults when required Oliver O'Halloran 2017-04-11 17:42 ` Oliver O'Halloran 2017-04-11 17:42 ` Oliver O'Halloran 2017-04-12 5:51 ` Aneesh Kumar K.V 2017-04-12 5:51 ` Aneesh Kumar K.V 2017-04-12 5:51 ` Aneesh Kumar K.V 2017-04-11 17:42 ` [PATCH 3/9] powerpc/mm: Add _PAGE_DEVMAP for ppc64 Oliver O'Halloran 2017-04-11 17:42 ` Oliver O'Halloran 2017-04-12 0:19 ` Stephen Rothwell 2017-04-12 0:19 ` Stephen Rothwell 2017-04-12 3:07 ` Aneesh Kumar K.V 2017-04-12 3:07 ` Aneesh Kumar K.V 2017-04-13 5:20 ` Aneesh Kumar K.V 2017-04-13 5:20 ` Aneesh Kumar K.V 2017-04-11 17:42 ` Oliver O'Halloran [this message] 2017-04-11 17:42 ` [PATCH 4/9] powerpc/mm: Reshuffle vmemmap_free() Oliver O'Halloran 2017-04-12 0:33 ` Stephen Rothwell 2017-04-12 0:33 ` Stephen Rothwell 2017-04-11 17:42 ` [PATCH 5/9] powerpc/vmemmap: Add altmap support Oliver O'Halloran 2017-04-11 17:42 ` Oliver O'Halloran 2017-04-12 0:24 ` Balbir Singh 2017-04-12 0:24 ` Balbir Singh 2017-04-11 17:42 ` [PATCH 6/9] powerpc, mm: Enable ZONE_DEVICE on powerpc Oliver O'Halloran 2017-04-11 17:42 ` Oliver O'Halloran 2017-04-12 0:25 ` Balbir Singh 2017-04-12 0:25 ` Balbir Singh 2017-04-12 0:43 ` Stephen Rothwell 2017-04-12 0:43 ` Stephen Rothwell 2017-04-12 2:03 ` Michael Ellerman 2017-04-12 2:03 ` Michael Ellerman 2017-04-11 17:42 ` [PATCH 7/9] powerpc/mm: Wire up ioremap_cache Oliver O'Halloran 2017-04-11 17:42 ` Oliver O'Halloran 2017-04-23 11:53 ` [7/9] " Michael Ellerman 2017-04-23 11:53 ` Michael Ellerman 2017-04-11 17:42 ` [PATCH 8/9] powerpc/mm: Wire up hpte_removebolted for powernv Oliver O'Halloran 2017-04-11 17:42 ` Oliver O'Halloran [not found] ` <20170411174233.21902-9-oohall-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2017-04-11 22:50 ` Anton Blanchard 2017-04-11 22:50 ` Anton Blanchard 2017-04-12 0:18 ` Stephen Rothwell 2017-04-12 0:18 ` Stephen Rothwell 2017-04-12 3:30 ` Rashmica Gupta 2017-04-12 3:30 ` Rashmica Gupta 2017-04-12 1:53 ` Balbir Singh 2017-04-12 1:53 ` Balbir Singh 2017-04-13 4:21 ` Oliver O'Halloran 2017-04-13 4:21 ` Oliver O'Halloran 2017-04-13 10:10 ` Michael Ellerman 2017-04-13 10:10 ` Michael Ellerman 2017-04-11 17:42 ` [PATCH 9/9] powerpc: Add pmem API support Oliver O'Halloran 2017-04-11 17:42 ` Oliver O'Halloran 2017-04-11 18:22 ` ZONE_DEVICE and pmem API support for powerpc Dan Williams 2017-04-11 18:22 ` Dan Williams 2017-04-12 9:14 ` Oliver O'Halloran 2017-04-12 9:14 ` Oliver O'Halloran 2017-04-12 1:10 ` Stephen Rothwell 2017-04-12 1:10 ` Stephen Rothwell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170411174233.21902-5-oohall@gmail.com \ --to=oohall@gmail.com \ --cc=arbab@linux.vnet.ibm.com \ --cc=bsingharora@gmail.com \ --cc=linux-nvdimm@lists.01.org \ --cc=linuxppc-dev@lists.ozlabs.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.