io_uring IO interface
Subsystems (13)
Jens Axboe
maintainerPATCH v15 1/1 io_uring IO interface
Some final tweaks, mostly cosmetic, but also two important fixes:
1) Ensure that we account the skb appropriately against the socket. Some network config options apparently return is an skb with ->truesize != 0 when allocated with a size of 0, ensure we add those as references against sock->sk_wmem_alloc. Reported by Matt Mullins.
2) Ensure that ANY async punt of an sqe operates on a copy. We've already committed the SQ ring change at this point, we don't want the application inadvertently reusing the SQE causing issues for an SQE that got punted with -EAGAIN. This change ensures that whatever io_uring_enter(2) returned that got submitted, it's totally safe to reuse those SQE entries in the ring.
Outside of that, just cosmetic changes and additions of comments. I've run this version in various torture overnight, using the various modes (polled, buffered, sq thread, any combination thereof) and it's help up perfectly. As far as I'm concerned, this is ready to get staged for 5.1.
The liburing git repo has a full set of man pages for this, though they could probably still use a bit of polish. I'd also like to see a io_uring(7) man page to describe the overall design of the project, expect that in the not-so-distant future. You can clone that here:
git://git.kernel.dk/liburing
Patches are against 5.0-rc6, and can also be found in my io_uring branch here:
git://git.kernel.dk/linux-block io_uring
Changes since v14:
- Fix skb/sock referencing if skb->truesize != 0
- Add comments on memory ordering
- Add comments on READ/WRITE_ONCE()
- Various function comments
- Align struct members of io_poll_iocb and io_submit_state
- Use io_fput() in two places where it was open-coded
- Make async context always use a copy of the sqe
- Don't reset s->needs_fixed_file for async context
- Rebase on v5.0-rc6
Documentation/filesystems/vfs.txt | 3 + arch/x86/entry/syscalls/syscall_32.tbl | 3 + arch/x86/entry/syscalls/syscall_64.tbl | 3 + block/bio.c | 59 +- fs/Makefile | 1 + fs/block_dev.c | 19 +- fs/file.c | 15 +- fs/file_table.c | 9 +- fs/gfs2/file.c | 2 + fs/io_uring.c | 2920 ++++++++++++++++++++++++ fs/iomap.c | 48 +- fs/xfs/xfs_file.c | 1 + include/linux/bio.h | 14 + include/linux/blk_types.h | 1 + include/linux/file.h | 2 + include/linux/fs.h | 15 +- include/linux/iomap.h | 1 + include/linux/sched/user.h | 2 +- include/linux/syscalls.h | 8 + include/net/af_unix.h | 1 + include/uapi/asm-generic/unistd.h | 8 +- include/uapi/linux/io_uring.h | 142 ++ init/Kconfig | 9 + kernel/sys_ni.c | 3 + net/Makefile | 2 +- net/unix/Kconfig | 5 + net/unix/Makefile | 2 + net/unix/af_unix.c | 63 +- net/unix/garbage.c | 68 +- net/unix/scm.c | 151 ++ net/unix/scm.h | 10 + 31 files changed, 3421 insertions(+), 169 deletions(-)
Signature · 8 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 1/19 fs: add an iopoll method to struct file_operations
From: Christoph Hellwig <[email protected]>
This new methods is used to explicitly poll for I/O completion for an iocb. It must be called for any iocb submitted asynchronously (that is with a non-null ki_complete) which has the IOCB_HIPRI flag set.
The method is assisted by a new ki_cookie field in struct iocb to store the polling cookie.
--- Documentation/filesystems/vfs.txt | 3 +++ include/linux/fs.h | 2 ++ 2 files changed, 5 insertions(+)
Documentation/filesystems/vfs.txt +3 -0
@@ -857,6 +857,7 @@ struct file_operations { ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); ssize_t (*read_iter) (struct kiocb *, struct iov_iter *); ssize_t (*write_iter) (struct kiocb *, struct iov_iter *); + int (*iopoll)(struct kiocb *kiocb, bool spin); int (*iterate) (struct file *, struct dir_context *); int (*iterate_shared) (struct file *, struct dir_context *); __poll_t (*poll) (struct file *, struct poll_table_struct *);
@@ -902,6 +903,8 @@ otherwise noted. write_iter: possibly asynchronous write with iov_iter as source + iopoll: called when aio wants to poll for completions on HIPRI iocbs + iterate: called when the VFS needs to read the directory contents iterate_shared: called when the VFS needs to read the directory contents
include/linux/fs.h +2 -0
@@ -310,6 +310,7 @@ struct kiocb {int ki_flags;u16 ki_hint;u16 ki_ioprio;/* See linux/ioprio.h */ +unsigned int ki_cookie;/* for ->iopoll */ } __randomize_layout;static inline bool is_sync_kiocb (struct kiocb *kiocb)
@@ -1787,6 +1788,7 @@ struct file_operations {ssize_t (*write) (struct file *,const char __user *,size_t ,loff_t *);ssize_t (*read_iter) (struct kiocb *,struct iov_iter *);ssize_t (*write_iter) (struct kiocb *,struct iov_iter *); +int (*iopoll)(struct kiocb *kiocb,bool spin);int (*iterate) (struct file *,struct dir_context *);int (*iterate_shared) (struct file *,struct dir_context *);__poll_t (*poll) (struct file *,struct poll_table_struct *);
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 1/1 io_uring: add io_uring_event cache hit information
In reply to Jens AxboeAdd hint on whether a read was served out of the page cache, or if it hit media. This is useful for buffered async IO, O_DIRECT reads would never have this set (for obvious reasons).
If the read hit page cache, cqe->flags will have IOCQE_FLAG_CACHEHIT set.
--- fs/io_uring.c | 7 ++++++- include/uapi/linux/io_uring.h | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-)
fs/io_uring.c +6 -1
@@ -611,11 +611,16 @@ static void io_fput(struct io_kiocb *req)static void io_complete_rw (struct kiocb *kiocb,long res,long res2) { struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw); +unsigned ev_flags =0 ;kiocb_end_write (kiocb);io_fput (req); -io_cqring_add_event (req->ctx, req->user_data, res,0 ); + +if (res >0 && (req->flags &REQ_F_FORCE_NONBLOCK )) + ev_flags =IOCQE_FLAG_CACHEHIT ; + +io_cqring_add_event (req->ctx, req->user_data, res, ev_flags);io_free_req (req); }
include/uapi/linux/io_uring.h +5 -0
@@ -69,6 +69,11 @@ struct io_uring_cqe {__u32 flags; }; +/* +* io_uring_event->flags +*/ +#define IOCQE_FLAG_CACHEHIT (1U << 0)/* IO did not hit media */ +/* * Magic offsets for the application to mmap the data it needs */
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 2/19 block: wire up block device iopoll method
In reply to Jens AxboeFrom: Christoph Hellwig <[email protected]>
Just call blk_poll on the iocb cookie, we can derive the block device from the inode trivially.
--- fs/block_dev.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/block_dev.c +10 -0
@@ -293,6 +293,14 @@ struct blkdev_dio {static struct bio_set blkdev_dio_pool; +static int blkdev_iopoll (struct kiocb *kiocb,bool wait) +{ +struct block_device *bdev =I_BDEV (kiocb->ki_filp->f_mapping->host); +struct request_queue *q =bdev_get_queue (bdev); + +return blk_poll (q,READ_ONCE (kiocb->ki_cookie), wait); +} +static void blkdev_bio_end_io (struct bio *bio) {struct blkdev_dio *dio = bio->bi_private;
@@ -410,6 +418,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) bio->bi_opf |=REQ_HIPRI ; qc =submit_bio (bio); +WRITE_ONCE (iocb->ki_cookie, qc);break ; }
@@ -2076,6 +2085,7 @@ const struct file_operations def_blk_fops = { .llseek = block_llseek, .read_iter = blkdev_read_iter, .write_iter = blkdev_write_iter, + .iopoll = blkdev_iopoll, .mmap = generic_file_mmap, .fsync = blkdev_fsync, .unlocked_ioctl = block_ioctl,
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 3/19 block: add bio_set_polled() helper
In reply to Jens AxboeFor the upcoming async polled IO, we can't sleep allocating requests. If we do, then we introduce a deadlock where the submitter already has async polled IO in-flight, but can't wait for them to complete since polled requests must be active found and reaped.
Utilize the helper in the blockdev DIRECT_IO code.
--- fs/block_dev.c | 4 ++-- include/linux/bio.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-)
fs/block_dev.c +2 -2
@@ -247,7 +247,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,task_io_account_write (ret); }if (iocb->ki_flags &IOCB_HIPRI ) - bio.bi_opf |=REQ_HIPRI ; +bio_set_polled (&bio, iocb); qc =submit_bio (&bio);for (;;) {
@@ -415,7 +415,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) nr_pages =iov_iter_npages (iter,BIO_MAX_PAGES );if (!nr_pages) {if (iocb->ki_flags &IOCB_HIPRI ) - bio->bi_opf |=REQ_HIPRI ; +bio_set_polled (bio, iocb); qc =submit_bio (bio);WRITE_ONCE (iocb->ki_cookie, qc);
include/linux/bio.h +14 -0
@@ -823,5 +823,19 @@ static inline int bio_integrity_add_page(struct bio *bio, struct page *page,#endif /* CONFIG_BLK_DEV_INTEGRITY */ +/* +* Mark a bio as polled. Note that for async polled IO, the caller must +* expect -EWOULDBLOCK if we cannot allocate a request (or other resources). +* We cannot block waiting for requests on polled IO, as those completions +* must be found by the caller. This is different than IRQ driven IO, where +* it's safe to wait for IO to complete. +*/ +static inline void bio_set_polled (struct bio *bio,struct kiocb *kiocb) +{ + bio->bi_opf |=REQ_HIPRI ; +if (!is_sync_kiocb (kiocb)) + bio->bi_opf |=REQ_NOWAIT ; +} +#endif /* CONFIG_BLOCK */ #endif /* __LINUX_BIO_H */
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 4/19 iomap: wire up the iopoll method
In reply to Jens AxboeFrom: Christoph Hellwig <[email protected]>
Store the request queue the last bio was submitted to in the iocb private data in addition to the cookie so that we find the right block device. Also refactor the common direct I/O bio submission code into a nice little helper.
Modified to use bio_set_polled().
--- fs/gfs2/file.c | 2 ++ fs/iomap.c | 43 ++++++++++++++++++++++++++++--------------- fs/xfs/xfs_file.c | 1 + include/linux/iomap.h | 1 + 4 files changed, 32 insertions(+), 15 deletions(-)
fs/gfs2/file.c +2 -0
@@ -1280,6 +1280,7 @@ const struct file_operations gfs2_file_fops = { .llseek = gfs2_llseek, .read_iter = gfs2_file_read_iter, .write_iter = gfs2_file_write_iter, + .iopoll = iomap_dio_iopoll, .unlocked_ioctl = gfs2_ioctl, .mmap = gfs2_mmap, .open = gfs2_open,
@@ -1310,6 +1311,7 @@ const struct file_operations gfs2_file_fops_nolock = { .llseek = gfs2_llseek, .read_iter = gfs2_file_read_iter, .write_iter = gfs2_file_write_iter, + .iopoll = iomap_dio_iopoll, .unlocked_ioctl = gfs2_ioctl, .mmap = gfs2_mmap, .open = gfs2_open,
fs/iomap.c +28 -15
82 lines not on this page · raw message
fs/xfs/xfs_file.c +1 -0
@@ -1203,6 +1203,7 @@ const struct file_operations xfs_file_operations = { .write_iter = xfs_file_write_iter, .splice_read = generic_file_splice_read, .splice_write = iter_file_splice_write, + .iopoll = iomap_dio_iopoll, .unlocked_ioctl = xfs_file_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = xfs_file_compat_ioctl,
include/linux/iomap.h +1 -0
@@ -162,6 +162,7 @@ typedef int (iomap_dio_end_io_t)(struct kiocb *iocb, ssize_t ret, unsigned flags);ssize_t iomap_dio_rw (struct kiocb *iocb,struct iov_iter *iter,const struct iomap_ops *ops,iomap_dio_end_io_t end_io); +int iomap_dio_iopoll (struct kiocb *kiocb,bool spin);#ifdef CONFIG_SWAP struct file ;
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 5/19 Add io_uring IO interface
In reply to Jens AxboeThe submission queue (SQ) and completion queue (CQ) rings are shared between the application and the kernel. This eliminates the need to copy data back and forth to submit and complete IO.
IO submissions use the io_uring_sqe data structure, and completions are generated in the form of io_uring_cqe data structures. The SQ ring is an index into the io_uring_sqe array, which makes it possible to submit a batch of IOs without them being contiguous in the ring. The CQ ring is always contiguous, as completion events are inherently unordered, and hence any io_uring_cqe entry can point back to an arbitrary submission.
Two new system calls are added for this:
io_uring_setup(entries, params)
Sets up an io_uring instance for doing async IO. On success, returns a file descriptor that the application can mmap to gain access to the SQ ring, CQ ring, and io_uring_sqes.
io_uring_enter(fd, to_submit, min_complete, flags, sigset, sigsetsize)
Initiates IO against the rings mapped to this fd, or waits for them to complete, or both. The behavior is controlled by the parameters passed in. If 'to_submit' is non-zero, then we'll try and submit new IO. If IORING_ENTER_GETEVENTS is set, the kernel will wait for 'min_complete' events, if they aren't already available. It's valid to set IORING_ENTER_GETEVENTS and 'min_complete' == 0 at the same time, this allows the kernel to return already completed events without waiting for them. This is useful only for polling, as for IRQ driven IO, the application can just check the CQ ring without entering the kernel.
With this setup, it's possible to do async IO with a single system call. Future developments will enable polled IO with this interface, and polled submission as well. The latter will enable an application to do IO without doing ANY system calls at all.
For IRQ driven IO, an application only needs to enter the kernel for completions if it wants to wait for them to occur.
Each io_uring is backed by a workqueue, to support buffered async IO as well. We will only punt to an async context if the command would need to wait for IO on the device side. Any data that can be accessed directly in the page cache is done inline. This avoids the slowness issue of usual threadpools, since cached data is accessed as quickly as a sync interface.
Sample application: http://git.kernel.dk/cgit/fio/plain/t/io_uring.c
--- arch/x86/entry/syscalls/syscall_32.tbl | 2 + arch/x86/entry/syscalls/syscall_64.tbl | 2 + fs/Makefile | 1 + fs/io_uring.c | 1243 ++++++++++++++++++++++++ include/linux/fs.h | 9 + include/linux/sched/user.h | 2 +- include/linux/syscalls.h | 6 + include/uapi/asm-generic/unistd.h | 6 +- include/uapi/linux/io_uring.h | 95 ++ init/Kconfig | 9 + kernel/sys_ni.c | 2 + net/unix/garbage.c | 3 + 12 files changed, 1378 insertions(+), 2 deletions(-) create mode 100644 fs/io_uring.c create mode 100644 include/uapi/linux/io_uring.h
arch/x86/entry/syscalls/syscall_32.tbl +2 -0
@@ -398,3 +398,5 @@ 384 i386 arch_prctl sys_arch_prctl __ia32_compat_sys_arch_prctl 385 i386 io_pgetevents sys_io_pgetevents __ia32_compat_sys_io_pgetevents 386 i386 rseq sys_rseq __ia32_sys_rseq +425 i386 io_uring_setup sys_io_uring_setup __ia32_sys_io_uring_setup +426 i386 io_uring_enter sys_io_uring_enter __ia32_sys_io_uring_enter
arch/x86/entry/syscalls/syscall_64.tbl +2 -0
@@ -343,6 +343,8 @@ 332 common statx __x64_sys_statx 333 common io_pgetevents __x64_sys_io_pgetevents 334 common rseq __x64_sys_rseq +425 common io_uring_setup __x64_sys_io_uring_setup +426 common io_uring_enter __x64_sys_io_uring_enter # # x32-specific system call numbers start at 512 to avoid cache impact
fs/Makefile +1 -0
@@ -30,6 +30,7 @@ obj-$(CONFIG_TIMERFD) += timerfd.o obj-$(CONFIG_EVENTFD) += eventfd.o obj-$(CONFIG_USERFAULTFD) += userfaultfd.o obj-$(CONFIG_AIO) += aio.o +obj-$(CONFIG_IO_URING) += io_uring.o obj-$(CONFIG_FS_DAX) += dax.o obj-$(CONFIG_FS_ENCRYPTION) += crypto/ obj-$(CONFIG_FILE_LOCKING) += locks.o
fs/io_uring.c new file +1243 -0
1,243 lines not on this page · raw message
include/linux/fs.h +9 -0
@@ -3517,4 +3517,13 @@ extern void inode_nohighmem(struct inode *inode);extern int vfs_fadvise (struct file *file,loff_t offset,loff_t len,int advice); +#if defined(CONFIG_IO_URING ) +extern struct sock *io_uring_get_socket (struct file *file); +#else +static inline struct sock *io_uring_get_socket (struct file *file) +{ +return NULL ; +} +#endif +#endif /* _LINUX_FS_H */
include/linux/sched/user.h +1 -1
@@ -40,7 +40,7 @@ struct user_struct {kuid_t uid;#if defined(CONFIG_PERF_EVENTS ) || defined(CONFIG_BPF_SYSCALL ) || \ - defined(CONFIG_NET ) + defined(CONFIG_NET ) || defined(CONFIG_IO_URING )atomic_long_t locked_vm;#endif
include/linux/syscalls.h +6 -0
@@ -69,6 +69,7 @@ struct file_handle;struct sigaltstack ;struct rseq ;union bpf_attr ; +struct io_uring_params ;#include <linux/types.h> #include <linux/aio_abi.h>
@@ -309,6 +310,11 @@ asmlinkage long sys_io_pgetevents_time32(aio_context_t ctx_id,struct io_event __user *events, struct old_timespec32 __user *timeout, const struct __aio_sigset *sig); +asmlinkage long sys_io_uring_setup (u32 entries, +struct io_uring_params __user *p); +asmlinkage long sys_io_uring_enter (unsigned int fd,u32 to_submit, +u32 min_complete,u32 flags, +const sigset_t __user *sig,size_t sigsz);/* fs/xattr.c */ asmlinkage long sys_setxattr(const char __user *path, const char __user *name,
include/uapi/asm-generic/unistd.h +5 -1
@@ -740,9 +740,13 @@ __SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents) __SYSCALL(__NR_rseq, sys_rseq)#define __NR_kexec_file_load 294 __SYSCALL(__NR_kexec_file_load, sys_kexec_file_load) +#define __NR_io_uring_setup 425 +__SYSCALL(__NR_io_uring_setup, sys_io_uring_setup) +#define __NR_io_uring_enter 426 +__SYSCALL(__NR_io_uring_enter, sys_io_uring_enter)#undef __NR_syscalls -#define __NR_syscalls 295 +#define __NR_syscalls 427/* * 32 bit systems traditionally used different
include/uapi/linux/io_uring.h new file +95 -0
95 lines not on this page · raw message
init/Kconfig +9 -0
@@ -1414,6 +1414,15 @@ config AIO by some high performance threaded applications. Disabling this option saves about 7k. +config IO_URING + bool "Enable IO uring support" if EXPERT + select ANON_INODES + default y + help + This option enables support for the io_uring interface, enabling + applications to submit and complete IO through submission and + completion rings that are shared between the kernel and application. + config ADVISE_SYSCALLS bool "Enable madvise/fadvise syscalls" if EXPERT default y
kernel/sys_ni.c +2 -0
@@ -46,6 +46,8 @@ COND_SYSCALL(io_getevents);COND_SYSCALL (io_pgetevents);COND_SYSCALL_COMPAT (io_getevents);COND_SYSCALL_COMPAT (io_pgetevents); +COND_SYSCALL (io_uring_setup); +COND_SYSCALL (io_uring_enter);/* fs/xattr.c */
net/unix/garbage.c +3 -0
@@ -108,6 +108,9 @@ struct sock *unix_get_socket(struct file *filp)/* PF_UNIX ? */ if (s && sock->ops && sock->ops->family ==PF_UNIX ) u_sock = s; + }else { +/* Could be an io_uring instance */ + u_sock =io_uring_get_socket (filp); }return u_sock; }
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 6/19 io_uring: add fsync support
In reply to Jens AxboeFrom: Christoph Hellwig <[email protected]>
Add a new fsync opcode, which either syncs a range if one is passed, or the whole file if the offset and length fields are both cleared to zero. A flag is provided to use fdatasync semantics, that is only force out metadata which is required to retrieve the file data, but not others like metadata.
--- fs/io_uring.c | 54 +++++++++++++++++++++++++++++++++++ include/uapi/linux/io_uring.h | 8 +++++- 2 files changed, 61 insertions(+), 1 deletion(-)
fs/io_uring.c +54 -0
@@ -24,6 +24,7 @@* data that the application could potentially modify, it remains stable. * * Copyright (C) 2018-2019 Jens Axboe +* Copyright (c) 2018-2019 Christoph Hellwig */ #include <linux/kernel.h> #include <linux/init.h>
@@ -557,6 +558,56 @@ static int io_nop(struct io_kiocb *req, u64 user_data)return 0 ; } +static int io_prep_fsync (struct io_kiocb *req,const struct io_uring_sqe *sqe) +{ +int fd; + +/* Prep already done */ +if (req->rw.ki_filp) +return 0 ; + +if (unlikely (sqe->addr || sqe->ioprio)) +return -EINVAL ; + + fd =READ_ONCE (sqe->fd); + req->rw.ki_filp =fget (fd); +if (unlikely (!req->rw.ki_filp)) +return -EBADF ; + +return 0 ; +} + +static int io_fsync (struct io_kiocb *req,const struct io_uring_sqe *sqe, +bool force_nonblock) +{ +loff_t sqe_off =READ_ONCE (sqe->off); +loff_t sqe_len =READ_ONCE (sqe->len); +loff_t end = sqe_off + sqe_len; +unsigned fsync_flags; +int ret; + + fsync_flags =READ_ONCE (sqe->fsync_flags); +if (unlikely (fsync_flags & ~IORING_FSYNC_DATASYNC )) +return -EINVAL ; + + ret =io_prep_fsync (req, sqe); +if (ret) +return ret; + +/* fsync always requires a blocking context */ +if (force_nonblock) +return -EAGAIN ; + + ret =vfs_fsync_range (req->rw.ki_filp, sqe_off, + end >0 ? end :LLONG_MAX , + fsync_flags &IORING_FSYNC_DATASYNC ); + +fput (req->rw.ki_filp); +io_cqring_add_event (req->ctx, sqe->user_data, ret,0 ); +io_free_req (req); +return 0 ; +} +static int __io_submit_sqe (struct io_ring_ctx *ctx,struct io_kiocb *req,const struct sqe_submit *s,bool force_nonblock) {
@@ -578,6 +629,9 @@ static int __io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,case IORING_OP_WRITEV : ret =io_write (req, s, force_nonblock);break ; +case IORING_OP_FSYNC : + ret =io_fsync (req, s->sqe, force_nonblock); +break ;default : ret = -EINVAL ;break ;
include/uapi/linux/io_uring.h +7 -1
@@ -24,7 +24,7 @@ struct io_uring_sqe {__u32 len;/* buffer size or number of iovecs */ union {__kernel_rwf_t rw_flags; -__u32 __resv; +__u32 fsync_flags; };__u64 user_data;/* data to be passed back at completion time */ __u64 __pad2[3 ];
@@ -33,6 +33,12 @@ struct io_uring_sqe {#define IORING_OP_NOP 0#define IORING_OP_READV 1#define IORING_OP_WRITEV 2 +#define IORING_OP_FSYNC 3 + +/* +* sqe->fsync_flags +*/ +#define IORING_FSYNC_DATASYNC (1U << 0)/* * IO completion data structure (Completion Queue Entry)
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 7/19 io_uring: support for IO polling
In reply to Jens AxboeAdd support for a polled io_uring instance. When a read or write is submitted to a polled io_uring, the application must poll for completions on the CQ ring through io_uring_enter(2). Polled IO may not generate IRQ completions, hence they need to be actively found by the application itself.
To use polling, io_uring_setup() must be used with the IORING_SETUP_IOPOLL flag being set. It is illegal to mix and match polled and non-polled IO on an io_uring.
--- fs/io_uring.c | 275 ++++++++++++++++++++++++++++++++-- include/uapi/linux/io_uring.h | 5 + 2 files changed, 271 insertions(+), 9 deletions(-)
fs/io_uring.c +266 -9
@@ -124,6 +124,14 @@ struct io_ring_ctx {struct {spinlock_t completion_lock; +bool poll_multi_file; +/* +* ->poll_list is protected by the ctx->uring_lock for +* io_uring instances that don't use IORING_SETUP_SQPOLL. +* For SQPOLL, only the single threaded io_sq_thread() will +* manipulate the list, hence no extra locking is needed there. +*/ +struct list_head poll_list; }____cacheline_aligned_in_smp ;#if defined(CONFIG_UNIX )
@@ -135,6 +143,7 @@ struct sqe_submit {const struct io_uring_sqe *sqe;unsigned short index;bool has_user; +bool needs_lock; };struct io_kiocb {
@@ -146,12 +155,15 @@ struct io_kiocb {struct list_head list;unsigned int flags;#define REQ_F_FORCE_NONBLOCK 1/* inline submission attempt */ +#define REQ_F_IOPOLL_COMPLETED 2/* polled IO has completed */ u64 user_data; +u64 error;struct work_struct work; };#define IO_PLUG_THRESHOLD 2 +#define IO_IOPOLL_BATCH 8static struct kmem_cache *req_cachep;
@@ -196,6 +208,7 @@ static struct io_ring_ctx *io_ring_ctx_alloc(struct io_uring_params *p)mutex_init (&ctx->uring_lock);init_waitqueue_head (&ctx->wait);spin_lock_init (&ctx->completion_lock); +INIT_LIST_HEAD (&ctx->poll_list);return ctx; }
@@ -297,12 +310,153 @@ static struct io_kiocb *io_get_req(struct io_ring_ctx *ctx)return NULL ; } +static void io_free_req_many (struct io_ring_ctx *ctx,void **reqs,int *nr) +{ +if (*nr) { +kmem_cache_free_bulk (req_cachep, *nr, reqs); +io_ring_drop_ctx_refs (ctx, *nr); + *nr =0 ; + } +} +static void io_free_req (struct io_kiocb *req) {io_ring_drop_ctx_refs (req->ctx,1 );kmem_cache_free (req_cachep, req); } +/* +* Find and free completed poll iocbs +*/ +static void io_iopoll_complete (struct io_ring_ctx *ctx,unsigned int *nr_events, +struct list_head *done) +{ +void *reqs[IO_IOPOLL_BATCH ]; +struct io_kiocb *req; +int to_free =0 ; + +while (!list_empty (done)) { + req = list_first_entry(done, struct io_kiocb, list); +list_del (&req->list); + +io_cqring_fill_event (ctx, req->user_data, req->error,0 ); + + reqs[to_free++] = req; + (*nr_events)++; + +fput (req->rw.ki_filp); +if (to_free ==ARRAY_SIZE (reqs)) +io_free_req_many (ctx, reqs, &to_free); + } +io_commit_cqring (ctx); + +io_free_req_many (ctx, reqs, &to_free); +} + +static int io_do_iopoll (struct io_ring_ctx *ctx,unsigned int *nr_events, +long min) +{ +struct io_kiocb *req, *tmp; +LIST_HEAD (done); +bool spin; +int ret; + +/* +* Only spin for completions if we don't have multiple devices hanging +* off our complete list, and we're under the requested amount. +*/ + spin = !ctx->poll_multi_file && *nr_events < min; + + ret =0 ; +list_for_each_entry_safe (req, tmp, &ctx->poll_list, list) { +struct kiocb *kiocb = &req->rw; + +/* +* Move completed entries to our local list. If we find a +* request that requires polling, break out and complete +* the done list first, if we have entries there. +*/ +if (req->flags &REQ_F_IOPOLL_COMPLETED ) { +list_move_tail (&req->list, &done); +continue ; + } +if (!list_empty (&done)) +break ; + + ret = kiocb->ki_filp->f_op->iopoll (kiocb, spin); +if (ret <0 ) +break ; + +if (ret && spin) + spin = false; + ret =0 ; + } + +if (!list_empty (&done)) +io_iopoll_complete (ctx, nr_events, &done); + +return ret; +} + +/* +* Poll for a mininum of 'min' events. Note that if min == 0 we consider that a +* non-spinning poll check - we'll still enter the driver poll loop, but only +* as a non-spinning completion check. +*/ +static int io_iopoll_getevents (struct io_ring_ctx *ctx,unsigned int *nr_events, +long min) +{ +while (!list_empty (&ctx->poll_list)) { +int ret; + + ret =io_do_iopoll (ctx, nr_events, min); +if (ret <0 ) +return ret; +if (!min || *nr_events >= min) +return 0 ; + } + +return 1 ; +} + +/* +* We can't just wait for polled events to come to us, we have to actively +* find and complete them. +*/ +static void io_iopoll_reap_events (struct io_ring_ctx *ctx) +{ +if (!(ctx->flags &IORING_SETUP_IOPOLL )) +return ; + +mutex_lock (&ctx->uring_lock); +while (!list_empty (&ctx->poll_list)) { +unsigned int nr_events =0 ; + +io_iopoll_getevents (ctx, &nr_events,1 ); + } +mutex_unlock (&ctx->uring_lock); +} + +static int io_iopoll_check (struct io_ring_ctx *ctx,unsigned *nr_events, +long min) +{ +int ret =0 ; + +do { +int tmin =0 ; + +if (*nr_events < min) + tmin = min - *nr_events; + + ret =io_iopoll_getevents (ctx, nr_events, tmin); +if (ret <=0 ) +break ; + ret =0 ; + }while (min && !*nr_events && !need_resched ()); + +return ret; +} +static void kiocb_end_write (struct kiocb *kiocb) {if (kiocb->ki_flags &IOCB_WRITE ) {
@@ -329,6 +483,53 @@ static void io_complete_rw(struct kiocb *kiocb, long res, long res2)io_free_req (req); } +static void io_complete_rw_iopoll (struct kiocb *kiocb,long res,long res2) +{ + struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw); + +kiocb_end_write (kiocb); + + req->error = res; +if (res != -EAGAIN ) + req->flags |=REQ_F_IOPOLL_COMPLETED ; +} + +/* +* After the iocb has been issued, it's safe to be found on the poll list. +* Adding the kiocb to the list AFTER submission ensures that we don't +* find it from a io_iopoll_getevents() thread before the issuer is done +* accessing the kiocb cookie. +*/ +static void io_iopoll_req_issued (struct io_kiocb *req) +{ +struct io_ring_ctx *ctx = req->ctx; + +/* +* Track whether we have multiple files in our lists. This will impact +* how we do polling eventually, not spinning if we're on potentially +* different devices. +*/ +if (list_empty (&ctx->poll_list)) { + ctx->poll_multi_file = false; + }else if (!ctx->poll_multi_file) { +struct io_kiocb *list_req; + + list_req = list_first_entry(&ctx->poll_list, struct io_kiocb, + list); +if (list_req->rw.ki_filp != req->rw.ki_filp) + ctx->poll_multi_file = true; + } + +/* +* For fast devices, IO may have already completed. If it has, add +* it to the front so we find it first. +*/ +if (req->flags &REQ_F_IOPOLL_COMPLETED ) +list_add (&req->list, &ctx->poll_list); +else +list_add_tail (&req->list, &ctx->poll_list); +} +/* * If we tracked the file through the SCM inflight mechanism, we could support * any file. For now, just ensure that anything potentially problematic is done
@@ -349,6 +550,7 @@ static bool io_file_supports_async(struct file *file)static int io_prep_rw (struct io_kiocb *req,const struct io_uring_sqe *sqe,bool force_nonblock) { +struct io_ring_ctx *ctx = req->ctx;struct kiocb *kiocb = &req->rw;unsigned ioprio;int fd, ret;
@@ -384,12 +586,22 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, kiocb->ki_flags |=IOCB_NOWAIT ; req->flags |=REQ_F_FORCE_NONBLOCK ; } -if (kiocb->ki_flags &IOCB_HIPRI ) { - ret = -EINVAL ; - goto out_fput; - } +if (ctx->flags &IORING_SETUP_IOPOLL ) { + ret = -EOPNOTSUPP ; +if (!(kiocb->ki_flags &IOCB_DIRECT ) || + !kiocb->ki_filp->f_op->iopoll) + goto out_fput; - kiocb->ki_complete = io_complete_rw; + req->error =0 ; + kiocb->ki_flags |=IOCB_HIPRI ; + kiocb->ki_complete = io_complete_rw_iopoll; + }else { +if (kiocb->ki_flags &IOCB_HIPRI ) { + ret = -EINVAL ; + goto out_fput; + } + kiocb->ki_complete = io_complete_rw; + }return 0 ; out_fput:fput (kiocb->ki_filp);
@@ -543,6 +755,9 @@ static int io_nop(struct io_kiocb *req, u64 user_data)struct io_ring_ctx *ctx = req->ctx;long err =0 ; +if (unlikely (ctx->flags &IORING_SETUP_IOPOLL )) +return -EINVAL ; +/* * Twilight zone - it's possible that someone issued an opcode that * has a file attached, then got -EAGAIN on submission, and changed
@@ -566,6 +781,8 @@ static int io_prep_fsync(struct io_kiocb *req, const struct io_uring_sqe *sqe)if (req->rw.ki_filp)return 0 ; +if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL )) +return -EINVAL ;if (unlikely (sqe->addr || sqe->ioprio))return -EINVAL ;
@@ -637,7 +854,22 @@ static int __io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,break ; } -return ret; +if (ret) +return ret; + +if (ctx->flags &IORING_SETUP_IOPOLL ) { +if (req->error == -EAGAIN ) +return -EAGAIN ; + +/* workqueue context doesn't hold uring_lock, grab it now */ +if (s->needs_lock) +mutex_lock (&ctx->uring_lock); +io_iopoll_req_issued (req); +if (s->needs_lock) +mutex_unlock (&ctx->uring_lock); + } + +return 0 ; }static void io_sq_wq_submit_work (struct work_struct *work)
@@ -661,8 +893,19 @@ static void io_sq_wq_submit_work(struct work_struct *work)use_mm (ctx->sqo_mm);set_fs (USER_DS ); s->has_user = true; + s->needs_lock = true; - ret =__io_submit_sqe (ctx, req, s, false); +do { + ret =__io_submit_sqe (ctx, req, s, false); +/* +* We can get EAGAIN for polled IO even though we're forcing +* a sync submission from here, since we can't wait for +* request slots on the block side. +*/ +if (ret != -EAGAIN ) +break ; +cond_resched (); + }while (1 );set_fs (old_fs);unuse_mm (ctx->sqo_mm);
@@ -793,6 +1036,8 @@ static int io_ring_submit(struct io_ring_ctx *ctx, unsigned int to_submit)break ; s.has_user = true; + s.needs_lock = false; + ret =io_submit_sqe (ctx, &s);if (ret) {io_drop_sqring (ctx);
@@ -938,6 +1183,9 @@ static void io_ring_ctx_free(struct io_ring_ctx *ctx)destroy_workqueue (ctx->sqo_wq);if (ctx->sqo_mm)mmdrop (ctx->sqo_mm); + +io_iopoll_reap_events (ctx); +#if defined(CONFIG_UNIX )if (ctx->ring_sock)sock_release (ctx->ring_sock);
@@ -984,6 +1232,7 @@ static void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx)percpu_ref_kill (&ctx->refs);mutex_unlock (&ctx->uring_lock); +io_iopoll_reap_events (ctx);wait_for_completion (&ctx->ctx_done);io_ring_ctx_free (ctx); }
@@ -1064,6 +1313,8 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit, goto out_ctx; }if (flags &IORING_ENTER_GETEVENTS ) { +unsigned nr_events =0 ; +/* * The application could have included the 'to_submit' count * in how many events it wanted to wait for. If we failed to
@@ -1073,7 +1324,13 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,if (submitted < to_submit) min_complete =min_t (unsigned, submitted, min_complete); - ret =io_cqring_wait (ctx, min_complete, sig, sigsz); +if (ctx->flags &IORING_SETUP_IOPOLL ) { +mutex_lock (&ctx->uring_lock); + ret =io_iopoll_check (ctx, &nr_events, min_complete); +mutex_unlock (&ctx->uring_lock); + }else { + ret =io_cqring_wait (ctx, min_complete, sig, sigsz); + } } out_ctx:
@@ -1270,7 +1527,7 @@ static long io_uring_setup(u32 entries, struct io_uring_params __user *params)return -EINVAL ; } -if (p.flags) +if (p.flags & ~IORING_SETUP_IOPOLL )return -EINVAL ; ret =io_uring_create (entries, &p);
include/uapi/linux/io_uring.h +5 -0
@@ -30,6 +30,11 @@ struct io_uring_sqe {__u64 __pad2[3 ]; }; +/* +* io_uring_setup() flags +*/ +#define IORING_SETUP_IOPOLL (1U << 0)/* io_context is polled */ +#define IORING_OP_NOP 0#define IORING_OP_READV 1#define IORING_OP_WRITEV 2
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 8/19 fs: add fget_many() and fput_many()
In reply to Jens AxboeSome uses cases repeatedly get and put references to the same file, but the only exposed interface is doing these one at the time. As each of these entail an atomic inc or dec on a shared structure, that cost can add up.
Add fget_many(), which works just like fget(), except it takes an argument for how many references to get on the file. Ditto fput_many(), which can drop an arbitrary number of references to a file.
--- fs/file.c | 15 ++++++++++----- fs/file_table.c | 9 +++++++-- include/linux/file.h | 2 ++ include/linux/fs.h | 4 +++- 4 files changed, 22 insertions(+), 8 deletions(-)
fs/file.c +10 -5
@@ -705,7 +705,7 @@ void do_close_on_exec(struct files_struct *files)spin_unlock (&files->file_lock); } -static struct file *__fget (unsigned int fd,fmode_t mask) +static struct file *__fget (unsigned int fd,fmode_t mask,unsigned int refs) {struct files_struct *files = current->files;struct file *file;
@@ -720,7 +720,7 @@ static struct file *__fget(unsigned int fd, fmode_t mask)*/ if (file->f_mode & mask) file =NULL ; -else if (!get_file_rcu (file)) +else if (!get_file_rcu_many (file, refs)) goto loop; }rcu_read_unlock ();
@@ -728,15 +728,20 @@ static struct file *__fget(unsigned int fd, fmode_t mask)return file; } +struct file *fget_many (unsigned int fd,unsigned int refs) +{ +return __fget (fd,FMODE_PATH , refs); +} +struct file *fget (unsigned int fd) { -return __fget (fd,FMODE_PATH ); +return __fget (fd,FMODE_PATH ,1 ); }EXPORT_SYMBOL (fget);struct file *fget_raw (unsigned int fd) { -return __fget (fd,0 ); +return __fget (fd,0 ,1 ); }EXPORT_SYMBOL (fget_raw);
@@ -767,7 +772,7 @@ static unsigned long __fget_light(unsigned int fd, fmode_t mask)return 0 ;return (unsigned long )file; }else { - file =__fget (fd, mask); + file =__fget (fd, mask,1 );if (!file)return 0 ;return FDPUT_FPUT | (unsigned long )file;
fs/file_table.c +7 -2
@@ -326,9 +326,9 @@ void flush_delayed_fput(void) static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput); -void fput (struct file *file) +void fput_many (struct file *file,unsigned int refs) { -if (atomic_long_dec_and_test (&file->f_count)) { +if (atomic_long_sub_and_test (refs, &file->f_count)) {struct task_struct *task = current;if (likely (!in_interrupt () && !(task->flags &PF_KTHREAD ))) {
@@ -347,6 +347,11 @@ void fput(struct file *file) } } +void fput (struct file *file) +{ +fput_many (file,1 ); +} +/* * synchronous analog of fput(); for kernel threads that might be needed * in some umount() (and thus can't use flush_delayed_fput() without
include/linux/file.h +2 -0
@@ -13,6 +13,7 @@struct file ;extern void fput (struct file *); +extern void fput_many (struct file *,unsigned int );struct file_operations ;struct vfsmount ;
@@ -44,6 +45,7 @@ static inline void fdput(struct fd fd) }extern struct file *fget (unsigned int fd); +extern struct file *fget_many (unsigned int fd,unsigned int refs);extern struct file *fget_raw (unsigned int fd);extern unsigned long __fdget (unsigned int fd);extern unsigned long __fdget_raw (unsigned int fd);
include/linux/fs.h +3 -1
@@ -952,7 +952,9 @@ static inline struct file *get_file(struct file *f)atomic_long_inc (&f->f_count);return f; } -#define get_file_rcu (x) atomic_long_inc_not_zero(&(x)->f_count) +#define get_file_rcu_many (x, cnt) \ + atomic_long_add_unless(&(x)->f_count, (cnt), 0) +#define get_file_rcu (x) get_file_rcu_many((x), 1)#define fput_atomic (x) atomic_long_add_unless(&(x)->f_count, -1, 1)#define file_count (x) atomic_long_read(&(x)->f_count)
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 9/19 io_uring: use fget/fput_many() for file references
In reply to Jens AxboeAdd a separate io_submit_state structure, to cache some of the things we need for IO submission.
One such example is file reference batching. io_submit_state. We get as many references as the number of sqes we are submitting, and drop unused ones if we end up switching files. The assumption here is that we're usually only dealing with one fd, and if there are multiple, hopefuly they are at least somewhat ordered. Could trivially be extended to cover multiple fds, if needed.
On the completion side we do the same thing, except this is trivially done just locally in io_iopoll_reap().
--- fs/io_uring.c | 142 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 121 insertions(+), 21 deletions(-)
fs/io_uring.c +121 -21
@@ -165,6 +165,19 @@ struct io_kiocb {#define IO_PLUG_THRESHOLD 2#define IO_IOPOLL_BATCH 8 +struct io_submit_state { +struct blk_plug plug; + +/* +* File reference cache +*/ +struct file *file; +unsigned int fd; +unsigned int has_refs; +unsigned int used_refs; +unsigned int ios_left; +}; +static struct kmem_cache *req_cachep;static const struct file_operations io_uring_fops;
@@ -332,9 +345,11 @@ static void io_iopoll_complete(struct io_ring_ctx *ctx, unsigned int *nr_events, struct list_head *done) {void *reqs[IO_IOPOLL_BATCH ]; +int file_count, to_free; +struct file *file =NULL ;struct io_kiocb *req; -int to_free =0 ; + file_count = to_free =0 ;while (!list_empty (done)) { req = list_first_entry(done, struct io_kiocb, list);list_del (&req->list);
@@ -344,12 +359,28 @@ static void io_iopoll_complete(struct io_ring_ctx *ctx, unsigned int *nr_events, reqs[to_free++] = req; (*nr_events)++; -fput (req->rw.ki_filp); +/* +* Batched puts of the same file, to avoid dirtying the +* file usage count multiple times, if avoidable. +*/ +if (!file) { + file = req->rw.ki_filp; + file_count =1 ; + }else if (file == req->rw.ki_filp) { + file_count++; + }else { +fput_many (file, file_count); + file = req->rw.ki_filp; + file_count =1 ; + } +if (to_free ==ARRAY_SIZE (reqs))io_free_req_many (ctx, reqs, &to_free); }io_commit_cqring (ctx); +if (file) +fput_many (file, file_count);io_free_req_many (ctx, reqs, &to_free); }
@@ -530,6 +561,48 @@ static void io_iopoll_req_issued(struct io_kiocb *req)list_add_tail (&req->list, &ctx->poll_list); } +static void io_file_put (struct io_submit_state *state,struct file *file) +{ +if (!state) { +fput (file); + }else if (state->file) { +int diff = state->has_refs - state->used_refs; + +if (diff) +fput_many (state->file, diff); + state->file =NULL ; + } +} + +/* +* Get as many references to a file as we have IOs left in this submission, +* assuming most submissions are for one file, or at least that each file +* has more than one submission. +*/ +static struct file *io_file_get (struct io_submit_state *state,int fd) +{ +if (!state) +return fget (fd); + +if (state->file) { +if (state->fd == fd) { + state->used_refs++; + state->ios_left--; +return state->file; + } +io_file_put (state,NULL ); + } + state->file =fget_many (fd, state->ios_left); +if (!state->file) +return NULL ; + + state->fd = fd; + state->has_refs = state->ios_left; + state->used_refs =1 ; + state->ios_left--; +return state->file; +} +/* * If we tracked the file through the SCM inflight mechanism, we could support * any file. For now, just ensure that anything potentially problematic is done
@@ -548,7 +621,7 @@ static bool io_file_supports_async(struct file *file) }static int io_prep_rw (struct io_kiocb *req,const struct io_uring_sqe *sqe, -bool force_nonblock) +bool force_nonblock,struct io_submit_state *state) {struct io_ring_ctx *ctx = req->ctx;struct kiocb *kiocb = &req->rw;
@@ -560,7 +633,7 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe,return 0 ; fd =READ_ONCE (sqe->fd); - kiocb->ki_filp =fget (fd); + kiocb->ki_filp =io_file_get (state, fd);if (unlikely (!kiocb->ki_filp))return -EBADF ;if (force_nonblock && !io_file_supports_async (kiocb->ki_filp))
@@ -604,7 +677,10 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, }return 0 ; out_fput: -fput (kiocb->ki_filp); +/* in case of error, we didn't use this file reference. drop it. */ +if (state) + state->used_refs--; +io_file_put (state, kiocb->ki_filp);return ret; }
@@ -650,7 +726,7 @@ static int io_import_iovec(struct io_ring_ctx *ctx, int rw, }static ssize_t io_read (struct io_kiocb *req,const struct sqe_submit *s, -bool force_nonblock) +bool force_nonblock,struct io_submit_state *state) {struct iovec inline_vecs[UIO_FASTIOV ], *iovec = inline_vecs;struct kiocb *kiocb = &req->rw;
@@ -658,7 +734,7 @@ static ssize_t io_read(struct io_kiocb *req, const struct sqe_submit *s,struct file *file;ssize_t ret; - ret =io_prep_rw (req, s->sqe, force_nonblock); + ret =io_prep_rw (req, s->sqe, force_nonblock, state);if (ret)return ret; file = kiocb->ki_filp;
@@ -694,7 +770,7 @@ static ssize_t io_read(struct io_kiocb *req, const struct sqe_submit *s, }static ssize_t io_write (struct io_kiocb *req,const struct sqe_submit *s, -bool force_nonblock) +bool force_nonblock,struct io_submit_state *state) {struct iovec inline_vecs[UIO_FASTIOV ], *iovec = inline_vecs;struct kiocb *kiocb = &req->rw;
@@ -702,7 +778,7 @@ static ssize_t io_write(struct io_kiocb *req, const struct sqe_submit *s,struct file *file;ssize_t ret; - ret =io_prep_rw (req, s->sqe, force_nonblock); + ret =io_prep_rw (req, s->sqe, force_nonblock, state);if (ret)return ret;/* Hold on to the file for -EAGAIN */
@@ -826,7 +902,8 @@ static int io_fsync(struct io_kiocb *req, const struct io_uring_sqe *sqe, }static int __io_submit_sqe (struct io_ring_ctx *ctx,struct io_kiocb *req, -const struct sqe_submit *s,bool force_nonblock) +const struct sqe_submit *s,bool force_nonblock, +struct io_submit_state *state) {ssize_t ret;int opcode;
@@ -841,10 +918,10 @@ static int __io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, ret =io_nop (req, req->user_data);break ;case IORING_OP_READV : - ret =io_read (req, s, force_nonblock); + ret =io_read (req, s, force_nonblock, state);break ;case IORING_OP_WRITEV : - ret =io_write (req, s, force_nonblock); + ret =io_write (req, s, force_nonblock, state);break ;case IORING_OP_FSYNC : ret =io_fsync (req, s->sqe, force_nonblock);
@@ -896,7 +973,7 @@ static void io_sq_wq_submit_work(struct work_struct *work) s->needs_lock = true; do { - ret = __io_submit_sqe(ctx, req, s, false); + ret = __io_submit_sqe(ctx, req, s, false, NULL); /* * We can get EAGAIN for polled IO even though we're forcing * a sync submission from here, since we can't wait for
@@ -920,7 +997,8 @@ static void io_sq_wq_submit_work(struct work_struct *work)kfree (sqe); } -static int io_submit_sqe (struct io_ring_ctx *ctx,struct sqe_submit *s) +static int io_submit_sqe (struct io_ring_ctx *ctx,struct sqe_submit *s, +struct io_submit_state *state) {struct io_kiocb *req;ssize_t ret;
@@ -935,7 +1013,7 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct sqe_submit *s) req->rw.ki_filp =NULL ; - ret =__io_submit_sqe (ctx, req, s, true); + ret =__io_submit_sqe (ctx, req, s, true, state);if (ret == -EAGAIN ) {struct io_uring_sqe *sqe_copy;
@@ -956,6 +1034,26 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct sqe_submit *s)return ret; } +/* +* Batched submission is done, ensure local IO is flushed out. +*/ +static void io_submit_state_end (struct io_submit_state *state) +{ +blk_finish_plug (&state->plug); +io_file_put (state,NULL ); +} + +/* +* Start submission side cache. +*/ +static void io_submit_state_start (struct io_submit_state *state, +struct io_ring_ctx *ctx,unsigned max_ios) +{ +blk_start_plug (&state->plug); + state->file =NULL ; + state->ios_left = max_ios; +} +static void io_commit_sqring (struct io_ring_ctx *ctx) {struct io_sq_ring *ring = ctx->sq_ring;
@@ -1023,11 +1121,13 @@ static bool io_get_sqring(struct io_ring_ctx *ctx, struct sqe_submit *s)static int io_ring_submit (struct io_ring_ctx *ctx,unsigned int to_submit) { +struct io_submit_state state, *statep =NULL ;int i, ret =0 , submit =0 ; -struct blk_plug plug; -if (to_submit >IO_PLUG_THRESHOLD ) -blk_start_plug (&plug); +if (to_submit >IO_PLUG_THRESHOLD ) { +io_submit_state_start (&state, ctx, to_submit); + statep = &state; + }for (i =0 ; i < to_submit; i++) {struct sqe_submit s;
@@ -1038,7 +1138,7 @@ static int io_ring_submit(struct io_ring_ctx *ctx, unsigned int to_submit) s.has_user = true; s.needs_lock = false; - ret =io_submit_sqe (ctx, &s); + ret =io_submit_sqe (ctx, &s, statep);if (ret) {io_drop_sqring (ctx);break ;
@@ -1048,8 +1148,8 @@ static int io_ring_submit(struct io_ring_ctx *ctx, unsigned int to_submit) }io_commit_sqring (ctx); -if (to_submit >IO_PLUG_THRESHOLD ) -blk_finish_plug (&plug); +if (statep) +io_submit_state_end (statep);return submit ? submit : ret; }
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 10/19 io_uring: batch io_kiocb allocation
In reply to Jens AxboeSimilarly to how we use the state->ios_left to know how many references to get to a file, we can use it to allocate the io_kiocb's we need in bulk.
--- fs/io_uring.c | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-)
fs/io_uring.c +38 -7
@@ -168,6 +168,13 @@ struct io_kiocb {struct io_submit_state {struct blk_plug plug; +/* +* io_kiocb alloc cache +*/ +void *reqs[IO_IOPOLL_BATCH ]; +unsigned int free_reqs; +unsigned int cur_req; +/* * File reference cache */
@@ -305,20 +312,40 @@ static void io_ring_drop_ctx_refs(struct io_ring_ctx *ctx, unsigned refs)wake_up (&ctx->wait); } -static struct io_kiocb *io_get_req (struct io_ring_ctx *ctx) +static struct io_kiocb *io_get_req (struct io_ring_ctx *ctx, +struct io_submit_state *state) {struct io_kiocb *req;if (!percpu_ref_tryget (&ctx->refs))return NULL ; - req =kmem_cache_alloc (req_cachep, __GFP_NOWARN); -if (req) { - req->ctx = ctx; - req->flags =0 ; -return req; +if (!state) { + req =kmem_cache_alloc (req_cachep, __GFP_NOWARN); +if (unlikely (!req)) + goto out; + }else if (!state->free_reqs) { +size_t sz; +int ret; + + sz =min_t (size_t, state->ios_left,ARRAY_SIZE (state->reqs)); + ret =kmem_cache_alloc_bulk (req_cachep, __GFP_NOWARN, sz, + state->reqs); +if (unlikely (ret <=0 )) + goto out; + state->free_reqs = ret -1 ; + state->cur_req =1 ; + req = state->reqs[0 ]; + }else { + req = state->reqs[state->cur_req]; + state->free_reqs--; + state->cur_req++; } + req->ctx = ctx; + req->flags =0 ; +return req; +out:io_ring_drop_ctx_refs (ctx,1 );return NULL ; }
@@ -1007,7 +1034,7 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct sqe_submit *s,if (unlikely (s->sqe->flags))return -EINVAL ; - req =io_get_req (ctx); + req =io_get_req (ctx, state);if (unlikely (!req))return -EAGAIN ;
@@ -1041,6 +1068,9 @@ static void io_submit_state_end(struct io_submit_state *state) {blk_finish_plug (&state->plug);io_file_put (state,NULL ); +if (state->free_reqs) +kmem_cache_free_bulk (req_cachep, state->free_reqs, + &state->reqs[state->cur_req]); }/*
@@ -1050,6 +1080,7 @@ static void io_submit_state_start(struct io_submit_state *state, struct io_ring_ctx *ctx, unsigned max_ios) {blk_start_plug (&state->plug); + state->free_reqs =0 ; state->file =NULL ; state->ios_left = max_ios; }
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 11/19 block: implement bio helper to add iter bvec pages to bio
In reply to Jens AxboeFor an ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add a BIO_NO_PAGE_REF flag for that.
The current two callers of bio_iov_iter_get_pages() are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.
--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)
block/bio.c +49 -10
@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page); +static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset); +if (size == len) { +iov_iter_advance (iter, size); +return 0 ; + } + +return -EINVAL ; +} +#define PAGE_PTRS_PER_BVEC (sizeof(struct bio_vec) / sizeof(struct page *))/**
@@ -876,23 +893,43 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) }/** -* bio_iov_iter_get_pages - pin user or kernel pages and add them to a bio +* bio_iov_iter_get_pages - add user or kernel pages to a bio * @bio: bio to add pages to -* @iter: iov iterator describing the region to be mapped +* @iter: iov iterator describing the region to be added +* +* This takes either an iterator pointing to user memory, or one pointing to +* kernel pages (BVEC iterator). If we're adding user pages, we pin them and +* map them into the kernel. On IO completion, the caller should put those +* pages. If we're adding kernel pages, we just have to add the pages to the +* bio directly. We don't grab an extra reference to those pages (the user +* should already have that), and we don't put the page on IO completion. +* The caller needs to check if the bio is flagged BIO_NO_PAGE_REF on IO +* completion. If it isn't, then pages should be released. * -* Pins pages from *iter and appends them to @bio's bvec array. The -* pages will have to be released using put_page() when done. * The function tries, but does not guarantee, to pin as many pages as -* fit into the bio, or are requested in *iter, whatever is smaller. -* If MM encounters an error pinning the requested pages, it stops. -* Error is returned only if 0 pages could be pinned. +* fit into the bio, or are requested in *iter, whatever is smaller. If +* MM encounters an error pinning the requested pages, it stops. Error +* is returned only if 0 pages could be pinned. */ int bio_iov_iter_get_pages (struct bio *bio,struct iov_iter *iter) { +const bool is_bvec =iov_iter_is_bvec (iter);unsigned short orig_vcnt = bio->bi_vcnt; +/* +* If this is a BVEC iter, then the pages are kernel pages. Don't +* release them on IO completion. +*/ +if (is_bvec) +bio_set_flag (bio,BIO_NO_PAGE_REF ); + do { - int ret = __bio_iov_iter_get_pages(bio, iter); + int ret; + + if (is_bvec) + ret = __bio_iov_bvec_add_pages(bio, iter); + else + ret = __bio_iov_iter_get_pages(bio, iter); if (unlikely(ret)) return bio->bi_vcnt > orig_vcnt ? 0 : ret;
@@ -1634,7 +1671,8 @@ static void bio_dirty_fn(struct work_struct *work) next = bio->bi_private;bio_set_pages_dirty (bio); -bio_release_pages (bio); +if (!bio_flagged (bio,BIO_NO_PAGE_REF )) +bio_release_pages (bio);bio_put (bio); } }
@@ -1650,7 +1688,8 @@ void bio_check_pages_dirty(struct bio *bio) goto defer; } -bio_release_pages (bio); +if (!bio_flagged (bio,BIO_NO_PAGE_REF )) +bio_release_pages (bio);bio_put (bio);return ; defer:
fs/block_dev.c +3 -2
@@ -338,8 +338,9 @@ static void blkdev_bio_end_io(struct bio *bio)struct bio_vec *bvec;int i; -bio_for_each_segment_all (bvec, bio, i) -put_page (bvec->bv_page); +if (!bio_flagged (bio,BIO_NO_PAGE_REF )) +bio_for_each_segment_all (bvec, bio, i) +put_page (bvec->bv_page);bio_put (bio); } }
fs/iomap.c +3 -2
@@ -1591,8 +1591,9 @@ static void iomap_dio_bio_end_io(struct bio *bio)struct bio_vec *bvec;int i; -bio_for_each_segment_all (bvec, bio, i) -put_page (bvec->bv_page); +if (!bio_flagged (bio,BIO_NO_PAGE_REF )) +bio_for_each_segment_all (bvec, bio, i) +put_page (bvec->bv_page);bio_put (bio); } }
include/linux/blk_types.h +1 -0
@@ -215,6 +215,7 @@ struct bio {/* * bio flags */ +#define BIO_NO_PAGE_REF 0/* don't put release vec pages */ #define BIO_SEG_VALID 1/* bi_phys_segments valid */ #define BIO_CLONED 2/* doesn't own data */ #define BIO_BOUNCED 3/* bio is a bounce bio */
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 25 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 10 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offset needs to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.
Another interesting thing is that bio_add_page() is capable of adding multi contiguous pages actually, especially loop uses ITER_BVEC to pass multi-page bvecs. Even though pages in loop's ITER_BVEC may belong to user-space, looks it is still safe to not grab the page ref given it has been done by fs.
[1]
block/bio.c +4 -1
@@ -842,7 +842,10 @@ static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)unsigned int len;size_t size; - len =min_t (size_t, bv->bv_len, iter->count); +if (WARN_ON_ONCE (iter->iov_offset > bv->bv_len)) +return -EINVAL ; + + len =min_t (size_t, bv->bv_len - iter->iov_offset, iter->count); size =bio_add_page (bio, bv->bv_page, len, bv->bv_offset + iter->iov_offset);if (size == len) {
Thanks,
Ming
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);
Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.
Thanks, I folded this in.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.
Quoted 5 lines
Thanks, I folded this in.
Signature · 1 line
Jens Axboe
syzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit a566653ab5ab80a from your io_uring branch with commit date Sun Feb 24 08:20:53 2019 -0700.
Reproducer:
#define _GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>
int main(void)
{
int memfd, loopfd;
memfd = syscall(__NR_memfd_create, "foo", 0);
pwrite(memfd, "\xa8", 1, 4096);
loopfd = open("/dev/loop0", O_RDWR|O_DIRECT);
ioctl(loopfd, LOOP_SET_FD, memfd);
sendfile(loopfd, loopfd, NULL, 1000000);
}Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()
raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0) ------------[ cut here ]------------ kernel BUG at include/linux/mm.h:546! invalid opcode: 0000 [#1] SMP CPU: 1 PID: 173 Comm: syz_mm Not tainted 5.0.0-rc6-00007-ga566653ab5ab8 #22 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-20181126_142135-anatol 04/01/2014 RIP: 0010:put_page_testzero include/linux/mm.h:546 [inline] RIP: 0010:put_page include/linux/mm.h:992 [inline] RIP: 0010:generic_pipe_buf_release+0x37/0x40 fs/pipe.c:225 Code: 50 ff a8 01 48 0f 45 fa 8b 47 34 85 c0 74 0f f0 ff 4f 34 74 02 5d c3 e8 c7 1b fa ff 5d c3 48 c7 c6 60 aa b1 81 e8 59 25 fc ff <0f> 0b 0f 1f 80 00 00 00 00 55 48 89 e5 41 56 41 55 41 54 53 e8 a0 RSP: 0018:ffffc90000783cb0 EFLAGS: 00010246 RAX: 000000000000003e RBX: ffff88807c358800 RCX: 0000000000000006 RDX: 0000000000000000 RSI: 0000000000000001 RDI: ffff88807fc95420 RBP: ffffc90000783cb0 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000001000 R13: 0000000000001000 R14: 0000000000000000 R15: ffff88807c0b6e00 FS: 00007fd858adb240(0000) GS:ffff88807fc80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055dc13859000 CR3: 000000007a96b000 CR4: 00000000003406e0 Call Trace: pipe_buf_release include/linux/pipe_fs_i.h:136 [inline] iter_file_splice_write+0x2df/0x3f0 fs/splice.c:763 do_splice_from fs/splice.c:851 [inline] direct_splice_actor+0x31/0x40 fs/splice.c:1023 splice_direct_to_actor+0xff/0x240 fs/splice.c:978 do_splice_direct+0x92/0xc0 fs/splice.c:1066 do_sendfile+0x1be/0x390 fs/read_write.c:1436 __do_sys_sendfile64 fs/read_write.c:1497 [inline] __se_sys_sendfile64+0xa6/0xc0 fs/read_write.c:1483 __x64_sys_sendfile64+0x19/0x20 fs/read_write.c:1483 do_syscall_64+0x4a/0x180 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x7fd858bd224e Code: 89 ce 5b e9 b4 fd ff ff 0f 1f 40 00 31 c0 5b c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 f3 0f 1e fa 49 89 ca b8 28 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d e2 cb 0c 00 f7 d8 64 89 01 48 RSP: 002b:00007fffc517d148 EFLAGS: 00000206 ORIG_RAX: 0000000000000028 RAX: ffffffffffffffda RBX: 0000000000000004 RCX: 00007fd858bd224e RDX: 0000000000000000 RSI: 0000000000000004 RDI: 0000000000000004 RBP: 0000000000000003 R08: 00007fd858ca0be0 R09: 00007fffc517d240 R10: 00000000000f4240 R11: 0000000000000206 R12: 000055dc13858100 R13: 00007fffc517d240 R14: 0000000000000000 R15: 0000000000000000 ---[ end trace 1d878656972e4a26 ]--- RIP: 0010:put_page_testzero include/linux/mm.h:546 [inline] RIP: 0010:put_page include/linux/mm.h:992 [inline] RIP: 0010:generic_pipe_buf_release+0x37/0x40 fs/pipe.c:225 Code: 50 ff a8 01 48 0f 45 fa 8b 47 34 85 c0 74 0f f0 ff 4f 34 74 02 5d c3 e8 c7 1b fa ff 5d c3 48 c7 c6 60 aa b1 81 e8 59 25 fc ff <0f> 0b 0f 1f 80 00 00 00 00 55 48 89 e5 41 56 41 55 41 54 53 e8 a0 RSP: 0018:ffffc90000783cb0 EFLAGS: 00010246 RAX: 000000000000003e RBX: ffff88807c358800 RCX: 0000000000000006 RDX: 0000000000000000 RSI: 0000000000000001 RDI: ffff88807fc95420 RBP: ffffc90000783cb0 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000001000 R13: 0000000000001000 R14: 0000000000000000 R15: ffff88807c0b6e00 FS: 00007fd858adb240(0000) GS:ffff88807fc80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055dc13859000 CR3: 000000007a96b000 CR4: 00000000003406e0
- Eric
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 82 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
Signature · 1 line
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }
Quoted 7 lines
Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)
I see what this is, I'll cut a fix for this tomorrow.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 85 lines · Jens Axboe
Quoted 84 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
Signature · 1 line
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
Quoted 7 lines
Quoted 5 lines
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current io_uring branch and my for-next branch.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)
Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.
Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normal O_DIRECT case, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ * bio_release_pages() at IO completion time.
+ */
+ get_page(bv->bv_page);
Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
struct bvec_iter_all iter_all;
struct bio_vec *tmp;
mp_bvec_for_each_segment(tmp, bv, i, iter_all)
get_page(tmp->bv_page);
Thanks,
Ming Lei
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 118 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
Quoted 6 lines
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);
I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Thanks,
Ming
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like bio_for_each_bvec() and indexing through nth_page() is MUCH slower than before.
We need to do something about this, it's like tossing out months of optimizations.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 10 lines · Jens Axboe
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.We need to do something about this, it's like tossing out months of optimizations.
See attached quick profile. This is doing 4k IOS, btw, so just single segment requests. Yet we spend most of the time in blk_rq_map_sg(), and blk_queue_split() is not far behind. Between just the two of them, that's more than 8% of the total CPU utilization. As this test case is running on just one CPU for all of it, that's a LOT of wasted time.
Signature · 1 line
Jens Axboe
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
In reply to Jens AxboeQuoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.
But bio_for_each_bvec() needn't nth_page(), and only bio_for_each_segment() needs that. However, bio_for_each_segment() isn't called from blk_queue_split() and blk_rq_map_sg().
One issue is that bio_for_each_bvec() still advances by page size instead of bvec->len, I guess that is the problem, will cook a patch for your test.
Quoted 3 lines
We need to do something about this, it's like tossing out months of optimizations.
Some following optimization can be done, such as removing biovec_phys_mergeable() from blk_bio_segment_split().
Thanks,
Ming
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 142 lines · Ming Lei
Quoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.
Quoted 7 lines
But
bio_for_each_bvec()needn'tnth_page(), and onlybio_for_each_segment()needs that. However,bio_for_each_segment()isn't called fromblk_queue_split()andblk_rq_map_sg().One issue is that
bio_for_each_bvec()still advances by page size instead ofbvec->len, I guess that is the problem, will cook a patch for your test.
Probably won't make a difference for my test case...
Quoted 5 lines
Quoted 2 lines
We need to do something about this, it's like tossing out months of optimizations.
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().
I think we really need a fast path for <= PAGE_SIZE IOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.
5% regressions is HUGE. I know I've mentioned this before, I just want to really stress how big of a deal that is. It's enough to make me consider just reverting it again, which sucks, but I don't feel great shipping something that is known that much slower.
Suggestions?
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 164 lines · Jens Axboe
Quoted 142 lines · Ming Lei
Quoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.Quoted 7 lines
But
bio_for_each_bvec()needn'tnth_page(), and onlybio_for_each_segment()needs that. However,bio_for_each_segment()isn't called fromblk_queue_split()andblk_rq_map_sg().One issue is that
bio_for_each_bvec()still advances by page size instead ofbvec->len, I guess that is the problem, will cook a patch for your test.Probably won't make a difference for my test case...
Quoted 5 lines
Quoted 2 lines
We need to do something about this, it's like tossing out months of optimizations.
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().I think we really need a fast path for <=
PAGE_SIZEIOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.
Quoted 6 lines
5% regressions is HUGE. I know I've mentioned this before, I just want to really stress how big of a deal that is. It's enough to make me consider just reverting it again, which sucks, but I don't feel great shipping something that is known that much slower.
Suggestions?
You mentioned nth_page() costs much in bio_for_each_bvec(), but which shouldn't call into nth_page(). I will look into it first.
Thanks,
Ming
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 170 lines · Ming Lei
Quoted 169 lines · Jens Axboe
Quoted 142 lines · Ming Lei
Quoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an ITER_BVEC, we can just iterate the iov and add the pages
to the bio directly. This requires that the caller doesn't releases
the pages on IO completion, we add a BIO_NO_PAGE_REF flag for that.The current two callers of bio_iov_iter_get_pages() are updated to
check if they need to release pages on completion. This makes them
work with bvecs that contain kernel mapped pages already.Reviewed-by: Hannes Reinecke <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
---
block/bio.c | 59 ++++++++++++++++++++++++++++++++-------
fs/block_dev.c | 5 ++--
fs/iomap.c | 5 ++--
include/linux/blk_types.h | 1 +
4 files changed, 56 insertions(+), 14 deletions(-)diff --git a/block/bio.c b/block/bio.c
index 4db1008309ed..330df572cfb8 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page,
}
EXPORT_SYMBOL(bio_add_page);Quoted 13 lines
Quoted 9 lines
+static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
+{
+ const struct bio_vec *bv = iter->bvec;
+ unsigned int len;
+ size_t size;
+
+ len = min_t(size_t, bv->bv_len, iter->count);
+ size = bio_add_page(bio, bv->bv_page, len,
+ bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.Quoted 7 lines
But
bio_for_each_bvec()needn'tnth_page(), and onlybio_for_each_segment()needs that. However,bio_for_each_segment()isn't called fromblk_queue_split()andblk_rq_map_sg().One issue is that
bio_for_each_bvec()still advances by page size instead ofbvec->len, I guess that is the problem, will cook a patch for your test.Probably won't make a difference for my test case...
Quoted 5 lines
Quoted 2 lines
We need to do something about this, it's like tossing out months of optimizations.
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().I think we really need a fast path for <=
PAGE_SIZEIOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.5% regressions is HUGE. I know I've mentioned this before, I just want to really stress how big of a deal that is. It's enough to make me consider just reverting it again, which sucks, but I don't feel great shipping something that is known that much slower.
Quoted 4 lines
Quoted 1 line
Suggestions?
You mentioned
nth_page()costs much inbio_for_each_bvec(), but which shouldn't call intonth_page(). I will look into it first.
I'll check on the test box tomorrow, I lost connectivity before. I'll double check in the morning.
I'd focus on the blk_rq_map_sg() path, since that's the biggest cycle consumer.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 173 lines · Jens Axboe
Quoted 172 lines · Ming Lei
Quoted 170 lines · Jens Axboe
Quoted 142 lines · Ming Lei
Quoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 40 lines · Ming Lei
On Mon, Feb 11, 2019 at 12:00:41PM -0700, Jens Axboe wrote:
For an ITER_BVEC, we can just iterate the iov and add the pages
to the bio directly. This requires that the caller doesn't releases
the pages on IO completion, we add a BIO_NO_PAGE_REF flag for that.The current two callers of bio_iov_iter_get_pages() are updated to
check if they need to release pages on completion. This makes them
work with bvecs that contain kernel mapped pages already.Reviewed-by: Hannes Reinecke <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
---
block/bio.c | 59 ++++++++++++++++++++++++++++++++-------
fs/block_dev.c | 5 ++--
fs/iomap.c | 5 ++--
include/linux/blk_types.h | 1 +
4 files changed, 56 insertions(+), 14 deletions(-)diff --git a/block/bio.c b/block/bio.c
index 4db1008309ed..330df572cfb8 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page,
}
EXPORT_SYMBOL(bio_add_page);+static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
+{
+ const struct bio_vec *bv = iter->bvec;
+ unsigned int len;
+ size_t size;
+
+ len = min_t(size_t, bv->bv_len, iter->count);
+ size = bio_add_page(bio, bv->bv_page, len,
+ bv->bv_offset + iter->iov_offset);iter->iov_offset needs to be subtracted from 'len', looks
the following delta change[1] is required, otherwise memory corruption
can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.Quoted 7 lines
But
bio_for_each_bvec()needn'tnth_page(), and onlybio_for_each_segment()needs that. However,bio_for_each_segment()isn't called fromblk_queue_split()andblk_rq_map_sg().One issue is that
bio_for_each_bvec()still advances by page size instead ofbvec->len, I guess that is the problem, will cook a patch for your test.Probably won't make a difference for my test case...
Quoted 5 lines
Quoted 2 lines
We need to do something about this, it's like tossing out months of optimizations.
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().I think we really need a fast path for <=
PAGE_SIZEIOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.5% regressions is HUGE. I know I've mentioned this before, I just want to really stress how big of a deal that is. It's enough to make me consider just reverting it again, which sucks, but I don't feel great shipping something that is known that much slower.
Suggestions?
Quoted 8 lines
Quoted 2 lines
You mentioned
nth_page()costs much inbio_for_each_bvec(), but which shouldn't call intonth_page(). I will look into it first.I'll check on the test box tomorrow, I lost connectivity before. I'll double check in the morning.
I'd focus on the
blk_rq_map_sg()path, since that's the biggest cycle consumer.
Hi Jens,
Could you test the following patch which may improve on the 4k randio test case?
block/blk-merge.c +8 -3
@@ -447,7 +447,7 @@ static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,return biovec_phys_mergeable (q, &end_bv, &nxt_bv); } -static struct scatterlist *blk_next_sg (struct scatterlist **sg, +static inline struct scatterlist *blk_next_sg (struct scatterlist **sg,struct scatterlist *sglist) {if (!*sg)
@@ -483,7 +483,7 @@ static unsigned blk_bvec_map_sg(struct request_queue *q, offset = (total + bvec->bv_offset) %PAGE_SIZE ; idx = (total + bvec->bv_offset) /PAGE_SIZE ; - pg =nth_page (bvec->bv_page, idx); + pg =bvec_nth_page (bvec->bv_page, idx);sg_set_page (*sg, pg, seg_size, offset);
@@ -512,7 +512,12 @@ __blk_segment_map_sg(struct request_queue *q, struct bio_vec *bvec, (*sg)->length += nbytes; }else { new_segment: - (*nsegs) +=blk_bvec_map_sg (q, bvec, sglist, sg); +if (bvec->bv_offset + bvec->bv_len <=PAGE_SIZE ) { + *sg =blk_next_sg (sg, sglist); +sg_set_page (*sg, bvec->bv_page, nbytes, bvec->bv_offset); + (*nsegs) +=1 ; + }else + (*nsegs) +=blk_bvec_map_sg (q, bvec, sglist, sg); } *bvprv = *bvec; }
include/linux/bvec.h +8 -3
@@ -51,6 +51,11 @@ struct bvec_iter_all {unsigned done; }; +static inline struct page *bvec_nth_page (struct page *page,int idx) +{ +return idx ==0 ? page :nth_page (page, idx); +} +/* * various member access, note that bio_data should of course not be used * on highmem page vectors
@@ -87,8 +92,8 @@ struct bvec_iter_all { PAGE_SIZE - bvec_iter_offset((bvec), (iter)))#define bvec_iter_page (bvec, iter) \ - nth_page(mp_bvec_iter_page((bvec), (iter)), \ - mp_bvec_iter_page_idx((bvec), (iter))) + bvec_nth_page(mp_bvec_iter_page((bvec), (iter)), \ + mp_bvec_iter_page_idx((bvec), (iter)))#define bvec_iter_bvec (bvec, iter) \ ((struct bio_vec) { \
@@ -171,7 +176,7 @@ static inline void mp_bvec_last_segment(const struct bio_vec *bvec,unsigned total = bvec->bv_offset + bvec->bv_len;unsigned last_page = (total -1 ) /PAGE_SIZE ; - seg->bv_page =nth_page (bvec->bv_page, last_page); + seg->bv_page =bvec_nth_page (bvec->bv_page, last_page);/* the whole segment is inside the last page */ if (bvec->bv_offset >= last_page *PAGE_SIZE ) {
thanks,
Ming
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 180 lines · Ming Lei
Quoted 179 lines · Jens Axboe
Quoted 170 lines · Ming Lei
Quoted 169 lines · Jens Axboe
Quoted 142 lines · Ming Lei
Quoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 47 lines · Jens Axboe
On 2/20/19 3:58 PM, Ming Lei wrote:
On Mon, Feb 11, 2019 at 12:00:41PM -0700, Jens Axboe wrote:
For an ITER_BVEC, we can just iterate the iov and add the pages
to the bio directly. This requires that the caller doesn't releases
the pages on IO completion, we add a BIO_NO_PAGE_REF flag for that.The current two callers of bio_iov_iter_get_pages() are updated to
check if they need to release pages on completion. This makes them
work with bvecs that contain kernel mapped pages already.Reviewed-by: Hannes Reinecke <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
---
block/bio.c | 59 ++++++++++++++++++++++++++++++++-------
fs/block_dev.c | 5 ++--
fs/iomap.c | 5 ++--
include/linux/blk_types.h | 1 +
4 files changed, 56 insertions(+), 14 deletions(-)diff --git a/block/bio.c b/block/bio.c
index 4db1008309ed..330df572cfb8 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page,
}
EXPORT_SYMBOL(bio_add_page);+static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
+{
+ const struct bio_vec *bv = iter->bvec;
+ unsigned int len;
+ size_t size;
+
+ len = min_t(size_t, bv->bv_len, iter->count);
+ size = bio_add_page(bio, bv->bv_page, len,
+ bv->bv_offset + iter->iov_offset);iter->iov_offset needs to be subtracted from 'len', looks
the following delta change[1] is required, otherwise memory corruption
can be observed when running xfstests over loop/dio.Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.Quoted 7 lines
But
bio_for_each_bvec()needn'tnth_page(), and onlybio_for_each_segment()needs that. However,bio_for_each_segment()isn't called fromblk_queue_split()andblk_rq_map_sg().One issue is that
bio_for_each_bvec()still advances by page size instead ofbvec->len, I guess that is the problem, will cook a patch for your test.Probably won't make a difference for my test case...
Quoted 5 lines
Quoted 2 lines
We need to do something about this, it's like tossing out months of optimizations.
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().I think we really need a fast path for <=
PAGE_SIZEIOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.5% regressions is HUGE. I know I've mentioned this before, I just want to really stress how big of a deal that is. It's enough to make me consider just reverting it again, which sucks, but I don't feel great shipping something that is known that much slower.
Quoted 4 lines
Quoted 1 line
Suggestions?
You mentioned
nth_page()costs much inbio_for_each_bvec(), but which shouldn't call intonth_page(). I will look into it first.I'll check on the test box tomorrow, I lost connectivity before. I'll double check in the morning.
Quoted 7 lines
Quoted 2 lines
I'd focus on the
blk_rq_map_sg()path, since that's the biggest cycle consumer.Hi Jens,
Could you test the following patch which may improve on the 4k randio test case?
A bit, it's up 1% with this patch. I'm going to try without the get_page/put_page that we had earlier, to see where we are in regards to the old baseline.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 184 lines · Jens Axboe
Quoted 183 lines · Ming Lei
Quoted 181 lines · Jens Axboe
Quoted 170 lines · Ming Lei
Quoted 169 lines · Jens Axboe
Quoted 142 lines · Ming Lei
Quoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
On Thu, Feb 21, 2019 at 10:45:27AM -0700, Jens Axboe wrote:
On 2/20/19 3:58 PM, Ming Lei wrote:
On Mon, Feb 11, 2019 at 12:00:41PM -0700, Jens Axboe wrote:
For an ITER_BVEC, we can just iterate the iov and add the pages
to the bio directly. This requires that the caller doesn't releases
the pages on IO completion, we add a BIO_NO_PAGE_REF flag for that.The current two callers of bio_iov_iter_get_pages() are updated to
check if they need to release pages on completion. This makes them
work with bvecs that contain kernel mapped pages already.Reviewed-by: Hannes Reinecke <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
---
block/bio.c | 59 ++++++++++++++++++++++++++++++++-------
fs/block_dev.c | 5 ++--
fs/iomap.c | 5 ++--
include/linux/blk_types.h | 1 +
4 files changed, 56 insertions(+), 14 deletions(-)diff --git a/block/bio.c b/block/bio.c
index 4db1008309ed..330df572cfb8 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page,
}
EXPORT_SYMBOL(bio_add_page);+static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
+{
+ const struct bio_vec *bv = iter->bvec;
+ unsigned int len;
+ size_t size;
+
+ len = min_t(size_t, bv->bv_len, iter->count);
+ size = bio_add_page(bio, bv->bv_page, len,
+ bv->bv_offset + iter->iov_offset);iter->iov_offset needs to be subtracted from 'len', looks
the following delta change[1] is required, otherwise memory corruption
can be observed when running xfstests over loop/dio.Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and
it still occurs even with your latest version that has Ming's fix folded in.
Specifically, commit a566653ab5ab80a from your io_uring branch with commit date
Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define _GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{
int memfd, loopfd;memfd = syscall(__NR_memfd_create, "foo", 0);
pwrite(memfd, "\xa8", 1, 4096);
loopfd = open("/dev/loop0", O_RDWR|O_DIRECT);
ioctl(loopfd, LOOP_SET_FD, memfd);
sendfile(loopfd, loopfd, NULL, 1000000);
}Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()
raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000
raw: 0000000000000000 0000000000000000 00000000ffffffff
page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.Quoted 7 lines
But
bio_for_each_bvec()needn'tnth_page(), and onlybio_for_each_segment()needs that. However,bio_for_each_segment()isn't called fromblk_queue_split()andblk_rq_map_sg().One issue is that
bio_for_each_bvec()still advances by page size instead ofbvec->len, I guess that is the problem, will cook a patch for your test.Probably won't make a difference for my test case...
Quoted 5 lines
Quoted 2 lines
We need to do something about this, it's like tossing out months of optimizations.
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().I think we really need a fast path for <=
PAGE_SIZEIOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.5% regressions is HUGE. I know I've mentioned this before, I just want to really stress how big of a deal that is. It's enough to make me consider just reverting it again, which sucks, but I don't feel great shipping something that is known that much slower.
Quoted 4 lines
Quoted 1 line
Suggestions?
You mentioned
nth_page()costs much inbio_for_each_bvec(), but which shouldn't call intonth_page(). I will look into it first.I'll check on the test box tomorrow, I lost connectivity before. I'll double check in the morning.
I'd focus on the
blk_rq_map_sg()path, since that's the biggest cycle consumer.
Quoted 8 lines
Quoted 4 lines
Hi Jens,
Could you test the following patch which may improve on the 4k randio test case?
A bit, it's up 1% with this patch. I'm going to try without the get_page/put_page that we had earlier, to see where we are in regards to the old baseline.
~1548K now, down from 1615-1620K, which matches the numbers. That's down now roughly 4%, instead of the original 5%, with this recent patch being the source of that reclaimed 1%.
So that's a good start, but still 4% to go.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
In reply to Jens AxboeQuoted 184 lines · Jens Axboe
Quoted 183 lines · Ming Lei
Quoted 181 lines · Jens Axboe
Quoted 170 lines · Ming Lei
Quoted 169 lines · Jens Axboe
Quoted 142 lines · Ming Lei
Quoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
On Thu, Feb 21, 2019 at 10:45:27AM -0700, Jens Axboe wrote:
On 2/20/19 3:58 PM, Ming Lei wrote:
On Mon, Feb 11, 2019 at 12:00:41PM -0700, Jens Axboe wrote:
For an ITER_BVEC, we can just iterate the iov and add the pages
to the bio directly. This requires that the caller doesn't releases
the pages on IO completion, we add a BIO_NO_PAGE_REF flag for that.The current two callers of bio_iov_iter_get_pages() are updated to
check if they need to release pages on completion. This makes them
work with bvecs that contain kernel mapped pages already.Reviewed-by: Hannes Reinecke <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
---
block/bio.c | 59 ++++++++++++++++++++++++++++++++-------
fs/block_dev.c | 5 ++--
fs/iomap.c | 5 ++--
include/linux/blk_types.h | 1 +
4 files changed, 56 insertions(+), 14 deletions(-)diff --git a/block/bio.c b/block/bio.c
index 4db1008309ed..330df572cfb8 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page,
}
EXPORT_SYMBOL(bio_add_page);+static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
+{
+ const struct bio_vec *bv = iter->bvec;
+ unsigned int len;
+ size_t size;
+
+ len = min_t(size_t, bv->bv_len, iter->count);
+ size = bio_add_page(bio, bv->bv_page, len,
+ bv->bv_offset + iter->iov_offset);iter->iov_offset needs to be subtracted from 'len', looks
the following delta change[1] is required, otherwise memory corruption
can be observed when running xfstests over loop/dio.Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and
it still occurs even with your latest version that has Ming's fix folded in.
Specifically, commit a566653ab5ab80a from your io_uring branch with commit date
Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define _GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{
int memfd, loopfd;memfd = syscall(__NR_memfd_create, "foo", 0);
pwrite(memfd, "\xa8", 1, 4096);
loopfd = open("/dev/loop0", O_RDWR|O_DIRECT);
ioctl(loopfd, LOOP_SET_FD, memfd);
sendfile(loopfd, loopfd, NULL, 1000000);
}Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()
raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000
raw: 0000000000000000 0000000000000000 00000000ffffffff
page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.Quoted 7 lines
But
bio_for_each_bvec()needn'tnth_page(), and onlybio_for_each_segment()needs that. However,bio_for_each_segment()isn't called fromblk_queue_split()andblk_rq_map_sg().One issue is that
bio_for_each_bvec()still advances by page size instead ofbvec->len, I guess that is the problem, will cook a patch for your test.Probably won't make a difference for my test case...
Quoted 5 lines
Quoted 2 lines
We need to do something about this, it's like tossing out months of optimizations.
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().I think we really need a fast path for <=
PAGE_SIZEIOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.5% regressions is HUGE. I know I've mentioned this before, I just want to really stress how big of a deal that is. It's enough to make me consider just reverting it again, which sucks, but I don't feel great shipping something that is known that much slower.
Quoted 4 lines
Quoted 1 line
Suggestions?
You mentioned
nth_page()costs much inbio_for_each_bvec(), but which shouldn't call intonth_page(). I will look into it first.I'll check on the test box tomorrow, I lost connectivity before. I'll double check in the morning.
I'd focus on the
blk_rq_map_sg()path, since that's the biggest cycle consumer.
Quoted 8 lines
Quoted 4 lines
Hi Jens,
Could you test the following patch which may improve on the 4k randio test case?
A bit, it's up 1% with this patch. I'm going to try without the get_page/put_page that we had earlier, to see where we are in regards to the old baseline.
OK, today I will test io_uring over null_blk on one real machine and see if something can be improved.
Thanks,
Ming
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 190 lines · Ming Lei
Quoted 189 lines · Jens Axboe
Quoted 187 lines · Ming Lei
Quoted 173 lines · Jens Axboe
Quoted 172 lines · Ming Lei
Quoted 170 lines · Jens Axboe
Quoted 142 lines · Ming Lei
Quoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
On 2/25/19 8:46 PM, Eric Biggers wrote:
Hi Jens,On Thu, Feb 21, 2019 at 10:45:27AM -0700, Jens Axboe wrote:
On 2/20/19 3:58 PM, Ming Lei wrote:
On Mon, Feb 11, 2019 at 12:00:41PM -0700, Jens Axboe wrote:
For an ITER_BVEC, we can just iterate the iov and add the pages
to the bio directly. This requires that the caller doesn't releases
the pages on IO completion, we add a BIO_NO_PAGE_REF flag for that.The current two callers of bio_iov_iter_get_pages() are updated to
check if they need to release pages on completion. This makes them
work with bvecs that contain kernel mapped pages already.Reviewed-by: Hannes Reinecke <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
---
block/bio.c | 59 ++++++++++++++++++++++++++++++++-------
fs/block_dev.c | 5 ++--
fs/iomap.c | 5 ++--
include/linux/blk_types.h | 1 +
4 files changed, 56 insertions(+), 14 deletions(-)diff --git a/block/bio.c b/block/bio.c
index 4db1008309ed..330df572cfb8 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page,
}
EXPORT_SYMBOL(bio_add_page);+static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
+{
+ const struct bio_vec *bv = iter->bvec;
+ unsigned int len;
+ size_t size;
+
+ len = min_t(size_t, bv->bv_len, iter->count);
+ size = bio_add_page(bio, bv->bv_page, len,
+ bv->bv_offset + iter->iov_offset);iter->iov_offset needs to be subtracted from 'len', looks
the following delta change[1] is required, otherwise memory corruption
can be observed when running xfstests over loop/dio.Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and
it still occurs even with your latest version that has Ming's fix folded in.
Specifically, commit a566653ab5ab80a from your io_uring branch with commit date
Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define _GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{
int memfd, loopfd;memfd = syscall(__NR_memfd_create, "foo", 0);
pwrite(memfd, "\xa8", 1, 4096);
loopfd = open("/dev/loop0", O_RDWR|O_DIRECT);
ioctl(loopfd, LOOP_SET_FD, memfd);
sendfile(loopfd, loopfd, NULL, 1000000);
}Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()
raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000
raw: 0000000000000000 0000000000000000 00000000ffffffff
page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.Quoted 7 lines
But
bio_for_each_bvec()needn'tnth_page(), and onlybio_for_each_segment()needs that. However,bio_for_each_segment()isn't called fromblk_queue_split()andblk_rq_map_sg().One issue is that
bio_for_each_bvec()still advances by page size instead ofbvec->len, I guess that is the problem, will cook a patch for your test.Probably won't make a difference for my test case...
Quoted 5 lines
Quoted 2 lines
We need to do something about this, it's like tossing out months of optimizations.
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().I think we really need a fast path for <=
PAGE_SIZEIOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.5% regressions is HUGE. I know I've mentioned this before, I just want to really stress how big of a deal that is. It's enough to make me consider just reverting it again, which sucks, but I don't feel great shipping something that is known that much slower.
Suggestions?
Quoted 8 lines
Quoted 2 lines
You mentioned
nth_page()costs much inbio_for_each_bvec(), but which shouldn't call intonth_page(). I will look into it first.I'll check on the test box tomorrow, I lost connectivity before. I'll double check in the morning.
I'd focus on the
blk_rq_map_sg()path, since that's the biggest cycle consumer.Hi Jens,
Could you test the following patch which may improve on the 4k randio test case?
Quoted 6 lines
Quoted 3 lines
A bit, it's up 1% with this patch. I'm going to try without the get_page/put_page that we had earlier, to see where we are in regards to the old baseline.
OK, today I will test
io_uringovernull_blkon one real machine and see if something can be improved.
For reference, I'm running the default t/io_uring from fio, which is QD=128, fixed files/buffers, and polled. Running it on two devices to max out the CPU core:
sudo taskset -c 0 t/io_uring /dev/nvme1n1 /dev/nvme5n1
since nvme1n1 tops out at 1164K 4k rand reads (hardware limit). Just tried with null_blk, since I haven't done that before, and I get about 1875K from a single device with the same test case. Using 2 devices yields the same result, so we're CPU core bound at that point. We don't get the sg walk with null_blk though, but I do see about 4% blk_queue_split() time with that.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 195 lines · Jens Axboe
Quoted 194 lines · Ming Lei
Quoted 192 lines · Jens Axboe
Quoted 180 lines · Ming Lei
Quoted 179 lines · Jens Axboe
Quoted 170 lines · Ming Lei
Quoted 169 lines · Jens Axboe
Quoted 142 lines · Ming Lei
Quoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 97 lines · Jens Axboe
On 2/25/19 9:34 PM, Jens Axboe wrote:
On 2/25/19 8:46 PM, Eric Biggers wrote:
Hi Jens,On Thu, Feb 21, 2019 at 10:45:27AM -0700, Jens Axboe wrote:
On 2/20/19 3:58 PM, Ming Lei wrote:
On Mon, Feb 11, 2019 at 12:00:41PM -0700, Jens Axboe wrote:
For an ITER_BVEC, we can just iterate the iov and add the pages
to the bio directly. This requires that the caller doesn't releases
the pages on IO completion, we add a BIO_NO_PAGE_REF flag for that.The current two callers of bio_iov_iter_get_pages() are updated to
check if they need to release pages on completion. This makes them
work with bvecs that contain kernel mapped pages already.Reviewed-by: Hannes Reinecke <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
---
block/bio.c | 59 ++++++++++++++++++++++++++++++++-------
fs/block_dev.c | 5 ++--
fs/iomap.c | 5 ++--
include/linux/blk_types.h | 1 +
4 files changed, 56 insertions(+), 14 deletions(-)diff --git a/block/bio.c b/block/bio.c
index 4db1008309ed..330df572cfb8 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page,
}
EXPORT_SYMBOL(bio_add_page);+static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
+{
+ const struct bio_vec *bv = iter->bvec;
+ unsigned int len;
+ size_t size;
+
+ len = min_t(size_t, bv->bv_len, iter->count);
+ size = bio_add_page(bio, bv->bv_page, len,
+ bv->bv_offset + iter->iov_offset);iter->iov_offset needs to be subtracted from 'len', looks
the following delta change[1] is required, otherwise memory corruption
can be observed when running xfstests over loop/dio.Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and
it still occurs even with your latest version that has Ming's fix folded in.
Specifically, commit a566653ab5ab80a from your io_uring branch with commit date
Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define _GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{
int memfd, loopfd;memfd = syscall(__NR_memfd_create, "foo", 0);
pwrite(memfd, "\xa8", 1, 4096);
loopfd = open("/dev/loop0", O_RDWR|O_DIRECT);
ioctl(loopfd, LOOP_SET_FD, memfd);
sendfile(loopfd, loopfd, NULL, 1000000);
}Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()
raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000
raw: 0000000000000000 0000000000000000 00000000ffffffff
page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current io_uring branch and my for-next
branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.Quoted 7 lines
But
bio_for_each_bvec()needn'tnth_page(), and onlybio_for_each_segment()needs that. However,bio_for_each_segment()isn't called fromblk_queue_split()andblk_rq_map_sg().One issue is that
bio_for_each_bvec()still advances by page size instead ofbvec->len, I guess that is the problem, will cook a patch for your test.Probably won't make a difference for my test case...
Quoted 5 lines
Quoted 2 lines
We need to do something about this, it's like tossing out months of optimizations.
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().I think we really need a fast path for <=
PAGE_SIZEIOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.5% regressions is HUGE. I know I've mentioned this before, I just want to really stress how big of a deal that is. It's enough to make me consider just reverting it again, which sucks, but I don't feel great shipping something that is known that much slower.
Quoted 4 lines
Quoted 1 line
Suggestions?
You mentioned
nth_page()costs much inbio_for_each_bvec(), but which shouldn't call intonth_page(). I will look into it first.I'll check on the test box tomorrow, I lost connectivity before. I'll double check in the morning.
Quoted 7 lines
Quoted 2 lines
I'd focus on the
blk_rq_map_sg()path, since that's the biggest cycle consumer.Hi Jens,
Could you test the following patch which may improve on the 4k randio test case?
A bit, it's up 1% with this patch. I'm going to try without the get_page/put_page that we had earlier, to see where we are in regards to the old baseline.
Quoted 8 lines
Quoted 2 lines
OK, today I will test
io_uringovernull_blkon one real machine and see if something can be improved.For reference, I'm running the default t/io_uring from fio, which is QD=128, fixed files/buffers, and polled. Running it on two devices to max out the CPU core:
sudo taskset -c 0 t/io_uring
/dev/nvme1n1/dev/nvme5n1
Forgot to mention, this is loading nvme with 12 poll queues, which is of course important to get good performance on this test case.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 199 lines · Jens Axboe
Quoted 198 lines · Jens Axboe
Quoted 196 lines · Ming Lei
Quoted 184 lines · Jens Axboe
Quoted 183 lines · Ming Lei
Quoted 181 lines · Jens Axboe
Quoted 170 lines · Ming Lei
Quoted 169 lines · Jens Axboe
Quoted 142 lines · Ming Lei
Quoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
On Tue, Feb 26, 2019 at 11:56 PM Jens Axboe <[email protected]> wrote:
On 2/25/19 9:34 PM, Jens Axboe wrote:
On 2/25/19 8:46 PM, Eric Biggers wrote:
Hi Jens,On Thu, Feb 21, 2019 at 10:45:27AM -0700, Jens Axboe wrote:
On 2/20/19 3:58 PM, Ming Lei wrote:
On Mon, Feb 11, 2019 at 12:00:41PM -0700, Jens Axboe wrote:
For an ITER_BVEC, we can just iterate the iov and add the pages
to the bio directly. This requires that the caller doesn't releases
the pages on IO completion, we add a BIO_NO_PAGE_REF flag for that.The current two callers of bio_iov_iter_get_pages() are updated to
check if they need to release pages on completion. This makes them
work with bvecs that contain kernel mapped pages already.Reviewed-by: Hannes Reinecke <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
---
block/bio.c | 59 ++++++++++++++++++++++++++++++++-------
fs/block_dev.c | 5 ++--
fs/iomap.c | 5 ++--
include/linux/blk_types.h | 1 +
4 files changed, 56 insertions(+), 14 deletions(-)diff --git a/block/bio.c b/block/bio.c
index 4db1008309ed..330df572cfb8 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page,
}
EXPORT_SYMBOL(bio_add_page);+static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
+{
+ const struct bio_vec *bv = iter->bvec;
+ unsigned int len;
+ size_t size;
+
+ len = min_t(size_t, bv->bv_len, iter->count);
+ size = bio_add_page(bio, bv->bv_page, len,
+ bv->bv_offset + iter->iov_offset);iter->iov_offset needs to be subtracted from 'len', looks
the following delta change[1] is required, otherwise memory corruption
can be observed when running xfstests over loop/dio.Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and
it still occurs even with your latest version that has Ming's fix folded in.
Specifically, commit a566653ab5ab80a from your io_uring branch with commit date
Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define _GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{
int memfd, loopfd;memfd = syscall(__NR_memfd_create, "foo", 0);
pwrite(memfd, "\xa8", 1, 4096);
loopfd = open("/dev/loop0", O_RDWR|O_DIRECT);
ioctl(loopfd, LOOP_SET_FD, memfd);
sendfile(loopfd, loopfd, NULL, 1000000);
}Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()
raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000
raw: 0000000000000000 0000000000000000 00000000ffffffff
page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current io_uring branch and my for-next
branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normal O_DIRECT case, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ * bio_release_pages() at IO completion time.
+ */
+ get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be
needed:int i;
struct bvec_iter_all iter_all;
struct bio_vec *tmp;Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)
get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.Quoted 7 lines
But
bio_for_each_bvec()needn'tnth_page(), and onlybio_for_each_segment()needs that. However,bio_for_each_segment()isn't called fromblk_queue_split()andblk_rq_map_sg().One issue is that
bio_for_each_bvec()still advances by page size instead ofbvec->len, I guess that is the problem, will cook a patch for your test.Probably won't make a difference for my test case...
Quoted 5 lines
Quoted 2 lines
We need to do something about this, it's like tossing out months of optimizations.
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().I think we really need a fast path for <=
PAGE_SIZEIOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.5% regressions is HUGE. I know I've mentioned this before, I just want to really stress how big of a deal that is. It's enough to make me consider just reverting it again, which sucks, but I don't feel great shipping something that is known that much slower.
Quoted 4 lines
Quoted 1 line
Suggestions?
You mentioned
nth_page()costs much inbio_for_each_bvec(), but which shouldn't call intonth_page(). I will look into it first.I'll check on the test box tomorrow, I lost connectivity before. I'll double check in the morning.
I'd focus on the
blk_rq_map_sg()path, since that's the biggest cycle consumer.Quoted 8 lines
Quoted 4 lines
Hi Jens,
Could you test the following patch which may improve on the 4k randio test case?
A bit, it's up 1% with this patch. I'm going to try without the get_page/put_page that we had earlier, to see where we are in regards to the old baseline.
OK, today I will test
io_uringovernull_blkon one real machine and see if something can be improved.
Quoted 8 lines
Quoted 5 lines
For reference, I'm running the default t/io_uring from fio, which is QD=128, fixed files/buffers, and polled. Running it on two devices to max out the CPU core:
sudo taskset -c 0 t/io_uring
/dev/nvme1n1/dev/nvme5n1Forgot to mention, this is loading nvme with 12 poll queues, which is of course important to get good performance on this test case.
Btw, is your nvme device SGL capable? There is some low hanging fruit in that IFF a device has SGL support we can basically dumb down blk_mq_map_sg to never split in this case ever because we don't have any segment size limits.
PRPs only unforturtunately are a little dumb and could lead to all kinds of whacky splitting.
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 206 lines · Christoph Hellwig
Quoted 205 lines · Jens Axboe
Quoted 203 lines · Jens Axboe
Quoted 190 lines · Ming Lei
Quoted 189 lines · Jens Axboe
Quoted 187 lines · Ming Lei
Quoted 173 lines · Jens Axboe
Quoted 172 lines · Ming Lei
Quoted 170 lines · Jens Axboe
Quoted 142 lines · Ming Lei
Quoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
On 2/26/19 6:21 PM, Ming Lei wrote:
On Tue, Feb 26, 2019 at 11:56 PM Jens Axboe <[email protected]> wrote:On 2/25/19 9:34 PM, Jens Axboe wrote:
On 2/25/19 8:46 PM, Eric Biggers wrote:
Hi Jens,On Thu, Feb 21, 2019 at 10:45:27AM -0700, Jens Axboe wrote:
On 2/20/19 3:58 PM, Ming Lei wrote:
On Mon, Feb 11, 2019 at 12:00:41PM -0700, Jens Axboe wrote:
For an ITER_BVEC, we can just iterate the iov and add the pages
to the bio directly. This requires that the caller doesn't releases
the pages on IO completion, we add a BIO_NO_PAGE_REF flag for that.The current two callers of bio_iov_iter_get_pages() are updated to
check if they need to release pages on completion. This makes them
work with bvecs that contain kernel mapped pages already.Reviewed-by: Hannes Reinecke <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
---
block/bio.c | 59 ++++++++++++++++++++++++++++++++-------
fs/block_dev.c | 5 ++--
fs/iomap.c | 5 ++--
include/linux/blk_types.h | 1 +
4 files changed, 56 insertions(+), 14 deletions(-)diff --git a/block/bio.c b/block/bio.c
index 4db1008309ed..330df572cfb8 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page,
}
EXPORT_SYMBOL(bio_add_page);+static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
+{
+ const struct bio_vec *bv = iter->bvec;
+ unsigned int len;
+ size_t size;
+
+ len = min_t(size_t, bv->bv_len, iter->count);
+ size = bio_add_page(bio, bv->bv_page, len,
+ bv->bv_offset + iter->iov_offset);iter->iov_offset needs to be subtracted from 'len', looks
the following delta change[1] is required, otherwise memory corruption
can be observed when running xfstests over loop/dio.Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and
it still occurs even with your latest version that has Ming's fix folded in.
Specifically, commit a566653ab5ab80a from your io_uring branch with commit date
Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define _GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{
int memfd, loopfd;memfd = syscall(__NR_memfd_create, "foo", 0);
pwrite(memfd, "\xa8", 1, 4096);
loopfd = open("/dev/loop0", O_RDWR|O_DIRECT);
ioctl(loopfd, LOOP_SET_FD, memfd);
sendfile(loopfd, loopfd, NULL, 1000000);
}Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()
raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000
raw: 0000000000000000 0000000000000000 00000000ffffffff
page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current io_uring branch and my for-next
branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normal O_DIRECT case, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ * bio_release_pages() at IO completion time.
+ */
+ get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be
needed:int i;
struct bvec_iter_all iter_all;
struct bio_vec *tmp;Quoted 7 lines
Quoted 5 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)
get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more
than one page in there. I'll fix it up.It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.Quoted 7 lines
But
bio_for_each_bvec()needn'tnth_page(), and onlybio_for_each_segment()needs that. However,bio_for_each_segment()isn't called fromblk_queue_split()andblk_rq_map_sg().One issue is that
bio_for_each_bvec()still advances by page size instead ofbvec->len, I guess that is the problem, will cook a patch for your test.Probably won't make a difference for my test case...
Quoted 5 lines
Quoted 2 lines
We need to do something about this, it's like tossing out months of optimizations.
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().I think we really need a fast path for <=
PAGE_SIZEIOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.5% regressions is HUGE. I know I've mentioned this before, I just want to really stress how big of a deal that is. It's enough to make me consider just reverting it again, which sucks, but I don't feel great shipping something that is known that much slower.
Suggestions?
Quoted 8 lines
Quoted 2 lines
You mentioned
nth_page()costs much inbio_for_each_bvec(), but which shouldn't call intonth_page(). I will look into it first.I'll check on the test box tomorrow, I lost connectivity before. I'll double check in the morning.
I'd focus on the
blk_rq_map_sg()path, since that's the biggest cycle consumer.Hi Jens,
Could you test the following patch which may improve on the 4k randio test case?
Quoted 6 lines
Quoted 3 lines
A bit, it's up 1% with this patch. I'm going to try without the get_page/put_page that we had earlier, to see where we are in regards to the old baseline.
OK, today I will test
io_uringovernull_blkon one real machine and see if something can be improved.For reference, I'm running the default t/io_uring from fio, which is QD=128, fixed files/buffers, and polled. Running it on two devices to max out the CPU core:
sudo taskset -c 0 t/io_uring
/dev/nvme1n1/dev/nvme5n1
Quoted 7 lines
Quoted 2 lines
Forgot to mention, this is loading nvme with 12 poll queues, which is of course important to get good performance on this test case.
Btw, is your nvme device SGL capable? There is some low hanging fruit in that IFF a device has SGL support we can basically dumb down
blk_mq_map_sgto never split in this case ever because we don't have any segment size limits.
Indeed.
In case of SGL, big sg list may not be needed and blk_rq_map_sg() can be skipped if proper DMA mapping interface is to return the dma address for each segment. That can be one big improvement.
Thanks,
Ming
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
In reply to Jens AxboeQuoted 147 lines · Jens Axboe
Quoted 146 lines · Ming Lei
Quoted 133 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 123 lines · Jens Axboe
Quoted 122 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);I guess that would be the safest, even if we don't currently have more than one page in there. I'll fix it up.
It is easy to see multipage bvec from loop, :-)
Quoted 7 lines
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.But
bio_for_each_bvec()needn'tnth_page(), and onlybio_for_each_segment()needs that. However,bio_for_each_segment()isn't called fromblk_queue_split()andblk_rq_map_sg().
Quoted 5 lines
Quoted 3 lines
One issue is that
bio_for_each_bvec()still advances by page size instead ofbvec->len, I guess that is the problem, will cook a patch for your test.Probably won't make a difference for my test case...
The thing is that bvec_iter_len() becomes much slower than before, I will work a patch for you soon.
Thanks,
Ming
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
In reply to Jens AxboeQuoted 130 lines · Jens Axboe
Quoted 129 lines · Ming Lei
Quoted 128 lines · Jens Axboe
Quoted 127 lines · Ming Lei
Quoted 126 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an
ITER_BVEC, we can just iterate the iov and add the pages to the bio directly. This requires that the caller doesn't releases the pages on IO completion, we add aBIO_NO_PAGE_REFflag for that.The current two callers of
bio_iov_iter_get_pages()are updated to check if they need to release pages on completion. This makes them work with bvecs that contain kernel mapped pages already.Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>--- block/bio.c | 59 ++++++++++++++++++++++++++++++++------- fs/block_dev.c | 5 ++-- fs/iomap.c | 5 ++-- include/linux/blk_types.h | 1 + 4 files changed, 56 insertions(+), 14 deletions(-)block/bio.c +0
-0@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page, }EXPORT_SYMBOL (bio_add_page);Quoted 13 lines
block/bio.c int bio_add_page(struct bio *bio, struct page *page, · line 839
Quoted 9 lines
block/bio.c +9
-0+static int __bio_iov_bvec_add_pages (struct bio *bio,struct iov_iter *iter) +{ +const struct bio_vec *bv = iter->bvec; +unsigned int len; +size_t size; + + len =min_t (size_t, bv->bv_len, iter->count); + size =bio_add_page (bio, bv->bv_page, len, + bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);
Quoted 7 lines
Quoted 2 lines
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().I think we really need a fast path for <=
PAGE_SIZEIOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.
FYI, I've got a nice fast path for the driver side in nvme here, but I'll need to do some more testing before submitting it:
http://git.infradead.org/users/hch/block.git/shortlog/refs/heads/nvme-optimize-single-segment-io
But in the block layer I think one major issue is all the phys_segments crap. What we really should do is to remove bi_phys_segments and all the front/back segment crap and only do the calculation of the actual per-bio segments once, just before adding the bio to the segment.
And don't bother with it at all unless the driver has weird segment size or boundary limitations.
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
Quoted 142 lines · Christoph Hellwig
Quoted 130 lines · Jens Axboe
Quoted 129 lines · Ming Lei
Quoted 128 lines · Jens Axboe
Quoted 127 lines · Ming Lei
Quoted 126 lines · Jens Axboe
Quoted 124 lines · Ming Lei
Quoted 93 lines · Jens Axboe
Quoted 91 lines · Jens Axboe
Quoted 89 lines · Eric Biggers
Hi Jens,
Quoted 42 lines · Jens Axboe
Quoted 27 lines · Ming Lei
Quoted 26 lines · Jens Axboe
For an ITER_BVEC, we can just iterate the iov and add the pages
to the bio directly. This requires that the caller doesn't releases
the pages on IO completion, we add a BIO_NO_PAGE_REF flag for that.The current two callers of bio_iov_iter_get_pages() are updated to
check if they need to release pages on completion. This makes them
work with bvecs that contain kernel mapped pages already.Reviewed-by: Hannes Reinecke <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
---
block/bio.c | 59 ++++++++++++++++++++++++++++++++-------
fs/block_dev.c | 5 ++--
fs/iomap.c | 5 ++--
include/linux/blk_types.h | 1 +
4 files changed, 56 insertions(+), 14 deletions(-)diff --git a/block/bio.c b/block/bio.c
index 4db1008309ed..330df572cfb8 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -828,6 +828,23 @@ int bio_add_page(struct bio *bio, struct page *page,
}
EXPORT_SYMBOL(bio_add_page);Quoted 13 lines
Quoted 9 lines
+static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter)
+{
+ const struct bio_vec *bv = iter->bvec;
+ unsigned int len;
+ size_t size;
+
+ len = min_t(size_t, bv->bv_len, iter->count);
+ size = bio_add_page(bio, bv->bv_page, len,
+ bv->bv_offset + iter->iov_offset);
iter->iov_offsetneeds to be subtracted from 'len', looks the following delta change[1] is required, otherwise memory corruption can be observed when running xfstests over loop/dio.Quoted 5 lines
Thanks, I folded this in.
--
Jens Axboesyzkaller started hitting a crash on linux-next starting with this commit, and it still occurs even with your latest version that has Ming's fix folded in. Specifically, commit
a566653ab5ab80afrom yourio_uringbranch with commit date Sun Feb 24 08:20:53 2019 -0700.Reproducer:
#define
_GNU_SOURCE
#include <fcntl.h>
#include <linux/loop.h>
#include <sys/ioctl.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <unistd.h>int main(void)
{ int memfd, loopfd; memfd = syscall(__NR_memfd_create, "foo", 0); pwrite(memfd, "\xa8", 1, 4096); loopfd = open("/dev/loop0", O_RDWR|O_DIRECT); ioctl(loopfd, LOOP_SET_FD, memfd); sendfile(loopfd, loopfd, NULL, 1000000); }Crash:
page:ffffea0001a6aab8 count:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x100000000000000()raw: 0100000000000000 ffffea0001ad2c50 ffff88807fca49d0 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0)Quoted 4 lines
Quoted 1 line
I see what this is, I'll cut a fix for this tomorrow.
Folded in a fix for this, it's in my current
io_uringbranch and my for-next branch.Hi Jens,
I saw the following change is added:
+ if (size == len) {
+ /*
+ * For the normalO_DIRECTcase, we could skip grabbing this
+ * reference and then not have to put them again when IO
+ * completes. But this breaks some in-kernel users, like
+ * splicing to/from a loop device, where we release the pipe
+ * pages unconditionally. If we can fix that case, we can
+ * get rid of the get here and the need to call
+ *bio_release_pages()at IO completion time.
+ */
+get_page(bv->bv_page);Now the 'bv' may point to more than one page, so the following one may be needed:
int i;
structbvec_iter_alliter_all;
structbio_vec*tmp;
mp_bvec_for_each_segment(tmp, bv, i, iter_all)get_page(tmp->bv_page);Quoted 7 lines
Quoted 2 lines
Some following optimization can be done, such as removing
biovec_phys_mergeable()fromblk_bio_segment_split().I think we really need a fast path for <=
PAGE_SIZEIOs, to the extent that it is possible. But iteration startup cost is a problem in a lot of spots, and a split fast path will only help a bit for that specific case.FYI, I've got a nice fast path for the driver side in nvme here, but I'll need to do some more testing before submitting it:
Quoted 6 lines
http://git.infradead.org/users/hch/block.git/shortlog/refs/heads/nvme-optimize-single-segment-io
But in the block layer I think one major issue is all the
phys_segmentscrap. What we really should do is to removebi_phys_segmentsand all the front/back segment crap and only do the calculation of the actual per-bio segments once, just before adding the bio to the segment.
I have enabled multi-page bvec for passthrough IO in the following:
https://github.com/ming1/linux/commits/v5.0-blk-for-blk_post_mp
in which .bi_phys_segments becomes same with .bi_vcnt for passthrough bio.
Also intra-bvec merging in one bio has been killed, then only the merge between bios is required, and seems we still need front/back segment size, especially some use cases(such as mkfs) may make lots of small mergeable bios.
Quoted 3 lines
And don't bother with it at all unless the driver has weird segment size or boundary limitations.
It should be easy to observe that .bv_len is bigger than max segment size.
Thanks,
Ming
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 11/19] block: implement bio helper to add iter bvec pages to bio
In reply to Jens AxboeQuoted 7 lines · Jens Axboe
Speaking of this, I took a quick look at why we've now regressed a lot on IOPS perf with the multipage work. It looks like it's all related to the (much) fatter setup around iteration, which is related to this very topic too.
Basically setup of things like
bio_for_each_bvec()and indexing throughnth_page()is MUCH slower than before.
I haven't quite figure out what the point of nth_page is. If we physically merge the page structures should also be consecuite in memory in general. The only case where this could theoretically not be the case is with CONFIG_DISCONTIGMEM, but in that case we should check this once in biovec_phys_mergeable, and only for that case.
Does this patch make a difference for you on x86?
include/linux/bvec.h +1 -1
@@ -53,7 +53,7 @@ struct bvec_iter_all {static inline struct page *bvec_nth_page (struct page *page,int idx) { -return idx ==0 ? page :nth_page (page, idx); +return page + idx; }/*
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 12/19 io_uring: add support for pre-mapped user IO buffers
In reply to Jens AxboeIf we have fixed user buffers, we can map them into the kernel when we setup the io_uring. That avoids the need to do get_user_pages() for each and every IO.
To utilize this feature, the application must call io_uring_register() after having setup an io_uring instance, passing in IORING_REGISTER_BUFFERS as the opcode. The argument must be a pointer to an iovec array, and the nr_args should contain how many iovecs the application wishes to map.
If successful, these buffers are now mapped into the kernel, eligible for IO. To use these fixed buffers, the application must use the IORING_OP_READ_FIXED and IORING_OP_WRITE_FIXED opcodes, and then set sqe->index to the desired buffer index. sqe->addr..sqe->addr+seq->len must point to somewhere inside the indexed buffer.
The application may register buffers throughout the lifetime of the io_uring instance. It can call io_uring_register() with IORING_UNREGISTER_BUFFERS as the opcode to unregister the current set of buffers, and then register a new set. The application need not unregister buffers explicitly before shutting down the io_uring instance.
It's perfectly valid to setup a larger buffer, and then sometimes only use parts of it for an IO. As long as the range is within the originally mapped region, it will work just fine.
For now, buffers must not be file backed. If file backed buffers are passed in, the registration will fail with -1/EOPNOTSUPP. This restriction may be relaxed in the future.
RLIMIT_MEMLOCK is used to check how much memory we can pin. A somewhat arbitrary 1G per buffer size is also imposed.
--- arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + fs/io_uring.c | 373 ++++++++++++++++++++++++- include/linux/syscalls.h | 2 + include/uapi/asm-generic/unistd.h | 4 +- include/uapi/linux/io_uring.h | 13 +- kernel/sys_ni.c | 1 + 7 files changed, 380 insertions(+), 15 deletions(-)
arch/x86/entry/syscalls/syscall_32.tbl +1 -0
@@ -400,3 +400,4 @@ 386 i386 rseq sys_rseq __ia32_sys_rseq 425 i386 io_uring_setup sys_io_uring_setup __ia32_sys_io_uring_setup 426 i386 io_uring_enter sys_io_uring_enter __ia32_sys_io_uring_enter +427 i386 io_uring_register sys_io_uring_register __ia32_sys_io_uring_register
arch/x86/entry/syscalls/syscall_64.tbl +1 -0
@@ -345,6 +345,7 @@ 334 common rseq __x64_sys_rseq 425 common io_uring_setup __x64_sys_io_uring_setup 426 common io_uring_enter __x64_sys_io_uring_enter +427 common io_uring_register __x64_sys_io_uring_register # # x32-specific system call numbers start at 512 to avoid cache impact
fs/io_uring.c +360 -13
467 lines not on this page · raw message
include/linux/syscalls.h +2 -0
@@ -315,6 +315,8 @@ asmlinkage long sys_io_uring_setup(u32 entries,asmlinkage long sys_io_uring_enter (unsigned int fd,u32 to_submit,u32 min_complete,u32 flags,const sigset_t __user *sig,size_t sigsz); +asmlinkage long sys_io_uring_register (unsigned int fd,unsigned int op, +void __user *arg,unsigned int nr_args);/* fs/xattr.c */ asmlinkage long sys_setxattr(const char __user *path, const char __user *name,
include/uapi/asm-generic/unistd.h +3 -1
@@ -744,9 +744,11 @@ __SYSCALL(__NR_kexec_file_load, sys_kexec_file_load) __SYSCALL(__NR_io_uring_setup, sys_io_uring_setup)#define __NR_io_uring_enter 426 __SYSCALL(__NR_io_uring_enter, sys_io_uring_enter) +#define __NR_io_uring_register 427 +__SYSCALL(__NR_io_uring_register, sys_io_uring_register)#undef __NR_syscalls -#define __NR_syscalls 427 +#define __NR_syscalls 428/* * 32 bit systems traditionally used different
include/uapi/linux/io_uring.h +12 -1
@@ -27,7 +27,10 @@ struct io_uring_sqe {__u32 fsync_flags; };__u64 user_data;/* data to be passed back at completion time */ -__u64 __pad2[3 ]; +union { +__u16 buf_index;/* index into fixed buffers, if used */ +__u64 __pad2[3 ]; + }; };/*
@@ -39,6 +42,8 @@ struct io_uring_sqe {#define IORING_OP_READV 1#define IORING_OP_WRITEV 2#define IORING_OP_FSYNC 3 +#define IORING_OP_READ_FIXED 4 +#define IORING_OP_WRITE_FIXED 5/* * sqe->fsync_flags
@@ -103,4 +108,10 @@ struct io_uring_params { struct io_cqring_offsets cq_off; }; +/* +* io_uring_register(2) opcodes and arguments +*/ +#define IORING_REGISTER_BUFFERS 0 +#define IORING_UNREGISTER_BUFFERS 1 +#endif
kernel/sys_ni.c +1 -0
@@ -48,6 +48,7 @@ COND_SYSCALL_COMPAT(io_getevents);COND_SYSCALL_COMPAT (io_pgetevents);COND_SYSCALL (io_uring_setup);COND_SYSCALL (io_uring_enter); +COND_SYSCALL (io_uring_register);/* fs/xattr.c */
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 12/19] io_uring: add support for pre-mapped user IO buffers
Quoted 37 lines · Jens Axboe
If we have fixed user buffers, we can map them into the kernel when we setup the
io_uring. That avoids the need to doget_user_pages()for each and every IO.To utilize this feature, the application must call
io_uring_register()after having setup anio_uringinstance, passing inIORING_REGISTER_BUFFERSas the opcode. The argument must be a pointer to an iovec array, and thenr_argsshould contain how many iovecs the application wishes to map.If successful, these buffers are now mapped into the kernel, eligible for IO. To use these fixed buffers, the application must use the
IORING_OP_READ_FIXEDandIORING_OP_WRITE_FIXEDopcodes, and then setsqe->indexto the desired buffer index. sqe->addr..sqe->addr+seq->len must point to somewhere inside the indexed buffer.The application may register buffers throughout the lifetime of the
io_uringinstance. It can callio_uring_register()withIORING_UNREGISTER_BUFFERSas the opcode to unregister the current set of buffers, and then register a new set. The application need not unregister buffers explicitly before shutting down theio_uringinstance.It's perfectly valid to setup a larger buffer, and then sometimes only use parts of it for an IO. As long as the range is within the originally mapped region, it will work just fine.
For now, buffers must not be file backed. If file backed buffers are passed in, the registration will fail with -1/EOPNOTSUPP. This restriction may be relaxed in the future.
RLIMIT_MEMLOCKis used to check how much memory we can pin. A somewhat arbitrary 1G per buffer size is also imposed.Reviewed-by Hannes Reinecke <[email protected]>Signed-off-by Jens Axboe <[email protected]>---
[...]
Quoted 87 lines
static void
io_sq_wq_submit_work(struct work_struct *work){ struct io_kiocb *req = container_of(work, struct io_kiocb, work); struct sqe_submit *s = &req->submit; const struct io_uring_sqe *sqe = s->sqe; struct io_ring_ctx *ctx = req->ctx;fs/io_uring.c +48
-12-mm_segment_t old_fs =get_fs (); +mm_segment_t old_fs; +bool needs_user;int ret;/* Ensure we clear previously set forced non-block flag */ req->flags &= ~REQ_F_FORCE_NONBLOCK ; req->rw.ki_flags &= ~IOCB_NOWAIT ; -if (!mmget_not_zero (ctx->sqo_mm)) { - ret = -EFAULT ; - goto err; - } - -use_mm (ctx->sqo_mm); -set_fs (USER_DS ); - s->has_user = true; s->needs_lock = true; + s->has_user = false; + +/* +* If we're doing IO to fixed buffers, we don't need to get/set +* user context +*/ + needs_user =io_sqe_needs_user (s->sqe); +if (needs_user) { +if (!mmget_not_zero (ctx->sqo_mm)) { + ret = -EFAULT ; + goto err; + } +use_mm (ctx->sqo_mm); + old_fs =get_fs (); +set_fs (USER_DS ); + s->has_user = true; + } do { ret = __io_submit_sqe(ctx, req, s, false, NULL);@@ -1011,9 +1110,11 @@ static void io_sq_wq_submit_work(struct work_struct *work)cond_resched (); }while (1 ); -set_fs (old_fs); -unuse_mm (ctx->sqo_mm); -mmput (ctx->sqo_mm); +if (needs_user) { +set_fs (old_fs); +unuse_mm (ctx->sqo_mm); +mmput (ctx->sqo_mm); + } err:if (ret) {io_cqring_add_event (ctx, sqe->user_data, ret,0 );@@ -1308,6 +1409,197 @@ static unsigned long ring_pages(unsigned sq_entries, unsigned cq_entries)return (bytes +PAGE_SIZE -1 ) /PAGE_SIZE ; } +static int io_sqe_buffer_unregister (struct io_ring_ctx *ctx) +{ +int i, j; + +if (!ctx->user_bufs) +return -ENXIO ; + +for (i =0 ; i < ctx->nr_user_bufs; i++) { +struct io_mapped_ubuf *imu = &ctx->user_bufs[i]; + +for (j =0 ; j < imu->nr_bvecs; j++) +put_page (imu->bvec[j].bv_page); + +if (ctx->account_mem) +io_unaccount_mem (ctx->user, imu->nr_bvecs); +kfree (imu->bvec); + imu->nr_bvecs =0 ; + } + +kfree (ctx->user_bufs); + ctx->user_bufs =NULL ; + ctx->nr_user_bufs =0 ; +return 0 ; +}
[...]
Quoted 45 lines
fs/io_uring.c +45
-0+static int io_sqe_buffer_register (struct io_ring_ctx *ctx,void __user *arg, +unsigned nr_args) +{ +struct vm_area_struct **vmas =NULL ; +struct page **pages =NULL ; +int i, j, got_pages =0 ; +int ret = -EINVAL ; + +if (ctx->user_bufs) +return -EBUSY ; +if (!nr_args || nr_args >UIO_MAXIOV ) +return -EINVAL ; + + ctx->user_bufs =kcalloc (nr_args,sizeof (struct io_mapped_ubuf ), +GFP_KERNEL ); +if (!ctx->user_bufs) +return -ENOMEM ; + +for (i =0 ; i < nr_args; i++) { +struct io_mapped_ubuf *imu = &ctx->user_bufs[i]; +unsigned long off, start, end, ubuf; +int pret, nr_pages; +struct iovec iov; +size_t size; + + ret =io_copy_iov (ctx, &iov, arg, i); +if (ret) +break ; + +/* +* Don't impose further limits on the size and buffer +* constraints here, we'll -EINVAL later when IO is +* submitted if they are wrong. +*/ + ret = -EFAULT ; +if (!iov.iov_base || !iov.iov_len) + goto err; + +/* arbitrary limit, but we need something */ +if (iov.iov_len >SZ_1G ) + goto err; + + ubuf = (unsigned long ) iov.iov_base; + end = (ubuf + iov.iov_len +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + start = ubuf >>PAGE_SHIFT ;
fs/io_uring.c static unsigned long ring_pages(unsigned sq_entries, unsigned cq_entries) · line 1516
Quoted 10 lines
fs/io_uring.c +10
-0+ nr_pages = end - start; + +if (ctx->account_mem) { + ret =io_account_mem (ctx->user, nr_pages); +if (ret) + goto err; + } + + ret =0 ; +if (!pages || nr_pages > got_pages) {
Nit: No need to check for !pages as long as pages and got_pages are synchronized (which guarantees that !pages implies got_pages==0).
fs/io_uring.c static unsigned long ring_pages(unsigned sq_entries, unsigned cq_entries) · line 1522
Quoted 6 lines
fs/io_uring.c +6
-0+kfree (vmas); +kfree (pages); + pages =kmalloc_array (nr_pages,sizeof (struct page *), +GFP_KERNEL ); + vmas = kmalloc_array(nr_pages, + sizeof(struct vma_area_struct *),
typo: s/vma_area_struct/vm_area_struct/
Quoted 67 lines
fs/io_uring.c +67
-0+ GFP_KERNEL); +if (!pages || !vmas) { + ret = -ENOMEM ; +if (ctx->account_mem) +io_unaccount_mem (ctx->user, nr_pages); + goto err; + } + got_pages = nr_pages; + } + + imu->bvec =kmalloc_array (nr_pages,sizeof (struct bio_vec ), +GFP_KERNEL ); + ret = -ENOMEM ; +if (!imu->bvec) { +if (ctx->account_mem) +io_unaccount_mem (ctx->user, nr_pages); + goto err; + } + + ret =0 ; +down_read (¤t->mm->mmap_sem); + pret =get_user_pages_longterm (ubuf, nr_pages,FOLL_WRITE , + pages, vmas); +if (pret == nr_pages) { +/* don't support file backed memory */ +for (j =0 ; j < nr_pages; j++) { +struct vm_area_struct *vma = vmas[j]; + +if (vma->vm_file && + !is_file_hugepages (vma->vm_file)) { + ret = -EOPNOTSUPP ; +break ; + } + } + }else { + ret = pret <0 ? pret : -EFAULT ; + } +up_read (¤t->mm->mmap_sem); +if (ret) { +/* +* if we did partial map, or found file backed vmas, +* release any pages we did get +*/ +if (pret >0 ) { +for (j =0 ; j < pret; j++) +put_page (pages[j]); + } +if (ctx->account_mem) +io_unaccount_mem (ctx->user, nr_pages); + goto err; + } + + off = ubuf & ~PAGE_MASK ; + size = iov.iov_len; +for (j =0 ; j < nr_pages; j++) { +size_t vec_len; + + vec_len =min_t (size_t, size,PAGE_SIZE - off); + imu->bvec[j].bv_page = pages[j]; + imu->bvec[j].bv_len = vec_len; + imu->bvec[j].bv_offset = off; + off =0 ; + size -= vec_len; + } +/* store original address for later verification */ + imu->ubuf = ubuf; + imu->len = iov.iov_len;
fs/io_uring.c static unsigned long ring_pages(unsigned sq_entries, unsigned cq_entries) · line 1599
Quoted 10 lines
fs/io_uring.c +10
-0+ imu->nr_bvecs = nr_pages; + } +kfree (pages); +kfree (vmas); + ctx->nr_user_bufs = nr_args; +return 0 ; +err: +kfree (pages); +kfree (vmas); +io_sqe_buffer_unregister (ctx);
io_sqe_buffer_unregister() gets rid of elements up to ctx->nr_user_bufs, but as far as I can tell, ctx->nr_user_bufs is always zero here. I think that's going to cause a reference leak.
Review
Quoted 2 lines
(quoted diff) +2
-0+ return ret; +}
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 12/19] io_uring: add support for pre-mapped user IO buffers
Quoted 178 lines · Jann Horn
Quoted 37 lines · Jens Axboe
If we have fixed user buffers, we can map them into the kernel when we setup the
io_uring. That avoids the need to doget_user_pages()for each and every IO.To utilize this feature, the application must call
io_uring_register()after having setup anio_uringinstance, passing inIORING_REGISTER_BUFFERSas the opcode. The argument must be a pointer to an iovec array, and thenr_argsshould contain how many iovecs the application wishes to map.If successful, these buffers are now mapped into the kernel, eligible for IO. To use these fixed buffers, the application must use the
IORING_OP_READ_FIXEDandIORING_OP_WRITE_FIXEDopcodes, and then setsqe->indexto the desired buffer index. sqe->addr..sqe->addr+seq->len must point to somewhere inside the indexed buffer.The application may register buffers throughout the lifetime of the
io_uringinstance. It can callio_uring_register()withIORING_UNREGISTER_BUFFERSas the opcode to unregister the current set of buffers, and then register a new set. The application need not unregister buffers explicitly before shutting down theio_uringinstance.It's perfectly valid to setup a larger buffer, and then sometimes only use parts of it for an IO. As long as the range is within the originally mapped region, it will work just fine.
For now, buffers must not be file backed. If file backed buffers are passed in, the registration will fail with -1/EOPNOTSUPP. This restriction may be relaxed in the future.
RLIMIT_MEMLOCKis used to check how much memory we can pin. A somewhat arbitrary 1G per buffer size is also imposed.Reviewed-by Hannes Reinecke <[email protected]>Signed-off-by Jens Axboe <[email protected]>---
[...]
Quoted 87 lines
static void
io_sq_wq_submit_work(struct work_struct *work){ struct io_kiocb *req = container_of(work, struct io_kiocb, work); struct sqe_submit *s = &req->submit; const struct io_uring_sqe *sqe = s->sqe; struct io_ring_ctx *ctx = req->ctx;fs/io_uring.c +48
-12-mm_segment_t old_fs =get_fs (); +mm_segment_t old_fs; +bool needs_user;int ret;/* Ensure we clear previously set forced non-block flag */ req->flags &= ~REQ_F_FORCE_NONBLOCK ; req->rw.ki_flags &= ~IOCB_NOWAIT ; -if (!mmget_not_zero (ctx->sqo_mm)) { - ret = -EFAULT ; - goto err; - } - -use_mm (ctx->sqo_mm); -set_fs (USER_DS ); - s->has_user = true; s->needs_lock = true; + s->has_user = false; + +/* +* If we're doing IO to fixed buffers, we don't need to get/set +* user context +*/ + needs_user =io_sqe_needs_user (s->sqe); +if (needs_user) { +if (!mmget_not_zero (ctx->sqo_mm)) { + ret = -EFAULT ; + goto err; + } +use_mm (ctx->sqo_mm); + old_fs =get_fs (); +set_fs (USER_DS ); + s->has_user = true; + } do { ret = __io_submit_sqe(ctx, req, s, false, NULL);@@ -1011,9 +1110,11 @@ static void io_sq_wq_submit_work(struct work_struct *work)cond_resched (); }while (1 ); -set_fs (old_fs); -unuse_mm (ctx->sqo_mm); -mmput (ctx->sqo_mm); +if (needs_user) { +set_fs (old_fs); +unuse_mm (ctx->sqo_mm); +mmput (ctx->sqo_mm); + } err:if (ret) {io_cqring_add_event (ctx, sqe->user_data, ret,0 );@@ -1308,6 +1409,197 @@ static unsigned long ring_pages(unsigned sq_entries, unsigned cq_entries)return (bytes +PAGE_SIZE -1 ) /PAGE_SIZE ; } +static int io_sqe_buffer_unregister (struct io_ring_ctx *ctx) +{ +int i, j; + +if (!ctx->user_bufs) +return -ENXIO ; + +for (i =0 ; i < ctx->nr_user_bufs; i++) { +struct io_mapped_ubuf *imu = &ctx->user_bufs[i]; + +for (j =0 ; j < imu->nr_bvecs; j++) +put_page (imu->bvec[j].bv_page); + +if (ctx->account_mem) +io_unaccount_mem (ctx->user, imu->nr_bvecs); +kfree (imu->bvec); + imu->nr_bvecs =0 ; + } + +kfree (ctx->user_bufs); + ctx->user_bufs =NULL ; + ctx->nr_user_bufs =0 ; +return 0 ; +}[...]
Quoted 51 lines
fs/io_uring.c +51
-0+static int io_sqe_buffer_register (struct io_ring_ctx *ctx,void __user *arg, +unsigned nr_args) +{ +struct vm_area_struct **vmas =NULL ; +struct page **pages =NULL ; +int i, j, got_pages =0 ; +int ret = -EINVAL ; + +if (ctx->user_bufs) +return -EBUSY ; +if (!nr_args || nr_args >UIO_MAXIOV ) +return -EINVAL ; + + ctx->user_bufs =kcalloc (nr_args,sizeof (struct io_mapped_ubuf ), +GFP_KERNEL ); +if (!ctx->user_bufs) +return -ENOMEM ; + +for (i =0 ; i < nr_args; i++) { +struct io_mapped_ubuf *imu = &ctx->user_bufs[i]; +unsigned long off, start, end, ubuf; +int pret, nr_pages; +struct iovec iov; +size_t size; + + ret =io_copy_iov (ctx, &iov, arg, i); +if (ret) +break ; + +/* +* Don't impose further limits on the size and buffer +* constraints here, we'll -EINVAL later when IO is +* submitted if they are wrong. +*/ + ret = -EFAULT ; +if (!iov.iov_base || !iov.iov_len) + goto err; + +/* arbitrary limit, but we need something */ +if (iov.iov_len >SZ_1G ) + goto err; + + ubuf = (unsigned long ) iov.iov_base; + end = (ubuf + iov.iov_len +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + start = ubuf >>PAGE_SHIFT ; + nr_pages = end - start; + +if (ctx->account_mem) { + ret =io_account_mem (ctx->user, nr_pages); +if (ret) + goto err;
Quoted 8 lines
fs/io_uring.c static unsigned long ring_pages(unsigned sq_entries, unsigned cq_entries) · line 1516
Quoted 4 lines
fs/io_uring.c +4
-0+ } + + ret =0 ; +if (!pages || nr_pages > got_pages) {Nit: No need to check for
!pagesas long aspagesandgot_pagesare synchronized (which guarantees that!pagesimpliesgot_pages==0).
I just prefer it that way, less confusion and past history this always confuses the compiler and then we have to deal with a bogus warning.
Quoted 8 lines
fs/io_uring.c static unsigned long ring_pages(unsigned sq_entries, unsigned cq_entries) · line 1522
Quoted 6 lines
fs/io_uring.c +6
-0+kfree (vmas); +kfree (pages); + pages =kmalloc_array (nr_pages,sizeof (struct page *), +GFP_KERNEL ); + vmas = kmalloc_array(nr_pages, + sizeof(struct vma_area_struct *),typo: s/vma_area_struct/vm_area_struct/
Fixed, thanks.
Quoted 73 lines
Quoted 73 lines
fs/io_uring.c +73
-0+ GFP_KERNEL); +if (!pages || !vmas) { + ret = -ENOMEM ; +if (ctx->account_mem) +io_unaccount_mem (ctx->user, nr_pages); + goto err; + } + got_pages = nr_pages; + } + + imu->bvec =kmalloc_array (nr_pages,sizeof (struct bio_vec ), +GFP_KERNEL ); + ret = -ENOMEM ; +if (!imu->bvec) { +if (ctx->account_mem) +io_unaccount_mem (ctx->user, nr_pages); + goto err; + } + + ret =0 ; +down_read (¤t->mm->mmap_sem); + pret =get_user_pages_longterm (ubuf, nr_pages,FOLL_WRITE , + pages, vmas); +if (pret == nr_pages) { +/* don't support file backed memory */ +for (j =0 ; j < nr_pages; j++) { +struct vm_area_struct *vma = vmas[j]; + +if (vma->vm_file && + !is_file_hugepages (vma->vm_file)) { + ret = -EOPNOTSUPP ; +break ; + } + } + }else { + ret = pret <0 ? pret : -EFAULT ; + } +up_read (¤t->mm->mmap_sem); +if (ret) { +/* +* if we did partial map, or found file backed vmas, +* release any pages we did get +*/ +if (pret >0 ) { +for (j =0 ; j < pret; j++) +put_page (pages[j]); + } +if (ctx->account_mem) +io_unaccount_mem (ctx->user, nr_pages); + goto err; + } + + off = ubuf & ~PAGE_MASK ; + size = iov.iov_len; +for (j =0 ; j < nr_pages; j++) { +size_t vec_len; + + vec_len =min_t (size_t, size,PAGE_SIZE - off); + imu->bvec[j].bv_page = pages[j]; + imu->bvec[j].bv_len = vec_len; + imu->bvec[j].bv_offset = off; + off =0 ; + size -= vec_len; + } +/* store original address for later verification */ + imu->ubuf = ubuf; + imu->len = iov.iov_len; + imu->nr_bvecs = nr_pages; + } +kfree (pages); +kfree (vmas); + ctx->nr_user_bufs = nr_args; +return 0 ;
Quoted 8 lines
fs/io_uring.c static unsigned long ring_pages(unsigned sq_entries, unsigned cq_entries) · line 1599
Quoted 4 lines
fs/io_uring.c +4
-0+err: +kfree (pages); +kfree (vmas); +io_sqe_buffer_unregister (ctx);
io_sqe_buffer_unregister()gets rid of elements up toctx->nr_user_bufs, but as far as I can tell,ctx->nr_user_bufsis always zero here. I think that's going to cause a reference leak.
Fixed, thanks.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 13/19 net: split out functions related to registering inflight socket files
In reply to Jens AxboeWe need this functionality for the io_uring file registration, but we cannot rely on it since CONFIG_UNIX can be modular. Move the helpers to a separate file, that's always builtin to the kernel if CONFIG_UNIX is m/y.
No functional changes in this patch, just moving code around.
--- include/net/af_unix.h | 1 + net/Makefile | 2 +- net/unix/Kconfig | 5 ++ net/unix/Makefile | 2 + net/unix/af_unix.c | 63 +----------------- net/unix/garbage.c | 71 +------------------- net/unix/scm.c | 151 ++++++++++++++++++++++++++++++++++++++++++ net/unix/scm.h | 10 +++ 8 files changed, 174 insertions(+), 131 deletions(-) create mode 100644 net/unix/scm.c create mode 100644 net/unix/scm.h
include/net/af_unix.h +1 -0
@@ -10,6 +10,7 @@void unix_inflight (struct user_struct *user,struct file *fp);void unix_notinflight (struct user_struct *user,struct file *fp); +void unix_destruct_scm (struct sk_buff *skb);void unix_gc (void );void wait_for_unix_gc (void );struct sock *unix_get_socket (struct file *filp);
net/Makefile +1 -1
@@ -18,7 +18,7 @@ obj-$(CONFIG_NETFILTER) += netfilter/ obj-$(CONFIG_INET) += ipv4/ obj-$(CONFIG_TLS) += tls/ obj-$(CONFIG_XFRM) += xfrm/ -obj-$(CONFIG_UNIX) += unix/ +obj-$(CONFIG_UNIX_SCM) += unix/ obj-$(CONFIG_NET) += ipv6/ obj-$(CONFIG_BPFILTER) += bpfilter/ obj-$(CONFIG_PACKET) += packet/
net/unix/Kconfig +5 -0
@@ -19,6 +19,11 @@ config UNIX Say Y unless you know what you are doing. +config UNIX_SCM + bool + depends on UNIX + default y + config UNIX_DIAG tristate "UNIX: socket monitoring interface" depends on UNIX
net/unix/Makefile +2 -0
@@ -10,3 +10,5 @@ unix-$(CONFIG_SYSCTL) += sysctl_net_unix.o obj-$(CONFIG_UNIX_DIAG) += unix_diag.o unix_diag-y := diag.o + +obj-$(CONFIG_UNIX_SCM) += scm.o
net/unix/af_unix.c +2 -61
75 lines not on this page · raw message
net/unix/garbage.c +2 -69
82 lines not on this page · raw message
net/unix/scm.c new file +151 -0
151 lines not on this page · raw message
net/unix/scm.h new file +10 -0
@@ -0,0 +1,10 @@ +#ifndef NET_UNIX_SCM_H +#define NET_UNIX_SCM_H + +extern struct list_head gc_inflight_list; +extern spinlock_t unix_gc_lock; + +int unix_attach_fds (struct scm_cookie *scm,struct sk_buff *skb); +void unix_detach_fds (struct scm_cookie *scm,struct sk_buff *skb); + +#endif
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 14/19 io_uring: add file set registration
In reply to Jens AxboeWe normally have to fget/fput for each IO we do on a file. Even with the batching we do, the cost of the atomic inc/dec of the file usage count adds up.
This adds IORING_REGISTER_FILES, and IORING_UNREGISTER_FILES opcodes for the io_uring_register(2) system call. The arguments passed in must be an array of __s32 holding file descriptors, and nr_args should hold the number of file descriptors the application wishes to pin for the duration of the io_uring instance (or until IORING_UNREGISTER_FILES is called).
When used, the application must set IOSQE_FIXED_FILE in the sqe->flags member. Then, instead of setting sqe->fd to the real fd, it sets sqe->fd to the index in the array passed in to IORING_REGISTER_FILES.
Files are automatically unregistered when the io_uring instance is torn down. An application need only unregister if it wishes to register a new set of fds.
--- fs/io_uring.c | 267 ++++++++++++++++++++++++++++++---- include/uapi/linux/io_uring.h | 9 +- 2 files changed, 246 insertions(+), 30 deletions(-)
fs/io_uring.c +238 -29
@@ -49,6 +49,7 @@#include <linux/net.h> #include <net/sock.h> #include <net/af_unix.h> +#include <net/scm.h> #include <linux/anon_inodes.h> #include <linux/sched/mm.h> #include <linux/uaccess.h>
@@ -61,6 +62,7 @@#include "internal.h" #define IORING_MAX_ENTRIES 4096 +#define IORING_MAX_FIXED_FILES 1024struct io_uring {u32 head____cacheline_aligned_in_smp ;
@@ -123,6 +125,14 @@ struct io_ring_ctx {struct fasync_struct *cq_fasync; }____cacheline_aligned_in_smp ; +/* +* If used, fixed file set. Writers must ensure that ->refs is dead, +* readers must ensure that ->refs is alive as long as the file* is +* used. Only updated through io_uring_register(2). +*/ +struct file **user_files; +unsigned nr_user_files; +/* if used, fixed mapped user buffers */ unsigned nr_user_bufs;struct io_mapped_ubuf *user_bufs;
@@ -170,6 +180,7 @@ struct io_kiocb {unsigned int flags;#define REQ_F_FORCE_NONBLOCK 1/* inline submission attempt */ #define REQ_F_IOPOLL_COMPLETED 2/* polled IO has completed */ +#define REQ_F_FIXED_FILE 4/* ctx owns file */ u64 user_data;u64 error;
@@ -404,15 +415,17 @@ static void io_iopoll_complete(struct io_ring_ctx *ctx, unsigned int *nr_events,* Batched puts of the same file, to avoid dirtying the * file usage count multiple times, if avoidable. */ -if (!file) { - file = req->rw.ki_filp; - file_count =1 ; - }else if (file == req->rw.ki_filp) { - file_count++; - }else { -fput_many (file, file_count); - file = req->rw.ki_filp; - file_count =1 ; +if (!(req->flags &REQ_F_FIXED_FILE )) { +if (!file) { + file = req->rw.ki_filp; + file_count =1 ; + }else if (file == req->rw.ki_filp) { + file_count++; + }else { +fput_many (file, file_count); + file = req->rw.ki_filp; + file_count =1 ; + } }if (to_free ==ARRAY_SIZE (reqs))
@@ -544,13 +557,19 @@ static void kiocb_end_write(struct kiocb *kiocb) } } +static void io_fput (struct io_kiocb *req) +{ +if (!(req->flags &REQ_F_FIXED_FILE )) +fput (req->rw.ki_filp); +} +static void io_complete_rw (struct kiocb *kiocb,long res,long res2) { struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw);kiocb_end_write (kiocb); -fput (kiocb->ki_filp); +io_fput (req);io_cqring_add_event (req->ctx, req->user_data, res,0 );io_free_req (req); }
@@ -666,19 +685,29 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, {struct io_ring_ctx *ctx = req->ctx;struct kiocb *kiocb = &req->rw; -unsigned ioprio; +unsigned ioprio, flags;int fd, ret;/* For -EAGAIN retry, everything is already prepped */ if (kiocb->ki_filp)return 0 ; + flags =READ_ONCE (sqe->flags); fd =READ_ONCE (sqe->fd); - kiocb->ki_filp =io_file_get (state, fd); -if (unlikely (!kiocb->ki_filp)) -return -EBADF ; -if (force_nonblock && !io_file_supports_async (kiocb->ki_filp)) - force_nonblock = false; + +if (flags &IOSQE_FIXED_FILE ) { +if (unlikely (!ctx->user_files || + (unsigned ) fd >= ctx->nr_user_files)) +return -EBADF ; + kiocb->ki_filp = ctx->user_files[fd]; + req->flags |=REQ_F_FIXED_FILE ; + }else { + kiocb->ki_filp =io_file_get (state, fd); +if (unlikely (!kiocb->ki_filp)) +return -EBADF ; +if (force_nonblock && !io_file_supports_async (kiocb->ki_filp)) + force_nonblock = false; + } kiocb->ki_pos =READ_ONCE (sqe->off); kiocb->ki_flags =iocb_flags (kiocb->ki_filp); kiocb->ki_hint =ki_hint_validate (file_write_hint (kiocb->ki_filp));
@@ -718,10 +747,14 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, }return 0 ; out_fput: -/* in case of error, we didn't use this file reference. drop it. */ -if (state) - state->used_refs--; -io_file_put (state, kiocb->ki_filp); +if (!(flags &IOSQE_FIXED_FILE )) { +/* +* in case of error, we didn't use this file reference. drop it. +*/ +if (state) + state->used_refs--; +io_file_put (state, kiocb->ki_filp); + }return ret; }
@@ -863,7 +896,7 @@ static ssize_t io_read(struct io_kiocb *req, const struct sqe_submit *s, out_fput:/* Hold on to the file for -EAGAIN */ if (unlikely (ret && ret != -EAGAIN )) -fput (file); +io_fput (req);return ret; }
@@ -917,7 +950,7 @@ static ssize_t io_write(struct io_kiocb *req, const struct sqe_submit *s,kfree (iovec); out_fput:if (unlikely (ret)) -fput (file); +io_fput (req);return ret; }
@@ -940,7 +973,7 @@ static int io_nop(struct io_kiocb *req, u64 user_data)*/ if (req->rw.ki_filp) { err = -EBADF ; -fput (req->rw.ki_filp); +io_fput (req); }io_cqring_add_event (ctx, user_data, err,0 );io_free_req (req);
@@ -949,21 +982,32 @@ static int io_nop(struct io_kiocb *req, u64 user_data)static int io_prep_fsync (struct io_kiocb *req,const struct io_uring_sqe *sqe) { +struct io_ring_ctx *ctx = req->ctx; +unsigned flags;int fd;/* Prep already done */ if (req->rw.ki_filp)return 0 ; -if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL )) +if (unlikely (ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ;if (unlikely (sqe->addr || sqe->ioprio || sqe->buf_index))return -EINVAL ; fd =READ_ONCE (sqe->fd); - req->rw.ki_filp =fget (fd); -if (unlikely (!req->rw.ki_filp)) -return -EBADF ; + flags =READ_ONCE (sqe->flags); + +if (flags &IOSQE_FIXED_FILE ) { +if (unlikely (!ctx->user_files || fd >= ctx->nr_user_files)) +return -EBADF ; + req->rw.ki_filp = ctx->user_files[fd]; + req->flags |=REQ_F_FIXED_FILE ; + }else { + req->rw.ki_filp =fget (fd); +if (unlikely (!req->rw.ki_filp)) +return -EBADF ; + }return 0 ; }
@@ -993,7 +1037,7 @@ static int io_fsync(struct io_kiocb *req, const struct io_uring_sqe *sqe, end >0 ? end :LLONG_MAX , fsync_flags & IORING_FSYNC_DATASYNC); -fput (req->rw.ki_filp); +io_fput (req);io_cqring_add_event (req->ctx, sqe->user_data, ret,0 );io_free_req (req);return 0 ;
@@ -1132,7 +1176,7 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct sqe_submit *s,ssize_t ret;/* enforce forwards compatibility on users */ -if (unlikely (s->sqe->flags)) +if (unlikely (s->sqe->flags & ~IOSQE_FIXED_FILE ))return -EINVAL ; req =io_get_req (ctx, state);
@@ -1335,6 +1379,161 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,return READ_ONCE (ring->r.head) ==READ_ONCE (ring->r.tail) ? ret :0 ; } +static void __io_sqe_files_unregister (struct io_ring_ctx *ctx) +{ +#if defined(CONFIG_UNIX ) +if (ctx->ring_sock) { +struct sock *sock = ctx->ring_sock->sk; +struct sk_buff *skb; + +while ((skb =skb_dequeue (&sock->sk_receive_queue)) !=NULL ) +kfree_skb (skb); + } +#else +int i; + +for (i =0 ; i < ctx->nr_user_files; i++) +fput (ctx->user_files[i]); +#endif +} + +static int io_sqe_files_unregister (struct io_ring_ctx *ctx) +{ +if (!ctx->user_files) +return -ENXIO ; + +__io_sqe_files_unregister (ctx); +kfree (ctx->user_files); + ctx->user_files =NULL ; +return 0 ; +} + +#if defined(CONFIG_UNIX ) +/* +* Ensure the UNIX gc is aware of our file set, so we are certain that +* the io_uring can be safely unregistered on process exit, even if we have +* loops in the file referencing. +*/ +static int __io_sqe_files_scm (struct io_ring_ctx *ctx,int nr,int offset) +{ +struct sock *sk = ctx->ring_sock->sk; +struct scm_fp_list *fpl; +struct sk_buff *skb; +int i; + + fpl =kzalloc (sizeof (*fpl),GFP_KERNEL ); +if (!fpl) +return -ENOMEM ; + + skb =alloc_skb (0 ,GFP_KERNEL ); +if (!skb) { +kfree (fpl); +return -ENOMEM ; + } + + skb->sk = sk; + skb->destructor = unix_destruct_scm; + + fpl->user =get_uid (ctx->user); +for (i =0 ; i < nr; i++) { + fpl->fp[i] =get_file (ctx->user_files[i + offset]); +unix_inflight (fpl->user, fpl->fp[i]); + } + + fpl->max = fpl->count = nr; +UNIXCB (skb).fp = fpl; +refcount_add (skb->truesize, &sk->sk_wmem_alloc); +skb_queue_head (&sk->sk_receive_queue, skb); + +for (i =0 ; i < nr; i++) +fput (fpl->fp[i]); + +return 0 ; +} + +/* +* If UNIX sockets are enabled, fd passing can cause a reference cycle which +* causes regular reference counting to break down. We rely on the UNIX +* garbage collection to take care of this problem for us. +*/ +static int io_sqe_files_scm (struct io_ring_ctx *ctx) +{ +unsigned left, total; +int ret =0 ; + + total =0 ; + left = ctx->nr_user_files; +while (left) { +unsigned this_files =min_t (unsigned, left,SCM_MAX_FD ); +int ret; + + ret =__io_sqe_files_scm (ctx, this_files, total); +if (ret) +break ; + left -= this_files; + total += this_files; + } + +return ret; +} +#else +static int io_sqe_files_scm (struct io_ring_ctx *ctx) +{ +return 0 ; +} +#endif + +static int io_sqe_files_register (struct io_ring_ctx *ctx,void __user *arg, +unsigned nr_args) +{ +__s32 __user *fds = (__s32 __user *) arg; +int fd, ret =0 ; +unsigned i; + +if (ctx->user_files) +return -EBUSY ; +if (!nr_args) +return -EINVAL ; +if (nr_args >IORING_MAX_FIXED_FILES ) +return -EMFILE ; + + ctx->user_files =kcalloc (nr_args,sizeof (struct file *),GFP_KERNEL ); +if (!ctx->user_files) +return -ENOMEM ; + +for (i =0 ; i < nr_args; i++) { + ret = -EFAULT ; +if (copy_from_user (&fd, &fds[i],sizeof (fd))) +break ; + + ctx->user_files[i] =fget (fd); + + ret = -EBADF ; +if (!ctx->user_files[i]) +break ; +/* +* Don't allow io_uring instances to be registered. If UNIX +* isn't enabled, then this causes a reference cycle and this +* instance can never get freed. If UNIX is enabled we'll +* handle it just fine, but there's still no point in allowing +* a ring fd as it doesn't support regular read/write anyway. +*/ +if (ctx->user_files[i]->f_op == &io_uring_fops) { +fput (ctx->user_files[i]); +break ; + } + ctx->nr_user_files++; + ret =0 ; + } + +if (!ret) + ret =io_sqe_files_scm (ctx); +if (ret) +io_sqe_files_unregister (ctx); + +return ret; +} +static int io_sq_offload_start (struct io_ring_ctx *ctx) {int ret;
@@ -1609,6 +1808,7 @@ static void io_ring_ctx_free(struct io_ring_ctx *ctx)io_iopoll_reap_events (ctx);io_sqe_buffer_unregister (ctx); +io_sqe_files_unregister (ctx);#if defined(CONFIG_UNIX )if (ctx->ring_sock)
@@ -1988,6 +2188,15 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,break ; ret =io_sqe_buffer_unregister (ctx);break ; +case IORING_REGISTER_FILES : + ret =io_sqe_files_register (ctx, arg, nr_args); +break ; +case IORING_UNREGISTER_FILES : + ret = -EINVAL ; +if (arg || nr_args) +break ; + ret =io_sqe_files_unregister (ctx); +break ;default : ret = -EINVAL ;break ;
include/uapi/linux/io_uring.h +8 -1
@@ -16,7 +16,7 @@*/ struct io_uring_sqe {__u8 opcode;/* type of operation for this sqe */ -__u8 flags;/* as of now unused */ +__u8 flags;/* IOSQE_ flags */ __u16 ioprio;/* ioprio for the request */ __s32 fd;/* file descriptor to do IO on */ __u64 off;/* offset into file */
@@ -33,6 +33,11 @@ struct io_uring_sqe { }; }; +/* +* sqe->flags +*/ +#define IOSQE_FIXED_FILE (1U << 0)/* use fixed fileset */ +/* * io_uring_setup() flags */
@@ -113,5 +118,7 @@ struct io_uring_params {*/ #define IORING_REGISTER_BUFFERS 0#define IORING_UNREGISTER_BUFFERS 1 +#define IORING_REGISTER_FILES 2 +#define IORING_UNREGISTER_FILES 3#endif
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 14/19] io_uring: add file set registration
Quoted 22 lines · Jens Axboe
We normally have to fget/fput for each IO we do on a file. Even with the batching we do, the cost of the atomic inc/dec of the file usage count adds up.
This adds
IORING_REGISTER_FILES, andIORING_UNREGISTER_FILESopcodes for theio_uring_register(2)system call. The arguments passed in must be an array of__s32holding file descriptors, andnr_argsshould hold the number of file descriptors the application wishes to pin for the duration of theio_uringinstance (or untilIORING_UNREGISTER_FILESis called).When used, the application must set
IOSQE_FIXED_FILEin thesqe->flagsmember. Then, instead of settingsqe->fdto the real fd, it setssqe->fdto the index in the array passed in toIORING_REGISTER_FILES.Files are automatically unregistered when the
io_uringinstance is torn down. An application need only unregister if it wishes to register a new set of fds.Reviewed-by Hannes Reinecke <[email protected]>Signed-off-by Jens Axboe <[email protected]>---
[...]
Quoted 29 lines
fs/io_uring.c +25
-0@@ -1335,6 +1379,161 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,return READ_ONCE (ring->r.head) ==READ_ONCE (ring->r.tail) ? ret :0 ; } +static void __io_sqe_files_unregister (struct io_ring_ctx *ctx) +{ +#if defined(CONFIG_UNIX ) +if (ctx->ring_sock) { +struct sock *sock = ctx->ring_sock->sk; +struct sk_buff *skb; + +while ((skb =skb_dequeue (&sock->sk_receive_queue)) !=NULL ) +kfree_skb (skb); + } +#else +int i; + +for (i =0 ; i < ctx->nr_user_files; i++) +fput (ctx->user_files[i]); +#endif +} + +static int io_sqe_files_unregister (struct io_ring_ctx *ctx) +{ +if (!ctx->user_files) +return -ENXIO ; + +__io_sqe_files_unregister (ctx); +kfree (ctx->user_files);
fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1416
Quoted 10 lines
fs/io_uring.c +10
-0+ ctx->user_files =NULL ; +return 0 ; +} + +#if defined(CONFIG_UNIX ) +/* +* Ensure the UNIX gc is aware of our file set, so we are certain that +* the io_uring can be safely unregistered on process exit, even if we have +* loops in the file referencing. +*/
I still don't get how this is supposed to work. Quoting from an earlier version of the patch:
|> I think the overall concept here is still broken: You're giving the |> user_files to the GC, and I think the GC can drop their refcounts, but |> I don't see you actually getting feedback from the GC anywhere that |> would let the GC break your references? E.g. in io_prep_rw() you grab |> file pointers from ctx->user_files after simply checking |> ctx->nr_user_files, and there is no path from the GC that touches |> those fields. As far as I can tell, the GC is just going to go through |> unix_destruct_scm() and drop references on your files, causing |> use-after-free. |> |> But the unix GC is complicated, and maybe I'm just missing something... | | Only when the skb is released, which is either done when the io_uring | is torn down (and then definitely safe), or if the socket is released, | which is again also at a safe time.
I'll try to add inline comments on my understanding of the code, maybe you can point out where exactly we're understanding it differently...
fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1427
Quoted 11 lines
fs/io_uring.c +11
-0+static int __io_sqe_files_scm (struct io_ring_ctx *ctx,int nr,int offset) +{ +struct sock *sk = ctx->ring_sock->sk; +struct scm_fp_list *fpl; +struct sk_buff *skb; +int i; + + fpl =kzalloc (sizeof (*fpl),GFP_KERNEL ); +if (!fpl) +return -ENOMEM ; +
// here we allocate a new `skb` with ->users==1
fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1434
Quoted 7 lines
fs/io_uring.c +7
-0+ skb =alloc_skb (0 ,GFP_KERNEL ); +if (!skb) { +kfree (fpl); +return -ENOMEM ; + } + + skb->sk = sk;
// set the skb's destructor, invoked when ->users drops to 0;
// destructor drops file refcountsfs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1438
Quoted 4 lines
fs/io_uring.c +4
-0+ skb->destructor = unix_destruct_scm; + + fpl->user =get_uid (ctx->user); +for (i =0 ; i < nr; i++) {
// grab a reference to each file for the skb
fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1445
Quoted 7 lines
fs/io_uring.c +7
-0+ fpl->fp[i] =get_file (ctx->user_files[i + offset]); +unix_inflight (fpl->user, fpl->fp[i]); + } + + fpl->max = fpl->count = nr; +UNIXCB (skb).fp = fpl; +refcount_add (skb->truesize, &sk->sk_wmem_alloc);
// put the skb in the sk_receive_queue, still with a refcount of 1.
Review static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1447
Quoted 2 lines
(quoted diff) +2
-0+ skb_queue_head(&sk->sk_receive_queue, skb); +
// drop a reference from each file; after this, only the
skb owns references to files;
// the ctx->user_files entries borrow their lifetime from the skbfs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1452
Quoted 5 lines
fs/io_uring.c +5
-0+for (i =0 ; i < nr; i++) +fput (fpl->fp[i]); + +return 0 ; +}
So let's say you have a cyclic dependency where an io_uring points to a unix domain socket, and the unix domain socket points back at the uring. The last reference from outside the loop goes away when the user closes the uring's fd, but the uring's busypolling kernel thread is still running and busypolling for new submission queue entries.
The GC can then come along and run scan_inflight(), detect that ctx->ring_sock->sk->sk_receive_queue contains a reference to a unix domain socket, and steal the skb (unlinking it from the ring_sock and linking it into the hitlist):
__skb_unlink(skb, &x->sk_receive_queue);__skb_queue_tail(hitlist, skb);
And then the hitlist will be processed by __skb_queue_purge(), dropping the refcount of the skb from 1 to 0. At that point, the unix domain socket can be freed, and you still have a pointer to it in ctx->user_files.
Quoted 10 lines
fs/io_uring.c +10
-0+ +/* +* If UNIX sockets are enabled, fd passing can cause a reference cycle which +* causes regular reference counting to break down. We rely on the UNIX +* garbage collection to take care of this problem for us. +*/ +static int io_sqe_files_scm (struct io_ring_ctx *ctx) +{ +unsigned left, total; +int ret =0 ;
fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1472
Quoted 10 lines
fs/io_uring.c +10
-0+ + total =0 ; + left = ctx->nr_user_files; +while (left) { +unsigned this_files =min_t (unsigned, left,SCM_MAX_FD ); +int ret; + + ret =__io_sqe_files_scm (ctx, this_files, total); +if (ret) +break ;
If we bail out in the middle of translating the ->user_files here, we have to make sure that we both destroy the already-created SKBs and drop our references on the files we haven't dealt with yet.
Quoted 31 lines
fs/io_uring.c +31
-0+ left -= this_files; + total += this_files; + } + +return ret; +} +#else +static int io_sqe_files_scm (struct io_ring_ctx *ctx) +{ +return 0 ; +} +#endif + +static int io_sqe_files_register (struct io_ring_ctx *ctx,void __user *arg, +unsigned nr_args) +{ +__s32 __user *fds = (__s32 __user *) arg; +int fd, ret =0 ; +unsigned i; + +if (ctx->user_files) +return -EBUSY ; +if (!nr_args) +return -EINVAL ; +if (nr_args >IORING_MAX_FIXED_FILES ) +return -EMFILE ; + + ctx->user_files =kcalloc (nr_args,sizeof (struct file *),GFP_KERNEL ); +if (!ctx->user_files) +return -ENOMEM ; +
fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1513
Quoted 10 lines
fs/io_uring.c +10
-0+for (i =0 ; i < nr_args; i++) { + ret = -EFAULT ; +if (copy_from_user (&fd, &fds[i],sizeof (fd))) +break ; + + ctx->user_files[i] =fget (fd); + + ret = -EBADF ; +if (!ctx->user_files[i]) +break ;
Let's say we hit this error condition after N successful loop iterations, on a kernel with CONFIG_UNIX. At that point, we've filled N file pointers into ctx->user_files[], and we've incremented ctx->nr_user_files up to N. Now we jump to the if (ret) branch, which goes into io_sqe_files_unregister(); but that's going to attempt to dequeue inflight files from ctx->ring_sock, so that's not going to work.
fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1525
Quoted 12 lines
fs/io_uring.c +12
-0+/* +* Don't allow io_uring instances to be registered. If UNIX +* isn't enabled, then this causes a reference cycle and this +* instance can never get freed. If UNIX is enabled we'll +* handle it just fine, but there's still no point in allowing +* a ring fd as it doesn't support regular read/write anyway. +*/ +if (ctx->user_files[i]->f_op == &io_uring_fops) { +fput (ctx->user_files[i]); +break ; + } + ctx->nr_user_files++;
I don't see anything that can set ctx->nr_user_files back down to zero; as far as I can tell, if you repeatedly register and unregister a set of files, ctx->nr_user_files will just grow, and since it's used as an upper bound for array accesses, that's bad.
fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1535
Quoted 10 lines
fs/io_uring.c +10
-0+ ret =0 ; + } + +if (!ret) + ret =io_sqe_files_scm (ctx); +if (ret) +io_sqe_files_unregister (ctx); + +return ret; +}
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerRe: [PATCH 14/19] io_uring: add file set registration
Quoted 142 lines · Jann Horn
Quoted 22 lines · Jens Axboe
We normally have to fget/fput for each IO we do on a file. Even with the batching we do, the cost of the atomic inc/dec of the file usage count adds up.
This adds
IORING_REGISTER_FILES, andIORING_UNREGISTER_FILESopcodes for theio_uring_register(2)system call. The arguments passed in must be an array of__s32holding file descriptors, andnr_argsshould hold the number of file descriptors the application wishes to pin for the duration of theio_uringinstance (or untilIORING_UNREGISTER_FILESis called).When used, the application must set
IOSQE_FIXED_FILEin thesqe->flagsmember. Then, instead of settingsqe->fdto the real fd, it setssqe->fdto the index in the array passed in toIORING_REGISTER_FILES.Files are automatically unregistered when the
io_uringinstance is torn down. An application need only unregister if it wishes to register a new set of fds.Reviewed-by Hannes Reinecke <[email protected]>Signed-off-by Jens Axboe <[email protected]>---
[...]
Quoted 29 lines
fs/io_uring.c +25
-0@@ -1335,6 +1379,161 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,return READ_ONCE (ring->r.head) ==READ_ONCE (ring->r.tail) ? ret :0 ; } +static void __io_sqe_files_unregister (struct io_ring_ctx *ctx) +{ +#if defined(CONFIG_UNIX ) +if (ctx->ring_sock) { +struct sock *sock = ctx->ring_sock->sk; +struct sk_buff *skb; + +while ((skb =skb_dequeue (&sock->sk_receive_queue)) !=NULL ) +kfree_skb (skb); + } +#else +int i; + +for (i =0 ; i < ctx->nr_user_files; i++) +fput (ctx->user_files[i]); +#endif +} + +static int io_sqe_files_unregister (struct io_ring_ctx *ctx) +{ +if (!ctx->user_files) +return -ENXIO ; + +__io_sqe_files_unregister (ctx); +kfree (ctx->user_files);fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1416
Quoted 10 lines
fs/io_uring.c +10
-0+ ctx->user_files =NULL ; +return 0 ; +} + +#if defined(CONFIG_UNIX ) +/* +* Ensure the UNIX gc is aware of our file set, so we are certain that +* the io_uring can be safely unregistered on process exit, even if we have +* loops in the file referencing. +*/ I still don't get how this is supposed to work. Quoting from an earlier version of the patch:
|> I think the overall concept here is still broken: You're giving the |> user_files to the GC, and I think the GC can drop their refcounts, but |> I don't see you actually getting feedback from the GC anywhere that |> would let the GC break your references? E.g. in io_prep_rw() you grab |> file pointers from ctx->user_files after simply checking |> ctx->nr_user_files, and there is no path from the GC that touches |> those fields. As far as I can tell, the GC is just going to go through |> unix_destruct_scm() and drop references on your files, causing |> use-after-free. |> |> But the unix GC is complicated, and maybe I'm just missing something... | | Only when the skb is released, which is either done when the io_uring | is torn down (and then definitely safe), or if the socket is released, | which is again also at a safe time.I'll try to add inline comments on my understanding of the code, maybe you can point out where exactly we're understanding it differently...
fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1427
Quoted 11 lines
fs/io_uring.c +11
-0+static int __io_sqe_files_scm (struct io_ring_ctx *ctx,int nr,int offset) +{ +struct sock *sk = ctx->ring_sock->sk; +struct scm_fp_list *fpl; +struct sk_buff *skb; +int i; + + fpl =kzalloc (sizeof (*fpl),GFP_KERNEL ); +if (!fpl) +return -ENOMEM ; +// here we allocate a new `skb` with ->users==1fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1434
Quoted 7 lines
fs/io_uring.c +7
-0+ skb =alloc_skb (0 ,GFP_KERNEL ); +if (!skb) { +kfree (fpl); +return -ENOMEM ; + } + + skb->sk = sk;// set the skb's destructor, invoked when ->users drops to 0; // destructor drops file refcountsfs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1438
Quoted 4 lines
fs/io_uring.c +4
-0+ skb->destructor = unix_destruct_scm; + + fpl->user =get_uid (ctx->user); +for (i =0 ; i < nr; i++) {// grab a reference to each file for the skbfs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1445
Quoted 7 lines
fs/io_uring.c +7
-0+ fpl->fp[i] =get_file (ctx->user_files[i + offset]); +unix_inflight (fpl->user, fpl->fp[i]); + } + + fpl->max = fpl->count = nr; +UNIXCB (skb).fp = fpl; +refcount_add (skb->truesize, &sk->sk_wmem_alloc);// put the skb in the sk_receive_queue, still with a refcount of 1.Review static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1447
Quoted 2 lines
(quoted diff) +2
-0+ skb_queue_head(&sk->sk_receive_queue, skb); +// drop a reference from each file; after this, only the skb owns references to files; // the ctx->user_files entries borrow their lifetime from the skbfs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1452
Quoted 5 lines
fs/io_uring.c +5
-0+for (i =0 ; i < nr; i++) +fput (fpl->fp[i]); + +return 0 ; +}So let's say you have a cyclic dependency where an
io_uringpoints to a unix domain socket, and the unix domain socket points back at the uring. The last reference from outside the loop goes away when the user closes the uring's fd, but the uring's busypolling kernel thread is still running and busypolling for new submission queue entries.The GC can then come along and run
scan_inflight(), detect thatctx->ring_sock->sk->sk_receive_queuecontains a reference to a unix domain socket, and steal the skb (unlinking it from thering_sockand linking it into the hitlist):
Quoted 7 lines
__skb_unlink(skb, &x->sk_receive_queue);__skb_queue_tail(hitlist, skb);And then the hitlist will be processed by
__skb_queue_purge(), dropping the refcount of the skb from 1 to 0. At that point, the unix domain socket can be freed, and you still have a pointer to it inctx->user_files.
I've fixed this for the sq offload case.
Quoted 16 lines
Quoted 16 lines
fs/io_uring.c +16
-0+ +/* +* If UNIX sockets are enabled, fd passing can cause a reference cycle which +* causes regular reference counting to break down. We rely on the UNIX +* garbage collection to take care of this problem for us. +*/ +static int io_sqe_files_scm (struct io_ring_ctx *ctx) +{ +unsigned left, total; +int ret =0 ; + + total =0 ; + left = ctx->nr_user_files; +while (left) { +unsigned this_files =min_t (unsigned, left,SCM_MAX_FD ); +int ret;
Quoted 8 lines
fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1472
Quoted 4 lines
fs/io_uring.c +4
-0+ + ret =__io_sqe_files_scm (ctx, this_files, total); +if (ret) +break ;If we bail out in the middle of translating the ->user_files here, we have to make sure that we both destroy the already-created SKBs and drop our references on the files we haven't dealt with yet.
Good catch, fixed.
Quoted 42 lines
Quoted 31 lines
fs/io_uring.c +31
-0+ left -= this_files; + total += this_files; + } + +return ret; +} +#else +static int io_sqe_files_scm (struct io_ring_ctx *ctx) +{ +return 0 ; +} +#endif + +static int io_sqe_files_register (struct io_ring_ctx *ctx,void __user *arg, +unsigned nr_args) +{ +__s32 __user *fds = (__s32 __user *) arg; +int fd, ret =0 ; +unsigned i; + +if (ctx->user_files) +return -EBUSY ; +if (!nr_args) +return -EINVAL ; +if (nr_args >IORING_MAX_FIXED_FILES ) +return -EMFILE ; + + ctx->user_files =kcalloc (nr_args,sizeof (struct file *),GFP_KERNEL ); +if (!ctx->user_files) +return -ENOMEM ; +fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1513
Quoted 10 lines
fs/io_uring.c +10
-0+for (i =0 ; i < nr_args; i++) { + ret = -EFAULT ; +if (copy_from_user (&fd, &fds[i],sizeof (fd))) +break ; + + ctx->user_files[i] =fget (fd); + + ret = -EBADF ; +if (!ctx->user_files[i]) +break ;
Quoted 7 lines
Let's say we hit this error condition after N successful loop iterations, on a kernel with
CONFIG_UNIX. At that point, we've filled N file pointers into ctx->user_files[], and we've incrementedctx->nr_user_filesup to N. Now we jump to theif (ret)branch, which goes intoio_sqe_files_unregister(); but that's going to attempt to dequeue inflight files fromctx->ring_sock, so that's not going to work.
Fixed, thanks.
Quoted 13 lines
fs/io_uring.c static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, · line 1525
Quoted 12 lines
fs/io_uring.c +12
-0+/* +* Don't allow io_uring instances to be registered. If UNIX +* isn't enabled, then this causes a reference cycle and this +* instance can never get freed. If UNIX is enabled we'll +* handle it just fine, but there's still no point in allowing +* a ring fd as it doesn't support regular read/write anyway. +*/ +if (ctx->user_files[i]->f_op == &io_uring_fops) { +fput (ctx->user_files[i]); +break ; + } + ctx->nr_user_files++;
Quoted 4 lines
I don't see anything that can set
ctx->nr_user_filesback down to zero; as far as I can tell, if you repeatedly register and unregister a set of files,ctx->nr_user_fileswill just grow, and since it's used as an upper bound for array accesses, that's bad.
Fixed that one earlier.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 15/19 io_uring: add submission polling
In reply to Jens AxboeThis enables an application to do IO, without ever entering the kernel. By using the SQ ring to fill in new sqes and watching for completions on the CQ ring, we can submit and reap IOs without doing a single system call. The kernel side thread will poll for new submissions, and in case of HIPRI/polled IO, it'll also poll for completions.
By default, we allow 1 second of active spinning. This can by changed by passing in a different grace period at io_uring_register(2) time. If the thread exceeds this idle time without having any work to do, it will set:
sq_ring->flags |= IORING_SQ_NEED_WAKEUP.
The application will have to call io_uring_enter() to start things back up again. If IO is kept busy, that will never be needed. Basically an application that has this feature enabled will guard it's io_uring_enter(2) call with:
read_barrier();
if (*sq_ring->flags & IORING_SQ_NEED_WAKEUP)
io_uring_enter(fd, 0, 0, IORING_ENTER_SQ_WAKEUP);
instead of calling it unconditionally.
It's mandatory to use fixed files with this feature. Failure to do so will result in the application getting an -EBADF CQ entry when submitting IO.
--- fs/io_uring.c | 248 +++++++++++++++++++++++++++++++++- include/uapi/linux/io_uring.h | 12 +- 2 files changed, 252 insertions(+), 8 deletions(-)
fs/io_uring.c +241 -7
@@ -44,6 +44,7 @@#include <linux/percpu.h> #include <linux/slab.h> #include <linux/workqueue.h> +#include <linux/kthread.h> #include <linux/blkdev.h> #include <linux/bvec.h> #include <linux/net.h>
@@ -108,12 +109,16 @@ struct io_ring_ctx {unsigned cached_sq_head;unsigned sq_entries;unsigned sq_mask; +unsigned sq_thread_idle;struct io_uring_sqe *sq_sqes; }____cacheline_aligned_in_smp ;/* IO offload */ struct workqueue_struct *sqo_wq; +struct task_struct *sqo_thread;/* if using sq thread polling */ struct mm_struct *sqo_mm; +wait_queue_head_t sqo_wait; +unsigned sqo_stop;struct {/* CQ ring */
@@ -168,6 +173,7 @@ struct sqe_submit {unsigned short index;bool has_user;bool needs_lock; +bool needs_fixed_file; };struct io_kiocb {
@@ -327,6 +333,8 @@ static void io_cqring_add_event(struct io_ring_ctx *ctx, u64 ki_user_data,if (waitqueue_active (&ctx->wait))wake_up (&ctx->wait); +if (waitqueue_active (&ctx->sqo_wait)) +wake_up (&ctx->sqo_wait); }static void io_ring_drop_ctx_refs (struct io_ring_ctx *ctx,unsigned refs)
@@ -680,9 +688,10 @@ static bool io_file_supports_async(struct file *file)return false; } -static int io_prep_rw (struct io_kiocb *req,const struct io_uring_sqe *sqe, +static int io_prep_rw (struct io_kiocb *req,const struct sqe_submit *s,bool force_nonblock,struct io_submit_state *state) { +const struct io_uring_sqe *sqe = s->sqe;struct io_ring_ctx *ctx = req->ctx;struct kiocb *kiocb = &req->rw;unsigned ioprio, flags;
@@ -702,6 +711,8 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, kiocb->ki_filp = ctx->user_files[fd]; req->flags |=REQ_F_FIXED_FILE ; }else { +if (s->needs_fixed_file) +return -EBADF ; kiocb->ki_filp =io_file_get (state, fd);if (unlikely (!kiocb->ki_filp))return -EBADF ;
@@ -865,7 +876,7 @@ static ssize_t io_read(struct io_kiocb *req, const struct sqe_submit *s,struct file *file;ssize_t ret; - ret =io_prep_rw (req, s->sqe, force_nonblock, state); + ret =io_prep_rw (req, s, force_nonblock, state);if (ret)return ret; file = kiocb->ki_filp;
@@ -909,7 +920,7 @@ static ssize_t io_write(struct io_kiocb *req, const struct sqe_submit *s,struct file *file;ssize_t ret; - ret =io_prep_rw (req, s->sqe, force_nonblock, state); + ret =io_prep_rw (req, s, force_nonblock, state);if (ret)return ret;/* Hold on to the file for -EAGAIN */
@@ -1295,6 +1306,170 @@ static bool io_get_sqring(struct io_ring_ctx *ctx, struct sqe_submit *s)return false; } +static int io_submit_sqes (struct io_ring_ctx *ctx,struct sqe_submit *sqes, +unsigned int nr,bool has_user,bool mm_fault) +{ +struct io_submit_state state, *statep =NULL ; +int ret, i, submitted =0 ; + +if (nr >IO_PLUG_THRESHOLD ) { +io_submit_state_start (&state, ctx, nr); + statep = &state; + } + +for (i =0 ; i < nr; i++) { +if (unlikely (mm_fault)) { + ret = -EFAULT ; + }else { + sqes[i].has_user = has_user; + sqes[i].needs_lock = true; + sqes[i].needs_fixed_file = true; + ret =io_submit_sqe (ctx, &sqes[i], statep); + } +if (!ret) { + submitted++; +continue ; + } + +io_cqring_add_event (ctx, sqes[i].sqe->user_data, ret,0 ); + } + +if (statep) +io_submit_state_end (&state); + +return submitted; +} + +static int io_sq_thread (void *data) +{ +struct sqe_submit sqes[IO_IOPOLL_BATCH ]; +struct io_ring_ctx *ctx = data; +struct mm_struct *cur_mm =NULL ; +mm_segment_t old_fs; +DEFINE_WAIT (wait); +unsigned inflight; +unsigned long timeout; + + old_fs =get_fs (); +set_fs (USER_DS ); + + timeout = inflight =0 ; +while (!kthread_should_stop () && !ctx->sqo_stop) { +bool all_fixed, mm_fault = false; +int i; + +if (inflight) { +unsigned nr_events =0 ; + +if (ctx->flags &IORING_SETUP_IOPOLL ) { +/* +* We disallow the app entering submit/complete +* with polling, but we still need to lock the +* ring to prevent racing with polled issue +* that got punted to a workqueue. +*/ +mutex_lock (&ctx->uring_lock); +io_iopoll_check (ctx, &nr_events,0 ); +mutex_unlock (&ctx->uring_lock); + }else { +/* +* Normal IO, just pretend everything completed. +* We don't have to poll completions for that. +*/ + nr_events = inflight; + } + + inflight -= nr_events; +if (!inflight) + timeout = jiffies + ctx->sq_thread_idle; + } + +if (!io_get_sqring (ctx, &sqes[0 ])) { +/* +* We're polling. If we're within the defined idle +* period, then let us spin without work before going +* to sleep. +*/ +if (inflight || !time_after (jiffies, timeout)) { +cpu_relax (); +continue ; + } + +/* +* Drop cur_mm before scheduling, we can't hold it for +* long periods (or over schedule()). Do this before +* adding ourselves to the waitqueue, as the unuse/drop +* may sleep. +*/ +if (cur_mm) { +unuse_mm (cur_mm); +mmput (cur_mm); + cur_mm =NULL ; + } + +prepare_to_wait (&ctx->sqo_wait, &wait, +TASK_INTERRUPTIBLE ); + +/* Tell userspace we may need a wakeup call */ + ctx->sq_ring->flags |=IORING_SQ_NEED_WAKEUP ; +smp_wmb (); + +if (!io_get_sqring (ctx, &sqes[0 ])) { +if (kthread_should_stop ()) { +finish_wait (&ctx->sqo_wait, &wait); +break ; + } +if (signal_pending (current)) +flush_signals (current); +schedule (); +finish_wait (&ctx->sqo_wait, &wait); + + ctx->sq_ring->flags &= ~IORING_SQ_NEED_WAKEUP ; +smp_wmb (); +continue ; + } +finish_wait (&ctx->sqo_wait, &wait); + + ctx->sq_ring->flags &= ~IORING_SQ_NEED_WAKEUP ; +smp_wmb (); + } + + i =0 ; + all_fixed = true; +do { +if (all_fixed &&io_sqe_needs_user (sqes[i].sqe)) + all_fixed = false; + + i++; +if (i ==ARRAY_SIZE (sqes)) +break ; + }while (io_get_sqring (ctx, &sqes[i])); + +io_commit_sqring (ctx); + +/* Unless all new commands are FIXED regions, grab mm */ +if (!all_fixed && !cur_mm) { + mm_fault = !mmget_not_zero (ctx->sqo_mm); +if (!mm_fault) { +use_mm (ctx->sqo_mm); + cur_mm = ctx->sqo_mm; + } + } + + inflight +=io_submit_sqes (ctx, sqes, i, cur_mm !=NULL , + mm_fault); + } + +io_iopoll_reap_events (ctx); + +set_fs (old_fs); +if (cur_mm) { +unuse_mm (cur_mm); +mmput (cur_mm); + } +return 0 ; +} +static int io_ring_submit (struct io_ring_ctx *ctx,unsigned int to_submit) {struct io_submit_state state, *statep =NULL ;
@@ -1313,6 +1488,7 @@ static int io_ring_submit(struct io_ring_ctx *ctx, unsigned int to_submit) s.has_user = true; s.needs_lock = false; + s.needs_fixed_file = false; ret =io_submit_sqe (ctx, &s, statep);if (ret) {
@@ -1534,13 +1710,47 @@ static int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg,return ret; } -static int io_sq_offload_start (struct io_ring_ctx *ctx) +static int io_sq_offload_start (struct io_ring_ctx *ctx, +struct io_uring_params *p) {int ret; +init_waitqueue_head (&ctx->sqo_wait);mmgrab (current->mm); ctx->sqo_mm = current->mm; + ctx->sq_thread_idle =msecs_to_jiffies (p->sq_thread_idle); +if (!ctx->sq_thread_idle) + ctx->sq_thread_idle =HZ ; + + ret = -EINVAL ; +if (!cpu_possible (p->sq_thread_cpu)) + goto err; + +if (ctx->flags &IORING_SETUP_SQPOLL ) { +if (p->flags &IORING_SETUP_SQ_AFF ) { +int cpu; + + cpu =array_index_nospec (p->sq_thread_cpu,NR_CPUS ); + ctx->sqo_thread =kthread_create_on_cpu (io_sq_thread, + ctx, cpu, +"io_uring-sq" ); + }else { + ctx->sqo_thread =kthread_create (io_sq_thread, ctx, +"io_uring-sq" ); + } +if (IS_ERR (ctx->sqo_thread)) { + ret =PTR_ERR (ctx->sqo_thread); + ctx->sqo_thread =NULL ; + goto err; + } +wake_up_process (ctx->sqo_thread); + }else if (p->flags &IORING_SETUP_SQ_AFF ) { +/* Can't have SQ_AFF without SQPOLL */ + ret = -EINVAL ; + goto err; + } +/* Do QD, or 2 * CPUS, whatever is smallest */ ctx->sqo_wq =alloc_workqueue ("io_ring-wq" ,WQ_UNBOUND |WQ_FREEZABLE ,min (ctx->sq_entries -1 ,2 *num_online_cpus ()));
@@ -1551,6 +1761,12 @@ static int io_sq_offload_start(struct io_ring_ctx *ctx)return 0 ; err: +if (ctx->sqo_thread) { + ctx->sqo_stop =1 ; +mb (); +kthread_stop (ctx->sqo_thread); + ctx->sqo_thread =NULL ; + }mmdrop (ctx->sqo_mm); ctx->sqo_mm =NULL ;return ret;
@@ -1801,6 +2017,11 @@ static int io_sqe_buffer_register(struct io_ring_ctx *ctx, void __user *arg,static void io_ring_ctx_free (struct io_ring_ctx *ctx) { +if (ctx->sqo_thread) { + ctx->sqo_stop =1 ; +mb (); +kthread_stop (ctx->sqo_thread); + }if (ctx->sqo_wq)destroy_workqueue (ctx->sqo_wq);if (ctx->sqo_mm)
@@ -1910,7 +2131,7 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,int submitted =0 ;struct fd f; -if (flags & ~IORING_ENTER_GETEVENTS ) +if (flags & ~(IORING_ENTER_GETEVENTS |IORING_ENTER_SQ_WAKEUP ))return -EINVAL ; f =fdget (fd);
@@ -1926,6 +2147,18 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,if (!percpu_ref_tryget (&ctx->refs)) goto out_fput; +/* +* For SQ polling, the thread will do all submissions and completions. +* Just return the requested submit count, and wake the thread if +* we were asked to. +*/ +if (ctx->flags &IORING_SETUP_SQPOLL ) { +if (flags &IORING_ENTER_SQ_WAKEUP ) +wake_up (&ctx->sqo_wait); + submitted = to_submit; + goto out_ctx; + } +if (to_submit) { to_submit =min (to_submit, ctx->sq_entries);
@@ -2103,7 +2336,7 @@ static int io_uring_create(unsigned entries, struct io_uring_params *p)if (ret) goto err; - ret =io_sq_offload_start (ctx); + ret =io_sq_offload_start (ctx, p);if (ret) goto err;
@@ -2151,7 +2384,8 @@ static long io_uring_setup(u32 entries, struct io_uring_params __user *params)return -EINVAL ; } -if (p.flags & ~IORING_SETUP_IOPOLL ) +if (p.flags & ~(IORING_SETUP_IOPOLL |IORING_SETUP_SQPOLL | +IORING_SETUP_SQ_AFF ))return -EINVAL ; ret =io_uring_create (entries, &p);
include/uapi/linux/io_uring.h +11 -1
@@ -42,6 +42,8 @@ struct io_uring_sqe {* io_uring_setup() flags */ #define IORING_SETUP_IOPOLL (1U << 0)/* io_context is polled */ +#define IORING_SETUP_SQPOLL (1U << 1)/* SQ poll thread */ +#define IORING_SETUP_SQ_AFF (1U << 2)/* sq_thread_cpu is valid */ #define IORING_OP_NOP 0#define IORING_OP_READV 1
@@ -86,6 +88,11 @@ struct io_sqring_offsets {__u64 resv2; }; +/* +* sq_ring->flags +*/ +#define IORING_SQ_NEED_WAKEUP (1U << 0)/* needs io_uring_enter wakeup */ +struct io_cqring_offsets {__u32 head;__u32 tail;
@@ -100,6 +107,7 @@ struct io_cqring_offsets {* io_uring_enter(2) flags */ #define IORING_ENTER_GETEVENTS (1U << 0) +#define IORING_ENTER_SQ_WAKEUP (1U << 1)/* * Passed in for io_uring_setup(2). Copied back with updated info on success
@@ -108,7 +116,9 @@ struct io_uring_params {__u32 sq_entries;__u32 cq_entries;__u32 flags; -__u32 resv[7 ]; +__u32 sq_thread_cpu; +__u32 sq_thread_idle; +__u32 resv[5 ];struct io_sqring_offsets sq_off;struct io_cqring_offsets cq_off; };
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 16/19 io_uring: add io_kiocb ref count
In reply to Jens AxboeWe'll use this for the POLL implementation. Regular requests will NOT be using references, so initialize it to 0. Any real use of the io_kiocb ref will initialize it to at least 2.
--- fs/io_uring.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/io_uring.c +6 -2
@@ -184,6 +184,7 @@ struct io_kiocb {struct io_ring_ctx *ctx;struct list_head list;unsigned int flags; +refcount_t refs;#define REQ_F_FORCE_NONBLOCK 1/* inline submission attempt */ #define REQ_F_IOPOLL_COMPLETED 2/* polled IO has completed */ #define REQ_F_FIXED_FILE 4/* ctx owns file */
@@ -377,6 +378,7 @@ static struct io_kiocb *io_get_req(struct io_ring_ctx *ctx, req->ctx = ctx; req->flags =0 ; +refcount_set (&req->refs,0 );return req; out:io_ring_drop_ctx_refs (ctx,1 );
@@ -394,8 +396,10 @@ static void io_free_req_many(struct io_ring_ctx *ctx, void **reqs, int *nr)static void io_free_req (struct io_kiocb *req) { -io_ring_drop_ctx_refs (req->ctx,1 ); -kmem_cache_free (req_cachep, req); +if (!refcount_read (&req->refs) ||refcount_dec_and_test (&req->refs)) { +io_ring_drop_ctx_refs (req->ctx,1 ); +kmem_cache_free (req_cachep, req); + } }/*
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 17/19 io_uring: add support for IORING_OP_POLL
In reply to Jens AxboeThis is basically a direct port of bfe4037e722e, which implements a one-shot poll command through aio. Description below is based on that commit as well. However, instead of adding a POLL command and relying on io_cancel(2) to remove it, we mimic the epoll(2) interface of having a command to add a poll notification, IORING_OP_POLL_ADD, and one to remove it again, IORING_OP_POLL_REMOVE.
To poll for a file descriptor the application should submit an sqe of type IORING_OP_POLL. It will poll the fd for the events specified in the poll_events field.
Unlike poll or epoll without EPOLLONESHOT this interface always works in one shot mode, that is once the sqe is completed, it will have to be resubmitted.
Based-on-code-from: Christoph Hellwig <[email protected]>
--- fs/io_uring.c | 261 +++++++++++++++++++++++++++++++++- include/uapi/linux/io_uring.h | 3 + 2 files changed, 263 insertions(+), 1 deletion(-)
fs/io_uring.c +260 -1
@@ -161,6 +161,7 @@ struct io_ring_ctx {* manipulate the list, hence no extra locking is needed there. */ struct list_head poll_list; +struct list_head cancel_list; }____cacheline_aligned_in_smp ;#if defined(CONFIG_UNIX )
@@ -176,8 +177,20 @@ struct sqe_submit {bool needs_fixed_file; }; +struct io_poll_iocb { +struct file *file; +struct wait_queue_head *head; +__poll_t events; +bool woken; +bool canceled; +struct wait_queue_entry wait; +}; +struct io_kiocb { -struct kiocb rw; +union { +struct kiocb rw; +struct io_poll_iocb poll; + };struct sqe_submit submit;
@@ -261,6 +274,7 @@ static struct io_ring_ctx *io_ring_ctx_alloc(struct io_uring_params *p)init_waitqueue_head (&ctx->wait);spin_lock_init (&ctx->completion_lock);INIT_LIST_HEAD (&ctx->poll_list); +INIT_LIST_HEAD (&ctx->cancel_list);return ctx; }
@@ -1058,6 +1072,244 @@ static int io_fsync(struct io_kiocb *req, const struct io_uring_sqe *sqe,return 0 ; } +static void io_poll_remove_one (struct io_kiocb *req) +{ +struct io_poll_iocb *poll = &req->poll; + +spin_lock (&poll->head->lock); +WRITE_ONCE (poll->canceled, true); +if (!list_empty (&poll->wait.entry)) { +list_del_init (&poll->wait.entry); +queue_work (req->ctx->sqo_wq, &req->work); + } +spin_unlock (&poll->head->lock); + +list_del_init (&req->list); +} + +static void io_poll_remove_all (struct io_ring_ctx *ctx) +{ +struct io_kiocb *req; + +spin_lock_irq (&ctx->completion_lock); +while (!list_empty (&ctx->cancel_list)) { + req = list_first_entry(&ctx->cancel_list, struct io_kiocb,list); +io_poll_remove_one (req); + } +spin_unlock_irq (&ctx->completion_lock); +} + +/* +* Find a running poll command that matches one specified in sqe->addr, +* and remove it if found. +*/ +static int io_poll_remove (struct io_kiocb *req,const struct io_uring_sqe *sqe) +{ +struct io_ring_ctx *ctx = req->ctx; +struct io_kiocb *poll_req, *next; +int ret = -ENOENT ; + +if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL )) +return -EINVAL ; +if (sqe->ioprio || sqe->off || sqe->len || sqe->buf_index || + sqe->poll_events) +return -EINVAL ; + +spin_lock_irq (&ctx->completion_lock); +list_for_each_entry_safe (poll_req, next, &ctx->cancel_list, list) { +if (READ_ONCE (sqe->addr) == poll_req->user_data) { +io_poll_remove_one (poll_req); + ret =0 ; +break ; + } + } +spin_unlock_irq (&ctx->completion_lock); + +io_cqring_add_event (req->ctx, sqe->user_data, ret,0 ); +io_free_req (req); +return 0 ; +} + +static void io_poll_complete (struct io_kiocb *req,__poll_t mask) +{ +io_cqring_add_event (req->ctx, req->user_data,mangle_poll (mask),0 ); +io_fput (req); +io_free_req (req); +} + +static void io_poll_complete_work (struct work_struct *work) +{ + struct io_kiocb *req = container_of(work, struct io_kiocb, work); +struct io_poll_iocb *poll = &req->poll; +struct poll_table_struct pt = { ._key = poll->events }; +struct io_ring_ctx *ctx = req->ctx; +__poll_t mask =0 ; + +if (!READ_ONCE (poll->canceled)) + mask =vfs_poll (poll->file, &pt) & poll->events; + +/* +* Note that ->ki_cancel callers also delete iocb from active_reqs after +* calling ->ki_cancel. We need the ctx_lock roundtrip here to +* synchronize with them. In the cancellation case the list_del_init +* itself is not actually needed, but harmless so we keep it in to +* avoid further branches in the fast path. +*/ +spin_lock_irq (&ctx->completion_lock); +if (!mask && !READ_ONCE (poll->canceled)) { +add_wait_queue (poll->head, &poll->wait); +spin_unlock_irq (&ctx->completion_lock); +return ; + } +list_del_init (&req->list); +spin_unlock_irq (&ctx->completion_lock); + +io_poll_complete (req, mask); +} + +static int io_poll_wake (struct wait_queue_entry *wait,unsigned mode,int sync, +void *key) +{ + struct io_poll_iocb *poll = container_of(wait, struct io_poll_iocb, + wait); + struct io_kiocb *req = container_of(poll, struct io_kiocb, poll); +struct io_ring_ctx *ctx = req->ctx; +__poll_t mask =key_to_poll (key); + + poll->woken = true; + +/* for instances that support it check for an event match first: */ +if (mask) { +if (!(mask & poll->events)) +return 0 ; + +/* try to complete the iocb inline if we can: */ +if (spin_trylock (&ctx->completion_lock)) { +list_del (&req->list); +spin_unlock (&ctx->completion_lock); + +list_del_init (&poll->wait.entry); +io_poll_complete (req, mask); +return 1 ; + } + } + +list_del_init (&poll->wait.entry); +queue_work (ctx->sqo_wq, &req->work); +return 1 ; +} + +struct io_poll_table { +struct poll_table_struct pt; +struct io_kiocb *req; +int error; +}; + +static void io_poll_queue_proc (struct file *file,struct wait_queue_head *head, +struct poll_table_struct *p) +{ + struct io_poll_table *pt = container_of(p, struct io_poll_table, pt); + +if (unlikely (pt->req->poll.head)) { + pt->error = -EINVAL ; +return ; + } + + pt->error =0 ; + pt->req->poll.head = head; +add_wait_queue (head, &pt->req->poll.wait); +} + +static int io_poll_add (struct io_kiocb *req,const struct io_uring_sqe *sqe) +{ +struct io_poll_iocb *poll = &req->poll; +struct io_ring_ctx *ctx = req->ctx; +struct io_poll_table ipt; +unsigned flags; +__poll_t mask; +u16 events; +int fd; + +if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL )) +return -EINVAL ; +if (sqe->addr || sqe->ioprio || sqe->off || sqe->len || sqe->buf_index) +return -EINVAL ; + +INIT_WORK (&req->work, io_poll_complete_work); + events =READ_ONCE (sqe->poll_events); + poll->events =demangle_poll (events) |EPOLLERR |EPOLLHUP ; + + flags =READ_ONCE (sqe->flags); + fd =READ_ONCE (sqe->fd); + +if (flags &IOSQE_FIXED_FILE ) { +if (unlikely (!ctx->user_files || fd >= ctx->nr_user_files)) +return -EBADF ; + poll->file = ctx->user_files[fd]; + req->flags |=REQ_F_FIXED_FILE ; + }else { + poll->file =fget (fd); + } +if (unlikely (!poll->file)) +return -EBADF ; + + poll->head =NULL ; + poll->woken = false; + poll->canceled = false; + + ipt.pt._qproc = io_poll_queue_proc; + ipt.pt._key = poll->events; + ipt.req = req; + ipt.error = -EINVAL ;/* same as no support for IOCB_CMD_POLL */ + +/* initialized the list so that we can do list_empty checks */ +INIT_LIST_HEAD (&poll->wait.entry); +init_waitqueue_func_entry (&poll->wait, io_poll_wake); + +/* one for removal from waitqueue, one for this function */ +refcount_set (&req->refs,2 ); + + mask =vfs_poll (poll->file, &ipt.pt) & poll->events; +if (unlikely (!poll->head)) { +/* we did not manage to set up a waitqueue, done */ + goto out; + } + +spin_lock_irq (&ctx->completion_lock); +spin_lock (&poll->head->lock); +if (poll->woken) { +/* wake_up context handles the rest */ + mask =0 ; + ipt.error =0 ; + }else if (mask || ipt.error) { +/* if we get an error or a mask we are done */ +WARN_ON_ONCE (list_empty (&poll->wait.entry)); +list_del_init (&poll->wait.entry); + }else { +/* actually waiting for an event */ +list_add_tail (&req->list, &ctx->cancel_list); + } +spin_unlock (&poll->head->lock); +spin_unlock_irq (&ctx->completion_lock); + +out: +if (unlikely (ipt.error)) { +if (!(flags &IOSQE_FIXED_FILE )) +fput (poll->file); +/* +* Drop one of our refs to this req, __io_submit_sqe() will +* drop the other one since we're returning an error. +*/ +io_free_req (req); +return ipt.error; + } + +if (mask) +io_poll_complete (req, mask); +io_free_req (req); +return 0 ; +} +static int __io_submit_sqe (struct io_ring_ctx *ctx,struct io_kiocb *req,const struct sqe_submit *s,bool force_nonblock,struct io_submit_state *state)
@@ -1093,6 +1345,12 @@ static int __io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,case IORING_OP_FSYNC : ret =io_fsync (req, s->sqe, force_nonblock);break ; +case IORING_OP_POLL_ADD : + ret =io_poll_add (req, s->sqe); +break ; +case IORING_OP_POLL_REMOVE : + ret =io_poll_remove (req, s->sqe); +break ;default : ret = -EINVAL ;break ;
@@ -2081,6 +2339,7 @@ static void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx)percpu_ref_kill (&ctx->refs);mutex_unlock (&ctx->uring_lock); +io_poll_remove_all (ctx);io_iopoll_reap_events (ctx);wait_for_completion (&ctx->ctx_done);io_ring_ctx_free (ctx);
include/uapi/linux/io_uring.h +3 -0
@@ -25,6 +25,7 @@ struct io_uring_sqe {union {__kernel_rwf_t rw_flags;__u32 fsync_flags; +__u16 poll_events; };__u64 user_data;/* data to be passed back at completion time */ union {
@@ -51,6 +52,8 @@ struct io_uring_sqe {#define IORING_OP_FSYNC 3#define IORING_OP_READ_FIXED 4#define IORING_OP_WRITE_FIXED 5 +#define IORING_OP_POLL_ADD 6 +#define IORING_OP_POLL_REMOVE 7/* * sqe->fsync_flags
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 18/19 io_uring: allow workqueue item to handle multiple buffered requests
In reply to Jens AxboeRight now we punt any buffered request that ends up triggering an -EAGAIN to an async workqueue. This works fine in terms of providing async execution of them, but it also can create quite a lot of work queue items. For sequentially buffered IO, it's advantageous to serialize the issue of them. For reads, the first one will trigger a read-ahead, and subsequent request merely end up waiting on later pages to complete. For writes, devices usually respond better to streamed sequential writes.
Add state to track the last buffered request we punted to a work queue, and if the next one is sequential to the previous, attempt to get the previous work item to handle it. We limit the number of sequential add-ons to the a multiple (8) of the max read-ahead size of the file. This should be a good number for both reads and wries, as it defines the max IO size the device can do directly.
This drastically cuts down on the number of context switches we need to handle buffered sequential IO, and a basic test case of copying a big file with io_uring sees a 5x speedup.
--- fs/io_uring.c | 281 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 229 insertions(+), 52 deletions(-)
fs/io_uring.c +229 -52
@@ -94,6 +94,16 @@ struct io_mapped_ubuf {unsigned int nr_bvecs; }; +struct async_list { +spinlock_t lock; +atomic_t cnt; +struct list_head list; + +struct file *file; +off_t io_end; +size_t io_pages; +}; + struct io_ring_ctx { struct { struct percpu_ref refs;
@@ -164,6 +174,8 @@ struct io_ring_ctx {struct list_head cancel_list; }____cacheline_aligned_in_smp ; +struct async_list pending_async[2 ]; +#if defined(CONFIG_UNIX )struct socket *ring_sock;#endif
@@ -201,6 +213,7 @@ struct io_kiocb {#define REQ_F_FORCE_NONBLOCK 1/* inline submission attempt */ #define REQ_F_IOPOLL_COMPLETED 2/* polled IO has completed */ #define REQ_F_FIXED_FILE 4/* ctx owns file */ +#define REQ_F_SEQ_PREV 8/* sequential with previous */ u64 user_data;u64 error;
@@ -257,6 +270,7 @@ static void io_ring_ctx_ref_free(struct percpu_ref *ref)static struct io_ring_ctx *io_ring_ctx_alloc (struct io_uring_params *p) {struct io_ring_ctx *ctx; +int i; ctx =kzalloc (sizeof (*ctx),GFP_KERNEL );if (!ctx)
@@ -272,6 +286,11 @@ static struct io_ring_ctx *io_ring_ctx_alloc(struct io_uring_params *p)init_completion (&ctx->ctx_done);mutex_init (&ctx->uring_lock);init_waitqueue_head (&ctx->wait); +for (i =0 ; i <ARRAY_SIZE (ctx->pending_async); i++) { +spin_lock_init (&ctx->pending_async[i].lock); +INIT_LIST_HEAD (&ctx->pending_async[i].list); +atomic_set (&ctx->pending_async[i].cnt,0 ); + }spin_lock_init (&ctx->completion_lock);INIT_LIST_HEAD (&ctx->poll_list);INIT_LIST_HEAD (&ctx->cancel_list);
@@ -885,6 +904,47 @@ static int io_import_iovec(struct io_ring_ctx *ctx, int rw,return import_iovec (rw, buf, sqe_len,UIO_FASTIOV , iovec, iter); } +/* +* Make a note of the last file/offset/direction we punted to async +* context. We'll use this information to see if we can piggy back a +* sequential request onto the previous one, if it's still hasn't been +* completed by the async worker. +*/ +static void io_async_list_note (int rw,struct io_kiocb *req,size_t len) +{ +struct async_list *async_list = &req->ctx->pending_async[rw]; +struct kiocb *kiocb = &req->rw; +struct file *filp = kiocb->ki_filp; +off_t io_end = kiocb->ki_pos + len; + +if (filp == async_list->file && kiocb->ki_pos == async_list->io_end) { +unsigned long max_pages; + +/* Use 8x RA size as a decent limiter for both reads/writes */ + max_pages = filp->f_ra.ra_pages; +if (!max_pages) + max_pages =VM_MAX_READAHEAD >> (PAGE_SHIFT -10 ); + max_pages *=8 ; + +/* If max pages are exceeded, reset the state */ + len >>=PAGE_SHIFT ; +if (async_list->io_pages + len <= max_pages) { + req->flags |=REQ_F_SEQ_PREV ; + async_list->io_pages += len; + }else { + io_end =0 ; + async_list->io_pages =0 ; + } + } + +/* New file? Reset state. */ +if (async_list->file != filp) { + async_list->io_pages =0 ; + async_list->file = filp; + } + async_list->io_end = io_end; +} +static ssize_t io_read (struct io_kiocb *req,const struct sqe_submit *s,bool force_nonblock,struct io_submit_state *state) {
@@ -892,6 +952,7 @@ static ssize_t io_read(struct io_kiocb *req, const struct sqe_submit *s,struct kiocb *kiocb = &req->rw;struct iov_iter iter;struct file *file; +size_t iov_count;ssize_t ret; ret =io_prep_rw (req, s, force_nonblock, state);
@@ -910,16 +971,24 @@ static ssize_t io_read(struct io_kiocb *req, const struct sqe_submit *s,if (ret) goto out_fput; - ret =rw_verify_area (READ , file, &kiocb->ki_pos,iov_iter_count (&iter)); + iov_count =iov_iter_count (&iter); + ret =rw_verify_area (READ , file, &kiocb->ki_pos, iov_count);if (!ret) {ssize_t ret2;/* Catch -EAGAIN return for forced non-blocking submission */ ret2 =call_read_iter (file, kiocb, &iter); -if (!force_nonblock || ret2 != -EAGAIN ) +if (!force_nonblock || ret2 != -EAGAIN ) {io_rw_done (kiocb, ret2); -else + }else { +/* +* If ->needs_lock is true, we're already in async +* context. +*/ +if (!s->needs_lock) +io_async_list_note (READ , req, iov_count); ret = -EAGAIN ; + } }kfree (iovec); out_fput:
@@ -936,14 +1005,12 @@ static ssize_t io_write(struct io_kiocb *req, const struct sqe_submit *s,struct kiocb *kiocb = &req->rw;struct iov_iter iter;struct file *file; +size_t iov_count;ssize_t ret; ret =io_prep_rw (req, s, force_nonblock, state);if (ret)return ret; -/* Hold on to the file for -EAGAIN */ -if (force_nonblock && !(kiocb->ki_flags &IOCB_DIRECT )) -return -EAGAIN ; ret = -EBADF ; file = kiocb->ki_filp;
@@ -957,8 +1024,17 @@ static ssize_t io_write(struct io_kiocb *req, const struct sqe_submit *s,if (ret) goto out_fput; - ret =rw_verify_area (WRITE , file, &kiocb->ki_pos, -iov_iter_count (&iter)); + iov_count =iov_iter_count (&iter); + + ret = -EAGAIN ; +if (force_nonblock && !(kiocb->ki_flags &IOCB_DIRECT )) { +/* If ->needs_lock is true, we're already in async context. */ +if (!s->needs_lock) +io_async_list_note (WRITE , req, iov_count); + goto out_free; + } + + ret =rw_verify_area (WRITE , file, &kiocb->ki_pos, iov_count);if (!ret) {/* * Open-code file_start_write here to grab freeze protection,
@@ -976,9 +1052,11 @@ static ssize_t io_write(struct io_kiocb *req, const struct sqe_submit *s, kiocb->ki_flags |=IOCB_WRITE ;io_rw_done (kiocb,call_write_iter (file, kiocb, &iter)); } +out_free:kfree (iovec); out_fput: -if (unlikely (ret)) +/* Hold on to the file for -EAGAIN */ +if (unlikely (ret && ret != -EAGAIN ))io_fput (req);return ret; }
@@ -1374,6 +1452,21 @@ static int __io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,return 0 ; } +static struct async_list *io_async_list_from_sqe (struct io_ring_ctx *ctx, +const struct io_uring_sqe *sqe) +{ +switch (sqe->opcode) { +case IORING_OP_READV : +case IORING_OP_READ_FIXED : +return &ctx->pending_async[READ ]; +case IORING_OP_WRITEV : +case IORING_OP_WRITE_FIXED : +return &ctx->pending_async[WRITE ]; +default : +return NULL ; + } +} +static inline bool io_sqe_needs_user (const struct io_uring_sqe *sqe) {u8 opcode =READ_ONCE (sqe->opcode);
@@ -1385,61 +1478,138 @@ static inline bool io_sqe_needs_user(const struct io_uring_sqe *sqe)static void io_sq_wq_submit_work (struct work_struct *work) { struct io_kiocb *req = container_of(work, struct io_kiocb, work); -struct sqe_submit *s = &req->submit; -const struct io_uring_sqe *sqe = s->sqe;struct io_ring_ctx *ctx = req->ctx; +struct mm_struct *cur_mm =NULL ; +struct async_list *async_list; +LIST_HEAD (req_list);mm_segment_t old_fs; -bool needs_user;int ret; -/* Ensure we clear previously set forced non-block flag */ - req->flags &= ~REQ_F_FORCE_NONBLOCK ; - req->rw.ki_flags &= ~IOCB_NOWAIT ; + async_list =io_async_list_from_sqe (ctx, req->submit.sqe); +restart: +do { +struct sqe_submit *s = &req->submit; +const struct io_uring_sqe *sqe = s->sqe; + +/* Ensure we clear previously set forced non-block flag */ + req->flags &= ~REQ_F_FORCE_NONBLOCK ; + req->rw.ki_flags &= ~IOCB_NOWAIT ; - s->needs_lock = true; - s->has_user = false; + ret =0 ; +if (io_sqe_needs_user (sqe) && !cur_mm) { +if (!mmget_not_zero (ctx->sqo_mm)) { + ret = -EFAULT ; + }else { + cur_mm = ctx->sqo_mm; +use_mm (cur_mm); + old_fs =get_fs (); +set_fs (USER_DS ); + } + } + +if (!ret) { + s->has_user = cur_mm !=NULL ; + s->needs_lock = true; +do { + ret =__io_submit_sqe (ctx, req, s, false,NULL ); +/* +* We can get EAGAIN for polled IO even though +* we're forcing a sync submission from here, +* since we can't wait for request slots on the +* block side. +*/ +if (ret != -EAGAIN ) +break ; +cond_resched (); + }while (1 ); + } +if (ret) { +io_cqring_add_event (ctx, sqe->user_data, ret,0 ); +io_free_req (req); + } + +/* async context always use a copy of the sqe */ +kfree (sqe); + +if (!async_list) +break ; +if (!list_empty (&req_list)) { + req = list_first_entry(&req_list, struct io_kiocb, + list); +list_del (&req->list); +continue ; + } +if (list_empty (&async_list->list)) +break ; + + req =NULL ; +spin_lock (&async_list->lock); +if (list_empty (&async_list->list)) { +spin_unlock (&async_list->lock); +break ; + } +list_splice_init (&async_list->list, &req_list); +spin_unlock (&async_list->lock); + + req = list_first_entry(&req_list, struct io_kiocb, list); +list_del (&req->list); + }while (req);/* -* If we're doing IO to fixed buffers, we don't need to get/set -* user context +* Rare case of racing with a submitter. If we find the count has +* dropped to zero AND we have pending work items, then restart +* the processing. This is a tiny race window. */ - needs_user =io_sqe_needs_user (s->sqe); -if (needs_user) { -if (!mmget_not_zero (ctx->sqo_mm)) { - ret = -EFAULT ; - goto err; +if (async_list) { + ret =atomic_dec_return (&async_list->cnt); +while (!ret && !list_empty (&async_list->list)) { +spin_lock (&async_list->lock); +atomic_inc (&async_list->cnt); +list_splice_init (&async_list->list, &req_list); +spin_unlock (&async_list->lock); + +if (!list_empty (&req_list)) { + req =list_first_entry (&req_list, + struct io_kiocb, list); +list_del (&req->list); + goto restart; + } + ret =atomic_dec_return (&async_list->cnt); } -use_mm (ctx->sqo_mm); - old_fs =get_fs (); -set_fs (USER_DS ); - s->has_user = true; } -do { - ret =__io_submit_sqe (ctx, req, s, false,NULL ); -/* -* We can get EAGAIN for polled IO even though we're forcing -* a sync submission from here, since we can't wait for -* request slots on the block side. -*/ -if (ret != -EAGAIN ) -break ; -cond_resched (); - }while (1 ); - -if (needs_user) { +if (cur_mm) {set_fs (old_fs); -unuse_mm (ctx->sqo_mm); -mmput (ctx->sqo_mm); - } -err: -if (ret) { -io_cqring_add_event (ctx, sqe->user_data, ret,0 ); -io_free_req (req); +unuse_mm (cur_mm); +mmput (cur_mm); } +} -/* async context always use a copy of the sqe */ -kfree (sqe); +/* +* See if we can piggy back onto previously submitted work, that is still +* running. We currently only allow this if the new request is sequential +* to the previous one we punted. +*/ +static bool io_add_to_prev_work (struct async_list *list,struct io_kiocb *req) +{ +bool ret = false; + +if (!list) +return false; +if (!(req->flags &REQ_F_SEQ_PREV )) +return false; +if (!atomic_read (&list->cnt)) +return false; + + ret = true; +spin_lock (&list->lock); +list_add_tail (&req->list, &list->list); +if (!atomic_read (&list->cnt)) { +list_del_init (&req->list); + ret = false; + } +spin_unlock (&list->lock); +return ret; } static int io_submit_sqe(struct io_ring_ctx *ctx, struct sqe_submit *s,
@@ -1464,12 +1634,19 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct sqe_submit *s, sqe_copy =kmalloc (sizeof (*sqe_copy),GFP_KERNEL );if (sqe_copy) { +struct async_list *list; +memcpy (sqe_copy, s->sqe,sizeof (*sqe_copy)); s->sqe = sqe_copy;memcpy (&req->submit, s,sizeof (*s)); -INIT_WORK (&req->work, io_sq_wq_submit_work); -queue_work (ctx->sqo_wq, &req->work); + list =io_async_list_from_sqe (ctx, s->sqe); +if (!io_add_to_prev_work (list, req)) { +if (list) +atomic_inc (&list->cnt); +INIT_WORK (&req->work, io_sq_wq_submit_work); +queue_work (ctx->sqo_wq, &req->work); + } ret =0 ; } }
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerPATCH 19/19 io_uring: add io_uring_event cache hit information
In reply to Jens AxboeAdd hint on whether a read was served out of the page cache, or if it hit media. This is useful for buffered async IO, O_DIRECT reads would never have this set (for obvious reasons).
If the read hit page cache, cqe->flags will have IOCQE_FLAG_CACHEHIT set.
--- fs/io_uring.c | 7 ++++++- include/uapi/linux/io_uring.h | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-)
fs/io_uring.c +6 -1
@@ -611,11 +611,16 @@ static void io_fput(struct io_kiocb *req)static void io_complete_rw (struct kiocb *kiocb,long res,long res2) { struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw); +unsigned ev_flags =0 ;kiocb_end_write (kiocb);io_fput (req); -io_cqring_add_event (req->ctx, req->user_data, res,0 ); + +if (res >0 && (req->flags &REQ_F_FORCE_NONBLOCK )) + ev_flags =IOCQE_FLAG_CACHEHIT ; + +io_cqring_add_event (req->ctx, req->user_data, res, ev_flags);io_free_req (req); }
include/uapi/linux/io_uring.h +5 -0
@@ -69,6 +69,11 @@ struct io_uring_cqe {__u32 flags; }; +/* +* io_uring_event->flags +*/ +#define IOCQE_FLAG_CACHEHIT (1U << 0)/* IO did not hit media */ +/* * Magic offsets for the application to mmap the data it needs */
Signature · 7 lines
2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Quoted 11 lines
From: Jens Axboe <[email protected]>
Subject: [PATCHSET v15]io_uringIO interface
Message-ID: <[email protected]> (raw)Some final tweaks, mostly cosmetic, but also two important fixes:
1) Ensure that we account the skb appropriately against the socket. Some network config options apparently return is an skb with ->truesize != 0 when allocated with a size of 0, ensure we add those as references against
sock->sk_wmem_alloc. Reported by Matt Mullins.
Jens,
I tried using io_uring with network sockets. It seem to be doing the right thing. One bit is missing though: "flags" as in recv(2).
In perfect world I would like to specify at least:
- MSG_DONTWAIT
- MSG_WAITALL
- MSG_NOSIGNAL
Right now, unless I'm missing something, io_uring_sqe doesn't have a place where we could store these. "flags" is needed for any non-trivial network I/O.
A separate discussion is about io_uring supporting more complex network stuff in future like 'struct msghdr', MSG_ERRQUEUE or CMSG.
Cheers,
Marek
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerQuoted 17 lines · Marek Majkowski
Quoted 11 lines
From: Jens Axboe <[email protected]>
Subject: [PATCHSET v15]io_uringIO interface
Message-ID: <[email protected]> (raw)Some final tweaks, mostly cosmetic, but also two important fixes:
1) Ensure that we account the skb appropriately against the socket. Some network config options apparently return is an skb with ->truesize != 0 when allocated with a size of 0, ensure we add those as references against
sock->sk_wmem_alloc. Reported by Matt Mullins.Jens,
I tried using
io_uringwith network sockets. It seem to be doing the right thing. One bit is missing though: "flags" as in recv(2).
Quoted 8 lines
In perfect world I would like to specify at least:
-MSG_DONTWAIT
-MSG_WAITALL
-MSG_NOSIGNALRight now, unless I'm missing something,
io_uring_sqedoesn't have a place where we could store these. "flags" is needed for any non-trivial network I/O.
We have flags for sqes, depending on the type. You can add to the union that already holds rw_flags/fsync_flags/poll_events? There's also a (smaller) flags field that applies for all types, which currently only holds the fixed file flag.
If you're talking on a per-syscall type of flag, io_uring_enter(2) does take a flags member.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Quoted 24 lines · Jens Axboe
Quoted 22 lines · Marek Majkowski
Quoted 11 lines
From: Jens Axboe <[email protected]>
Subject: [PATCHSET v15]io_uringIO interface
Message-ID: <[email protected]> (raw)Some final tweaks, mostly cosmetic, but also two important fixes:
1) Ensure that we account the skb appropriately against the socket. Some network config options apparently return is an skb with ->truesize != 0 when allocated with a size of 0, ensure we add those as references against
sock->sk_wmem_alloc. Reported by Matt Mullins.Jens,
I tried using
io_uringwith network sockets. It seem to be doing the right thing. One bit is missing though: "flags" as in recv(2).In perfect world I would like to specify at least:
-MSG_DONTWAIT
-MSG_WAITALL
-MSG_NOSIGNAL
Quoted 8 lines
Quoted 3 lines
Right now, unless I'm missing something,
io_uring_sqedoesn't have a place where we could store these. "flags" is needed for any non-trivial network I/O.We have flags for sqes, depending on the type. You can add to the union that already holds rw_flags/fsync_flags/poll_events? There's also a (smaller) flags field that applies for all types, which currently only holds the fixed file flag.
The "sqe->flags" right now is used by the IOSQE_FIXED_FILE which has the same value as MSG_OOB.
Sticking recv/send flags into the "rw_flags" union perhaps could work, barring the discussion about naming. The obvious names don't make sense. recv_flags, send_flags or socket_flags don't sound right.
If we tried to add networking stuff to io_uring (for batchinig and async), then:
- send()/recv() could work, only needs the "flags" field
- sendmsg()/recvmsg() likewise
- sendto()/recvfrom() require two more pointers: (struct sockaddr*dest_addr, socklen_t addrlen)
- sendmmsg() / recvmmsg() are perhaps irrelevant
Non-blocking stuff like socket(), setsockopt(), bind() perhaps don't need to be considered, although could benefit from batching.
Not sure what to think about connect() and accept(). In the prehistoric days there seem to have been an attempt to add socket things to libaio struct iocb. See:
https://code.woboq.org/linux/include/libaio.h.html#iocb::(anonymous)::saddr
struct iocb {
...
union {
...
struct io_iocb_sockaddr saddr;
} u;
};Are there chances of reserving space for two pointers in io_uring_sqe, which could be used for sendto/recvfrom/accept if we decided to add more network support?
Cheers,
Marek
Quoted 6 lines
If you're talking on a per-syscall type of flag,
io_uring_enter(2)does take a flags member.--
Jens Axboe
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Jens Axboe
maintainerQuoted 48 lines · Marek Majkowski
Quoted 24 lines · Jens Axboe
Quoted 22 lines · Marek Majkowski
Quoted 11 lines
From: Jens Axboe <[email protected]>
Subject: [PATCHSET v15]io_uringIO interface
Message-ID: <[email protected]> (raw)Some final tweaks, mostly cosmetic, but also two important fixes:
1) Ensure that we account the skb appropriately against the socket. Some network config options apparently return is an skb with ->truesize != 0 when allocated with a size of 0, ensure we add those as references against
sock->sk_wmem_alloc. Reported by Matt Mullins.Jens,
I tried using
io_uringwith network sockets. It seem to be doing the right thing. One bit is missing though: "flags" as in recv(2).In perfect world I would like to specify at least:
-MSG_DONTWAIT
-MSG_WAITALL
-MSG_NOSIGNALQuoted 8 lines
Quoted 3 lines
Right now, unless I'm missing something,
io_uring_sqedoesn't have a place where we could store these. "flags" is needed for any non-trivial network I/O.We have flags for sqes, depending on the type. You can add to the union that already holds rw_flags/fsync_flags/poll_events? There's also a (smaller) flags field that applies for all types, which currently only holds the fixed file flag.
The "
sqe->flags" right now is used by theIOSQE_FIXED_FILEwhich has the same value asMSG_OOB.Sticking recv/send flags into the "
rw_flags" union perhaps could work, barring the discussion about naming. The obvious names don't make sense.recv_flags,send_flagsorsocket_flagsdon't sound right.If we tried to add networking stuff to
io_uring(for batchinig and async), then:
- send()/recv() could work, only needs the "flags" field
- sendmsg()/recvmsg() likewise
- sendto()/recvfrom() require two more pointers: (struct sockaddr*dest_addr,socklen_taddrlen)
-sendmmsg()/recvmmsg()are perhaps irrelevant
Quoted 2 lines
Non-blocking stuff like
socket(),setsockopt(),bind()perhaps don't need to be considered, although could benefit from batching.
If we just do separate opcodes for them, then there's 32 bits of flag space for each one. That should be more than adequate.
Quoted 14 lines
Not sure what to think about
connect()andaccept(). In the prehistoric days there seem to have been an attempt to add socket things to libaio struct iocb. See:https://code.woboq.org/linux/include/libaio.h.html#iocb::(anonymous)::saddr
struct iocb { ... union { ... struct io_iocb_sockaddr saddr; } u; };
Quoted 3 lines
Are there chances of reserving space for two pointers in
io_uring_sqe, which could be used for sendto/recvfrom/accept if we decided to add more network support?
There is already space for that. We have 3 x 64 bits at the end of the sqe, 16 of those are used for the fixed buffers which networking probably wants to support as well. But that still leaves 112 bits of space for things opcode specific data.
Signature · 7 lines
Jens Axboe -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>