From: Oleg Nesterov <oleg@redhat.com>
To: Al Viro <viro@ZenIV.linux.org.uk>,
Andrew Morton <akpm@linux-foundation.org>,
Benjamin LaHaise <bcrl@kvack.org>, Jeff Moyer <jmoyer@redhat.com>
Cc: linux-aio@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] aio: make aio_ring->dead boolean
Date: Wed, 17 Jun 2015 01:04:29 +0200 [thread overview]
Message-ID: <20150616230429.GA15793@redhat.com> (raw)
In-Reply-To: <20150616230414.GA15776@redhat.com>
"atomic_t dead" makes no sense. atomic_read() is the plain LOAD,
it doesn't have some "additional" synchronization with xchg().
And now that kill_ioctx() sets "dead" under mm->ioctx_lock we do
not even need xchg().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
fs/aio.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fs/aio.c b/fs/aio.c
index 0693333..b605ab2 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -84,7 +84,7 @@ struct ctx_rq_wait {
struct kioctx {
struct percpu_ref users;
- atomic_t dead;
+ bool dead;
struct percpu_ref reqs;
@@ -327,7 +327,7 @@ static int aio_ring_remap(struct file *file, struct vm_area_struct *vma)
for (i = 0; i < table->nr; i++) {
struct kioctx *ctx = table->table[i];
- if (!ctx || WARN_ON(atomic_read(&ctx->dead)))
+ if (!ctx || ctx->dead)
continue;
if (ctx->aio_ring_file == file) {
@@ -768,7 +768,7 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
err_cleanup:
aio_nr_sub(ctx->max_reqs);
err_ctx:
- atomic_set(&ctx->dead, 1);
+ ctx->dead = true; /* unneeded */
if (ctx->mmap_size)
vm_munmap(ctx->mmap_base, ctx->mmap_size);
aio_free_ring(ctx);
@@ -793,11 +793,12 @@ static int kill_ioctx(struct mm_struct *mm, struct kioctx *ctx,
struct kioctx_table *table;
spin_lock(&mm->ioctx_lock);
- if (atomic_xchg(&ctx->dead, 1)) {
+ if (unlikely(ctx->dead)) {
spin_unlock(&mm->ioctx_lock);
return -EINVAL;
}
+ ctx->dead = true;
table = rcu_dereference_raw(mm->ioctx_table);
WARN_ON(ctx != table->table[ctx->id]);
table->table[ctx->id] = NULL;
@@ -1239,7 +1240,7 @@ static bool aio_read_events(struct kioctx *ctx, long min_nr, long nr,
if (ret > 0)
*i += ret;
- if (unlikely(atomic_read(&ctx->dead)))
+ if (unlikely(ctx->dead))
ret = -EINVAL;
if (!*i)
--
1.5.5.1
next prev parent reply other threads:[~2015-06-16 23:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-16 23:04 [PATCH 0/3] aio: ctx->dead cleanups Oleg Nesterov
2015-06-16 23:04 ` [PATCH 1/3] aio_ring_remap: turn the ctx->dead check into WARN_ON() Oleg Nesterov
2015-06-17 17:50 ` Jeff Moyer
2015-06-17 18:42 ` Oleg Nesterov
2015-06-16 23:04 ` Oleg Nesterov [this message]
2015-06-16 23:50 ` [PATCH v2 2/3] aio: make aio_ring->dead boolean Oleg Nesterov
2015-06-17 19:33 ` Jeff Moyer
2015-06-16 23:04 ` [PATCH 3/3] aio_free_ring: don't do page_count(NULL) Oleg Nesterov
2015-06-17 18:26 ` Jeff Moyer
2015-06-17 0:39 ` [PATCH 0/3] aio: ctx->dead cleanups Al Viro
2015-06-17 0:50 ` Al Viro
2015-06-17 1:22 ` Oleg Nesterov
2015-06-18 16:08 ` Oleg Nesterov
2015-06-17 1:05 ` Oleg Nesterov
2015-06-17 1:14 ` Oleg Nesterov
2015-06-17 1:32 ` Oleg Nesterov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150616230429.GA15793@redhat.com \
--to=oleg@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=bcrl@kvack.org \
--cc=jmoyer@redhat.com \
--cc=linux-aio@kvack.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox