From 65ccfc3a5fdb49d41eb534fdefd0819f712b7472 Mon Sep 17 00:00:00 2001 From: Benjamin LaHaise Date: Wed, 20 Feb 2013 13:16:58 +1100 Subject: aio: fix kioctx not being freed after cancellation at exit time The recent changes overhauling fs/aio.c introduced a bug that results in the kioctx not being freed when outstanding kiocbs are cancelled at exit_aio() time. Specifically, a kiocb that is cancelled has its completion events discarded by batch_complete_aio(), which then fails to wake up the process stuck in free_ioctx(). Fix this by removing the event suppression in batch_complete_aio() and modify the wait_event() condition in free_ioctx() appropriately. This patch was tested with the cancel operation in the thread based code posted yesterday. Signed-off-by: Benjamin LaHaise Cc: Kent Overstreet Cc: Josh Boyer Cc: Zach Brown Signed-off-by: Andrew Morton --- fs/aio.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index 057d9228b8df..63713e67fbc7 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -335,7 +335,9 @@ static void free_ioctx(struct kioctx *ctx) kunmap_atomic(ring); while (atomic_read(&ctx->reqs_available) < ctx->nr) { - wait_event(ctx->wait, head != ctx->shadow_tail); + wait_event(ctx->wait, + (head != ctx->shadow_tail) || + (atomic_read(&ctx->reqs_available) >= ctr->nr)); avail = (head <= ctx->shadow_tail ? ctx->shadow_tail : ctx->nr) - head; @@ -748,17 +750,6 @@ void batch_complete_aio(struct batch_complete *batch) n = rb_parent(n); } - if (unlikely(xchg(&req->ki_cancel, - KIOCB_CANCELLED) == KIOCB_CANCELLED)) { - /* - * Can't use the percpu reqs_available here - could race - * with free_ioctx() - */ - atomic_inc(&req->ki_ctx->reqs_available); - aio_put_req(req); - continue; - } - if (unlikely(req->ki_eventfd != eventfd)) { if (eventfd) { /* Make event visible */ -- cgit v1.2.3