From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Mar 2020 19:18:49 +0000 (-0700)
Subject: Merge tag 'for-5.7/io_uring-2020-03-29' of git://git.kernel.dk/linux-block
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e59cd88028dbd41472453e5883f78330aa73c56e;p=linux.git

Merge tag 'for-5.7/io_uring-2020-03-29' of git://git.kernel.dk/linux-block

Pull io_uring updates from Jens Axboe:
 "Here are the io_uring changes for this merge window. Light on new
  features this time around (just splice + buffer selection), lots of
  cleanups, fixes, and improvements to existing support. In particular,
  this contains:

   - Cleanup fixed file update handling for stack fallback (Hillf)

   - Re-work of how pollable async IO is handled, we no longer require
     thread offload to handle that. Instead we rely using poll to drive
     this, with task_work execution.

   - In conjunction with the above, allow expendable buffer selection,
     so that poll+recv (for example) no longer has to be a split
     operation.

   - Make sure we honor RLIMIT_FSIZE for buffered writes

   - Add support for splice (Pavel)

   - Linked work inheritance fixes and optimizations (Pavel)

   - Async work fixes and cleanups (Pavel)

   - Improve io-wq locking (Pavel)

   - Hashed link write improvements (Pavel)

   - SETUP_IOPOLL|SETUP_SQPOLL improvements (Xiaoguang)"

* tag 'for-5.7/io_uring-2020-03-29' of git://git.kernel.dk/linux-block: (54 commits)
  io_uring: cleanup io_alloc_async_ctx()
  io_uring: fix missing 'return' in comment
  io-wq: handle hashed writes in chains
  io-uring: drop 'free_pfile' in struct io_file_put
  io-uring: drop completion when removing file
  io_uring: Fix ->data corruption on re-enqueue
  io-wq: close cancel gap for hashed linked work
  io_uring: make spdxcheck.py happy
  io_uring: honor original task RLIMIT_FSIZE
  io-wq: hash dependent work
  io-wq: split hashing and enqueueing
  io-wq: don't resched if there is no work
  io-wq: remove duplicated cancel code
  io_uring: fix truncated async read/readv and write/writev retry
  io_uring: dual license io_uring.h uapi header
  io_uring: io_uring_enter(2) don't poll while SETUP_IOPOLL|SETUP_SQPOLL enabled
  io_uring: Fix unused function warnings
  io_uring: add end-of-bits marker and build time verify it
  io_uring: provide means of removing buffers
  io_uring: add IOSQE_BUFFER_SELECT support for IORING_OP_RECVMSG
  ...
---

e59cd88028dbd41472453e5883f78330aa73c56e
diff --cc fs/io_uring.c
index 3affd96a98ba7,b12d33b12bc7c..358f97be9c7ba
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@@ -3325,16 -3918,10 +3923,11 @@@ static int io_accept_prep(struct io_kio
  	accept->addr = u64_to_user_ptr(READ_ONCE(sqe->addr));
  	accept->addr_len = u64_to_user_ptr(READ_ONCE(sqe->addr2));
  	accept->flags = READ_ONCE(sqe->accept_flags);
 +	accept->nofile = rlimit(RLIMIT_NOFILE);
  	return 0;
- #else
- 	return -EOPNOTSUPP;
- #endif
  }
  
- #if defined(CONFIG_NET)
- static int __io_accept(struct io_kiocb *req, struct io_kiocb **nxt,
- 		       bool force_nonblock)
+ static int __io_accept(struct io_kiocb *req, bool force_nonblock)
  {
  	struct io_accept *accept = &req->accept;
  	unsigned file_flags;