On Thu, 2016-04-07 at 18:42 +0100, Robin Murphy wrote:
> /*
> @@ -215,8 +221,9 @@ static struct page **__iommu_dma_alloc_pages(unsigned int
> count, gfp_t gfp)
> * than a necessity, hence using __GFP_NORETRY until
> * falling back to single-page allocations.
> */
> - for (order = min_t(unsigned int, order, __fls(count));
> - order > 0; order--) {
> + for (pgsize_orders &= (2U << __fls(count)) - 1;
> + (order = __fls(pgsize_orders)) > min_order;
> + pgsize_orders &= (1U << order) - 1) {
> page = alloc_pages(gfp | __GFP_NORETRY, order);
> if (!page)
> continue;
> @@ -230,7 +237,7 @@ static struct page **__iommu_dma_alloc_pages(unsigned int
> count, gfp_t gfp)
> }
> }
> if (!page)
> - page = alloc_page(gfp);
> + page = alloc_pages(gfp, order);
A small question: Do we need split it too if order != 0 here?
> if (!page) {
> __iommu_dma_free_pages(pages, i);
> return NULL;
[...]
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
