Commit 7c713dd0 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring/zcrx: rename zcrx [un]register functions 



Drop "ifqs" from function names, as it refers to an interface queue and
there might be none once a device-less mode is introduced.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://patch.msgid.link/657874acd117ec30fa6f45d9d844471c753b5a0f.1774261953.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent de6ed1b3

io_uring/io_uring.c

+1 −1
Original line number Diff line number Diff line
@@ -2156,7 +2156,7 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx) 
	mutex_lock(&ctx->uring_lock);

	io_sqe_buffers_unregister(ctx);

	io_sqe_files_unregister(ctx);

	io_unregister_zcrx_ifqs(ctx);

	io_unregister_zcrx(ctx);

	io_cqring_overflow_kill(ctx);

	io_eventfd_unregister(ctx);

	io_free_alloc_caches(ctx);

io_uring/register.c

+1 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode, 
		ret = -EINVAL;

		if (!arg || nr_args != 1)

			break;

		ret = io_register_zcrx_ifq(ctx, arg);

		ret = io_register_zcrx(ctx, arg);

		break;

	case IORING_REGISTER_RESIZE_RINGS:

		ret = -EINVAL;

io_uring/zcrx.c

+3 −3
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ static int zcrx_register_netdev(struct io_zcrx_ifq *ifq, 
	return ret;

}



int io_register_zcrx_ifq(struct io_ring_ctx *ctx,

int io_register_zcrx(struct io_ring_ctx *ctx,

		     struct io_uring_zcrx_ifq_reg __user *arg)

{

	struct io_uring_zcrx_area_reg area;
@@ -955,7 +955,7 @@ void io_terminate_zcrx(struct io_ring_ctx *ctx) 
	}

}



void io_unregister_zcrx_ifqs(struct io_ring_ctx *ctx)

void io_unregister_zcrx(struct io_ring_ctx *ctx)

{

	struct io_zcrx_ifq *ifq;

io_uring/zcrx.h

+5 −5
Original line number Diff line number Diff line
@@ -76,9 +76,9 @@ struct io_zcrx_ifq { 


#if defined(CONFIG_IO_URING_ZCRX)

int io_zcrx_ctrl(struct io_ring_ctx *ctx, void __user *arg, unsigned nr_arg);

int io_register_zcrx_ifq(struct io_ring_ctx *ctx,

int io_register_zcrx(struct io_ring_ctx *ctx,

			 struct io_uring_zcrx_ifq_reg __user *arg);

void io_unregister_zcrx_ifqs(struct io_ring_ctx *ctx);

void io_unregister_zcrx(struct io_ring_ctx *ctx);

void io_terminate_zcrx(struct io_ring_ctx *ctx);

int io_zcrx_recv(struct io_kiocb *req, struct io_zcrx_ifq *ifq,

		 struct socket *sock, unsigned int flags,
@@ -86,12 +86,12 @@ int io_zcrx_recv(struct io_kiocb *req, struct io_zcrx_ifq *ifq, 
struct io_mapped_region *io_zcrx_get_region(struct io_ring_ctx *ctx,

					    unsigned int id);

#else

static inline int io_register_zcrx_ifq(struct io_ring_ctx *ctx,

static inline int io_register_zcrx(struct io_ring_ctx *ctx,

				   struct io_uring_zcrx_ifq_reg __user *arg)

{

	return -EOPNOTSUPP;

}

static inline void io_unregister_zcrx_ifqs(struct io_ring_ctx *ctx)

static inline void io_unregister_zcrx(struct io_ring_ctx *ctx)

{

}

static inline void io_terminate_zcrx(struct io_ring_ctx *ctx)