diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-04-19 14:16:03 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-04-20 06:51:48 -0600 |
| commit | 3c85cc43c8e7855d202da184baf00c7b8eeacf71 (patch) | |
| tree | 38b330a47e9342c10d68f7b40da89788dbf5d0bc /io_uring | |
| parent | ea97f6c8558e83cb457c3b5f53351e4fd8519ab1 (diff) | |
| download | linux-stable-3c85cc43c8e7855d202da184baf00c7b8eeacf71.tar.gz linux-stable-3c85cc43c8e7855d202da184baf00c7b8eeacf71.tar.bz2 linux-stable-3c85cc43c8e7855d202da184baf00c7b8eeacf71.zip | |
Revert "io_uring/rsrc: disallow multi-source reg buffers"
This reverts commit edd478269640b360c6f301f2baa04abdda563ef3.
There's really no specific need to disallow multiple sources of buffers,
and io_uring really should not be mandating this by itself. We should
be able to solely rely on GUP making these decisions.
As this also stands in the way of a cleanup where io_uring is the odd
one out, kill it.
Link: https://lore.kernel.org/all/61ded378-51a8-1dcb-b631-fda1903248a9@gmail.com/
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/rsrc.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index 20dcc7668cb0..ddee7adb4006 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -1053,17 +1053,14 @@ struct page **io_pin_pages(unsigned long ubuf, unsigned long len, int *npages) pret = pin_user_pages(ubuf, nr_pages, FOLL_WRITE | FOLL_LONGTERM, pages, vmas); if (pret == nr_pages) { - struct file *file = vmas[0]->vm_file; - /* don't support file backed memory */ for (i = 0; i < nr_pages; i++) { - if (vmas[i]->vm_file != file) { - ret = -EINVAL; - break; - } - if (!file) + struct vm_area_struct *vma = vmas[i]; + + if (vma_is_shmem(vma)) continue; - if (!vma_is_shmem(vmas[i]) && !is_file_hugepages(file)) { + if (vma->vm_file && + !is_file_hugepages(vma->vm_file)) { ret = -EOPNOTSUPP; break; } |