diff options
| author | Joao Martins <joao.m.martins@oracle.com> | 2024-06-27 14:01:00 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-03 10:00:13 +0300 |
| commit | 0036f27f2a7b4bd7c77ca1471c0e34dc393c5acb (patch) | |
| tree | 27e0d1cd7bf3e78fb137f6cf697822018e4277f3 /drivers/iommu/iommufd/iova_bitmap.c | |
| parent | 1d779d0e4e8fee90b7ed9315b9ae12afde5cdc1c (diff) | |
| download | linux-0036f27f2a7b4bd7c77ca1471c0e34dc393c5acb.tar.xz | |
iommufd/iova_bitmap: Check iova_bitmap_done() after set ahead
[ Upstream commit 792583656f554e35383d6b2325371c8fe056a56b ]
After iova_bitmap_set_ahead() returns it may be at the end of the range.
Move iova_bitmap_set_ahead() earlier to avoid unnecessary attempt in
trying to pin the next pages by reusing iova_bitmap_done() check.
Fixes: 2780025e01e2 ("iommufd/iova_bitmap: Handle recording beyond the mapped pages")
Link: https://lore.kernel.org/r/20240627110105.62325-7-joao.m.martins@oracle.com
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Tested-by: Matt Ochs <mochs@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/iommu/iommufd/iova_bitmap.c')
| -rw-r--r-- | drivers/iommu/iommufd/iova_bitmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/iommu/iommufd/iova_bitmap.c b/drivers/iommu/iommufd/iova_bitmap.c index db8c46bee155..e33ddfc239b5 100644 --- a/drivers/iommu/iommufd/iova_bitmap.c +++ b/drivers/iommu/iommufd/iova_bitmap.c @@ -384,8 +384,6 @@ static int iova_bitmap_advance(struct iova_bitmap *bitmap) bitmap->mapped_base_index += count; iova_bitmap_put(bitmap); - if (iova_bitmap_done(bitmap)) - return 0; /* Iterate, set and skip any bits requested for next iteration */ if (bitmap->set_ahead_length) { @@ -396,6 +394,9 @@ static int iova_bitmap_advance(struct iova_bitmap *bitmap) return ret; } + if (iova_bitmap_done(bitmap)) + return 0; + /* When advancing the index we pin the next set of bitmap pages */ return iova_bitmap_get(bitmap); } |