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

Merge tag 'io_uring-6.0-2022-08-19' of git://git.kernel.dk/linux-block 

Pull io_uring fixes from Jens Axboe:
 "A few fixes for regressions in this cycle:

   - Two instances of using the wrong "has async data" helper (Pavel)

   - Fixup zero-copy address import (Pavel)

   - Bump zero-copy notification slot limit (Pavel)"

* tag 'io_uring-6.0-2022-08-19' of git://git.kernel.dk/linux-block:
  io_uring/net: use right helpers for async_data
  io_uring/notif: raise limit on notification slots
  io_uring/net: improve zc addr import error handling
  io_uring/net: use right helpers for async recycle
parents 044610f8 3f743e9b

io_uring/net.c

+11 −11
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void io_netmsg_recycle(struct io_kiocb *req, unsigned int issue_flags) 
{

	struct io_async_msghdr *hdr = req->async_data;



	if (!hdr || issue_flags & IO_URING_F_UNLOCKED)

	if (!req_has_async_data(req) || issue_flags & IO_URING_F_UNLOCKED)

		return;



	/* Let normal cleanup path reap it if we fail adding to the cache */
@@ -152,9 +152,9 @@ static int io_setup_async_msg(struct io_kiocb *req, 
			      struct io_async_msghdr *kmsg,

			      unsigned int issue_flags)

{

	struct io_async_msghdr *async_msg = req->async_data;

	struct io_async_msghdr *async_msg;



	if (async_msg)

	if (req_has_async_data(req))

		return -EAGAIN;

	async_msg = io_recvmsg_alloc_async(req, issue_flags);

	if (!async_msg) {
@@ -977,6 +977,14 @@ int io_sendzc(struct io_kiocb *req, unsigned int issue_flags) 
	msg.msg_controllen = 0;

	msg.msg_namelen = 0;



	if (zc->addr) {

		ret = move_addr_to_kernel(zc->addr, zc->addr_len, &address);

		if (unlikely(ret < 0))

			return ret;

		msg.msg_name = (struct sockaddr *)&address;

		msg.msg_namelen = zc->addr_len;

	}



	if (zc->flags & IORING_RECVSEND_FIXED_BUF) {

		ret = io_import_fixed(WRITE, &msg.msg_iter, req->imu,

					(u64)(uintptr_t)zc->buf, zc->len);
@@ -992,14 +1000,6 @@ int io_sendzc(struct io_kiocb *req, unsigned int issue_flags) 
			return ret;

	}



	if (zc->addr) {

		ret = move_addr_to_kernel(zc->addr, zc->addr_len, &address);

		if (unlikely(ret < 0))

			return ret;

		msg.msg_name = (struct sockaddr *)&address;

		msg.msg_namelen = zc->addr_len;

	}



	msg_flags = zc->msg_flags | MSG_ZEROCOPY;

	if (issue_flags & IO_URING_F_NONBLOCK)

		msg_flags |= MSG_DONTWAIT;

io_uring/notif.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include "rsrc.h"



#define IO_NOTIF_SPLICE_BATCH	32

#define IORING_MAX_NOTIF_SLOTS (1U << 10)

#define IORING_MAX_NOTIF_SLOTS	(1U << 15)



struct io_notif_data {

	struct file		*file;