From: Jeff Layton <jlayton@redhat.com>
To: trond.myklebust@netapp.com, smfrench@gmail.com, pavel@ucw.cz,
rjw@sisk.pl
Cc: linux-pm@lists.linux-foundation.org, linux-cifs@vger.kernel.org,
linux-nfs@vger.kernel.org, john@Calva.COM,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] nfs: make TASK_KILLABLE sleeps attempt to freeze
Date: Wed, 28 Sep 2011 07:52:41 -0400 [thread overview]
Message-ID: <1317210761-11518-5-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1317210761-11518-1-git-send-email-jlayton@redhat.com>
Allow the TASK_KILLABLE sleeps in NFS layer to respect the freezer. This
should allow suspend and hibernate events to occur, even when there are
RPC's pending on the wire.
Tested-by: John Hughes <john@Calva.COM>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/nfs/inode.c | 4 +++-
fs/nfs/nfs3proc.c | 3 ++-
fs/nfs/nfs4proc.c | 12 ++++++++----
fs/nfs/proc.c | 3 ++-
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index fe12037..b7c4301 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -38,6 +38,7 @@
#include <linux/nfs_xdr.h>
#include <linux/slab.h>
#include <linux/compat.h>
+#include <linux/freezer.h>
#include <asm/system.h>
#include <asm/uaccess.h>
@@ -77,7 +78,8 @@ int nfs_wait_bit_killable(void *word)
{
if (fatal_signal_pending(current))
return -ERESTARTSYS;
- schedule();
+ if (!try_to_freeze())
+ schedule();
return 0;
}
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index 85f1690..ee64bf3 100644
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -32,7 +32,8 @@ nfs3_rpc_wrapper(struct rpc_clnt *clnt, struct rpc_message *msg, int flags)
res = rpc_call_sync(clnt, msg, flags);
if (res != -EJUKEBOX && res != -EKEYEXPIRED)
break;
- schedule_timeout_killable(NFS_JUKEBOX_RETRY_TIME);
+ if (!try_to_freeze())
+ schedule_timeout_killable(NFS_JUKEBOX_RETRY_TIME);
res = -ERESTARTSYS;
} while (!fatal_signal_pending(current));
return res;
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 4700fae..12f92dd 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -244,10 +244,12 @@ static int nfs4_delay(struct rpc_clnt *clnt, long *timeout)
*timeout = NFS4_POLL_RETRY_MIN;
if (*timeout > NFS4_POLL_RETRY_MAX)
*timeout = NFS4_POLL_RETRY_MAX;
- schedule_timeout_killable(*timeout);
+ if (!try_to_freeze()) {
+ schedule_timeout_killable(*timeout);
+ *timeout <<= 1;
+ }
if (fatal_signal_pending(current))
res = -ERESTARTSYS;
- *timeout <<= 1;
return res;
}
@@ -3970,8 +3972,10 @@ int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4
static unsigned long
nfs4_set_lock_task_retry(unsigned long timeout)
{
- schedule_timeout_killable(timeout);
- timeout <<= 1;
+ if (!try_to_freeze()) {
+ schedule_timeout_killable(timeout);
+ timeout <<= 1;
+ }
if (timeout > NFS4_LOCK_MAXTIMEOUT)
return NFS4_LOCK_MAXTIMEOUT;
return timeout;
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index ac40b85..e3f03d1 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -59,7 +59,8 @@ nfs_rpc_wrapper(struct rpc_clnt *clnt, struct rpc_message *msg, int flags)
res = rpc_call_sync(clnt, msg, flags);
if (res != -EKEYEXPIRED)
break;
- schedule_timeout_killable(NFS_JUKEBOX_RETRY_TIME);
+ if (!try_to_freeze())
+ schedule_timeout_killable(NFS_JUKEBOX_RETRY_TIME);
res = -ERESTARTSYS;
} while (!fatal_signal_pending(current));
return res;
--
1.7.6.2
next prev parent reply other threads:[~2011-09-28 11:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-28 11:52 [PATCH 0/4] allow freezing of tasks with netfs calls in flight Jeff Layton
2011-09-28 11:52 ` [PATCH 1/4] freezer: make fake_signal_wake_up wake TASK_KILLABLE tasks too Jeff Layton
2011-10-11 6:18 ` Pavel Machek
2011-10-11 10:10 ` Jeff Layton
2011-10-11 19:14 ` Rafael J. Wysocki
2011-10-26 19:55 ` Jeff Layton
2011-10-27 20:21 ` Rafael J. Wysocki
2011-10-27 20:22 ` [linux-pm] " Rafael J. Wysocki
2011-10-27 20:26 ` Steve French
2011-09-28 11:52 ` [PATCH 2/4] cifs, freezer: add wait_event_freezekillable and have cifs use it Jeff Layton
2011-09-29 4:28 ` Steve French
2011-09-29 10:41 ` Jeff Layton
2011-09-29 16:39 ` Steve French
2011-09-29 17:29 ` Jeff Layton
2011-09-28 11:52 ` [PATCH 3/4] sunrpc: make rpc_wait_bit_killable handle freeze events Jeff Layton
2011-10-11 6:19 ` Pavel Machek
2011-10-11 10:12 ` Jeff Layton
2011-10-11 12:52 ` Myklebust, Trond
2011-10-11 13:14 ` Jeff Layton
2011-09-28 11:52 ` Jeff Layton [this message]
2011-10-19 15:18 ` [PATCH 4/4] nfs: make TASK_KILLABLE sleeps attempt to freeze (try #2) Jeff Layton
2011-10-11 6:18 ` [PATCH 0/4] allow freezing of tasks with netfs calls in flight Pavel Machek
2011-10-11 10:05 ` Jeff Layton
2011-10-11 19:19 ` Rafael J. Wysocki
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=1317210761-11518-5-git-send-email-jlayton@redhat.com \
--to=jlayton@redhat.com \
--cc=john@Calva.COM \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=pavel@ucw.cz \
--cc=rjw@sisk.pl \
--cc=smfrench@gmail.com \
--cc=trond.myklebust@netapp.com \
/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).