diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-10 18:57:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-10 18:57:57 +0200 |
| commit | a581387e415bbb0085e7e67906c8f4a99746590e (patch) | |
| tree | 4c71abe1b05e335367158a2b6ed19c6edc6aa42b /include | |
| parent | Merge tag 'block-5.8-2020-07-10' of git://git.kernel.dk/linux-block (diff) | |
| parent | io_uring: account user memory freed when exit has been queued (diff) | |
| download | linux-a581387e415bbb0085e7e67906c8f4a99746590e.tar.xz linux-a581387e415bbb0085e7e67906c8f4a99746590e.zip | |
Merge tag 'io_uring-5.8-2020-07-10' of git://git.kernel.dk/linux-block
Pull io_uring fixes from Jens Axboe:
- Fix memleak for error path in registered files (Yang)
- Export CQ overflow state in flags, necessary to fix a case where
liburing doesn't know if it needs to enter the kernel (Xiaoguang)
- Fix for a regression in when user memory is accounted freed, causing
issues with back-to-back ring exit + init if the ulimit -l setting is
very tight.
* tag 'io_uring-5.8-2020-07-10' of git://git.kernel.dk/linux-block:
io_uring: account user memory freed when exit has been queued
io_uring: fix memleak in io_sqe_files_register()
io_uring: fix memleak in __io_sqe_files_update()
io_uring: export cq overflow status to userspace
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/io_uring.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 92c22699a5a7..7843742b8b74 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -197,6 +197,7 @@ struct io_sqring_offsets { * sq_ring->flags */ #define IORING_SQ_NEED_WAKEUP (1U << 0) /* needs io_uring_enter wakeup */ +#define IORING_SQ_CQ_OVERFLOW (1U << 1) /* CQ ring is overflown */ struct io_cqring_offsets { __u32 head; |