History

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

Linus Torvalds committed 6 years ago

Commit a5813872 parents d33db70 309fc032 files · +24 −6Browse files

Showing the changes to include/uapi/linux (1 of 2 files). Show all

Unified · Split

include/uapi/linux/io_uring.h+1−0
@@ -197,6 +197,7 @@ struct io_sqring_offsets { · 196 unmodified lines
197 * sq_ring->flags197 * sq_ring->flags
198 */198 */
199#define IORING_SQ_NEED_WAKEUP (1U << 0) /* needs io_uring_enter wakeup */199#define IORING_SQ_NEED_WAKEUP (1U << 0) /* needs io_uring_enter wakeup */
200#define IORING_SQ_CQ_OVERFLOW (1U << 1) /* CQ ring is overflown */
200 201
201struct io_cqring_offsets {202struct io_cqring_offsets {
202 __u32 head;203 __u32 head;