[patch] lockdep: core, fix rq-lock handling on __ARCH_WANT_UNLOCKED_CTXSW

[patch] lockdep: core, fix rq-lock handling on __ARCH_WANT_UNLOCKED_CTXSW

[Ingo Molnar]

Subject: lockdep: core, fix rq-lock handling on __ARCH_WANT_UNLOCKED_CTXSW
From: Ingo Molnar <mingo@elte.hu>

on platforms that have __ARCH_WANT_UNLOCKED_CTXSW set and want to 
implement lock validator support there's a bug in rq->lock handling: in 
this case we dont 'carry over' the runqueue lock into another task - but 
still we did a spinlock_release() of it. Fix this by making the 
spinlock_release() in context_switch() dependent on 
!__ARCH_WANT_UNLOCKED_CTXSW.

(Reported by Ralf Baechle on MIPS, which has __ARCH_WANT_UNLOCKED_CTXSW. 
This fixes a lockdep-internal BUG message on such platforms.)

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 kernel/sched.c        |    8 ++++++++
 1 file changed, 9 insertions(+)

Index: linux/kernel/sched.c
===================================================================
--- linux.orig/kernel/sched.c
+++ linux/kernel/sched.c
@@ -1788,7 +1788,15 @@ context_switch(struct rq *rq, struct tas
 		WARN_ON(rq->prev_mm);
 		rq->prev_mm = oldmm;
 	}
+	/*
+	 * Since the runqueue lock will be released by the next
+	 * task (which is an invalid locking op but in the case
+	 * of the scheduler it's an obvious special-case), so we
+	 * do an early lockdep release here:
+	 */
+#ifndef __ARCH_WANT_UNLOCKED_CTXSW
 	spin_release(&rq->lock.dep_map, 1, _THIS_IP_);
+#endif
 
 	/* Here we just switch the register state and the stack. */
 	switch_to(prev, next, prev);

Re: [patch] lockdep: core, fix rq-lock handling on __ARCH_WANT_UNLOCKED_CTXSW

[Ralf Baechle]

On Wed, Jul 12, 2006 at 10:26:39PM +0200, Ingo Molnar wrote:

> Subject: lockdep: core, fix rq-lock handling on __ARCH_WANT_UNLOCKED_CTXSW
> From: Ingo Molnar <mingo@elte.hu>
> 
> on platforms that have __ARCH_WANT_UNLOCKED_CTXSW set and want to 
> implement lock validator support there's a bug in rq->lock handling: in 
> this case we dont 'carry over' the runqueue lock into another task - but 
> still we did a spinlock_release() of it. Fix this by making the 
> spinlock_release() in context_switch() dependent on 
> !__ARCH_WANT_UNLOCKED_CTXSW.
> 
> (Reported by Ralf Baechle on MIPS, which has __ARCH_WANT_UNLOCKED_CTXSW. 
> This fixes a lockdep-internal BUG message on such platforms.)
> 
> Signed-off-by: Ingo Molnar <mingo@elte.hu>

Tested and works as advertised for me,

  Ralf