Commit 3b58e9f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-5.17-2022-01-28' of git://git.kernel.dk/linux-block 

Pull io_uring fixes from Jens Axboe:
 "Just two small fixes this time:

   - Fix a bug that can lead to node registration taking 1 second, when
     it should finish much quicker (Dylan)

   - Remove an unused argument from a function (Usama)"

* tag 'io_uring-5.17-2022-01-28' of git://git.kernel.dk/linux-block:
  io_uring: remove unused argument from io_rsrc_node_alloc
  io_uring: fix bug in slow unregistering of nodes
parents d66c1e79 f6133fbd

fs/io_uring.c

+8 −3
Original line number Diff line number Diff line
@@ -7822,10 +7822,15 @@ static __cold void io_rsrc_node_ref_zero(struct percpu_ref *ref) 
	struct io_ring_ctx *ctx = node->rsrc_data->ctx;

	unsigned long flags;

	bool first_add = false;

	unsigned long delay = HZ;



	spin_lock_irqsave(&ctx->rsrc_ref_lock, flags);

	node->done = true;



	/* if we are mid-quiesce then do not delay */

	if (node->rsrc_data->quiesce)

		delay = 0;



	while (!list_empty(&ctx->rsrc_ref_list)) {

		node = list_first_entry(&ctx->rsrc_ref_list,

					    struct io_rsrc_node, node);
@@ -7838,10 +7843,10 @@ static __cold void io_rsrc_node_ref_zero(struct percpu_ref *ref) 
	spin_unlock_irqrestore(&ctx->rsrc_ref_lock, flags);



	if (first_add)

		mod_delayed_work(system_wq, &ctx->rsrc_put_work, HZ);

		mod_delayed_work(system_wq, &ctx->rsrc_put_work, delay);

}



static struct io_rsrc_node *io_rsrc_node_alloc(struct io_ring_ctx *ctx)

static struct io_rsrc_node *io_rsrc_node_alloc(void)

{

	struct io_rsrc_node *ref_node;
@@ -7892,7 +7897,7 @@ static int io_rsrc_node_switch_start(struct io_ring_ctx *ctx) 
{

	if (ctx->rsrc_backup_node)

		return 0;

	ctx->rsrc_backup_node = io_rsrc_node_alloc(ctx);

	ctx->rsrc_backup_node = io_rsrc_node_alloc();

	return ctx->rsrc_backup_node ? 0 : -ENOMEM;

}