linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: Wu Fengguang <fengguang.wu@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Christoph Hellwig <hch@infradead.org>,
	Al Viro <viro@ZenIV.linux.org.uk>,
	linux-fsdevel@vger.kernel.org, Jan Kara <jack@suse.cz>
Subject: [PATCH 2/2] fs: Make write(2) interruptible by a signal
Date: Mon, 14 Nov 2011 17:15:24 +0100	[thread overview]
Message-ID: <1321287324-15121-3-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1321287324-15121-1-git-send-email-jack@suse.cz>

Currently write(2) to a file is not interruptible by a signal. Sometimes this
is desirable (e.g. when you want to quickly kill a process hogging your disk or
when some process gets blocked in balance_dirty_pages() indefinitely due to a
filesystem being in an error condition).

Reported-by: Kazuya Mio <k-mio@sx.jp.nec.com>
Tested-by: Kazuya Mio <k-mio@sx.jp.nec.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---
 mm/filemap.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mm/filemap.c b/mm/filemap.c
index c0018f2..166b30e 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2407,7 +2407,6 @@ static ssize_t generic_perform_write(struct file *file,
 						iov_iter_count(i));
 
 again:
-
 		/*
 		 * Bring in the user page that we will copy from _first_.
 		 * Otherwise there's a nasty deadlock on copying from the
@@ -2463,7 +2462,15 @@ again:
 		written += copied;
 
 		balance_dirty_pages_ratelimited(mapping);
-
+		/*
+		 * We check the signal independently of balance_dirty_pages()
+		 * because we need not wait and check for signal there although
+		 * this loop could have taken significant amount of time...
+		 */
+		if (fatal_signal_pending(current)) {
+			status = -EINTR;
+			break;
+		}
 	} while (iov_iter_count(i));
 
 	return written ? written : status;
-- 
1.7.1


  parent reply	other threads:[~2011-11-14 16:15 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-14 16:15 [PATCH 0/2 v2] Make task in balance_dirty_pages() killable Jan Kara
2011-11-14 16:15 ` [PATCH 1/2] mm: " Jan Kara
2011-11-14 16:23   ` Christoph Hellwig
2011-11-15 11:48   ` Wu Fengguang
2011-11-15 13:41     ` Jan Kara
2011-11-15 14:15       ` Wu Fengguang
2011-11-15 14:44         ` Jan Kara
2011-11-14 16:15 ` Jan Kara [this message]
2011-11-14 16:26   ` [PATCH 2/2] fs: Make write(2) interruptible by a signal Christoph Hellwig
2011-11-14 16:46     ` Jan Kara
2011-11-14 20:13       ` Christoph Hellwig
2011-11-14 22:19   ` Andrew Morton
2011-11-15 11:23     ` Jan Kara
  -- strict thread matches above, loose matches on Subject: below --
2011-11-16 11:12 [PATCH 0/2 v3] Make task in balance_dirty_pages() killable Jan Kara
2011-11-16 11:12 ` [PATCH 2/2] fs: Make write(2) interruptible by a signal Jan Kara
2011-11-16 11:44   ` Wu Fengguang
2011-11-16 12:54     ` Jan Kara
2011-11-16 13:11       ` Wu Fengguang
2011-11-22 22:28     ` Andrew Morton
2011-11-23  9:05       ` Wu Fengguang
2011-11-23  9:50         ` Andrew Morton
2011-11-23 13:08         ` Jan Kara
2011-11-23 13:27           ` Wu Fengguang
2011-11-23 15:06             ` Theodore Tso
2011-11-28  3:08               ` Wu Fengguang
2011-11-29 14:16                 ` Jan Kara
2011-11-14 11:10 [PATCH 0/2] Make task doing heavy writing killable Jan Kara
2011-11-14 11:10 ` [PATCH 2/2] fs: Make write(2) interruptible by a signal Jan Kara
2011-11-14 12:12   ` Matthew Wilcox
2011-11-14 12:15   ` Wu Fengguang
2011-11-14 12:34     ` Jan Kara
2011-11-14 14:16       ` Matthew Wilcox
2011-11-14 15:30         ` Jan Kara
2011-11-14 18:44           ` Jeremy Allison

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=1321287324-15121-3-git-send-email-jack@suse.cz \
    --to=jack@suse.cz \
    --cc=akpm@linux-foundation.org \
    --cc=fengguang.wu@intel.com \
    --cc=hch@infradead.org \
    --cc=linux-fsdevel@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;
as well as URLs for NNTP newsgroup(s).