Skip to content

Commit

Permalink
block: refactor put_iocontext_active
Browse files Browse the repository at this point in the history
Factor out a ioc_exit_icqs helper to tear down the icqs and the fold
the rest of put_iocontext_active into exit_io_context.

Signed-off-by: Christoph Hellwig <[email protected]>
Reviewed-by: Jan Kara <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
Christoph Hellwig authored and axboe committed Dec 16, 2021
1 parent 0aed2f1 commit 4be8a2e
Showing 1 changed file with 14 additions and 27 deletions.
41 changes: 14 additions & 27 deletions block/blk-ioc.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ static void ioc_exit_icq(struct io_cq *icq)
icq->flags |= ICQ_EXITED;
}

static void ioc_exit_icqs(struct io_context *ioc)
{
struct io_cq *icq;

spin_lock_irq(&ioc->lock);
hlist_for_each_entry(icq, &ioc->icq_list, ioc_node)
ioc_exit_icq(icq);
spin_unlock_irq(&ioc->lock);
}

/*
* Release an icq. Called with ioc locked for blk-mq, and with both ioc
* and queue locked for legacy.
Expand Down Expand Up @@ -169,32 +179,6 @@ void put_io_context(struct io_context *ioc)
}
EXPORT_SYMBOL_GPL(put_io_context);

/**
* put_io_context_active - put active reference on ioc
* @ioc: ioc of interest
*
* Put an active reference to an ioc. If active reference reaches zero after
* put, @ioc can never issue further IOs and ioscheds are notified.
*/
static void put_io_context_active(struct io_context *ioc)
{
struct io_cq *icq;

if (!atomic_dec_and_test(&ioc->active_ref))
return;

spin_lock_irq(&ioc->lock);
hlist_for_each_entry(icq, &ioc->icq_list, ioc_node) {
if (icq->flags & ICQ_EXITED)
continue;

ioc_exit_icq(icq);
}
spin_unlock_irq(&ioc->lock);

put_io_context(ioc);
}

/* Called by the exiting task */
void exit_io_context(struct task_struct *task)
{
Expand All @@ -205,7 +189,10 @@ void exit_io_context(struct task_struct *task)
task->io_context = NULL;
task_unlock(task);

put_io_context_active(ioc);
if (atomic_dec_and_test(&ioc->active_ref)) {
ioc_exit_icqs(ioc);
put_io_context(ioc);
}
}

static void __ioc_clear_queue(struct list_head *icq_list)
Expand Down

0 comments on commit 4be8a2e

Please sign in to comment.