All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: linux-ia64@vger.kernel.org, avagin@virtuozzo.com,
	peterz@infradead.org, heiko.carstens@de.ibm.com, hpa@zytor.com,
	gorcunov@virtuozzo.com, linux-arch@vger.kernel.org,
	linux-s390@vger.kernel.org, x86@kernel.org, mingo@redhat.com,
	mattst88@gmail.com, fenghua.yu@intel.com, arnd@arndb.de,
	ktkhai@virtuozzo.com, ink@jurassic.park.msu.ru,
	tglx@linutronix.de, rth@twiddle.net, tony.luck@intel.com,
	linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org,
	schwidefsky@de.ibm.com, davem@davemloft.net, rientjes@google.com,
	viro@zeniv.linux.org.uk
Subject: [PATCH REBASED 6/6] fs: Use killable down_read() in iterate_dir()
Date: Fri, 29 Sep 2017 19:06:48 +0300	[thread overview]
Message-ID: <150670120820.23930.5455667921545937220.stgit@localhost.localdomain> (raw)
In-Reply-To: <150670038738.23930.7190484711222807884.stgit@localhost.localdomain>

There was mutex_lock_interruptible() initially, and it was changed
to rwsem, but there were not killable rwsem primitives that time.
>From commit 9902af79c01a:

    "The main issue is the lack of down_write_killable(), so the places
     like readdir.c switched to plain inode_lock(); once killable
     variants of rwsem primitives appear, that'll be dealt with"

Use down_read_killable() same as down_write_killable() in !shared
case, as concurrent inode_lock() may take much time, that may be
wanted to be interrupted by user.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 fs/readdir.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/fs/readdir.c b/fs/readdir.c
index 89659549c09d..7c584bbb4ce3 100644
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -36,13 +36,12 @@ int iterate_dir(struct file *file, struct dir_context *ctx)
 	if (res)
 		goto out;
 
-	if (shared) {
-		inode_lock_shared(inode);
-	} else {
+	if (shared)
+		res = down_read_killable(&inode->i_rwsem);
+	else
 		res = down_write_killable(&inode->i_rwsem);
-		if (res)
-			goto out;
-	}
+	if (res)
+		goto out;
 
 	res = -ENOENT;
 	if (!IS_DEADDIR(inode)) {

WARNING: multiple messages have this Message-ID (diff)
From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: linux-ia64@vger.kernel.org, avagin@virtuozzo.com,
	peterz@infradead.org, heiko.carstens@de.ibm.com, hpa@zytor.com,
	gorcunov@virtuozzo.com, linux-arch@vger.kernel.org,
	linux-s390@vger.kernel.org, x86@kernel.org, mingo@redhat.com,
	mattst88@gmail.com, fenghua.yu@intel.com, arnd@arndb.de,
	ktkhai@virtuozzo.com, ink@jurassic.park.msu.ru,
	tglx@linutronix.de, rth@twiddle.net, tony.luck@intel.com,
	linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org,
	schwidefsky@de.ibm.com, davem@davemloft.net, rientjes@google.com,
	viro@zeniv.linux.org.uk
Subject: [PATCH REBASED 6/6] fs: Use killable down_read() in iterate_dir()
Date: Fri, 29 Sep 2017 19:06:48 +0300	[thread overview]
Message-ID: <150670120820.23930.5455667921545937220.stgit@localhost.localdomain> (raw)
In-Reply-To: <150670038738.23930.7190484711222807884.stgit@localhost.localdomain>

There was mutex_lock_interruptible() initially, and it was changed
to rwsem, but there were not killable rwsem primitives that time.
From commit 9902af79c01a:

    "The main issue is the lack of down_write_killable(), so the places
     like readdir.c switched to plain inode_lock(); once killable
     variants of rwsem primitives appear, that'll be dealt with"

Use down_read_killable() same as down_write_killable() in !shared
case, as concurrent inode_lock() may take much time, that may be
wanted to be interrupted by user.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 fs/readdir.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/fs/readdir.c b/fs/readdir.c
index 89659549c09d..7c584bbb4ce3 100644
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -36,13 +36,12 @@ int iterate_dir(struct file *file, struct dir_context *ctx)
 	if (res)
 		goto out;
 
-	if (shared) {
-		inode_lock_shared(inode);
-	} else {
+	if (shared)
+		res = down_read_killable(&inode->i_rwsem);
+	else
 		res = down_write_killable(&inode->i_rwsem);
-		if (res)
-			goto out;
-	}
+	if (res)
+		goto out;
 
 	res = -ENOENT;
 	if (!IS_DEADDIR(inode)) {

  parent reply	other threads:[~2017-09-29 16:07 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-29 16:05 [PATCH REBASED 0/6] rwsem: Implement down_read_killable() Kirill Tkhai
2017-09-29 16:05 ` [PATCH REBASED 1/6] alpha: Add __down_read_killable() Kirill Tkhai
2017-10-10 11:03   ` [tip:locking/core] locking/arch, " tip-bot for Kirill Tkhai
2017-09-29 16:06 ` [PATCH REBASED 2/6] ia64: " Kirill Tkhai
2017-10-10 11:04   ` [tip:locking/core] locking/arch, " tip-bot for Kirill Tkhai
2017-09-29 16:06 ` [PATCH REBASED 3/6] s390: " Kirill Tkhai
2017-09-30  9:20   ` Heiko Carstens
2017-09-30 10:36     ` Martin Schwidefsky
2017-09-30 10:38       ` Heiko Carstens
2017-09-30 10:39       ` Martin Schwidefsky
2017-10-10 11:04   ` [tip:locking/core] locking/arch, " tip-bot for Kirill Tkhai
2017-09-29 16:06 ` [PATCH REBASED 4/6] x86: " Kirill Tkhai
2017-10-10 11:05   ` [tip:locking/core] locking/arch, " tip-bot for Kirill Tkhai
2017-09-29 16:06 ` [PATCH REBASED 5/6] rwsem: Add down_read_killable() Kirill Tkhai
2017-10-10 11:05   ` [tip:locking/core] locking/rwsem: " tip-bot for Kirill Tkhai
2017-09-29 16:06 ` Kirill Tkhai [this message]
2017-09-29 16:06   ` [PATCH REBASED 6/6] fs: Use killable down_read() in iterate_dir() Kirill Tkhai
2017-10-10 11:05   ` [tip:locking/core] locking/rwsem, " tip-bot for Kirill Tkhai
2017-10-03  9:03 ` [PATCH REBASED 0/6] rwsem: Implement down_read_killable() Peter Zijlstra

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=150670120820.23930.5455667921545937220.stgit@localhost.localdomain \
    --to=ktkhai@virtuozzo.com \
    --cc=arnd@arndb.de \
    --cc=avagin@virtuozzo.com \
    --cc=davem@davemloft.net \
    --cc=fenghua.yu@intel.com \
    --cc=gorcunov@virtuozzo.com \
    --cc=heiko.carstens@de.ibm.com \
    --cc=hpa@zytor.com \
    --cc=ink@jurassic.park.msu.ru \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=mattst88@gmail.com \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rientjes@google.com \
    --cc=rth@twiddle.net \
    --cc=schwidefsky@de.ibm.com \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=x86@kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.