From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 11 Sep 2024 16:42:40 +0000 (-0600)
Subject: Merge branch 'for-6.12/io_uring' into for-6.12/io_uring-discard
X-Git-Tag: v6.12-rc1~203^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d0f8dcb3a634bbee46fcb028c5984c463f47812;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-6.12/io_uring' into for-6.12/io_uring-discard

* for-6.12/io_uring: (31 commits)
  io_uring/io-wq: inherit cpuset of cgroup in io worker
  io_uring/io-wq: do not allow pinning outside of cpuset
  io_uring/rw: drop -EOPNOTSUPP check in __io_complete_rw_common()
  io_uring/rw: treat -EOPNOTSUPP for IOCB_NOWAIT like -EAGAIN
  io_uring/sqpoll: do not allow pinning outside of cpuset
  io_uring/eventfd: move refs to refcount_t
  io_uring: remove unused rsrc_put_fn
  io_uring: add new line after variable declaration
  io_uring: add GCOV_PROFILE_URING Kconfig option
  io_uring/kbuf: add support for incremental buffer consumption
  io_uring/kbuf: pass in 'len' argument for buffer commit
  Revert "io_uring: Require zeroed sqe->len on provided-buffers send"
  io_uring/kbuf: move io_ring_head_to_buf() to kbuf.h
  io_uring/kbuf: add io_kbuf_commit() helper
  io_uring/kbuf: shrink nr_iovs/mode in struct buf_sel_arg
  io_uring: wire up min batch wake timeout
  io_uring: add support for batch wait timeout
  io_uring: implement our own schedule timeout handling
  io_uring: move schedule wait logic into helper
  io_uring: encapsulate extraneous wait flags into a separate struct
  ...
---

6d0f8dcb3a634bbee46fcb028c5984c463f47812
diff --cc io_uring/kbuf.c
index bdfa30b38321b,1f503bcc9c9fc..d407576ddfb78
--- a/io_uring/kbuf.c
+++ b/io_uring/kbuf.c
@@@ -129,15 -129,9 +129,9 @@@ static int io_provided_buffers_select(s
  
  	iov[0].iov_base = buf;
  	iov[0].iov_len = *len;
 -	return 0;
 +	return 1;
  }
  
- static struct io_uring_buf *io_ring_head_to_buf(struct io_uring_buf_ring *br,
- 						__u16 head, __u16 mask)
- {
- 	return &br->bufs[head & mask];
- }
- 
  static void __user *io_ring_buffer_select(struct io_kiocb *req, size_t *len,
  					  struct io_buffer_list *bl,
  					  unsigned int issue_flags)