Commit 61883d3c authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Andrew Morton

iommu: fix MAX_ORDER usage in __iommu_dma_alloc_pages()

MAX_ORDER is not inclusive: the maximum allocation order buddy allocator
can deliver is MAX_ORDER-1.

Fix MAX_ORDER usage in __iommu_dma_alloc_pages().

Also use GENMASK() instead of hard to read "(2U << order) - 1" magic.

Link: https://lkml.kernel.org/r/20230315113133.11326-10-kirill.shutemov@linux.intel.comSigned-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Acked-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7a16d7c7
...@@ -736,7 +736,7 @@ static struct page **__iommu_dma_alloc_pages(struct device *dev, ...@@ -736,7 +736,7 @@ static struct page **__iommu_dma_alloc_pages(struct device *dev,
struct page **pages; struct page **pages;
unsigned int i = 0, nid = dev_to_node(dev); unsigned int i = 0, nid = dev_to_node(dev);
order_mask &= (2U << MAX_ORDER) - 1; order_mask &= GENMASK(MAX_ORDER - 1, 0);
if (!order_mask) if (!order_mask)
return NULL; return NULL;
...@@ -756,7 +756,7 @@ static struct page **__iommu_dma_alloc_pages(struct device *dev, ...@@ -756,7 +756,7 @@ static struct page **__iommu_dma_alloc_pages(struct device *dev,
* than a necessity, hence using __GFP_NORETRY until * than a necessity, hence using __GFP_NORETRY until
* falling back to minimum-order allocations. * falling back to minimum-order allocations.
*/ */
for (order_mask &= (2U << __fls(count)) - 1; for (order_mask &= GENMASK(__fls(count), 0);
order_mask; order_mask &= ~order_size) { order_mask; order_mask &= ~order_size) {
unsigned int order = __fls(order_mask); unsigned int order = __fls(order_mask);
gfp_t alloc_flags = gfp; gfp_t alloc_flags = gfp;
......
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