Patchwork [natty] SRU: CIFS mount blocks suspend/hibernate

login
register
mail settings
Submitter Chris J Arges
Date Nov. 9, 2011, 3:38 p.m.
Message ID <4EBA9E6A.6080304@canonical.com>
Download mbox | patch
Permalink /patch/124575/
State New
Headers show

Comments

Chris J Arges - Nov. 9, 2011, 3:38 p.m.
SRU Justification:

Impact:
If a cifs share is mounted in ubuntu-natty and we try to suspend cifsd
prevents the laptop from suspending.

Fix:
Apply f06ac72e929115f2772c29727152ba0832d641e4 cherry picked from
upstream commit (this is already in ubuntu-oneric) to ubuntu-natty linux
kernel.
This small patch allows the laptop to suspend even if a cifs share is
mounted.

Testcase:
Boot ubuntu-natty. Mount cifs share. Suspend or Hibernate. (This will
not work.)
Boot ubuntu-natty with cifs patch applied. Mount cifs share. Suspend or
Hibernate. (This works.)
Steve Conklin - Nov. 9, 2011, 3:46 p.m.
On 11/09/2011 09:38 AM, Chris J Arges wrote:
> SRU Justification:
>
> Impact:
> If a cifs share is mounted in ubuntu-natty and we try to suspend cifsd
> prevents the laptop from suspending.
>
> Fix:
> Apply f06ac72e929115f2772c29727152ba0832d641e4 cherry picked from
> upstream commit (this is already in ubuntu-oneric) to ubuntu-natty linux
> kernel.
> This small patch allows the laptop to suspend even if a cifs share is
> mounted.
>
> Testcase:
> Boot ubuntu-natty. Mount cifs share. Suspend or Hibernate. (This will
> not work.)
> Boot ubuntu-natty with cifs patch applied. Mount cifs share. Suspend or
> Hibernate. (This works.)
>
>
I can't open the bug in the buglink

Steve
Chris J Arges - Nov. 9, 2011, 4:08 p.m.
On 11/09/2011 09:46 AM, Steve Conklin wrote:
> On 11/09/2011 09:38 AM, Chris J Arges wrote:
>> SRU Justification:
>>
>> Impact:
>> If a cifs share is mounted in ubuntu-natty and we try to suspend cifsd
>> prevents the laptop from suspending.
>>
>> Fix:
>> Apply f06ac72e929115f2772c29727152ba0832d641e4 cherry picked from
>> upstream commit (this is already in ubuntu-oneric) to ubuntu-natty linux
>> kernel.
>> This small patch allows the laptop to suspend even if a cifs share is
>> mounted.
>>
>> Testcase:
>> Boot ubuntu-natty. Mount cifs share. Suspend or Hibernate. (This will
>> not work.)
>> Boot ubuntu-natty with cifs patch applied. Mount cifs share. Suspend or
>> Hibernate. (This works.)
>>
>>
> I can't open the bug in the buglink
>
> Steve
Sending a new email with the correct link/format.
--chris

Patch

From 7d58ea603394ba00dece56514baca9ffc94b0c64 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 19 Oct 2011 15:30:40 -0400
Subject: [PATCH] cifs, freezer: add wait_event_freezekillable and have cifs use it

CIFS currently uses wait_event_killable to put tasks to sleep while
they await replies from the server. That function though does not
allow the freezer to run. In many cases, the network interface may
be going down anyway, in which case the reply will never come. The
client then ends up blocking the computer from suspending.

Fix this by adding a new wait_event_freezable variant --
wait_event_freezekillable. The idea is to combine the behavior of
wait_event_killable and wait_event_freezable -- put the task to
sleep and only allow it to be awoken by fatal signals, but also
allow the freezer to do its job.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit f06ac72e929115f2772c29727152ba0832d641e4)

Buglink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/884090

Signed-off-by: Chris J Arges <chris.j.arges@canonical.com>
---
 fs/cifs/transport.c     |    3 ++-
 include/linux/freezer.h |   19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index c1b9c4b..23a33ef 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -26,6 +26,7 @@ 
 #include <linux/wait.h>
 #include <linux/net.h>
 #include <linux/delay.h>
+#include <linux/freezer.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include <linux/mempool.h>
@@ -328,7 +329,7 @@  wait_for_response(struct TCP_Server_Info *server, struct mid_q_entry *midQ)
 {
 	int error;
 
-	error = wait_event_killable(server->response_q,
+	error = wait_event_freezekillable(server->response_q,
 				    midQ->midState != MID_REQUEST_SUBMITTED);
 	if (error < 0)
 		return -ERESTARTSYS;
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index 1effc8b..3672f73 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -134,10 +134,25 @@  static inline void set_freezable_with_signal(void)
 }
 
 /*
- * Freezer-friendly wrappers around wait_event_interruptible() and
- * wait_event_interruptible_timeout(), originally defined in <linux/wait.h>
+ * Freezer-friendly wrappers around wait_event_interruptible(),
+ * wait_event_killable() and wait_event_interruptible_timeout(), originally
+ * defined in <linux/wait.h>
  */
 
+#define wait_event_freezekillable(wq, condition)			\
+({									\
+	int __retval;							\
+	do {								\
+		__retval = wait_event_killable(wq, 			\
+				(condition) || freezing(current));	\
+		if (__retval && !freezing(current))			\
+			break;						\
+		else if (!(condition))					\
+			__retval = -ERESTARTSYS;			\
+	} while (try_to_freeze());					\
+	__retval;							\
+})
+
 #define wait_event_freezable(wq, condition)				\
 ({									\
 	int __retval;							\
-- 
1.7.0.4