Skip to contentSkip to conversation

locking validator: special rule: 3c59x.c disable_irq()

PATCH In review Ingo Molnar 2 participants 5 messages May 31, 2006 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 locking validator: special rule: 3c59x.c disable_irq()

Subject: locking validator: special rule: 3c59x.c disable_irq()
From: Ingo Molnar <[email protected]>

3c59x.c's vortex_timer() function knows that vp->lock can only be used by an irq context that it disabled - and can hence take the vp->lock without disabling hardirqs. Teach lockdep about this.

---
 drivers/net/3c59x.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/3c59x.c +2 -2
Index: linux/drivers/net/3c59x.c
===================================================================
@@ -1904,7 +1904,7 @@ vortex_timer(unsigned long data)
 		printk(KERN_DEBUG "dev->watchdog_timeo=%d\n", dev->watchdog_timeo);
 	}
 
-	disable_irq(dev->irq);
+	disable_irq_lockdep(dev->irq);
 	old_window = ioread16(ioaddr + EL3_CMD) >> 13;
 	EL3WINDOW(4);
 	media_status = ioread16(ioaddr + Wn4_Media);
@@ -1985,7 +1985,7 @@ leave_media_alone:
 			 dev->name, media_tbl[dev->if_port].name);
 
 	EL3WINDOW(old_window);
-	enable_irq(dev->irq);
+	enable_irq_lockdep(dev->irq);
 	mod_timer(&vp->timer, RUN_AT(next_tick));
 	if (vp->deferred)
 		iowrite16(FakeIntr, ioaddr + EL3_CMD);
#1 lore raw
Quoted 6 lines · Ingo Molnar

Subject: locking validator: special rule: 3c59x.c disable_irq()
From: Ingo Molnar <[email protected]>

3c59x.c's vortex_timer() function knows that vp->lock can only be used by an irq context that it disabled - and can hence take the vp->lock without disabling hardirqs. Teach lockdep about this.

Ingo,

Did you update your
http://people.redhat.com/mingo/lockdep-patches/lockdep-combo-2.6.17-rc5-mm1.patch
or did I miss the patch to add the disable_irq_lockdep function?

-- Steve

#2 lore raw
Quoted 8 lines · Steven Rostedt
Quoted 6 lines · Ingo Molnar

Subject: locking validator: special rule: 3c59x.c disable_irq()
From: Ingo Molnar <[email protected]>

3c59x.c's vortex_timer() function knows that vp->lock can only be used by an irq context that it disabled - and can hence take the vp->lock without disabling hardirqs. Teach lockdep about this.

Quoted 5 lines

Ingo,

Did you update your
http://people.redhat.com/mingo/lockdep-patches/lockdep-combo-2.6.17-rc5-mm1.patch
or did I miss the patch to add the disable_irq_lockdep function?

i've updated it now, please check it out. (i sent the generic disable_irq_lockdep() bits to lkml separately but forgot to Cc: you)

Ingo

#3 lore raw
Quoted 5 lines · Ingo Molnar

*

i've updated it now, please check it out. (i sent the generic disable_irq_lockdep() bits to lkml separately but forgot to Cc: you)

I've just booted it on my i386 SMP (with the vortex card) and it hasn't reported anything yet.

Looks good, I'll let you know if I find anything else.

-- Steve

#4 lore raw
Quoted 11 lines · Steven Rostedt
Quoted 5 lines · Ingo Molnar

*

i've updated it now, please check it out. (i sent the generic disable_irq_lockdep() bits to lkml separately but forgot to Cc: you)

I've just booted it on my i386 SMP (with the vortex card) and it hasn't reported anything yet.

Looks good, I'll let you know if I find anything else.

great and thanks for the testing!

Ingo