Re: [PATCH RESEND] rtsx_usb_ms: Use msleep_interruptible() in polling loop

[Ben Hutchings <ben@decadent.org.uk>]

[-- Attachment #1.1: Type: text/plain, Size: 1432 bytes --]

On Thu, 2015-10-08 at 08:19 +0100, Lee Jones wrote:
> On Mon, 28 Sep 2015, Ben Hutchings wrote:
> 
> > rtsx_usb_ms creates a task that mostly sleeps, but tasks in
> > uninterruptible sleep still contribute to the load average (for
> > bug-compatibility with Unix).  A load average of ~1 on a system that
> > should be idle is somewhat alarming.
> > 
> > Change the sleep to be interruptible, but still ignore signals.
> > 
> > A better fix might be to replace this loop with a delayed work item.
> > 
> > References: https://bugs.debian.org/765717
> > Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> 
> Any chance you can use Git instead of Quilt?  Failing that, is there a
> way to tell Quilt to supply a diffstat in the patch?

Why does it matter?  'git am' is happy to apply it.  But in case it
really does make a difference, I've attached the git-format-patch
version.

Ben.

> > ---
> > --- a/drivers/memstick/host/rtsx_usb_ms.c
> > +++ b/drivers/memstick/host/rtsx_usb_ms.c
> > @@ -706,7 +706,8 @@ poll_again:
> >  > > 	> > 	> > if (host->eject)
> >  > > 	> > 	> > 	> > break;
> >  
> > -> > 	> > 	> > msleep(1000);
> > +> > 	> > 	> > if (msleep_interruptible(1000))
> > +> > 	> > 	> > 	> > flush_signals(current);
> >  > > 	> > }
> >  
> >  > > 	> > complete(&host->detect_ms_exit);
> 
> 
> 
-- 
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.

[-- Attachment #1.2: 0001-rtsx_usb_ms-Use-msleep_interruptible-in-polling-loop.patch --]
[-- Type: text/x-patch, Size: 1170 bytes --]

From 34dca6b208a1108a9499412f584468b31ee025e0 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 26 Oct 2014 03:39:42 +0000
Subject: [PATCH] rtsx_usb_ms: Use msleep_interruptible() in polling loop

rtsx_usb_ms creates a task that mostly sleeps, but tasks in
uninterruptible sleep still contribute to the load average (for
bug-compatibility with Unix).  A load average of ~1 on a system that
should be idle is somewhat alarming.

Change the sleep to be interruptible, but still ignore signals.

A better fix might be to replace this loop with a delayed work item.

References: https://bugs.debian.org/765717
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 drivers/memstick/host/rtsx_usb_ms.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/memstick/host/rtsx_usb_ms.c b/drivers/memstick/host/rtsx_usb_ms.c
index 1105db2..645dede 100644
--- a/drivers/memstick/host/rtsx_usb_ms.c
+++ b/drivers/memstick/host/rtsx_usb_ms.c
@@ -706,7 +706,8 @@ poll_again:
 		if (host->eject)
 			break;
 
-		msleep(1000);
+		if (msleep_interruptible(1000))
+			flush_signals(current);
 	}
 
 	complete(&host->detect_ms_exit);

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]