Skip to content

Commit 0c5da35

Browse files
nhoriguchitorvalds
authored andcommitted
hugetlb: pass head page to remove_hugetlb_page()
When memory_failure() or soft_offline_page() is called on a tail page of some hugetlb page, "BUG: unable to handle page fault" error can be triggered. remove_hugetlb_page() dereferences page->lru, so it's assumed that the page points to a head page, but one of the caller, dissolve_free_huge_page(), provides remove_hugetlb_page() with 'page' which could be a tail page. So pass 'head' to it, instead. Link: https://lkml.kernel.org/r/20210526235257.2769473-1-nao.horiguchi@gmail.com Fixes: 6eb4e88 ("hugetlb: create remove_hugetlb_page() to separate functionality") Signed-off-by: Naoya Horiguchi <naoya.horiguchi@nec.com> Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com> Reviewed-by: Muchun Song <songmuchun@bytedance.com> Acked-by: Michal Hocko <mhocko@suse.com> Reviewed-by: Oscar Salvador <osalvador@suse.de> Cc: Miaohe Lin <linmiaohe@huawei.com> Cc: Matthew Wilcox <willy@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 9281305 commit 0c5da35

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

mm/hugetlb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,7 +1793,7 @@ int dissolve_free_huge_page(struct page *page)
17931793
SetPageHWPoison(page);
17941794
ClearPageHWPoison(head);
17951795
}
1796-
remove_hugetlb_page(h, page, false);
1796+
remove_hugetlb_page(h, head, false);
17971797
h->max_huge_pages--;
17981798
spin_unlock_irq(&hugetlb_lock);
17991799
update_and_free_page(h, head);

0 commit comments

Comments
 (0)