Messages in this thread Patch in this message | | | From | Jesper Juhl <> | Subject | Re: [BUG] 2.6.15-rc1, soft lockup detected while probing IDE devices on AMD7441 | Date | Wed, 23 Nov 2005 20:17:51 +0100 |
| |
On Monday 21 November 2005 21:38, Alan Cox wrote: > On Sul, 2005-11-20 at 17:29 -0800, Andrew Morton wrote: > > Alan Cox <alan@lxorguk.ukuu.org.uk> wrote: > > > Quite normal. The old IDE probe code takes a long time and it makes the > > > soft lockup code believe a lockup occurred - rememeber its a debugging > > > tool not a 100% reliable detector of failures. > > > > > > > We could put a touch_softlockup_watchdog() in there. > > Would make sense. Spin up and probe can take over 30 seconds worst case > and is polled in the IDE world. The loop will eventually exit and a true > lockup caused by a stuck IORDY line will hang forever in an inb/outb so > neither softlockup or even nmi lockup would save you. >
How about something like the patch below?
The if (!(timeout % 128)) bit is a guess that since touch_softlockup_watchdog() is a per_cpu thing it will be cheaper to do the modulo calculation than calling the function every time through the loop, especially as the nr of CPU's go up. But it's purely a guess, so I may very well be wrong - also, 128 is an arbitrarily chosen value, it's just a nice number that'll give us <10 function calls pr second.
<disclaimer>patch is completely un-tested</disclaimer>
From: Jesper Juhl <jesper.juhl@gmail.com> Subject: touch softlockup watchdog in ide_wait_not_busy
Make sure we touch the softlockup watchdog in ide_wait_not_busy() since it may cause the watchdog to trigger, but there's really no point in that since the loop will eventually return, and triggering the watchdog won't do us any good anyway.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> ---
drivers/ide/ide-iops.c | 8 ++++++++ 1 files changed, 8 insertions(+)
--- linux-2.6.15-rc2-orig/drivers/ide/ide-iops.c 2005-11-20 22:25:24.000000000 +0100 +++ linux-2.6.15-rc2/drivers/ide/ide-iops.c 2005-11-23 19:46:11.000000000 +0100 @@ -24,6 +24,7 @@ #include <linux/hdreg.h> #include <linux/ide.h> #include <linux/bitops.h> +#include <linux/sched.h> #include <asm/byteorder.h> #include <asm/irq.h> @@ -1243,6 +1244,13 @@ int ide_wait_not_busy(ide_hwif_t *hwif, */ if (stat == 0xff) return -ENODEV; + + /* + * We risk triggering the soft lockup detector, but we don't + * want that, so better poke it a bit once in a while. + */ + if (!(timeout % 128)) + touch_softlockup_watchdog(); } return -EBUSY; }
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |