From: Michal Hocko <mhocko@kernel.org> To: linux-mm@kvack.org Cc: Andrew Morton <akpm@linux-foundation.org>, Mel Gorman <mgorman@suse.de>, Vlastimil Babka <vbabka@suse.cz>, Andrea Arcangeli <aarcange@redhat.com>, Jerome Glisse <jglisse@redhat.com>, Reza Arbab <arbab@linux.vnet.ibm.com>, Yasuaki Ishimatsu <yasu.isimatu@gmail.com>, qiuxishi@huawei.com, Kani Toshimitsu <toshi.kani@hpe.com>, slaoub@gmail.com, Joonsoo Kim <js1304@gmail.com>, Andi Kleen <ak@linux.intel.com>, Daniel Kiper <daniel.kiper@oracle.com>, Igor Mammedov <imammedo@redhat.com>, Vitaly Kuznetsov <vkuznets@redhat.com>, LKML <linux-kernel@vger.kernel.org>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Dan Williams <dan.j.williams@intel.com>, "H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>, Michael Ellerman <mpe@ellerman.id.au>, Paul Mackerras <paulus@samba.org>, Thomas Gleixner <tglx@linutronix.de> Subject: Re: [RFC PATCH 3/5] mm, memory_hotplug: allocate memmap from the added memory range for sparse-vmemmap Date: Fri, 28 Jul 2017 19:47:05 +0200 [thread overview] Message-ID: <20170728174705.GA18993@dhcp22.suse.cz> (raw) In-Reply-To: <20170726083333.17754-4-mhocko@kernel.org> On Wed 26-07-17 10:33:31, Michal Hocko wrote: [...] > @@ -312,7 +324,7 @@ int __ref __add_pages(int nid, unsigned long phys_start_pfn, > } > > for (i = start_sec; i <= end_sec; i++) { > - err = __add_section(nid, section_nr_to_pfn(i), want_memblock); > + err = __add_section(nid, section_nr_to_pfn(i), want_memblock, altmap); > > /* > * EEXIST is finally dealt with by ioresource collision [...] > diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c > index 483ba270d522..42d6721cfb71 100644 > --- a/mm/sparse-vmemmap.c > +++ b/mm/sparse-vmemmap.c > @@ -794,8 +798,20 @@ int __meminit sparse_add_one_section(struct pglist_data *pgdat, unsigned long st > goto out; > } > > + /* > + * TODO get rid of this somehow - we want to postpone the full > + * initialization until memmap_init_zone. > + */ > memset(memmap, 0, sizeof(struct page) * PAGES_PER_SECTION); > > + /* > + * now that we have a valid vmemmap mapping we can use > + * pfn_to_page and flush struct pages which back the > + * memmap > + */ > + if (altmap && altmap->flush_alloc_pfns) > + altmap->flush_alloc_pfns(altmap); > + > section_mark_present(ms); > > ret = sparse_init_one_section(ms, section_nr, memmap, usemap); I have only now realized that flush_alloc_pfns would go over the same range of pfns for each section again and again. I haven't noticed that because my memblock has one section but larger memblocks (2GB on x86 with a lot of memory) would see that issue. So I will fold the following into the patch. --- commit 2658f448af25aa2d2ff7fea12e60a8fe78966f9b Author: Michal Hocko <mhocko@suse.com> Date: Fri Jul 28 19:45:25 2017 +0200 fold me "mm, memory_hotplug: allocate memmap from the added memory range for sparse-vmemmap" - rewind base pfn of the vmem_altmap when flushing one section (mark_vmemmap_pages) because we do not want to flush the same range all over again when memblock has more than one section diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 7aec9272fe4d..55f82c652d51 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -18,7 +18,7 @@ struct device; * is mapped to the vmemmap - see mark_vmemmap_pages */ struct vmem_altmap { - const unsigned long base_pfn; + unsigned long base_pfn; const unsigned long reserve; unsigned long free; unsigned long align; @@ -48,6 +48,9 @@ static inline void mark_vmemmap_pages(struct vmem_altmap *self) struct page *page = pfn_to_page(pfn); __SetPageVmemmap(page); } + + self->alloc = 0; + self->base_pfn += nr_pages + self->reserve; } /** * struct dev_pagemap - metadata for ZONE_DEVICE mappings -- Michal Hocko SUSE Labs
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@kernel.org> To: linux-mm@kvack.org Cc: Andrew Morton <akpm@linux-foundation.org>, Mel Gorman <mgorman@suse.de>, Vlastimil Babka <vbabka@suse.cz>, Andrea Arcangeli <aarcange@redhat.com>, Jerome Glisse <jglisse@redhat.com>, Reza Arbab <arbab@linux.vnet.ibm.com>, Yasuaki Ishimatsu <yasu.isimatu@gmail.com>, qiuxishi@huawei.com, Kani Toshimitsu <toshi.kani@hpe.com>, slaoub@gmail.com, Joonsoo Kim <js1304@gmail.com>, Andi Kleen <ak@linux.intel.com>, Daniel Kiper <daniel.kiper@oracle.com>, Igor Mammedov <imammedo@redhat.com>, Vitaly Kuznetsov <vkuznets@redhat.com>, LKML <linux-kernel@vger.kernel.org>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Dan Williams <dan.j.williams@intel.com>, "H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>, Michael Ellerman <mpe@ellerman.id.au>, Paul Mackerras <paulus@samba.org>, Thomas Gleixner <tglx@linutronix.de> Subject: Re: [RFC PATCH 3/5] mm, memory_hotplug: allocate memmap from the added memory range for sparse-vmemmap Date: Fri, 28 Jul 2017 19:47:05 +0200 [thread overview] Message-ID: <20170728174705.GA18993@dhcp22.suse.cz> (raw) In-Reply-To: <20170726083333.17754-4-mhocko@kernel.org> On Wed 26-07-17 10:33:31, Michal Hocko wrote: [...] > @@ -312,7 +324,7 @@ int __ref __add_pages(int nid, unsigned long phys_start_pfn, > } > > for (i = start_sec; i <= end_sec; i++) { > - err = __add_section(nid, section_nr_to_pfn(i), want_memblock); > + err = __add_section(nid, section_nr_to_pfn(i), want_memblock, altmap); > > /* > * EEXIST is finally dealt with by ioresource collision [...] > diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c > index 483ba270d522..42d6721cfb71 100644 > --- a/mm/sparse-vmemmap.c > +++ b/mm/sparse-vmemmap.c > @@ -794,8 +798,20 @@ int __meminit sparse_add_one_section(struct pglist_data *pgdat, unsigned long st > goto out; > } > > + /* > + * TODO get rid of this somehow - we want to postpone the full > + * initialization until memmap_init_zone. > + */ > memset(memmap, 0, sizeof(struct page) * PAGES_PER_SECTION); > > + /* > + * now that we have a valid vmemmap mapping we can use > + * pfn_to_page and flush struct pages which back the > + * memmap > + */ > + if (altmap && altmap->flush_alloc_pfns) > + altmap->flush_alloc_pfns(altmap); > + > section_mark_present(ms); > > ret = sparse_init_one_section(ms, section_nr, memmap, usemap); I have only now realized that flush_alloc_pfns would go over the same range of pfns for each section again and again. I haven't noticed that because my memblock has one section but larger memblocks (2GB on x86 with a lot of memory) would see that issue. So I will fold the following into the patch. --- commit 2658f448af25aa2d2ff7fea12e60a8fe78966f9b Author: Michal Hocko <mhocko@suse.com> Date: Fri Jul 28 19:45:25 2017 +0200 fold me "mm, memory_hotplug: allocate memmap from the added memory range for sparse-vmemmap" - rewind base pfn of the vmem_altmap when flushing one section (mark_vmemmap_pages) because we do not want to flush the same range all over again when memblock has more than one section diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 7aec9272fe4d..55f82c652d51 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -18,7 +18,7 @@ struct device; * is mapped to the vmemmap - see mark_vmemmap_pages */ struct vmem_altmap { - const unsigned long base_pfn; + unsigned long base_pfn; const unsigned long reserve; unsigned long free; unsigned long align; @@ -48,6 +48,9 @@ static inline void mark_vmemmap_pages(struct vmem_altmap *self) struct page *page = pfn_to_page(pfn); __SetPageVmemmap(page); } + + self->alloc = 0; + self->base_pfn += nr_pages + self->reserve; } /** * struct dev_pagemap - metadata for ZONE_DEVICE mappings -- 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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-07-28 17:47 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-07-26 8:33 [RFC PATCH 0/5] mm, memory_hotplug: allocate memmap from hotadded memory Michal Hocko 2017-07-26 8:33 ` Michal Hocko 2017-07-26 8:33 ` [RFC PATCH 1/5] mm, memory_hotplug: cleanup memory offline path Michal Hocko 2017-07-26 8:33 ` Michal Hocko 2017-07-26 8:33 ` [RFC PATCH 2/5] mm, arch: unify vmemmap_populate altmap handling Michal Hocko 2017-07-26 8:33 ` Michal Hocko 2017-07-31 12:40 ` Gerald Schaefer 2017-07-31 12:40 ` Gerald Schaefer 2017-07-31 12:55 ` Michal Hocko 2017-07-31 12:55 ` Michal Hocko 2017-07-31 14:27 ` Gerald Schaefer 2017-07-31 14:27 ` Gerald Schaefer 2017-07-31 14:36 ` Michal Hocko 2017-07-31 14:36 ` Michal Hocko 2017-07-26 8:33 ` [RFC PATCH 3/5] mm, memory_hotplug: allocate memmap from the added memory range for sparse-vmemmap Michal Hocko 2017-07-26 8:33 ` Michal Hocko 2017-07-26 11:45 ` Heiko Carstens 2017-07-26 11:45 ` Heiko Carstens 2017-07-26 11:49 ` Heiko Carstens 2017-07-26 11:49 ` Heiko Carstens 2017-07-26 12:30 ` Michal Hocko 2017-07-26 12:30 ` Michal Hocko 2017-07-26 17:20 ` Gerald Schaefer 2017-07-26 17:20 ` Gerald Schaefer 2017-07-28 11:26 ` Michal Hocko 2017-07-28 11:26 ` Michal Hocko 2017-07-28 17:47 ` Michal Hocko [this message] 2017-07-28 17:47 ` Michal Hocko 2017-07-26 8:33 ` [RFC PATCH 4/5] mm, sparse: complain about implicit altmap usage in vmemmap_populate Michal Hocko 2017-07-26 8:33 ` Michal Hocko 2017-07-26 8:33 ` [RFC PATCH 5/5] mm, sparse: rename kmalloc_section_memmap, __kfree_section_memmap Michal Hocko 2017-07-26 8:33 ` Michal Hocko 2017-07-26 11:39 ` [RFC PATCH 0/5] mm, memory_hotplug: allocate memmap from hotadded memory Michal Hocko 2017-07-26 11:39 ` Michal Hocko 2017-07-26 21:06 ` Jerome Glisse 2017-07-26 21:06 ` Jerome Glisse 2017-07-27 6:56 ` Michal Hocko 2017-07-27 6:56 ` Michal Hocko 2017-07-28 12:19 ` Michal Hocko 2017-07-28 12:19 ` Michal Hocko 2017-07-31 12:35 ` Gerald Schaefer 2017-07-31 12:35 ` Gerald Schaefer 2017-07-31 12:53 ` Michal Hocko 2017-07-31 12:53 ` Michal Hocko 2017-07-31 15:04 ` Gerald Schaefer 2017-07-31 15:04 ` Gerald Schaefer 2017-07-31 15:53 ` Michal Hocko 2017-07-31 15:53 ` Michal Hocko 2017-07-31 17:58 ` Gerald Schaefer 2017-07-31 17:58 ` Gerald Schaefer 2017-08-01 11:30 ` Igor Mammedov 2017-08-01 11:30 ` Igor Mammedov 2017-08-01 12:27 ` Michal Hocko 2017-08-01 12:27 ` Michal Hocko 2017-07-28 12:01 ` Michal Hocko 2017-07-28 12:01 ` Michal Hocko
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=20170728174705.GA18993@dhcp22.suse.cz \ --to=mhocko@kernel.org \ --cc=aarcange@redhat.com \ --cc=ak@linux.intel.com \ --cc=akpm@linux-foundation.org \ --cc=arbab@linux.vnet.ibm.com \ --cc=benh@kernel.crashing.org \ --cc=dan.j.williams@intel.com \ --cc=daniel.kiper@oracle.com \ --cc=hpa@zytor.com \ --cc=imammedo@redhat.com \ --cc=jglisse@redhat.com \ --cc=js1304@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@suse.de \ --cc=mingo@redhat.com \ --cc=mpe@ellerman.id.au \ --cc=paulus@samba.org \ --cc=qiuxishi@huawei.com \ --cc=slaoub@gmail.com \ --cc=tglx@linutronix.de \ --cc=toshi.kani@hpe.com \ --cc=vbabka@suse.cz \ --cc=vkuznets@redhat.com \ --cc=yasu.isimatu@gmail.com \ /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.