Re: [RFC] mm/madvise: Enable (soft|hard) offline of HugeTLB pages at PGD level
On 04/19/2017 12:12 PM, Anshuman Khandual wrote: > On 04/19/2017 11:50 AM, Aneesh Kumar K.V wrote: >> Anshuman Khandualwrites: >> >>> Though migrating gigantic HugeTLB pages does not sound much like real >>> world use case, they can be affected by memory errors. Hence migration >>> at the PGD level HugeTLB pages should be supported just to enable soft >>> and hard offline use cases. >> In that case do we want to isolated the entire 16GB range ? Should we >> just dequeue the page from hugepage pool convert them to regular 64K >> pages and then isolate the 64K that had memory error ? > Though its a better thing to do, assuming that we can actually dequeue > the huge page and push it to the buddy allocator as normal 64K pages > (need to check on this as the original allocation happened from the > memblock instead of the buddy allocator, guess it should be possible > given that we do similar stuff during memory hot plug). In that case > we will also have to consider the same for the PMD based HugeTLB pages > as well or it should be only for these gigantic huge pages ? If we look at the code inside the function soft_offline_huge_page(), if the source huge page has been freed to the active_freelist then we mark the *entire* hugepage as poisoned but if the huge page has been released back to the buddy allocator then only the page in question is marked poisoned not the entire huge page. This was part was added with the commit a49ecbcd7 ("mm/memory-failure.c: recheck PageHuge() after hugetlb page migrate successfully"). But when I look at the migrate_pages() handling of huge pages, it always calls putback_active_hugepage() after successful migration to release the huge page back the active list not to the buddy allocator. I am not sure if the second half of 'if' block is ever getting executed at all. I am starting to wonder whats the point of releasing the huge page to the active list in migrate_pages() when we will go and mark the entire huge page as *poisoned*, put it in a dangling state (page->lru pointing to itself) which can not be allocated anyway. After migrate_pages() is successful and the source huge page is release to the active list. We just mark the single normal page has poisoned, get the source page from the active list and free it to the buddy allocator. This should just take care both PMD and PGD based huge pages. -- ret = migrate_pages(, new_page, NULL, MPOL_MF_MOVE_ALL, MIGRATE_SYNC, MR_MEMORY_FAILURE); if (ret) { pr_info("soft offline: %#lx: migration failed %d, type %lx\n", pfn, ret, page->flags); /* * We know that soft_offline_huge_page() tries to migrate * only one hugepage pointed to by hpage, so we need not * run through the pagelist here. */ putback_active_hugepage(hpage); if (ret > 0) ret = -EIO; } else { /* overcommit hugetlb page will be freed to buddy */ if (PageHuge(page)) { set_page_hwpoison_huge_page(hpage); dequeue_hwpoisoned_huge_page(hpage); num_poisoned_pages_add(1 << compound_order(hpage)); } else { SetPageHWPoison(page); num_poisoned_pages_inc(); } } --
Re: [RFC] mm/madvise: Enable (soft|hard) offline of HugeTLB pages at PGD level
On 04/19/2017 12:12 PM, Anshuman Khandual wrote: > On 04/19/2017 11:50 AM, Aneesh Kumar K.V wrote: >> Anshuman Khandual writes: >> >>> Though migrating gigantic HugeTLB pages does not sound much like real >>> world use case, they can be affected by memory errors. Hence migration >>> at the PGD level HugeTLB pages should be supported just to enable soft >>> and hard offline use cases. >> In that case do we want to isolated the entire 16GB range ? Should we >> just dequeue the page from hugepage pool convert them to regular 64K >> pages and then isolate the 64K that had memory error ? > Though its a better thing to do, assuming that we can actually dequeue > the huge page and push it to the buddy allocator as normal 64K pages > (need to check on this as the original allocation happened from the > memblock instead of the buddy allocator, guess it should be possible > given that we do similar stuff during memory hot plug). In that case > we will also have to consider the same for the PMD based HugeTLB pages > as well or it should be only for these gigantic huge pages ? If we look at the code inside the function soft_offline_huge_page(), if the source huge page has been freed to the active_freelist then we mark the *entire* hugepage as poisoned but if the huge page has been released back to the buddy allocator then only the page in question is marked poisoned not the entire huge page. This was part was added with the commit a49ecbcd7 ("mm/memory-failure.c: recheck PageHuge() after hugetlb page migrate successfully"). But when I look at the migrate_pages() handling of huge pages, it always calls putback_active_hugepage() after successful migration to release the huge page back the active list not to the buddy allocator. I am not sure if the second half of 'if' block is ever getting executed at all. I am starting to wonder whats the point of releasing the huge page to the active list in migrate_pages() when we will go and mark the entire huge page as *poisoned*, put it in a dangling state (page->lru pointing to itself) which can not be allocated anyway. After migrate_pages() is successful and the source huge page is release to the active list. We just mark the single normal page has poisoned, get the source page from the active list and free it to the buddy allocator. This should just take care both PMD and PGD based huge pages. -- ret = migrate_pages(, new_page, NULL, MPOL_MF_MOVE_ALL, MIGRATE_SYNC, MR_MEMORY_FAILURE); if (ret) { pr_info("soft offline: %#lx: migration failed %d, type %lx\n", pfn, ret, page->flags); /* * We know that soft_offline_huge_page() tries to migrate * only one hugepage pointed to by hpage, so we need not * run through the pagelist here. */ putback_active_hugepage(hpage); if (ret > 0) ret = -EIO; } else { /* overcommit hugetlb page will be freed to buddy */ if (PageHuge(page)) { set_page_hwpoison_huge_page(hpage); dequeue_hwpoisoned_huge_page(hpage); num_poisoned_pages_add(1 << compound_order(hpage)); } else { SetPageHWPoison(page); num_poisoned_pages_inc(); } } --
Re: [RFC] mm/madvise: Enable (soft|hard) offline of HugeTLB pages at PGD level
On 04/19/2017 11:50 AM, Aneesh Kumar K.V wrote: > Anshuman Khandualwrites: > >> Though migrating gigantic HugeTLB pages does not sound much like real >> world use case, they can be affected by memory errors. Hence migration >> at the PGD level HugeTLB pages should be supported just to enable soft >> and hard offline use cases. > > In that case do we want to isolated the entire 16GB range ? Should we > just dequeue the page from hugepage pool convert them to regular 64K > pages and then isolate the 64K that had memory error ? Though its a better thing to do, assuming that we can actually dequeue the huge page and push it to the buddy allocator as normal 64K pages (need to check on this as the original allocation happened from the memblock instead of the buddy allocator, guess it should be possible given that we do similar stuff during memory hot plug). In that case we will also have to consider the same for the PMD based HugeTLB pages as well or it should be only for these gigantic huge pages ?
Re: [RFC] mm/madvise: Enable (soft|hard) offline of HugeTLB pages at PGD level
On 04/19/2017 11:50 AM, Aneesh Kumar K.V wrote: > Anshuman Khandual writes: > >> Though migrating gigantic HugeTLB pages does not sound much like real >> world use case, they can be affected by memory errors. Hence migration >> at the PGD level HugeTLB pages should be supported just to enable soft >> and hard offline use cases. > > In that case do we want to isolated the entire 16GB range ? Should we > just dequeue the page from hugepage pool convert them to regular 64K > pages and then isolate the 64K that had memory error ? Though its a better thing to do, assuming that we can actually dequeue the huge page and push it to the buddy allocator as normal 64K pages (need to check on this as the original allocation happened from the memblock instead of the buddy allocator, guess it should be possible given that we do similar stuff during memory hot plug). In that case we will also have to consider the same for the PMD based HugeTLB pages as well or it should be only for these gigantic huge pages ?
Re: [RFC] mm/madvise: Enable (soft|hard) offline of HugeTLB pages at PGD level
Anshuman Khandualwrites: > Though migrating gigantic HugeTLB pages does not sound much like real > world use case, they can be affected by memory errors. Hence migration > at the PGD level HugeTLB pages should be supported just to enable soft > and hard offline use cases. In that case do we want to isolated the entire 16GB range ? Should we just dequeue the page from hugepage pool convert them to regular 64K pages and then isolate the 64K that had memory error ? > > While allocating the new gigantic HugeTLB page, it should not matter > whether new page comes from the same node or not. There would be very > few gigantic pages on the system afterall, we should not be bothered > about node locality when trying to save a big page from crashing. > > This introduces a new HugeTLB allocator called alloc_gigantic_page() > which will scan over all online nodes on the system and allocate a > single HugeTLB page. > -aneesh
Re: [RFC] mm/madvise: Enable (soft|hard) offline of HugeTLB pages at PGD level
Anshuman Khandual writes: > Though migrating gigantic HugeTLB pages does not sound much like real > world use case, they can be affected by memory errors. Hence migration > at the PGD level HugeTLB pages should be supported just to enable soft > and hard offline use cases. In that case do we want to isolated the entire 16GB range ? Should we just dequeue the page from hugepage pool convert them to regular 64K pages and then isolate the 64K that had memory error ? > > While allocating the new gigantic HugeTLB page, it should not matter > whether new page comes from the same node or not. There would be very > few gigantic pages on the system afterall, we should not be bothered > about node locality when trying to save a big page from crashing. > > This introduces a new HugeTLB allocator called alloc_gigantic_page() > which will scan over all online nodes on the system and allocate a > single HugeTLB page. > -aneesh
[RFC] mm/madvise: Enable (soft|hard) offline of HugeTLB pages at PGD level
Though migrating gigantic HugeTLB pages does not sound much like real world use case, they can be affected by memory errors. Hence migration at the PGD level HugeTLB pages should be supported just to enable soft and hard offline use cases. While allocating the new gigantic HugeTLB page, it should not matter whether new page comes from the same node or not. There would be very few gigantic pages on the system afterall, we should not be bothered about node locality when trying to save a big page from crashing. This introduces a new HugeTLB allocator called alloc_gigantic_page() which will scan over all online nodes on the system and allocate a single HugeTLB page. Signed-off-by: Anshuman Khandual--- Tested on a POWER8 machine with 16GB pages along with Aneesh's recent HugeTLB enablement patch series on powerpc which can be found here. https://lkml.org/lkml/2017/4/17/225 Here, we directly call alloc_gigantic_page() which ignores node locality. But we can also first call normal alloc_huge_page() with the node number and if that fails to allocate then call alloc_gigantic_page() as a fallback option. include/linux/hugetlb.h | 8 +++- mm/hugetlb.c| 17 + mm/memory-failure.c | 8 ++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 04b73a9c8b4b..ee75197e6ed8 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -347,6 +347,7 @@ struct huge_bootmem_page { struct page *alloc_huge_page(struct vm_area_struct *vma, unsigned long addr, int avoid_reserve); +struct page *alloc_gigantic_page(struct hstate *h); struct page *alloc_huge_page_node(struct hstate *h, int nid); struct page *alloc_huge_page_noerr(struct vm_area_struct *vma, unsigned long addr, int avoid_reserve); @@ -473,7 +474,11 @@ extern int dissolve_free_huge_pages(unsigned long start_pfn, static inline bool hugepage_migration_supported(struct hstate *h) { #ifdef CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION - return huge_page_shift(h) == PMD_SHIFT; + if ((huge_page_shift(h) == PMD_SHIFT) || + (huge_page_shift(h) == PGDIR_SHIFT)) + return true; + else + return false; #else return false; #endif @@ -511,6 +516,7 @@ static inline void hugetlb_count_sub(long l, struct mm_struct *mm) #else /* CONFIG_HUGETLB_PAGE */ struct hstate {}; #define alloc_huge_page(v, a, r) NULL +#define alloc_gigantic_page(h) NULL #define alloc_huge_page_node(h, nid) NULL #define alloc_huge_page_noerr(v, a, r) NULL #define alloc_bootmem_huge_page(h) NULL diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 97a44db06850..f2b31dddb1bc 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1669,6 +1669,23 @@ struct page *__alloc_buddy_huge_page_with_mpol(struct hstate *h, return __alloc_buddy_huge_page(h, vma, addr, NUMA_NO_NODE); } +struct page *alloc_gigantic_page(struct hstate *h) +{ + struct page *page = NULL; + int nid = 0; + + spin_lock(_lock); + if (h->free_huge_pages - h->resv_huge_pages > 0) { + for_each_online_node(nid) { + page = dequeue_huge_page_node(h, nid); + if (page) + break; + } + } + spin_unlock(_lock); + return page; +} + /* * This allocation function is useful in the context where vma is irrelevant. * E.g. soft-offlining uses this function because it only cares physical diff --git a/mm/memory-failure.c b/mm/memory-failure.c index fe64d7729a8e..619650969fe5 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1481,11 +1481,15 @@ EXPORT_SYMBOL(unpoison_memory); static struct page *new_page(struct page *p, unsigned long private, int **x) { int nid = page_to_nid(p); - if (PageHuge(p)) + if (PageHuge(p)) { + if (hstate_is_gigantic(page_hstate(compound_head(p + return alloc_gigantic_page(page_hstate(compound_head(p))); + return alloc_huge_page_node(page_hstate(compound_head(p)), nid); - else + } else { return __alloc_pages_node(nid, GFP_HIGHUSER_MOVABLE, 0); + } } /* -- 2.12.0
[RFC] mm/madvise: Enable (soft|hard) offline of HugeTLB pages at PGD level
Though migrating gigantic HugeTLB pages does not sound much like real world use case, they can be affected by memory errors. Hence migration at the PGD level HugeTLB pages should be supported just to enable soft and hard offline use cases. While allocating the new gigantic HugeTLB page, it should not matter whether new page comes from the same node or not. There would be very few gigantic pages on the system afterall, we should not be bothered about node locality when trying to save a big page from crashing. This introduces a new HugeTLB allocator called alloc_gigantic_page() which will scan over all online nodes on the system and allocate a single HugeTLB page. Signed-off-by: Anshuman Khandual --- Tested on a POWER8 machine with 16GB pages along with Aneesh's recent HugeTLB enablement patch series on powerpc which can be found here. https://lkml.org/lkml/2017/4/17/225 Here, we directly call alloc_gigantic_page() which ignores node locality. But we can also first call normal alloc_huge_page() with the node number and if that fails to allocate then call alloc_gigantic_page() as a fallback option. include/linux/hugetlb.h | 8 +++- mm/hugetlb.c| 17 + mm/memory-failure.c | 8 ++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 04b73a9c8b4b..ee75197e6ed8 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -347,6 +347,7 @@ struct huge_bootmem_page { struct page *alloc_huge_page(struct vm_area_struct *vma, unsigned long addr, int avoid_reserve); +struct page *alloc_gigantic_page(struct hstate *h); struct page *alloc_huge_page_node(struct hstate *h, int nid); struct page *alloc_huge_page_noerr(struct vm_area_struct *vma, unsigned long addr, int avoid_reserve); @@ -473,7 +474,11 @@ extern int dissolve_free_huge_pages(unsigned long start_pfn, static inline bool hugepage_migration_supported(struct hstate *h) { #ifdef CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION - return huge_page_shift(h) == PMD_SHIFT; + if ((huge_page_shift(h) == PMD_SHIFT) || + (huge_page_shift(h) == PGDIR_SHIFT)) + return true; + else + return false; #else return false; #endif @@ -511,6 +516,7 @@ static inline void hugetlb_count_sub(long l, struct mm_struct *mm) #else /* CONFIG_HUGETLB_PAGE */ struct hstate {}; #define alloc_huge_page(v, a, r) NULL +#define alloc_gigantic_page(h) NULL #define alloc_huge_page_node(h, nid) NULL #define alloc_huge_page_noerr(v, a, r) NULL #define alloc_bootmem_huge_page(h) NULL diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 97a44db06850..f2b31dddb1bc 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1669,6 +1669,23 @@ struct page *__alloc_buddy_huge_page_with_mpol(struct hstate *h, return __alloc_buddy_huge_page(h, vma, addr, NUMA_NO_NODE); } +struct page *alloc_gigantic_page(struct hstate *h) +{ + struct page *page = NULL; + int nid = 0; + + spin_lock(_lock); + if (h->free_huge_pages - h->resv_huge_pages > 0) { + for_each_online_node(nid) { + page = dequeue_huge_page_node(h, nid); + if (page) + break; + } + } + spin_unlock(_lock); + return page; +} + /* * This allocation function is useful in the context where vma is irrelevant. * E.g. soft-offlining uses this function because it only cares physical diff --git a/mm/memory-failure.c b/mm/memory-failure.c index fe64d7729a8e..619650969fe5 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1481,11 +1481,15 @@ EXPORT_SYMBOL(unpoison_memory); static struct page *new_page(struct page *p, unsigned long private, int **x) { int nid = page_to_nid(p); - if (PageHuge(p)) + if (PageHuge(p)) { + if (hstate_is_gigantic(page_hstate(compound_head(p + return alloc_gigantic_page(page_hstate(compound_head(p))); + return alloc_huge_page_node(page_hstate(compound_head(p)), nid); - else + } else { return __alloc_pages_node(nid, GFP_HIGHUSER_MOVABLE, 0); + } } /* -- 2.12.0