Re: [BUG REPORT 2.6.0] cisco airo_cs scheduling while atomic

[Sven Dowideit <svenud@ozemail.com.au>]

[-- Attachment #1: Type: text/plain, Size: 6627 bytes --]

hey there,
	I have a longer version of this patch from Tom that i applied to
2.6-test1, that fixes the bad scheduling problem..

I have appended his patch - will this qualify for a sucessful test?

cheers

sven

--------

Message: 19
Date: Fri, 18 Jul 2003 14:04:14 -0700
From: Andrew Morton <akpm@osdl.org>
To: James Bourne <jbourne@hardrock.org>
Cc: breed@users.sourceforge.net, linux-kernel@vger.kernel.org
Subject: Re: [BUG REPORT 2.6.0] cisco airo_cs scheduling while atomic

James Bourne <jbourne@hardrock.org> wrote:
>
> The Cisco Airo card driver calls schedule while atomic in the function
> issuecommand in drivers/net/wireless/airo.c line 2388.
> 
> 
> Jul 17 15:27:10 localhost kernel: bad: scheduling while atomic!
> Jul 17 15:27:10 localhost kernel: Call Trace:
> Jul 17 15:27:10 localhost kernel:  [<c0119754>] schedule+0x3c4/0x3d0
> Jul 17 15:27:10 localhost kernel:  [<d18cbb51>] sendcommand+0xa1/0xe0
[airo]
> Jul 17 15:27:10 localhost kernel:  [<d18cba80>] issuecommand+0x60/0x90
[airo]
> Jul 17 15:27:10 localhost kernel:  [<d18cc001>]
PC4500_accessrid+0x41/0x80 [airo]
> Jul 17 15:27:10 localhost kernel:  [<d18cc0a3>]
PC4500_readrid+0x63/0x130 [airo]
> Jul 17 15:27:10 localhost kernel:  [<d18c95d9>] readStatsRid+0x29/0x50
[airo]
> Jul 17 15:27:10 localhost kernel:  [<d18c9c0a>]
airo_get_stats+0x2a/0xe0 [airo]

I've been waiting months for someone to test this patch.  Can you please
do
so?


diff -puN drivers/net/wireless/airo.c~airo-schedule-fix
drivers/net/wireless/airo.c
--- 25/drivers/net/wireless/airo.c~airo-schedule-fix    2003-06-26
17:37:47.000000000 -0700
+++ 25-akpm/drivers/net/wireless/airo.c 2003-06-26 17:37:47.000000000
-0700
@@ -44,6 +44,7 @@
 #include <linux/ioport.h>
 #include <linux/config.h>
 #include <linux/pci.h>
+#include <linux/delay.h>
 #include <asm/uaccess.h>
 
 #ifdef CONFIG_PCI
@@ -2379,20 +2380,26 @@ static u16 setup_card(struct airo_info *
 static u16 issuecommand(struct airo_info *ai, Cmd *pCmd, Resp *pRsp) {
         // Im really paranoid about letting it run forever!
        int max_tries = 600000;
+       static int max = 0;
+       int count = 0;
 
        if (sendcommand(ai, pCmd) == (u16)ERROR)
                return ERROR;
 
        while (max_tries-- && (IN4500(ai, EVSTAT) & EV_CMD) == 0) {
-               if (!in_interrupt() && (max_tries & 255) == 0)
-                       schedule();
+               udelay(1);
+               count++;
        }
-       if ( max_tries == -1 ) {
+       if (max_tries == -1) {
                printk( KERN_ERR
                        "airo: Max tries exceeded waiting for command\n"
);
                 return ERROR;
        }
        completecommand(ai, pRsp);
+       if (count > max) {
+               max = count;
+               printk("%s: max delay = %d usec\n", __FUNCTION__, max);
+       }
        return SUCCESS;
 }
 

_

-
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/

-----------------------------------------------------------------


Tom's patch:

--- airo.c      2003-05-31 09:26:12.000000000 -0400
+++ airo.c.tom  2003-06-19 15:37:07.100811000 -0400
@@ -44,6 +44,7 @@
 #include <linux/ioport.h>
 #include <linux/config.h>
 #include <linux/pci.h>
+#include <linux/delay.h>
 #include <asm/uaccess.h>
 
 #ifdef CONFIG_PCI
@@ -1762,6 +1763,8 @@
        int i;
        struct airo_info *ai = dev->priv;
 
+       if (down_interruptible(&ai->sem))
+               return -1;
        waitbusy (ai);
        OUT4500(ai,COMMAND,CMD_SOFTRESET);
        set_current_state (TASK_UNINTERRUPTIBLE);
@@ -1771,6 +1774,7 @@
        schedule_timeout (HZ/5);
        if ( setup_card(ai, dev->dev_addr ) != SUCCESS ) {
                printk( KERN_ERR "airo: MAC could not be enabled\n" );
+               up(&ai->sem);
                return -1;
        } else {
                printk( KERN_INFO "airo: MAC enabled %s
%x:%x:%x:%x:%x:%x\n",
@@ -1788,6 +1792,7 @@
        }
        enable_interrupts( ai );
        netif_wake_queue(dev);
+       up(&ai->sem);
        return 0;
 }
 
@@ -1866,6 +1871,7 @@
 
                if ( status & EV_MIC ) {
                        OUT4500( apriv, EVACK, EV_MIC );
+                       if (apriv->flags & FLAG_MIC_CAPABLE)
                        airo_read_mic( apriv );
                }
                if ( status & EV_LINK ) {
@@ -2379,20 +2385,26 @@
 static u16 issuecommand(struct airo_info *ai, Cmd *pCmd, Resp *pRsp) {
         // Im really paranoid about letting it run forever!
        int max_tries = 600000;
+       static int max = 0;
+       int count = 0;
 
        if (sendcommand(ai, pCmd) == (u16)ERROR)
                return ERROR;
 
        while (max_tries-- && (IN4500(ai, EVSTAT) & EV_CMD) == 0) {
-               if (!in_interrupt() && (max_tries & 255) == 0)
-                       schedule();
+               udelay(1);
+               count++;
        }
-       if ( max_tries == -1 ) {
+       if (max_tries == -1) {
                printk( KERN_ERR
                        "airo: Max tries exceeded waiting for command\n"
);
                 return ERROR;
        }
        completecommand(ai, pRsp);
+       if (count > max) {
+               max = count;
+               printk("%s: max delay = %d usec\n", __FUNCTION__, max);
+       }
        return SUCCESS;
 }
 
@@ -2653,11 +2665,11 @@
        if (down_interruptible(&ai->sem))
                return ERROR;
        if (issuecommand(ai, &cmd, &rsp) != SUCCESS) {
-               txFid = 0;
+               txFid = ERROR;
                goto done;
        }
        if ( (rsp.status & 0xFF00) != 0) {
-               txFid = 0;
+               txFid = ERROR;
                goto done;
        }
        /* wait for the allocate event/indication
@@ -2704,7 +2716,7 @@
 
        len >>= 16;
 
-       if (len < ETH_ALEN * 2) {
+       if (len <= ETH_ALEN * 2) {
                printk( KERN_WARNING "Short packet %d\n", len );
                return ERROR;
        }
@@ -4838,7 +4850,7 @@
        readCapabilityRid(local, &cap_rid);
 
        dwrq->length = sizeof(struct iw_range);
-       memset(range, 0, sizeof(*range));
+       memset(range, 0, sizeof(range));
        range->min_nwid = 0x0000;
        range->max_nwid = 0x0000;
        range->num_channels = 14;



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]