Skip to content

Commit

Permalink
fs/aio: Use rcu_work instead of explicit rcu and work item
Browse files Browse the repository at this point in the history
Workqueue now has rcu_work.  Use it instead of open-coding rcu -> work
item bouncing.

Signed-off-by: Tejun Heo <tj@kernel.org>
  • Loading branch information
Tejun Heo committed Mar 19, 2018
1 parent 8f36aae commit f729863
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions fs/aio.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@ struct kioctx {
struct page **ring_pages;
long nr_pages;

struct rcu_head free_rcu;
struct work_struct free_work; /* see free_ioctx() */
struct rcu_work free_rwork; /* see free_ioctx() */

/*
* signals when all in-flight requests are done
Expand Down Expand Up @@ -592,13 +591,12 @@ static int kiocb_cancel(struct aio_kiocb *kiocb)
/*
* free_ioctx() should be RCU delayed to synchronize against the RCU
* protected lookup_ioctx() and also needs process context to call
* aio_free_ring(), so the double bouncing through kioctx->free_rcu and
* ->free_work.
* aio_free_ring(). Use rcu_work.
*/
static void free_ioctx(struct work_struct *work)
{
struct kioctx *ctx = container_of(work, struct kioctx, free_work);

struct kioctx *ctx = container_of(to_rcu_work(work), struct kioctx,
free_rwork);
pr_debug("freeing %p\n", ctx);

aio_free_ring(ctx);
Expand All @@ -608,14 +606,6 @@ static void free_ioctx(struct work_struct *work)
kmem_cache_free(kioctx_cachep, ctx);
}

static void free_ioctx_rcufn(struct rcu_head *head)
{
struct kioctx *ctx = container_of(head, struct kioctx, free_rcu);

INIT_WORK(&ctx->free_work, free_ioctx);
schedule_work(&ctx->free_work);
}

static void free_ioctx_reqs(struct percpu_ref *ref)
{
struct kioctx *ctx = container_of(ref, struct kioctx, reqs);
Expand All @@ -625,7 +615,8 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
complete(&ctx->rq_wait->comp);

/* Synchronize against RCU protected table->table[] dereferences */
call_rcu(&ctx->free_rcu, free_ioctx_rcufn);
INIT_RCU_WORK(&ctx->free_rwork, free_ioctx);
queue_rcu_work(system_wq, &ctx->free_rwork);
}

/*
Expand Down

0 comments on commit f729863

Please sign in to comment.