korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-21 12:11:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

block: unpin user pages belonging to a folio at once

Browse Source 
Use newly added mm function unpin_user_folio() to put refs by npages
count.

Signed-off-by: Kundan Kumar <kundan.kumar@samsung.com>
Tested-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20240911064935.5630-5-kundan.kumar@samsung.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Kundan Kumar 2024-09-11 12:19:35 +05:30 committed by Jens Axboe
parent d3bfbfb124
commit eb1d46fcd5
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block/bio.c
View File

@ -1190,7 +1190,6 @@ void __bio_release_pages(struct bio *bio, bool mark_dirty)
struct folio_iter fi; struct folio_iter fi;
bio_for_each_folio_all(fi, bio) { bio_for_each_folio_all(fi, bio) {
struct page *page;
size_t nr_pages; size_t nr_pages;
if (mark_dirty) { if (mark_dirty) {
@ -1198,12 +1197,9 @@ void __bio_release_pages(struct bio *bio, bool mark_dirty)
folio_mark_dirty(fi.folio); folio_mark_dirty(fi.folio);
folio_unlock(fi.folio); folio_unlock(fi.folio);
} }
page = folio_page(fi.folio, fi.offset / PAGE_SIZE);
nr_pages = (fi.offset + fi.length - 1) / PAGE_SIZE - nr_pages = (fi.offset + fi.length - 1) / PAGE_SIZE -
fi.offset / PAGE_SIZE + 1; fi.offset / PAGE_SIZE + 1;
do { unpin_user_folio(fi.folio, nr_pages);
bio_release_page(bio, page++);
} while (--nr_pages != 0);
} }
} }
EXPORT_SYMBOL_GPL(__bio_release_pages); EXPORT_SYMBOL_GPL(__bio_release_pages);
@ -1241,8 +1237,8 @@ static int bio_iov_add_folio(struct bio *bio, struct folio *folio, size_t len,
folio_page(folio, 0), len, offset, folio_page(folio, 0), len, offset,
&same_page)) { &same_page)) {
bio->bi_iter.bi_size += len; bio->bi_iter.bi_size += len;
if (same_page) if (same_page && bio_flagged(bio, BIO_PAGE_PINNED))
bio_release_page(bio, folio_page(folio, 0)); unpin_user_folio(folio, 1);
return 0; return 0;
} }
bio_add_folio_nofail(bio, folio, len, offset); bio_add_folio_nofail(bio, folio, len, offset);
@ -1258,8 +1254,8 @@ static int bio_iov_add_zone_append_folio(struct bio *bio, struct folio *folio,
if (bio_add_hw_folio(q, bio, folio, len, offset, if (bio_add_hw_folio(q, bio, folio, len, offset,
queue_max_zone_append_sectors(q), &same_page) != len) queue_max_zone_append_sectors(q), &same_page) != len)
return -EINVAL; return -EINVAL;
if (same_page) if (same_page && bio_flagged(bio, BIO_PAGE_PINNED))
bio_release_page(bio, folio_page(folio, 0)); unpin_user_folio(folio, 1);
return 0; return 0;
} }