superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

io_uring/rsrc: clean up io_coalesce_buffer() 

We don't need special handling for the first page in
io_coalesce_buffer(), move it inside the loop.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Reviewed-by: Anuj Gupta <anuj20.g@samsung.com>
Link: https://lore.kernel.org/r/ad698cddc1eadb3d92a7515e95bb13f79420323d.1745083025.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1250/head
Pavel Begunkov 2025-04-19 18:47:05 +01:00 committed by Jens Axboe
parent ea76925614
commit 9cebcf7b0c
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
io_uring/rsrc.c
View File

@ -685,37 +685,34 @@ static bool io_coalesce_buffer(struct page ***pages, int *nr_pages,
struct io_imu_folio_data *data) struct io_imu_folio_data *data)
{ {
struct page **page_array = *pages, **new_array = NULL; struct page **page_array = *pages, **new_array = NULL;
int nr_pages_left = *nr_pages, i, j; unsigned nr_pages_left = *nr_pages;
int nr_folios = data->nr_folios; unsigned nr_folios = data->nr_folios;
unsigned i, j;
/* Store head pages only*/ /* Store head pages only*/
new_array = kvmalloc_array(nr_folios, sizeof(struct page *), new_array = kvmalloc_array(nr_folios, sizeof(struct page *), GFP_KERNEL);
GFP_KERNEL);
if (!new_array) if (!new_array)
return false; return false;
new_array[0] = compound_head(page_array[0]); for (i = 0, j = 0; i < nr_folios; i++) {
/* struct page *p = compound_head(page_array[j]);
* The pages are bound to the folio, it doesn't struct folio *folio = page_folio(p);
* actually unpin them but drops all but one reference, unsigned int nr;
* which is usually put down by io_buffer_unmap().
*/
if (data->nr_pages_head > 1)
unpin_user_folio(page_folio(new_array[0]), data->nr_pages_head - 1);
j = data->nr_pages_head; WARN_ON_ONCE(i > 0 && p != page_array[j]);
nr_pages_left -= data->nr_pages_head;
for (i = 1; i < nr_folios; i++) {
unsigned int nr_unpin;
new_array[i] = page_array[j]; nr = i ? data->nr_pages_mid : data->nr_pages_head;
nr_unpin = min_t(unsigned int, nr_pages_left - 1, nr = min(nr, nr_pages_left);
data->nr_pages_mid - 1); /* Drop all but one ref, the entire folio will remain pinned. */
if (nr_unpin) if (nr > 1)
unpin_user_folio(page_folio(new_array[i]), nr_unpin); unpin_user_folio(folio, nr - 1);
j += data->nr_pages_mid; j += nr;
nr_pages_left -= data->nr_pages_mid; nr_pages_left -= nr;
new_array[i] = p;
} }
WARN_ON_ONCE(j != *nr_pages);
kvfree(page_array); kvfree(page_array);
*pages = new_array; *pages = new_array;
*nr_pages = nr_folios; *nr_pages = nr_folios;