github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring/zcrx: rename zcrx [un]register functions

Browse Source 
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: Pavel Begunkov <asml.silence@gmail.com>
Link: https://patch.msgid.link/657874acd117ec30fa6f45d9d844471c753b5a0f.1774261953.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2026-03-23 12:44:05 +00:00 committed by Jens Axboe
parent de6ed1b323
commit 7c713dd007
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io_uring/io_uring.c
View File

@ -2156,7 +2156,7 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx)
mutex_lock(&ctx->uring_lock); mutex_lock(&ctx->uring_lock);
io_sqe_buffers_unregister(ctx); io_sqe_buffers_unregister(ctx);
io_sqe_files_unregister(ctx); io_sqe_files_unregister(ctx);
io_unregister_zcrx_ifqs(ctx); io_unregister_zcrx(ctx);
io_cqring_overflow_kill(ctx); io_cqring_overflow_kill(ctx);
io_eventfd_unregister(ctx); io_eventfd_unregister(ctx);
io_free_alloc_caches(ctx); io_free_alloc_caches(ctx);

2
io_uring/register.c
View File

@ -900,7 +900,7 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,
ret = -EINVAL; ret = -EINVAL;
if (!arg || nr_args != 1) if (!arg || nr_args != 1)
break; break;
ret = io_register_zcrx_ifq(ctx, arg); ret = io_register_zcrx(ctx, arg);
break; break;
case IORING_REGISTER_RESIZE_RINGS: case IORING_REGISTER_RESIZE_RINGS:
ret = -EINVAL; ret = -EINVAL;

6
io_uring/zcrx.c
View File

@ -816,8 +816,8 @@ static int zcrx_register_netdev(struct io_zcrx_ifq *ifq,
return ret; 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_ifq_reg __user *arg)
{ {
struct io_uring_zcrx_area_reg area; struct io_uring_zcrx_area_reg area;
struct io_uring_zcrx_ifq_reg reg; struct io_uring_zcrx_ifq_reg reg;
@ -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; struct io_zcrx_ifq *ifq;

10
io_uring/zcrx.h
View File

@ -76,9 +76,9 @@ struct io_zcrx_ifq {
#if defined(CONFIG_IO_URING_ZCRX) #if defined(CONFIG_IO_URING_ZCRX)
int io_zcrx_ctrl(struct io_ring_ctx *ctx, void __user *arg, unsigned nr_arg); 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); 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); void io_terminate_zcrx(struct io_ring_ctx *ctx);
int io_zcrx_recv(struct io_kiocb *req, struct io_zcrx_ifq *ifq, int io_zcrx_recv(struct io_kiocb *req, struct io_zcrx_ifq *ifq,
struct socket *sock, unsigned int flags, 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, struct io_mapped_region *io_zcrx_get_region(struct io_ring_ctx *ctx,
unsigned int id); unsigned int id);
#else #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) struct io_uring_zcrx_ifq_reg __user *arg)
{ {
return -EOPNOTSUPP; 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) static inline void io_terminate_zcrx(struct io_ring_ctx *ctx)