From patchwork Wed Mar 30 11:38:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 88909 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AEE0EB6F12 for ; Wed, 30 Mar 2011 22:38:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932274Ab1C3Lic (ORCPT ); Wed, 30 Mar 2011 07:38:32 -0400 Received: from mx1.fusionio.com ([64.244.102.30]:35594 "EHLO mx1.fusionio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932300Ab1C3Lib (ORCPT ); Wed, 30 Mar 2011 07:38:31 -0400 X-ASG-Debug-ID: 1301485110-03d6a5652c1f500001-WJxGKN Received: from mail1.int.fusionio.com (mail1.int.fusionio.com [10.101.1.21]) by mx1.fusionio.com with ESMTP id hEZu5YdpwxuNBekx; Wed, 30 Mar 2011 05:38:30 -0600 (MDT) X-Barracuda-Envelope-From: JAxboe@fusionio.com Received: from [192.168.0.33] (95.166.99.235) by mail.fusionio.com (10.101.1.19) with Microsoft SMTP Server (TLS) id 8.1.393.1; Wed, 30 Mar 2011 05:38:29 -0600 Message-ID: <4D931634.5030807@fusionio.com> Date: Wed, 30 Mar 2011 13:38:28 +0200 From: Jens Axboe MIME-Version: 1.0 To: Rob Landley CC: Pete Clements , linux-kernel , "linux-ide@vger.kernel.org" Subject: Re: Commit 7eaceaccab5f40 causing boot hang. References: <201103291551.p2TFpDqZ001692@clem.clem-digital.net> <4D92C874.7040104@parallels.com> X-ASG-Orig-Subj: Re: Commit 7eaceaccab5f40 causing boot hang. In-Reply-To: <4D92C874.7040104@parallels.com> X-Barracuda-Connect: mail1.int.fusionio.com[10.101.1.21] X-Barracuda-Start-Time: 1301485110 X-Barracuda-URL: http://10.101.1.180:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at fusionio.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.59400 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org On 2011-03-30 08:06, Rob Landley wrote: > On 03/29/2011 10:51 AM, Pete Clements wrote: >> Quoting Jens Axboe >> > >> > On 2011-03-29 16:13, Rob Landley wrote: >> > > On 03/29/2011 08:59 AM, Jens Axboe wrote: >> > >> On 2011-03-29 10:52, Rob Landley wrote: >> > >>> I'm booting all this under kvm or qemu, by the way: >> > >>> >> > >>> qemu-system-x86_64 -m 1024 -kernel arch/x86/boot/bzImage \ >> > >>> -hda ~/sid.ext3 -append "root=/dev/hda rw" >> > >>> >> > >>> Sometimes with init=/bin/bash in that last quoted bit. The root >> > >>> filesystem's debian sid but that's probably not relevant because it >> > >>> worked fine with .38. >> > >> >> > >> Does this help? >> > >> >> > >> diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c >> > >> index 0e406d73..ca27d30 100644 >> > >> --- a/drivers/ide/ide-io.c >> > >> +++ b/drivers/ide/ide-io.c >> > >> @@ -570,8 +570,7 @@ void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq) >> > >> spin_unlock_irqrestore(q->queue_lock, flags); >> > >> >> > >> /* Use 3ms as that was the old plug delay */ >> > >> - if (rq) >> > >> - blk_delay_queue(q, 3); >> > >> + blk_delay_queue(q, 3); >> > >> } >> > >> >> > >> static int drive_is_ready(ide_drive_t *drive) >> > >> >> > > >> > > Nope, still hung the same way. >> > >> > Funky. I'll try and reproduce this tonight. >> > >> > -- >> > Jens Axboe >> > >> >> I have had a similiar problem (reported earlier) unable to boot. >> With git15-18 hung with IDE drives (hda), git19-21 moved the hang down to >> the IDE CDROM (hdc). Applied the above patch and now booted into git21 without >> any hang and all appears ok. > > It may have made it better for me, it's hard to tell. > > I did a fresh pull, re-applied the patch, and tried again with > init=/bin/sh and it booted to the shell prompt... which then hung when I > did "ls -l /". > > If I let it boot normally, init announces itself, gives a spurious > warning about a fstab field (which it's been doing for a while, my fault > but harmless), then hangs. > >> This is i386, UP. > > I'm doing x86-64 SMP. I think we have the same issue the other location. How about this, then: diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 0e406d73..4978ec3 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -549,12 +549,11 @@ plug_device: spin_unlock_irq(&hwif->lock); ide_unlock_host(host); plug_device_2: + blk_delay_queue(q, queue_run_ms); spin_lock_irq(q->queue_lock); - if (rq) { + if (rq) blk_requeue_request(q, rq); - blk_delay_queue(q, queue_run_ms); - } } void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq) @@ -570,8 +569,7 @@ void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq) spin_unlock_irqrestore(q->queue_lock, flags); /* Use 3ms as that was the old plug delay */ - if (rq) - blk_delay_queue(q, 3); + blk_delay_queue(q, 3); } static int drive_is_ready(ide_drive_t *drive)