diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-05-16 12:31:19 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-05-16 12:31:19 -0600 |
| commit | 3de7361f7cd9c7b79acba5a3c72588ee1d83f031 (patch) | |
| tree | 4bec6d1271fa15c10e26144278f83a5140d1ffb7 /io_uring/memmap.c | |
| parent | 2b61bb1d9aa601ec393054a61be0a707a5bea928 (diff) | |
| parent | d871198ee431d90f5308d53998c1ba1d5db5619a (diff) | |
| download | lwn-3de7361f7cd9c7b79acba5a3c72588ee1d83f031.tar.gz lwn-3de7361f7cd9c7b79acba5a3c72588ee1d83f031.zip | |
Merge branch 'io_uring-6.15' into for-6.16/io_uring
Merge in 6.15 io_uring fixes, mostly so that the fdinfo changes can
get easily extended without causing merge conflicts.
* io_uring-6.15:
io_uring/fdinfo: grab ctx->uring_lock around io_uring_show_fdinfo()
io_uring/memmap: don't use page_address() on a highmem page
io_uring/uring_cmd: fix hybrid polling initialization issue
io_uring/sqpoll: Increase task_work submission batch size
io_uring: ensure deferred completions are flushed for multishot
io_uring: always arm linked timeouts prior to issue
io_uring/fdinfo: annotate racy sq/cq head/tail reads
io_uring: fix 'sync' handling of io_fallback_tw()
io_uring: don't duplicate flushing in io_req_post_cqe
Diffstat (limited to 'io_uring/memmap.c')
| -rw-r--r-- | io_uring/memmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/io_uring/memmap.c b/io_uring/memmap.c index 5cf3f23e751b..725dc0bec24c 100644 --- a/io_uring/memmap.c +++ b/io_uring/memmap.c @@ -117,7 +117,7 @@ static int io_region_init_ptr(struct io_mapped_region *mr) void *ptr; if (io_check_coalesce_buffer(mr->pages, mr->nr_pages, &ifd)) { - if (ifd.nr_folios == 1) { + if (ifd.nr_folios == 1 && !PageHighMem(mr->pages[0])) { mr->ptr = page_address(mr->pages[0]); return 0; } |