Skip to contentSkip to conversation

aio: only suppress events from cancelled kiocbs if free_ioctx() is in progress

PATCH In review Benjamin LaHaise 2 participants 2 messages Feb 13, 2013 – Feb 14, 2013

Subsystems (2)
lore
Share & tools
lore

Benjamin LaHaise

author maintainer
#0 lore raw

PATCH 1/1 aio: only suppress events from cancelled kiocbs if free_ioctx() is in progress

The io_cancel() syscall allows for cancellation of iocbs in flight to generate a completion event. The current behaviour of batch_complete_aio() is to suppress all completion events. Some types of asynchronous operations cannot be cancelled synchronously, and must generate a completion event at some point after the io_cancel() syscall. Instead, only suppress completion events during kioctx teardown by free_ioctx().

---
 fs/aio.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
fs/aio.c +5 -1
index 46f9dd0..1bcb818 100644
@@ -81,6 +81,7 @@ struct kioctx {
 
 	/* sys_io_setup currently limits this to an unsigned int */
 	unsigned		max_reqs;
+	unsigned		dead;
 
 	unsigned long		mmap_base;
 	unsigned long		mmap_size;
@@ -311,6 +312,7 @@ static void free_ioctx(struct kioctx *ctx)
 	struct kiocb *req;
 	unsigned cpu, head, avail;
 
+	ctx->dead = 1;
 	spin_lock_irq(&ctx->ctx_lock);
 
 	while (!list_empty(&ctx->active_reqs)) {
@@ -749,7 +751,9 @@ void batch_complete_aio(struct batch_complete *batch)
 			n = rb_parent(n);
 		}
 
-		if (unlikely(xchg(&req->ki_cancel,
+		/* Suppress cancelled events if free_ioctx() is in progress. */
+		if (unlikely(req->ki_ctx->dead &&
+			     xchg(&req->ki_cancel,
 				  KIOCB_CANCELLED) == KIOCB_CANCELLED)) {
 			/*
 			 * Can't use the percpu reqs_available here - could race
Signature · 11 lines
1.7.4.1


-- 
"Thought is the essence of where you are now."

--
To unsubscribe, send a message with 'unsubscribe linux-aio' in
the body to [email protected].  For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
#1 lore raw
Quoted 17 lines · Benjamin LaHaise

The io_cancel() syscall allows for cancellation of iocbs in flight to generate a completion event. The current behaviour of batch_complete_aio() is to suppress all completion events. Some types of asynchronous operations cannot be cancelled synchronously, and must generate a completion event at some point after the io_cancel() syscall. Instead, only suppress completion events during kioctx teardown by free_ioctx().

---
 fs/aio.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
fs/aio.c +0 -0
index 46f9dd0..1bcb818 100644

fs/aio.c struct kioctx { · line 84

Quoted 4 lines
fs/aio.c +1 -0
@@ -81,6 +81,7 @@ struct kioctx {
 
 	/* sys_io_setup currently limits this to an unsigned int */
 	unsigned		max_reqs;
+	unsigned		dead;

Can use percpu_ref_dead() for this - it returns true after percpu_ref_kill() has been called (it's what I converted the old ctx->dead uses to).

Quoted 12 lines
fs/aio.c +1 -0
 	unsigned long		mmap_base;
 	unsigned long		mmap_size;
@@ -311,6 +312,7 @@ static void free_ioctx(struct kioctx *ctx)
 	struct kiocb *req;
 	unsigned cpu, head, avail;
 
+	ctx->dead = 1;
 	spin_lock_irq(&ctx->ctx_lock);
 
 	while (!list_empty(&ctx->active_reqs)) {

fs/aio.c void batch_complete_aio(struct batch_complete *batch) · line 757

Quoted 8 lines
fs/aio.c +3 -1
@@ -749,7 +751,9 @@ void batch_complete_aio(struct batch_complete *batch)
 			n = rb_parent(n);
 		}
 
-		if (unlikely(xchg(&req->ki_cancel,
+		/* Suppress cancelled events if free_ioctx() is in progress. */
+		if (unlikely(req->ki_ctx->dead &&
+			     xchg(&req->ki_cancel,
 				  KIOCB_CANCELLED) == KIOCB_CANCELLED)) {

I'm not seeing why we need to supress events during teardown - if we just let it be delivered to the ringbuffer like normal, the free_ioctx() code will find it there.

I think the event supressing code can be deleted entirely.

--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>