linux-kernel - Re: [PATCH] cciss: fix schedule

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20090831130342.a5f3d821.rdunlap@xenotime.net>
Date:	Mon, 31 Aug 2009 13:03:42 -0700
From:	Randy Dunlap <rdunlap@...otime.net>
To:	Marcin Slusarz <marcin.slusarz@...il.com>
Cc:	lkml <linux-kernel@...r.kernel.org>,
	akpm <akpm@...ux-foundation.org>,
	Mike Miller <mike.miller@...com>, iss_storagedev@...com
Subject: Re: [PATCH] cciss: fix schedule_timeout() parameters

On Mon, 31 Aug 2009 20:24:45 +0200 Marcin Slusarz wrote:

> Randy Dunlap wrote:
> > From: Randy Dunlap <randy.dunlap@...cle.com>
> > 
> > Change schedule_timeout() parameter to not be specific to HZ=1000.
> > 
> > Signed-off-by: Randy Dunlap <randy.dunlap@...cle.com>
> > Cc: Mike Miller <mike.miller@...com>
> > Cc: iss_storagedev@...com
> > ---
> >  drivers/block/cciss.c |    5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> > 
> > --- lnx-2631-rc7.orig/drivers/block/cciss.c
> > +++ lnx-2631-rc7/drivers/block/cciss.c
> > @@ -36,6 +36,7 @@
> >  #include <linux/proc_fs.h>
> >  #include <linux/seq_file.h>
> >  #include <linux/init.h>
> > +#include <linux/jiffies.h>
> >  #include <linux/hdreg.h>
> >  #include <linux/spinlock.h>
> >  #include <linux/compat.h>
> > @@ -3489,7 +3490,7 @@ static int __devinit cciss_pci_init(ctlr
> >  		if (scratchpad == CCISS_FIRMWARE_READY)
> >  			break;
> >  		set_current_state(TASK_INTERRUPTIBLE);
> > -		schedule_timeout(HZ / 10);	/* wait 100ms */
> > +		schedule_timeout(msecs_to_jiffies(100));	/* wait 100ms */
> >  	}
> >  	if (scratchpad != CCISS_FIRMWARE_READY) {
> >  		printk(KERN_WARNING "cciss: Board not ready.  Timed out.\n");
> > @@ -3615,7 +3616,7 @@ static int __devinit cciss_pci_init(ctlr
> >  			break;
> >  		/* delay and try again */
> >  		set_current_state(TASK_INTERRUPTIBLE);
> > -		schedule_timeout(10);
> > +		schedule_timeout(msecs_to_jiffies(1));
> 
> shouldn't it be msecs_to_jiffies(10)?

Hm, thanks, that's a good observation -- and possibly correct.


The reason that I used (1) was that I looked at the loop:

	for (i = 0; i < MAX_CONFIG_WAIT; i++) {
		if (!(readl(c->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq))
			break;
		/* delay and try again */
		set_current_state(TASK_INTERRUPTIBLE);
		schedule_timeout(msecs_to_jiffies(1));
	}

and this:
/* How long to wait (in milliseconds) for board to go into simple mode */
#define MAX_CONFIG_WAIT 30000

and then I tried to make the loop run for a max. of 30000 milliseconds.

Mike M., any comments here?


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/