Re: suspend regression in 4.1-rc1

2015-05-19 Thread Michal Hocko
On Mon 18-05-15 11:45:31, Don Zickus wrote: > On Mon, May 18, 2015 at 04:41:37PM +0200, Michal Hocko wrote: > > On Mon 18-05-15 10:26:07, Don Zickus wrote: > > > On Mon, May 18, 2015 at 06:56:46AM -0400, Ulrich Obergfell wrote: > > > > > > > > > There further appears to be a distinct lack of seria

Re: suspend regression in 4.1-rc1

2015-05-19 Thread Peter Zijlstra
On Tue, May 19, 2015 at 09:12:59AM +0200, Michal Hocko wrote: > On Mon 18-05-15 10:10:50, Linus Torvalds wrote: > > On Mon, May 18, 2015 at 2:31 AM, Peter Zijlstra > > wrote: > > > Subject: watchdog: Fix merge 'conflict' > > > > > > Two watchdog changes that came through different trees had a non

Re: suspend regression in 4.1-rc1

2015-05-19 Thread Michal Hocko
On Mon 18-05-15 10:10:50, Linus Torvalds wrote: > On Mon, May 18, 2015 at 2:31 AM, Peter Zijlstra wrote: > > Subject: watchdog: Fix merge 'conflict' > > > > Two watchdog changes that came through different trees had a non > > conflicting conflict, that is, one changed the semantics of a variable >

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Linus Torvalds
On Mon, May 18, 2015 at 2:31 AM, Peter Zijlstra wrote: > Subject: watchdog: Fix merge 'conflict' > > Two watchdog changes that came through different trees had a non > conflicting conflict, that is, one changed the semantics of a variable > but no actual code conflict happened. So the merge appear

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Don Zickus
On Mon, May 18, 2015 at 04:41:37PM +0200, Michal Hocko wrote: > On Mon 18-05-15 10:26:07, Don Zickus wrote: > > On Mon, May 18, 2015 at 06:56:46AM -0400, Ulrich Obergfell wrote: > > > > > > > There further appears to be a distinct lack of serialization between > > > > setting and using watchdog_en

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Michal Hocko
On Mon 18-05-15 10:26:07, Don Zickus wrote: > On Mon, May 18, 2015 at 06:56:46AM -0400, Ulrich Obergfell wrote: > > > > > There further appears to be a distinct lack of serialization between > > > setting and using watchdog_enabled, so perhaps we should wrap the > > > {en,dis}able_all() things in

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Don Zickus
On Mon, May 18, 2015 at 06:56:46AM -0400, Ulrich Obergfell wrote: > > > There further appears to be a distinct lack of serialization between > > setting and using watchdog_enabled, so perhaps we should wrap the > > {en,dis}able_all() things in watchdog_proc_mutex. > > As I understand it, the {en,

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Don Zickus
On Mon, May 18, 2015 at 11:31:50AM +0200, Peter Zijlstra wrote: > On Mon, May 18, 2015 at 11:03:37AM +0200, Michal Hocko wrote: > > This doesn't hang anymore. I've just had to move the mutex definition > > up to make it compile. So feel free to add my > > I've also fixed a lock leak, see goto unlo

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Stephane Eranian
Hi, On Mon, May 18, 2015 at 4:05 AM, Peter Zijlstra wrote: > On Mon, May 18, 2015 at 06:56:46AM -0400, Ulrich Obergfell wrote: >> > Subject: watchdog: Fix merge 'conflict' >> > >> > Two watchdog changes that came through different trees had a non >> > conflicting conflict, that is, one changed th

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Michal Hocko
On Mon 18-05-15 06:10:20, Ulrich Obergfell wrote: [...] > Michal, > > if I understand you correctly, Peter's patch solves the problem for you. > I would like to make you aware of a patch that Don and I posted in April. > > https://lkml.org/lkml/2015/4/22/306 > > watchdog_nmi_enable_all() shoul

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Peter Zijlstra
On Mon, May 18, 2015 at 06:56:46AM -0400, Ulrich Obergfell wrote: > > Subject: watchdog: Fix merge 'conflict' > > > > Two watchdog changes that came through different trees had a non > > conflicting conflict, that is, one changed the semantics of a variable > > but no actual code conflict happened.

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Ulrich Obergfell
Peter, please see my comments in-line. Regards, Uli - Original Message - From: "Peter Zijlstra" To: "Michal Hocko" [...] > On Mon, May 18, 2015 at 11:03:37AM +0200, Michal Hocko wrote: >> This doesn't hang anymore. I've just had to move the mutex definition >> up to make it compile.

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Peter Zijlstra
Trim emails already.. this seems a spreading disease. On Mon, May 18, 2015 at 06:10:20AM -0400, Ulrich Obergfell wrote: > Michal, > > if I understand you correctly, Peter's patch solves the problem for you. > I would like to make you aware of a patch that Don and I posted in April. > > https:

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Ulrich Obergfell
- Original Message - From: "Michal Hocko" To: "Peter Zijlstra" [...] > On Mon 18-05-15 09:30:46, Peter Zijlstra wrote: >> On Sun, May 17, 2015 at 09:33:56PM -0700, Linus Torvalds wrote: >> > On Sun, May 17, 2015 at 11:50 AM, Michal Hocko wrote: >> > > >> > > The merge commit is empty and

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Peter Zijlstra
On Mon, May 18, 2015 at 11:03:37AM +0200, Michal Hocko wrote: > This doesn't hang anymore. I've just had to move the mutex definition > up to make it compile. So feel free to add my I've also fixed a lock leak, see goto unlock :-) > Reported-and-tested-by: Michal Hocko *blink* that actually fix

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Michal Hocko
On Mon 18-05-15 09:30:46, Peter Zijlstra wrote: > On Sun, May 17, 2015 at 09:33:56PM -0700, Linus Torvalds wrote: > > On Sun, May 17, 2015 at 11:50 AM, Michal Hocko wrote: > > > > > > The merge commit is empty and both 80dcc31fbe55 and e4b0db72be24 work > > > properly but the merge is bad. So it s

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Peter Zijlstra
On Mon, May 18, 2015 at 09:30:46AM +0200, Peter Zijlstra wrote: > Let me go see if I can reproduce / test this.. as is the below is > entirely untested. I cannot seem to get suspend to fail on my x240 with linus.git. echo mem > /sys/power/state makes it sleep, and pressing the power button bring

Re: suspend regression in 4.1-rc1

2015-05-18 Thread Peter Zijlstra
On Sun, May 17, 2015 at 09:33:56PM -0700, Linus Torvalds wrote: > On Sun, May 17, 2015 at 11:50 AM, Michal Hocko wrote: > > > > The merge commit is empty and both 80dcc31fbe55 and e4b0db72be24 work > > properly but the merge is bad. So it seems like some of the commits in > > either branch has a s

Re: suspend regression in 4.1-rc1

2015-05-17 Thread Omar Sandoval
On Sun, May 17, 2015 at 08:50:41PM +0200, Michal Hocko wrote: > Hi, > s2ram broke after 4.1-rc1 for me. The second s2ram simply doesn't wake > up (fans turn on but the screen is off). I have even noticed fans > starting also while suspended in some instances (which was especially > annoying when it

Re: suspend regression in 4.1-rc1

2015-05-17 Thread Linus Torvalds
On Sun, May 17, 2015 at 11:50 AM, Michal Hocko wrote: > > The merge commit is empty and both 80dcc31fbe55 and e4b0db72be24 work > properly but the merge is bad. So it seems like some of the commits in > either branch has a side effect which needs other branch in order to > reproduce. > > So've tri

Re: suspend regression in 4.1-rc1

2015-05-17 Thread Sergey Senozhatsky
On (05/17/15 20:50), Michal Hocko wrote: > Hi, > s2ram broke after 4.1-rc1 for me. The second s2ram simply doesn't wake > up (fans turn on but the screen is off). I have even noticed fans > starting also while suspended in some instances (which was especially > annoying when it happened on the way

suspend regression in 4.1-rc1

2015-05-17 Thread Michal Hocko
Hi, s2ram broke after 4.1-rc1 for me. The second s2ram simply doesn't wake up (fans turn on but the screen is off). I have even noticed fans starting also while suspended in some instances (which was especially annoying when it happened on the way home from work). I've tried /sys/power/pm_test and