Commit eba41c01 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.18-20251009' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux 

Pull io_uring fixes from Jens Axboe:

 - Fixup indentation in the UAPI header

 - Two fixes for zcrx. One fixes receiving too much in some cases, and
   the other deals with not correctly incrementing the source in the
   fallback copy loop

 - Fix for a race in the IORING_OP_WAITID command, where there was a
   small window where the request would be left on the wait_queue_head
   list even though it was being canceled/completed

 - Update liburing git URL in the kernel tree

* tag 'io_uring-6.18-20251009' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
  io_uring/zcrx: increment fallback loop src offset
  io_uring/zcrx: fix overshooting recv limit
  io_uring: use tab indentation for IORING_SEND_VECTORIZED comment
  io_uring/waitid: always prune wait queue entry in io_waitid_wait()
  io_uring: update liburing git URL
parents 8cc8ea22 e9a9dcb4

io_uring/io_uring.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 *

 * Also see the examples in the liburing library:

 *

 *	git://git.kernel.dk/liburing

 *	git://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git

 *

 * io_uring also uses READ/WRITE_ONCE() for _any_ store or load that happens

 * from data shared between the kernel and application. This is done both

io_uring/waitid.c

+2 −1
Original line number Diff line number Diff line
@@ -230,13 +230,14 @@ static int io_waitid_wait(struct wait_queue_entry *wait, unsigned mode, 
	if (!pid_child_should_wake(wo, p))

		return 0;



	list_del_init(&wait->entry);



	/* cancel is in progress */

	if (atomic_fetch_inc(&iw->refs) & IO_WAITID_REF_MASK)

		return 1;



	req->io_task_work.func = io_waitid_cb;

	io_req_task_work_add(req);

	list_del_init(&wait->entry);

	return 1;

}

io_uring/zcrx.c

+5 −0
Original line number Diff line number Diff line
@@ -1079,6 +1079,7 @@ static ssize_t io_copy_page(struct io_copy_cache *cc, struct page *src_page, 


		cc->size -= n;

		cc->offset += n;

		src_offset += n;

		len -= n;

		copied += n;

	}
@@ -1236,12 +1237,16 @@ io_zcrx_recv_skb(read_descriptor_t *desc, struct sk_buff *skb, 


		end = start + frag_iter->len;

		if (offset < end) {

			size_t count;



			copy = end - offset;

			if (copy > len)

				copy = len;



			off = offset - start;

			count = desc->count;

			ret = io_zcrx_recv_skb(desc, frag_iter, off, copy);

			desc->count = count;

			if (ret < 0)

				goto out;

include/uapi/linux/io_uring.h

+1 −1

File changed.

Contains only whitespace changes.