From: Naoya Horiguchi Date: Thu, 26 Jun 2014 00:42:34 +0000 (+1000) Subject: mm, hugetlbfs: fix rmapping for anonymous hugepages with page_pgoff() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=80e7f8765524d84504beff040d5aed9476f8e2e7;p=karo-tx-linux.git mm, hugetlbfs: fix rmapping for anonymous hugepages with page_pgoff() page->index stores pagecache index when the page is mapped into file mapping region, and the index is in pagecache size unit, so it depends on the page size. Some of users of reverse mapping obviously assumes that page->index is in PAGE_CACHE_SHIFT unit, so they don't work for anonymous hugepage. For example, consider that we have 3-hugepage vma and try to mbind the 2nd hugepage to migrate to another node. Then the vma is split and migrate_page() is called for the 2nd hugepage (belonging to the middle vma.) In migrate operation, rmap_walk_anon() tries to find the relevant vma to which the target hugepage belongs, but here we miscalculate pgoff. So anon_vma_interval_tree_foreach() grabs invalid vma, which fires VM_BUG_ON. This patch introduces a new API that is usable both for normal page and hugepage to get PAGE_SIZE offset from page->index. Users should clearly distinguish page_index for pagecache index and page_pgoff for page offset. Signed-off-by: Naoya Horiguchi Reported-by: Sasha Levin Cc: Rik van Riel Cc: [3.12+] Signed-off-by: Andrew Morton --- diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 0a97b583ee8d..4eb3b99a9440 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -411,6 +411,19 @@ static inline loff_t page_file_offset(struct page *page) return ((loff_t)page_file_index(page)) << PAGE_CACHE_SHIFT; } +extern pgoff_t hugepage_pgoff(struct page *page); + +/* + * page->index stores pagecache index whose unit is not always PAGE_SIZE. + * This function converts it into PAGE_SIZE offset. + */ +#define page_pgoff(page) \ +({ \ + unlikely(PageHuge(page)) ? \ + hugepage_pgoff(page) : \ + page->index >> (PAGE_CACHE_SHIFT - PAGE_SHIFT); \ +}) + extern pgoff_t linear_hugepage_index(struct vm_area_struct *vma, unsigned long address); diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 33514d88fef9..c491854d9b3d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1838,7 +1838,7 @@ static void __split_huge_page(struct page *page, struct list_head *list) { int mapcount, mapcount2; - pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); + pgoff_t pgoff = page_pgoff(page); struct anon_vma_chain *avc; BUG_ON(!PageHead(page)); diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 2024bbd573d2..63dd071296a1 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -981,6 +981,11 @@ pgoff_t __basepage_index(struct page *page) return (index << compound_order(page_head)) + compound_idx; } +pgoff_t hugepage_pgoff(struct page *page) +{ + return page->index << huge_page_order(page_hstate(page)); +} + static struct page *alloc_fresh_huge_page_node(struct hstate *h, int nid) { struct page *page; diff --git a/mm/memory-failure.c b/mm/memory-failure.c index c6399e328931..d148b54f82a2 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -435,7 +435,7 @@ static void collect_procs_anon(struct page *page, struct list_head *to_kill, if (av == NULL) /* Not actually mapped anymore */ return; - pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); + pgoff = page_pgoff(page); read_lock(&tasklist_lock); for_each_process (tsk) { struct anon_vma_chain *vmac; @@ -469,7 +469,7 @@ static void collect_procs_file(struct page *page, struct list_head *to_kill, mutex_lock(&mapping->i_mmap_mutex); read_lock(&tasklist_lock); for_each_process(tsk) { - pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); + pgoff_t pgoff = page_pgoff(page); struct task_struct *t = task_early_kill(tsk, force_early); if (!t) diff --git a/mm/rmap.c b/mm/rmap.c index b7e94ebbd09e..672ee4cebe80 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -517,11 +517,7 @@ void page_unlock_anon_vma_read(struct anon_vma *anon_vma) static inline unsigned long __vma_address(struct page *page, struct vm_area_struct *vma) { - pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); - - if (unlikely(is_vm_hugetlb_page(vma))) - pgoff = page->index << huge_page_order(page_hstate(page)); - + pgoff_t pgoff = page_pgoff(page); return vma->vm_start + ((pgoff - vma->vm_pgoff) << PAGE_SHIFT); } @@ -1639,7 +1635,7 @@ static struct anon_vma *rmap_walk_anon_lock(struct page *page, static int rmap_walk_anon(struct page *page, struct rmap_walk_control *rwc) { struct anon_vma *anon_vma; - pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); + pgoff_t pgoff = page_pgoff(page); struct anon_vma_chain *avc; int ret = SWAP_AGAIN;