| Message ID | 20220223194807.12070-5-joao.m.martins@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | sparse-vmemmap: memory savings for compound devmaps (device-dax) | expand |
On Thu, Feb 24, 2022 at 3:48 AM Joao Martins <joao.m.martins@oracle.com> wrote: > > A compound devmap is a dev_pagemap with @vmemmap_shift > 0 and it > means that pages are mapped at a given huge page alignment and utilize > uses compound pages as opposed to order-0 pages. > > Take advantage of the fact that most tail pages look the same (except > the first two) to minimize struct page overhead. Allocate a separate > page for the vmemmap area which contains the head page and separate for > the next 64 pages. The rest of the subsections then reuse this tail > vmemmap page to initialize the rest of the tail pages. > > Sections are arch-dependent (e.g. on x86 it's 64M, 128M or 512M) and > when initializing compound devmap with big enough @vmemmap_shift (e.g. > 1G PUD) it may cross multiple sections. The vmemmap code needs to > consult @pgmap so that multiple sections that all map the same tail > data can refer back to the first copy of that data for a given > gigantic page. > > On compound devmaps with 2M align, this mechanism lets 6 pages be > saved out of the 8 necessary PFNs necessary to set the subsection's > 512 struct pages being mapped. On a 1G compound devmap it saves > 4094 pages. > > Altmap isn't supported yet, given various restrictions in altmap pfn > allocator, thus fallback to the already in use vmemmap_populate(). It > is worth noting that altmap for devmap mappings was there to relieve the > pressure of inordinate amounts of memmap space to map terabytes of pmem. > With compound pages the motivation for altmaps for pmem gets reduced. > > Signed-off-by: Joao Martins <joao.m.martins@oracle.com> [...] > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 5f549cf6a4e8..b0798b9c6a6a 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -3118,7 +3118,7 @@ p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node); > pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node); > pmd_t *vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node); > pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, > - struct vmem_altmap *altmap); > + struct vmem_altmap *altmap, struct page *block); Have forgotten to update @block to @reuse here. [...] > + > +static int __meminit vmemmap_populate_range(unsigned long start, > + unsigned long end, > + int node, struct page *page) All of the users are passing a valid parameter of @page. This function will populate the vmemmap with the @page and without memory allocations. So the @node parameter seems to be unnecessary. If you want to make this function more generic like vmemmap_populate_address() to handle memory allocations (the case of @page == NULL). I think vmemmap_populate_range() should add another parameter of `struct vmem_altmap *altmap`. Otherwise, is it better to remove @node and rename @page to @reuse? Thanks.
On 2/24/22 05:54, Muchun Song wrote: > On Thu, Feb 24, 2022 at 3:48 AM Joao Martins <joao.m.martins@oracle.com> wrote: >> diff --git a/include/linux/mm.h b/include/linux/mm.h >> index 5f549cf6a4e8..b0798b9c6a6a 100644 >> --- a/include/linux/mm.h >> +++ b/include/linux/mm.h >> @@ -3118,7 +3118,7 @@ p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node); >> pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node); >> pmd_t *vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node); >> pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, >> - struct vmem_altmap *altmap); >> + struct vmem_altmap *altmap, struct page *block); > > Have forgotten to update @block to @reuse here. > Fixed. > [...] >> + >> +static int __meminit vmemmap_populate_range(unsigned long start, >> + unsigned long end, >> + int node, struct page *page) > > All of the users are passing a valid parameter of @page. This function > will populate the vmemmap with the @page Yeap. > and without memory > allocations. So the @node parameter seems to be unnecessary. > I am a little bit afraid of making this logic more fragile by removing node. When we populate the the tail vmemmap pages, we *may need* to populate a new PMD page . And we need the @node for those or anything preceeding that (even though it's highly unlikely). It's just the PTE reuse that doesn't need node :( > If you want to make this function more generic like > vmemmap_populate_address() to handle memory allocations > (the case of @page == NULL). I think vmemmap_populate_range() > should add another parameter of `struct vmem_altmap *altmap`. Oh, that's a nice cleanup/suggestion. I've moved vmemmap_populate_range() to be used by vmemmap_populate_basepages(), and delete the duplication. I'll adjust the second patch for this cleanup, to avoid moving the same code over again between the two patches. I'll keep your Rb in the second patch, this is the diff to this version: diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 44cb77523003..1b30a82f285e 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -637,8 +637,9 @@ static pte_t * __meminit vmemmap_populate_address(unsigned long addr, int node, return pte; } -int __meminit vmemmap_populate_basepages(unsigned long start, unsigned long end, - int node, struct vmem_altmap *altmap) +static int __meminit vmemmap_populate_range(unsigned long start, + unsigned long end, int node, + struct vmem_altmap *altmap) { unsigned long addr = start; pte_t *pte; @@ -652,6 +653,12 @@ int __meminit vmemmap_populate_basepages(unsigned long start, unsigned long end, return 0; } +int __meminit vmemmap_populate_basepages(unsigned long start, unsigned long end, + int node, struct vmem_altmap *altmap) +{ + return vmemmap_populate_range(start, end, node, altmap); +} + struct page * __meminit __populate_section_memmap(unsigned long pfn, unsigned long nr_pages, int nid, struct vmem_altmap *altmap, struct dev_pagemap *pgmap) Meanwhile I'll adjust the other callers of vmemmap_populate_range() in this patch. > Otherwise, is it better to remove @node and rename @page to @reuse? I've kept the @node for now, due to the concern explained earlier, but renamed vmemmap_populate_range() to have its new argument be named @reuse. Let me know if you disagree otherwise. Thanks again for the comments, appreciate it!
On Thu, Feb 24, 2022 at 7:47 PM Joao Martins <joao.m.martins@oracle.com> wrote: > > On 2/24/22 05:54, Muchun Song wrote: > > On Thu, Feb 24, 2022 at 3:48 AM Joao Martins <joao.m.martins@oracle.com> wrote: > >> diff --git a/include/linux/mm.h b/include/linux/mm.h > >> index 5f549cf6a4e8..b0798b9c6a6a 100644 > >> --- a/include/linux/mm.h > >> +++ b/include/linux/mm.h > >> @@ -3118,7 +3118,7 @@ p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node); > >> pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node); > >> pmd_t *vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node); > >> pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, > >> - struct vmem_altmap *altmap); > >> + struct vmem_altmap *altmap, struct page *block); > > > > Have forgotten to update @block to @reuse here. > > > > Fixed. > > > [...] > >> + > >> +static int __meminit vmemmap_populate_range(unsigned long start, > >> + unsigned long end, > >> + int node, struct page *page) > > > > All of the users are passing a valid parameter of @page. This function > > will populate the vmemmap with the @page > > Yeap. > > > and without memory > > allocations. So the @node parameter seems to be unnecessary. > > > I am a little bit afraid of making this logic more fragile by removing node. > When we populate the the tail vmemmap pages, we *may need* to populate a new PMD page > . And we need the @node for those or anything preceeding that (even though it's highly > unlikely). It's just the PTE reuse that doesn't need node :( Agree. So I suggest adding @altmap to vmemmap_populate_range() like you have done as follows. > > > If you want to make this function more generic like > > vmemmap_populate_address() to handle memory allocations > > (the case of @page == NULL). I think vmemmap_populate_range() > > should add another parameter of `struct vmem_altmap *altmap`. > > Oh, that's a nice cleanup/suggestion. I've moved vmemmap_populate_range() to be > used by vmemmap_populate_basepages(), and delete the duplication. I'll > adjust the second patch for this cleanup, to avoid moving the same code > over again between the two patches. I'll keep your Rb in the second patch, this is > the diff to this version: > > diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c > index 44cb77523003..1b30a82f285e 100644 > --- a/mm/sparse-vmemmap.c > +++ b/mm/sparse-vmemmap.c > @@ -637,8 +637,9 @@ static pte_t * __meminit vmemmap_populate_address(unsigned long addr, > int node, > return pte; > } > > -int __meminit vmemmap_populate_basepages(unsigned long start, unsigned long end, > - int node, struct vmem_altmap *altmap) > +static int __meminit vmemmap_populate_range(unsigned long start, > + unsigned long end, int node, > + struct vmem_altmap *altmap) > { > unsigned long addr = start; > pte_t *pte; > @@ -652,6 +653,12 @@ int __meminit vmemmap_populate_basepages(unsigned long start, > unsigned long end, > return 0; > } > > +int __meminit vmemmap_populate_basepages(unsigned long start, unsigned long end, > + int node, struct vmem_altmap *altmap) > +{ > + return vmemmap_populate_range(start, end, node, altmap); > +} > + > struct page * __meminit __populate_section_memmap(unsigned long pfn, > unsigned long nr_pages, int nid, struct vmem_altmap *altmap, > struct dev_pagemap *pgmap) > > Meanwhile I'll adjust the other callers of vmemmap_populate_range() in this patch. LGTM. > > > Otherwise, is it better to remove @node and rename @page to @reuse? > > I've kept the @node for now, due to the concern explained earlier, but > renamed vmemmap_populate_range() to have its new argument be named @reuse. Make sense.
diff --git a/Documentation/vm/vmemmap_dedup.rst b/Documentation/vm/vmemmap_dedup.rst index 8143b2ce414d..de958bbbf78c 100644 --- a/Documentation/vm/vmemmap_dedup.rst +++ b/Documentation/vm/vmemmap_dedup.rst @@ -2,9 +2,12 @@ .. _vmemmap_dedup: -================================== -Free some vmemmap pages of HugeTLB -================================== +========================================= +A vmemmap diet for HugeTLB and Device DAX +========================================= + +HugeTLB +======= The struct page structures (page structs) are used to describe a physical page frame. By default, there is a one-to-one mapping from a page frame to @@ -173,3 +176,50 @@ tail vmemmap pages are mapped to the head vmemmap page frame. So we can see more than one struct page struct with PG_head (e.g. 8 per 2 MB HugeTLB page) associated with each HugeTLB page. The compound_head() can handle this correctly (more details refer to the comment above compound_head()). + +Device DAX +========== + +The device-dax interface uses the same tail deduplication technique explained +in the previous chapter, except when used with the vmemmap in +the device (altmap). + +The following page sizes are supported in DAX: PAGE_SIZE (4K on x86_64), +PMD_SIZE (2M on x86_64) and PUD_SIZE (1G on x86_64). + +The differences with HugeTLB are relatively minor. + +It only use 3 page structs for storing all information as opposed +to 4 on HugeTLB pages. + +There's no remapping of vmemmap given that device-dax memory is not part of +System RAM ranges initialized at boot. Thus the tail page deduplication +happens at a later stage when we populate the sections. HugeTLB reuses the +the head vmemmap page representing, whereas device-dax reuses the tail +vmemmap page. This results in only half of the savings compared to HugeTLB. + +Deduplicated tail pages are not mapped read-only. + +Here's how things look like on device-dax after the sections are populated: + + +-----------+ ---virt_to_page---> +-----------+ mapping to +-----------+ + | | | 0 | -------------> | 0 | + | | +-----------+ +-----------+ + | | | 1 | -------------> | 1 | + | | +-----------+ +-----------+ + | | | 2 | ----------------^ ^ ^ ^ ^ ^ + | | +-----------+ | | | | | + | | | 3 | ------------------+ | | | | + | | +-----------+ | | | | + | | | 4 | --------------------+ | | | + | PMD | +-----------+ | | | + | level | | 5 | ----------------------+ | | + | mapping | +-----------+ | | + | | | 6 | ------------------------+ | + | | +-----------+ | + | | | 7 | --------------------------+ + | | +-----------+ + | | + | | + | | + +-----------+ diff --git a/include/linux/mm.h b/include/linux/mm.h index 5f549cf6a4e8..b0798b9c6a6a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3118,7 +3118,7 @@ p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node); pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node); pmd_t *vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node); pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, - struct vmem_altmap *altmap); + struct vmem_altmap *altmap, struct page *block); void *vmemmap_alloc_block(unsigned long size, int node); struct vmem_altmap; void *vmemmap_alloc_block_buf(unsigned long size, int node, diff --git a/mm/memremap.c b/mm/memremap.c index 2e9148a3421a..a6be2f5bf443 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -307,6 +307,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid) { struct mhp_params params = { .altmap = pgmap_altmap(pgmap), + .pgmap = pgmap, .pgprot = PAGE_KERNEL, }; const int nr_range = pgmap->nr_range; diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 44cb77523003..195c017c8d23 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -533,16 +533,31 @@ void __meminit vmemmap_verify(pte_t *pte, int node, } pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, - struct vmem_altmap *altmap) + struct vmem_altmap *altmap, + struct page *reuse) { pte_t *pte = pte_offset_kernel(pmd, addr); if (pte_none(*pte)) { pte_t entry; void *p; - p = vmemmap_alloc_block_buf(PAGE_SIZE, node, altmap); - if (!p) - return NULL; + if (!reuse) { + p = vmemmap_alloc_block_buf(PAGE_SIZE, node, altmap); + if (!p) + return NULL; + } else { + /* + * When a PTE/PMD entry is freed from the init_mm + * there's a a free_pages() call to this page allocated + * above. Thus this get_page() is paired with the + * put_page_testzero() on the freeing path. + * This can only called by certain ZONE_DEVICE path, + * and through vmemmap_populate_compound_pages() when + * slab is available. + */ + get_page(reuse); + p = page_to_virt(reuse); + } entry = pfn_pte(__pa(p) >> PAGE_SHIFT, PAGE_KERNEL); set_pte_at(&init_mm, addr, pte, entry); } @@ -609,7 +624,8 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node) } static pte_t * __meminit vmemmap_populate_address(unsigned long addr, int node, - struct vmem_altmap *altmap) + struct vmem_altmap *altmap, + struct page *reuse) { pgd_t *pgd; p4d_t *p4d; @@ -629,7 +645,7 @@ static pte_t * __meminit vmemmap_populate_address(unsigned long addr, int node, pmd = vmemmap_pmd_populate(pud, addr, node); if (!pmd) return NULL; - pte = vmemmap_pte_populate(pmd, addr, node, altmap); + pte = vmemmap_pte_populate(pmd, addr, node, altmap, reuse); if (!pte) return NULL; vmemmap_verify(pte, node, addr, addr + PAGE_SIZE); @@ -644,7 +660,23 @@ int __meminit vmemmap_populate_basepages(unsigned long start, unsigned long end, pte_t *pte; for (; addr < end; addr += PAGE_SIZE) { - pte = vmemmap_populate_address(addr, node, altmap); + pte = vmemmap_populate_address(addr, node, altmap, NULL); + if (!pte) + return -ENOMEM; + } + + return 0; +} + +static int __meminit vmemmap_populate_range(unsigned long start, + unsigned long end, + int node, struct page *page) +{ + unsigned long addr = start; + pte_t *pte; + + for (; addr < end; addr += PAGE_SIZE) { + pte = vmemmap_populate_address(addr, node, NULL, page); if (!pte) return -ENOMEM; } @@ -652,18 +684,111 @@ int __meminit vmemmap_populate_basepages(unsigned long start, unsigned long end, return 0; } +/* + * For compound pages bigger than section size (e.g. x86 1G compound + * pages with 2M subsection size) fill the rest of sections as tail + * pages. + * + * Note that memremap_pages() resets @nr_range value and will increment + * it after each range successful onlining. Thus the value or @nr_range + * at section memmap populate corresponds to the in-progress range + * being onlined here. + */ +static bool __meminit reuse_compound_section(unsigned long start_pfn, + struct dev_pagemap *pgmap) +{ + unsigned long nr_pages = pgmap_vmemmap_nr(pgmap); + unsigned long offset = start_pfn - + PHYS_PFN(pgmap->ranges[pgmap->nr_range].start); + + return !IS_ALIGNED(offset, nr_pages) && nr_pages > PAGES_PER_SUBSECTION; +} + +static pte_t * __meminit compound_section_tail_page(unsigned long addr) +{ + pte_t *pte; + + addr -= PAGE_SIZE; + + /* + * Assuming sections are populated sequentially, the previous section's + * page data can be reused. + */ + pte = pte_offset_kernel(pmd_off_k(addr), addr); + if (!pte) + return NULL; + + return pte; +} + +static int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, + unsigned long start, + unsigned long end, int node, + struct dev_pagemap *pgmap) +{ + unsigned long size, addr; + pte_t *pte; + int rc; + + if (reuse_compound_section(start_pfn, pgmap)) { + pte = compound_section_tail_page(start); + if (!pte) + return -ENOMEM; + + /* + * Reuse the page that was populated in the prior iteration + * with just tail struct pages. + */ + return vmemmap_populate_range(start, end, node, pte_page(*pte)); + } + + size = min(end - start, pgmap_vmemmap_nr(pgmap) * sizeof(struct page)); + for (addr = start; addr < end; addr += size) { + unsigned long next = addr, last = addr + size; + + /* Populate the head page vmemmap page */ + pte = vmemmap_populate_address(addr, node, NULL, NULL); + if (!pte) + return -ENOMEM; + + /* Populate the tail pages vmemmap page */ + next = addr + PAGE_SIZE; + pte = vmemmap_populate_address(next, node, NULL, NULL); + if (!pte) + return -ENOMEM; + + /* + * Reuse the previous page for the rest of tail pages + * See layout diagram in Documentation/vm/vmemmap_dedup.rst + */ + next += PAGE_SIZE; + rc = vmemmap_populate_range(next, last, node, pte_page(*pte)); + if (rc) + return -ENOMEM; + } + + return 0; +} + struct page * __meminit __populate_section_memmap(unsigned long pfn, unsigned long nr_pages, int nid, struct vmem_altmap *altmap, struct dev_pagemap *pgmap) { unsigned long start = (unsigned long) pfn_to_page(pfn); unsigned long end = start + nr_pages * sizeof(struct page); + int r; if (WARN_ON_ONCE(!IS_ALIGNED(pfn, PAGES_PER_SUBSECTION) || !IS_ALIGNED(nr_pages, PAGES_PER_SUBSECTION))) return NULL; - if (vmemmap_populate(start, end, nid, altmap)) + if (is_power_of_2(sizeof(struct page)) && + pgmap && pgmap_vmemmap_nr(pgmap) > 1 && !altmap) + r = vmemmap_populate_compound_pages(pfn, start, end, nid, pgmap); + else + r = vmemmap_populate(start, end, nid, altmap); + + if (r < 0) return NULL; return pfn_to_page(pfn);
A compound devmap is a dev_pagemap with @vmemmap_shift > 0 and it means that pages are mapped at a given huge page alignment and utilize uses compound pages as opposed to order-0 pages. Take advantage of the fact that most tail pages look the same (except the first two) to minimize struct page overhead. Allocate a separate page for the vmemmap area which contains the head page and separate for the next 64 pages. The rest of the subsections then reuse this tail vmemmap page to initialize the rest of the tail pages. Sections are arch-dependent (e.g. on x86 it's 64M, 128M or 512M) and when initializing compound devmap with big enough @vmemmap_shift (e.g. 1G PUD) it may cross multiple sections. The vmemmap code needs to consult @pgmap so that multiple sections that all map the same tail data can refer back to the first copy of that data for a given gigantic page. On compound devmaps with 2M align, this mechanism lets 6 pages be saved out of the 8 necessary PFNs necessary to set the subsection's 512 struct pages being mapped. On a 1G compound devmap it saves 4094 pages. Altmap isn't supported yet, given various restrictions in altmap pfn allocator, thus fallback to the already in use vmemmap_populate(). It is worth noting that altmap for devmap mappings was there to relieve the pressure of inordinate amounts of memmap space to map terabytes of pmem. With compound pages the motivation for altmaps for pmem gets reduced. Signed-off-by: Joao Martins <joao.m.martins@oracle.com> --- Documentation/vm/vmemmap_dedup.rst | 56 +++++++++++- include/linux/mm.h | 2 +- mm/memremap.c | 1 + mm/sparse-vmemmap.c | 141 +++++++++++++++++++++++++++-- 4 files changed, 188 insertions(+), 12 deletions(-)