Commit e92adcba authored by Jeff Moyer's avatar Jeff Moyer Committed by Linus Torvalds

aio: io_getevents() should return if io_destroy() is invoked

This patch wakes up a thread waiting in io_getevents if another thread
destroys the context.  This was tested using a small program that spawns a
thread to wait in io_getevents while the parent thread destroys the io context
and then waits for the getevents thread to exit.  Without this patch, the
program hangs indefinitely.  With the patch, the program exits as expected.
Signed-off-by: default avatarJeff Moyer <jmoyer@redhat.com>
Cc: Zach Brown <zach.brown@oracle.com>
Cc: Christopher Smith <x@xman.org>
Cc: Benjamin LaHaise <bcrl@kvack.org>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 180c06ef
...@@ -1166,7 +1166,10 @@ static int read_events(struct kioctx *ctx, ...@@ -1166,7 +1166,10 @@ static int read_events(struct kioctx *ctx,
break; break;
if (min_nr <= i) if (min_nr <= i)
break; break;
ret = 0; if (unlikely(ctx->dead)) {
ret = -EINVAL;
break;
}
if (to.timed_out) /* Only check after read evt */ if (to.timed_out) /* Only check after read evt */
break; break;
/* Try to only show up in io wait if there are ops /* Try to only show up in io wait if there are ops
...@@ -1231,6 +1234,13 @@ static void io_destroy(struct kioctx *ioctx) ...@@ -1231,6 +1234,13 @@ static void io_destroy(struct kioctx *ioctx)
aio_cancel_all(ioctx); aio_cancel_all(ioctx);
wait_for_all_aios(ioctx); wait_for_all_aios(ioctx);
/*
* Wake up any waiters. The setting of ctx->dead must be seen
* by other CPUs at this point. Right now, we rely on the
* locking done by the above calls to ensure this consistency.
*/
wake_up(&ioctx->wait);
put_ioctx(ioctx); /* once for the lookup */ put_ioctx(ioctx); /* once for the lookup */
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment