Skip to content

Commit 02255d5

Browse files
isilenceaxboe
authored andcommitted
io_uring: pass ctx to io_register_free_rings
A preparation patch, pass the context to io_register_free_rings. Signed-off-by: Pavel Begunkov <[email protected]> Link: https://lore.kernel.org/r/c1865fd2b3d4db22d1a1aac7dd06ea22cb990834.1732886067.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <[email protected]>
1 parent 087f997 commit 02255d5

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

io_uring/register.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,8 @@ struct io_ring_ctx_rings {
375375
struct io_rings *rings;
376376
};
377377

378-
static void io_register_free_rings(struct io_uring_params *p,
378+
static void io_register_free_rings(struct io_ring_ctx *ctx,
379+
struct io_uring_params *p,
379380
struct io_ring_ctx_rings *r)
380381
{
381382
if (!(p->flags & IORING_SETUP_NO_MMAP)) {
@@ -455,7 +456,7 @@ static int io_register_resize_rings(struct io_ring_ctx *ctx, void __user *arg)
455456
n.rings->cq_ring_entries = p.cq_entries;
456457

457458
if (copy_to_user(arg, &p, sizeof(p))) {
458-
io_register_free_rings(&p, &n);
459+
io_register_free_rings(ctx, &p, &n);
459460
return -EFAULT;
460461
}
461462

@@ -464,7 +465,7 @@ static int io_register_resize_rings(struct io_ring_ctx *ctx, void __user *arg)
464465
else
465466
size = array_size(sizeof(struct io_uring_sqe), p.sq_entries);
466467
if (size == SIZE_MAX) {
467-
io_register_free_rings(&p, &n);
468+
io_register_free_rings(ctx, &p, &n);
468469
return -EOVERFLOW;
469470
}
470471

@@ -475,7 +476,7 @@ static int io_register_resize_rings(struct io_ring_ctx *ctx, void __user *arg)
475476
p.sq_off.user_addr,
476477
size);
477478
if (IS_ERR(ptr)) {
478-
io_register_free_rings(&p, &n);
479+
io_register_free_rings(ctx, &p, &n);
479480
return PTR_ERR(ptr);
480481
}
481482

@@ -565,7 +566,7 @@ static int io_register_resize_rings(struct io_ring_ctx *ctx, void __user *arg)
565566
out:
566567
spin_unlock(&ctx->completion_lock);
567568
mutex_unlock(&ctx->mmap_lock);
568-
io_register_free_rings(&p, to_free);
569+
io_register_free_rings(ctx, &p, to_free);
569570

570571
if (ctx->sq_data)
571572
io_sq_thread_unpark(ctx->sq_data);

0 commit comments

Comments
 (0)