]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
locking/rtmutex: Set state back to running on error
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Fri, 27 Feb 2015 16:57:09 +0000 (17:57 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 1 Mar 2015 08:45:06 +0000 (09:45 +0100)
commit9d3e2d02f54160725d97f4ab1e1e8de493fbf33a
tree41da77b461389a4e06a9b2a9c52adca8436f2de1
parent895c8b7b4623d4f55e260e5dee2574b4f7113105
locking/rtmutex: Set state back to running on error

The "usual" path is:

 - rt_mutex_slowlock()
 - set_current_state()
 - task_blocks_on_rt_mutex() (ret 0)
 - __rt_mutex_slowlock()
   - sleep or not but do return with __set_current_state(TASK_RUNNING)
 - back to caller.

In the early error case where task_blocks_on_rt_mutex() return
-EDEADLK we never change the task's state back to RUNNING. I
assume this is intended. Without this change after ww_mutex
using rt_mutex the selftest passes but later I get plenty of:

  | bad: scheduling from the idle thread!

backtraces.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Mike Galbraith <umgwanakikbuti@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: afffc6c1805d ("locking/rtmutex: Optimize setting task running after being blocked")
Link: http://lkml.kernel.org/r/1425056229-22326-4-git-send-email-bigeasy@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/locking/rtmutex.c