LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Sébastien Dugué" <sebastien.dugue@bull.net>
To: linux-kernel <linux-kernel@vger.kernel.org>
Cc: Oleg Nesterov <oleg@tv-sign.ru>, Andrew Morton <akpm@osdl.org>,
	linux-aio <linux-aio@kvack.org>,
	Bharata B Rao <bharata@in.ibm.com>,
	Christoph Hellwig <hch@infradead.org>,
	Suparna Bhattacharya <suparna@in.ibm.com>,
	Ulrich Drepper <drepper@redhat.com>,
	Zach Brown <zach.brown@oracle.com>,
	Badari Pulavarty <pbadari@us.ibm.com>,
	Jean Pierre Dion <jean-pierre.dion@bull.net>
Subject: [PATCH -mm][AIO] AIO completion signal notification fixes and cleanups
Date: Tue, 6 Feb 2007 10:22:53 +0100	[thread overview]
Message-ID: <20070206102253.20b121ae@frecb000686> (raw)
In-Reply-To: <20070205171335.GA528@tv-sign.ru>


  Andrew, here is another incremental patch which does a bit of cleanup
as well as fixing a possible release on a task ref that was not taken.

  Thanks,

  Sébastien.


From: Sébastien Dugué <sebastien.dugue@bull.net>

	AIO completion signal notification misc fixes and cleanups

  This patches cleans up the notification path and fixes a possible
release on a task ref that was not taken in aio_setup_sigevent().


 aio.c |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Signed-off-by: Sébastien Dugué <sebastien.dugue@bull.net>


Index: linux-2.6.20-rc6-mm3/fs/aio.c
===================================================================
--- linux-2.6.20-rc6-mm3.orig/fs/aio.c	2007-02-05 16:53:43.000000000 +0100
+++ linux-2.6.20-rc6-mm3/fs/aio.c	2007-02-06 09:33:55.000000000 +0100
@@ -469,8 +469,7 @@ static inline void really_put_req(struct
 		kfree(req->ki_iovec);
 
 	/* Release task ref */
-	if (req->ki_notify.notify == SIGEV_THREAD_ID ||
-	    req->ki_notify.notify == SIGEV_SIGNAL)
+	if (req->ki_notify.notify != SIGEV_NONE)
 		put_task_struct(req->ki_notify.target);
 
 	kmem_cache_free(kiocb_cachep, req);
@@ -970,8 +969,14 @@ static long aio_setup_sigevent(struct ai
 	rcu_read_lock();
 	target = sigevent_find_task(&event);
 
-	if (unlikely(!target))
+	if (unlikely(!target)) {
+		/*
+		 * Revert notify to SIGEV_NONE so that really_put_req()
+		 * knows that no ref has been taken on a task.
+		 */
+		notify->notify = SIGEV_NONE;
 		goto out_unlock;
+	}
 
 	/*
 	 * At this point, we know that notify is either SIGEV_SIGNAL or
@@ -996,7 +1001,7 @@ static long aio_setup_sigevent(struct ai
 	return 0;
 
 out_unlock:
-	read_unlock(&tasklist_lock);
+	rcu_read_unlock();
 	return -EINVAL;
 }
 
@@ -1763,7 +1768,7 @@ int fastcall io_submit_one(struct kioctx
 					 (struct sigevent __user *)(unsigned long)
 					 iocb->aio_sigeventp);
 		if (ret)
-			goto out_put_req;
+			goto out_sigqfree;
 	}
 
 	/* Attach this iocb to its lio */

  parent reply	other threads:[~2007-02-06  9:24 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-01  9:22 [PATCH -mm 0/7][AIO] - AIO completion signal notification v6 Sébastien Dugué
2007-02-01  9:26 ` [PATCH -mm 1/7][AIO] - Rework compat_sys_io_submit Sébastien Dugué
2007-02-01  9:29 ` [PATCH -mm 2/7][AIO] - fix aio.h includes Sébastien Dugué
2007-02-01  9:30 ` [PATCH -mm 3/7][AIO] - Fix access_ok() checks Sébastien Dugué
2007-02-01  9:30 ` [PATCH -mm 4/7][AIO] - Make good_sigevent() non-static Sébastien Dugué
2007-02-02 18:00   ` Oleg Nesterov
2007-02-05 11:09     ` Sébastien Dugué
2007-02-05 12:18     ` [PATCH -mm 4/7][AIO] Resend " Sébastien Dugué
2007-02-05 13:43       ` Oleg Nesterov
2007-02-05 16:00         ` [PATCH -mm][AIO] Fix AIO completion signal notification possible ref leak Sébastien Dugué
2007-02-05 17:13           ` Oleg Nesterov
2007-02-06  8:31             ` Sébastien Dugué
2007-02-06  9:22             ` Sébastien Dugué [this message]
2007-02-06 11:05               ` [PATCH -mm][AIO] AIO completion signal notification fixes and cleanups Oleg Nesterov
2007-02-06 11:39                 ` Sébastien Dugué
2007-02-06 11:57                 ` [PATCH -mm][AIO] AIO completion signal notification small cleanup Sébastien Dugué
2007-02-01  9:31 ` [PATCH -mm 5/7][AIO] - Make __sigqueue_free() and __sigqueue_alloc() non static Sébastien Dugué
2007-02-01  9:31 ` [PATCH -mm 6/7][AIO] - AIO completion signal notification Sébastien Dugué
2007-02-01  9:32 ` [PATCH -mm 7/7][AIO] - Add listio syscall support Sébastien Dugué

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=20070206102253.20b121ae@frecb000686 \
    --to=sebastien.dugue@bull.net \
    --cc=akpm@osdl.org \
    --cc=bharata@in.ibm.com \
    --cc=drepper@redhat.com \
    --cc=hch@infradead.org \
    --cc=jean-pierre.dion@bull.net \
    --cc=linux-aio@kvack.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=oleg@tv-sign.ru \
    --cc=pbadari@us.ibm.com \
    --cc=suparna@in.ibm.com \
    --cc=zach.brown@oracle.com \
    --subject='Re: [PATCH -mm][AIO] AIO completion signal notification fixes and cleanups' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).