The patch titled
aio: fix buggy put_ioctx call in aio_complete
has been removed from the -mm tree. Its filename was
aio-fix-buggy-put_ioctx-call-in-aio_complete.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: aio: fix buggy put_ioctx call in aio_complete
From: "Chen, Kenneth W" <kenneth.w.chen@xxxxxxxxx>
Regarding to a bug report on:
http://marc.theaimsgroup.com/?l=linux-kernel&m=116599593200888&w=2
flush_workqueue() is not allowed to be called in the softirq context.
However, aio_complete() called from I/O interrupt can potentially call
put_ioctx with last ref count on ioctx and trigger a bug warning. It is
simply incorrect to perform ioctx freeing from aio_complete.
This patch removes all duplicate ref counting for each kiocb as reqs_active
already used as a request ref count for each active ioctx. This also
ensures that buggy call to flush_workqueue() in softirq context is
eliminated. wait_for_all_aios currently will wait on last active kiocb.
However, it is racy. This patch also tighten it up by utilizing rcu
synchronization mechanism to ensure no further reference to ioctx before
put_ioctx function is run.
Signed-off-by: Ken Chen <kenneth.w.chen@xxxxxxxxx>
Cc: Benjamin LaHaise <bcrl@xxxxxxxxx>
Cc: Zach Brown <zach.brown@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/aio.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff -puN fs/aio.c~aio-fix-buggy-put_ioctx-call-in-aio_complete fs/aio.c
--- a/fs/aio.c~aio-fix-buggy-put_ioctx-call-in-aio_complete
+++ a/fs/aio.c
@@ -308,6 +308,7 @@ static void wait_for_all_aios(struct kio
set_task_state(tsk, TASK_UNINTERRUPTIBLE);
}
__set_task_state(tsk, TASK_RUNNING);
+ synchronize_rcu();
remove_wait_queue(&ctx->wait, &wait);
}
@@ -424,7 +425,6 @@ static struct kiocb fastcall *__aio_get_
ring = kmap_atomic(ctx->ring_info.ring_pages[0], KM_USER0);
if (ctx->reqs_active < aio_ring_avail(&ctx->ring_info, ring)) {
list_add(&req->ki_list, &ctx->active_reqs);
- get_ioctx(ctx);
ctx->reqs_active++;
okay = 1;
}
@@ -536,8 +536,6 @@ int fastcall aio_put_req(struct kiocb *r
spin_lock_irq(&ctx->ctx_lock);
ret = __aio_put_req(ctx, req);
spin_unlock_irq(&ctx->ctx_lock);
- if (ret)
- put_ioctx(ctx);
return ret;
}
@@ -782,8 +780,7 @@ static int __aio_run_iocbs(struct kioctx
*/
iocb->ki_users++; /* grab extra reference */
aio_run_iocb(iocb);
- if (__aio_put_req(ctx, iocb)) /* drop extra ref */
- put_ioctx(ctx);
+ __aio_put_req(ctx, iocb);
}
if (!list_empty(&ctx->run_list))
return 1;
@@ -996,6 +993,7 @@ int fastcall aio_complete(struct kiocb *
pr_debug("added to ring %p at [%lu]\n", iocb, tail);
put_rq:
/* everything turned out well, dispose of the aiocb. */
+ rcu_read_lock();
ret = __aio_put_req(ctx, iocb);
spin_unlock_irqrestore(&ctx->ctx_lock, flags);
@@ -1003,9 +1001,7 @@ put_rq:
if (waitqueue_active(&ctx->wait))
wake_up(&ctx->wait);
- if (ret)
- put_ioctx(ctx);
-
+ rcu_read_unlock();
return ret;
}
_
Patches currently in -mm which might be from kenneth.w.chen@xxxxxxxxx are
origin.patch
aio-fix-buggy-put_ioctx-call-in-aio_complete.patch
fix-lock-inversion-aio_kick_handler.patch
ia64-alignment-bug-in-ldscript.patch
mm-only-sched-add-a-few-scheduler-event-counters.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
