Commit e889e96e authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Michael Ellerman

powerpc/iommu: Do not call PageTransHuge() on tail pages

The CMA pages migration code does not support compound pages at
the moment so it performs few tests before proceeding to actual page
migration.

One of the tests - PageTransHuge() - has VM_BUG_ON_PAGE(PageTail()) as
it is designed to be called on head pages only. Since we also test for
PageCompound(), and it contains PageTail() and PageHead(), we can
simplify the check by leaving just PageCompound() and therefore avoid
possible VM_BUG_ON_PAGE.

Fixes: 2e5bbb54 ("KVM: PPC: Book3S HV: Migrate pinned pages out of CMA")
Cc: stable@vger.kernel.org # v4.9+
Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Acked-by: default avatarBalbir Singh <bsingharora@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 321f7d29
...@@ -81,7 +81,7 @@ struct page *new_iommu_non_cma_page(struct page *page, unsigned long private, ...@@ -81,7 +81,7 @@ struct page *new_iommu_non_cma_page(struct page *page, unsigned long private,
gfp_t gfp_mask = GFP_USER; gfp_t gfp_mask = GFP_USER;
struct page *new_page; struct page *new_page;
if (PageHuge(page) || PageTransHuge(page) || PageCompound(page)) if (PageCompound(page))
return NULL; return NULL;
if (PageHighMem(page)) if (PageHighMem(page))
...@@ -100,7 +100,7 @@ static int mm_iommu_move_page_from_cma(struct page *page) ...@@ -100,7 +100,7 @@ static int mm_iommu_move_page_from_cma(struct page *page)
LIST_HEAD(cma_migrate_pages); LIST_HEAD(cma_migrate_pages);
/* Ignore huge pages for now */ /* Ignore huge pages for now */
if (PageHuge(page) || PageTransHuge(page) || PageCompound(page)) if (PageCompound(page))
return -EBUSY; return -EBUSY;
lru_add_drain(); lru_add_drain();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment