[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <000201c6ee59$cba3fda0$db34030a@amr.corp.intel.com>
Date: Thu, 12 Oct 2006 16:54:46 -0700
From: "Chen, Kenneth W" <kenneth.w.chen@...el.com>
To: "'Zach Brown'" <zach.brown@...cle.com>,
"'Suparna Bhattacharya'" <suparna@...ibm.com>,
"Lahaise, Benjamin C" <benjamin.c.lahaise@...el.com>
Cc: <linux-kernel@...r.kernel.org>, "'linux-aio'" <linux-aio@...ck.org>
Subject: [patch] remove redundant kioctx->users ref count
In the ioctx destroy path, both exit_aio and io_destroy calls
wait_for_all_aios(). And in that function, it won't return until
there are no outstanding kiocb, tracked by ctx->reqs_active. So
the ref counting on kioctx for every individual kiocb is overly
excessive. We know we won't perform last put_ioctx when releasing
Kiocb. This should clear out the cache line conflict mentioned in
earlier post.
Signed-off-by: Ken Chen <kenneth.w.chen@...el.com>
diff -Nurp linux-2.6.18/fs/aio.c linux-2.6.18.ken/fs/aio.c
--- linux-2.6.18/fs/aio.c 2006-09-19 20:42:06.000000000 -0700
+++ linux-2.6.18.ken/fs/aio.c 2006-10-12 13:33:09.000000000 -0700
@@ -423,7 +422,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;
}
@@ -534,8 +532,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;
}
@@ -791,8 +787,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;
@@ -1015,9 +1010,6 @@ put_rq:
if (waitqueue_active(&ctx->wait))
wake_up(&ctx->wait);
- if (ret)
- put_ioctx(ctx);
-
return ret;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists