Skip to content
Snippets Groups Projects
  • Linus Torvalds's avatar
    48aba79b
    Merge tag 'for-5.11/io_uring-2020-12-14' of git://git.kernel.dk/linux-block · 48aba79b
    Linus Torvalds authored
    Pull io_uring updates from Jens Axboe:
     "Fairly light set of changes this time around, and mostly some bits
      that were pushed out to 5.11 instead of 5.10, fixes/cleanups, and a
      few features. In particular:
    
       - Cleanups around iovec import (David Laight, Pavel)
    
       - Add timeout support for io_uring_enter(2), which enables us to
         clean up liburing and avoid a timeout sqe submission in the
         completion path.
    
         The big win here is that it allows setups that split SQ and CQ
         handling into separate threads to avoid locking, as the CQ side
         will no longer submit when timeouts are needed when waiting for
         events (Hao Xu)
    
       - Add support for socket shutdown, and renameat/unlinkat.
    
       - SQPOLL cleanups and improvements (Xiaoguang Wang)
    
       - Allow SQPOLL setups for CAP_SYS_NICE, and enable regular
         (non-fixed) files to be used.
    
       - Cancelation improvements (Pavel)
    
       - Fixed file reference improvements (Pavel)
    
       - IOPOLL related race fixes (Pavel)
    
       - Lots of other little fixes and cleanups (mostly Pavel)"
    
    * tag 'for-5.11/io_uring-2020-12-14' of git://git.kernel.dk/linux-block: (43 commits)
      io_uring: fix io_cqring_events()'s noflush
      io_uring: fix racy IOPOLL flush overflow
      io_uring: fix racy IOPOLL completions
      io_uring: always let io_iopoll_complete() complete polled io
      io_uring: add timeout update
      io_uring: restructure io_timeout_cancel()
      io_uring: fix files cancellation
      io_uring: use bottom half safe lock for fixed file data
      io_uring: fix miscounting ios_left
      io_uring: change submit file state invariant
      io_uring: check kthread stopped flag when sq thread is unparked
      io_uring: share fixed_file_refs b/w multiple rsrcs
      io_uring: replace inflight_wait with tctx->wait
      io_uring: don't take fs for recvmsg/sendmsg
      io_uring: only wake up sq thread while current task is in io worker context
      io_uring: don't acquire uring_lock twice
      io_uring: initialize 'timeout' properly in io_sq_thread()
      io_uring: refactor io_sq_thread() handling
      io_uring: always batch cancel in *cancel_files()
      io_uring: pass files into kill timeouts/poll
      ...
    48aba79b
    History
    Merge tag 'for-5.11/io_uring-2020-12-14' of git://git.kernel.dk/linux-block
    Linus Torvalds authored
    Pull io_uring updates from Jens Axboe:
     "Fairly light set of changes this time around, and mostly some bits
      that were pushed out to 5.11 instead of 5.10, fixes/cleanups, and a
      few features. In particular:
    
       - Cleanups around iovec import (David Laight, Pavel)
    
       - Add timeout support for io_uring_enter(2), which enables us to
         clean up liburing and avoid a timeout sqe submission in the
         completion path.
    
         The big win here is that it allows setups that split SQ and CQ
         handling into separate threads to avoid locking, as the CQ side
         will no longer submit when timeouts are needed when waiting for
         events (Hao Xu)
    
       - Add support for socket shutdown, and renameat/unlinkat.
    
       - SQPOLL cleanups and improvements (Xiaoguang Wang)
    
       - Allow SQPOLL setups for CAP_SYS_NICE, and enable regular
         (non-fixed) files to be used.
    
       - Cancelation improvements (Pavel)
    
       - Fixed file reference improvements (Pavel)
    
       - IOPOLL related race fixes (Pavel)
    
       - Lots of other little fixes and cleanups (mostly Pavel)"
    
    * tag 'for-5.11/io_uring-2020-12-14' of git://git.kernel.dk/linux-block: (43 commits)
      io_uring: fix io_cqring_events()'s noflush
      io_uring: fix racy IOPOLL flush overflow
      io_uring: fix racy IOPOLL completions
      io_uring: always let io_iopoll_complete() complete polled io
      io_uring: add timeout update
      io_uring: restructure io_timeout_cancel()
      io_uring: fix files cancellation
      io_uring: use bottom half safe lock for fixed file data
      io_uring: fix miscounting ios_left
      io_uring: change submit file state invariant
      io_uring: check kthread stopped flag when sq thread is unparked
      io_uring: share fixed_file_refs b/w multiple rsrcs
      io_uring: replace inflight_wait with tctx->wait
      io_uring: don't take fs for recvmsg/sendmsg
      io_uring: only wake up sq thread while current task is in io worker context
      io_uring: don't acquire uring_lock twice
      io_uring: initialize 'timeout' properly in io_sq_thread()
      io_uring: refactor io_sq_thread() handling
      io_uring: always batch cancel in *cancel_files()
      io_uring: pass files into kill timeouts/poll
      ...