shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

iommufd/iova_bitmap: Consider page offset for the pages to be pinned

Browse Source 
[ Upstream commit 4bbcbc6ea2fa379632a24c14cfb47aa603816ac6 ]

For small bitmaps that aren't PAGE_SIZE aligned *and* that are less than
512 pages in bitmap length, use an extra page to be able to cover the
entire range e.g. [1M..3G] which would be iterated more efficiently in a
single iteration, rather than two.

Fixes: b058ea3ab5 ("vfio/iova_bitmap: refactor iova_bitmap_set() to better handle page boundaries")
Link: https://lore.kernel.org/r/20240202133415.23819-10-joao.m.martins@oracle.com
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Tested-by: Avihai Horon <avihaih@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Joao Martins
2024-02-02 13:34:15 +00:00
committed by Greg Kroah-Hartman
parent c5bc02f60d
commit 47e93d2f28
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/vfio/iova_bitmap.c
View File

@@ -174,18 +174,19 @@ static int iova_bitmap_get(struct iova_bitmap *bitmap)
bitmap->mapped_base_index) * bitmap->mapped_base_index) *
sizeof(*bitmap->bitmap), PAGE_SIZE); sizeof(*bitmap->bitmap), PAGE_SIZE);
/*
* We always cap at max number of 'struct page' a base page can fit.
* This is, for example, on x86 means 2M of bitmap data max.
*/
npages = min(npages, PAGE_SIZE / sizeof(struct page *));
/* /*
* Bitmap address to be pinned is calculated via pointer arithmetic * Bitmap address to be pinned is calculated via pointer arithmetic
* with bitmap u64 word index. * with bitmap u64 word index.
*/ */
addr = bitmap->bitmap + bitmap->mapped_base_index; addr = bitmap->bitmap + bitmap->mapped_base_index;
/*
* We always cap at max number of 'struct page' a base page can fit.
* This is, for example, on x86 means 2M of bitmap data max.
*/
npages = min(npages + !!offset_in_page(addr),
PAGE_SIZE / sizeof(struct page *));
ret = pin_user_pages_fast((unsigned long)addr, npages, ret = pin_user_pages_fast((unsigned long)addr, npages,
FOLL_WRITE, mapped->pages); FOLL_WRITE, mapped->pages);
if (ret <= 0) if (ret <= 0)