Re: [PATCH] [-MM, FIX V4] e1000e: incorporate napi_struct changes from net-2.6.24.git
On 09/17/2007 06:29 PM, Kok, Auke wrote: > Jiri Slaby wrote: >> On 12/23/-28158 08:59 PM, Auke Kok wrote: >>> This incorporates the new napi_struct changes into e1000e. Included >>> bugfix for ifdown hang from Krishna Kumar for e1000. >>> >>> Disabling polling is no longer needed at init time, so remove >>> napi_disable() call from _probe(). >>> >>> This also fixes an endless polling loop where the driver signalled >>> "polling done" improperly back to the stack. >>> >>> Signed-off-by: Auke Kok <[EMAIL PROTECTED]> Tested-by: Jiri Slaby <[EMAIL PROTECTED]> >>> --- >>> >>> drivers/net/e1000e/e1000.h |2 ++ >>> drivers/net/e1000e/netdev.c | 40 >>> 2 files changed, 18 insertions(+), 24 deletions(-) [...] > I have no lockups here as well anymore, so I'm wondering if you accidentally > used > V3 of the patch. And so am I, it works, I ported one change to e1000 (non-e) driver and missed the return 0; removal. Fixed both of them now, so one of them caused it. thanks a lot, -- Jiri Slaby ([EMAIL PROTECTED]) Faculty of Informatics, Masaryk University - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [-MM, FIX V4] e1000e: incorporate napi_struct changes from net-2.6.24.git
Jiri Slaby wrote:
> On 12/23/-28158 08:59 PM, Auke Kok wrote:
>> This incorporates the new napi_struct changes into e1000e. Included
>> bugfix for ifdown hang from Krishna Kumar for e1000.
>>
>> Disabling polling is no longer needed at init time, so remove
>> napi_disable() call from _probe().
>>
>> This also fixes an endless polling loop where the driver signalled
>> "polling done" improperly back to the stack.
>>
>> Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
>> ---
>>
>> drivers/net/e1000e/e1000.h |2 ++
>> drivers/net/e1000e/netdev.c | 40
>> 2 files changed, 18 insertions(+), 24 deletions(-)
>>
>> diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
>> index c57e35a..d2499bb 100644
>> --- a/drivers/net/e1000e/e1000.h
>> +++ b/drivers/net/e1000e/e1000.h
>> @@ -187,6 +187,8 @@ struct e1000_adapter {
>> struct e1000_ring *tx_ring /* One per active queue */
>> cacheline_aligned_in_smp;
>>
>> +struct napi_struct napi;
>> +
>> unsigned long tx_queue_len;
>> unsigned int restart_queue;
>> u32 txd_cmd;
>> diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
>> index 372da46..eeb40cc 100644
>> --- a/drivers/net/e1000e/netdev.c
>> +++ b/drivers/net/e1000e/netdev.c
>> @@ -1149,12 +1149,12 @@ static irqreturn_t e1000_intr_msi(int irq, void
>> *data)
>> mod_timer(&adapter->watchdog_timer, jiffies + 1);
>> }
>>
>> -if (netif_rx_schedule_prep(netdev)) {
>> +if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
>> adapter->total_tx_bytes = 0;
>> adapter->total_tx_packets = 0;
>> adapter->total_rx_bytes = 0;
>> adapter->total_rx_packets = 0;
>> -__netif_rx_schedule(netdev);
>> +__netif_rx_schedule(netdev, &adapter->napi);
>> } else {
>> atomic_dec(&adapter->irq_sem);
>> }
>> @@ -1212,12 +1212,12 @@ static irqreturn_t e1000_intr(int irq, void *data)
>> mod_timer(&adapter->watchdog_timer, jiffies + 1);
>> }
>>
>> -if (netif_rx_schedule_prep(netdev)) {
>> +if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
>> adapter->total_tx_bytes = 0;
>> adapter->total_tx_packets = 0;
>> adapter->total_rx_bytes = 0;
>> adapter->total_rx_packets = 0;
>> -__netif_rx_schedule(netdev);
>> +__netif_rx_schedule(netdev, &adapter->napi);
>> } else {
>> atomic_dec(&adapter->irq_sem);
>> }
>> @@ -1662,10 +1662,10 @@ set_itr_now:
>> * e1000_clean - NAPI Rx polling callback
>> * @adapter: board private structure
>> **/
>> -static int e1000_clean(struct net_device *poll_dev, int *budget)
>> +static int e1000_clean(struct napi_struct *napi, int budget)
>> {
>> -struct e1000_adapter *adapter;
>> -int work_to_do = min(*budget, poll_dev->quota);
>> +struct e1000_adapter *adapter = container_of(napi, struct
>> e1000_adapter, napi);
>> +struct net_device *poll_dev = adapter->netdev;
>> int tx_cleaned = 0, work_done = 0;
>>
>> /* Must NOT use netdev_priv macro here. */
>> @@ -1684,25 +1684,19 @@ static int e1000_clean(struct net_device *poll_dev,
>> int *budget)
>> spin_unlock(&adapter->tx_queue_lock);
>> }
>>
>> -adapter->clean_rx(adapter, &work_done, work_to_do);
>> -*budget -= work_done;
>> -poll_dev->quota -= work_done;
>> +adapter->clean_rx(adapter, &work_done, budget);
>>
>> /* If no Tx and not enough Rx work done, exit the polling mode */
>> -if ((!tx_cleaned && (work_done == 0)) ||
>> +if ((!tx_cleaned && (work_done < budget)) ||
>
> Hi,
>
> sorry to say that, but this change since last your patch changes nothing on my
> machine (ksoftirq spinning at 100 % of CPU usage), I have some traces for you
> if
> it helps:
davem pulled all the drivers and fixups into net-2.6.24 including e1000e (and
tested it yesterday)... Perhaps you can give that tree a try?
I have no lockups here as well anymore, so I'm wondering if you accidentally
used
V3 of the patch.
Can you give today's net-2.6.24 a try?
Auke
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [-MM, FIX V4] e1000e: incorporate napi_struct changes from net-2.6.24.git
On 12/23/-28158 08:59 PM, Auke Kok wrote:
> This incorporates the new napi_struct changes into e1000e. Included
> bugfix for ifdown hang from Krishna Kumar for e1000.
>
> Disabling polling is no longer needed at init time, so remove
> napi_disable() call from _probe().
>
> This also fixes an endless polling loop where the driver signalled
> "polling done" improperly back to the stack.
>
> Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
> ---
>
> drivers/net/e1000e/e1000.h |2 ++
> drivers/net/e1000e/netdev.c | 40
> 2 files changed, 18 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
> index c57e35a..d2499bb 100644
> --- a/drivers/net/e1000e/e1000.h
> +++ b/drivers/net/e1000e/e1000.h
> @@ -187,6 +187,8 @@ struct e1000_adapter {
> struct e1000_ring *tx_ring /* One per active queue */
> cacheline_aligned_in_smp;
>
> + struct napi_struct napi;
> +
> unsigned long tx_queue_len;
> unsigned int restart_queue;
> u32 txd_cmd;
> diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
> index 372da46..eeb40cc 100644
> --- a/drivers/net/e1000e/netdev.c
> +++ b/drivers/net/e1000e/netdev.c
> @@ -1149,12 +1149,12 @@ static irqreturn_t e1000_intr_msi(int irq, void *data)
> mod_timer(&adapter->watchdog_timer, jiffies + 1);
> }
>
> - if (netif_rx_schedule_prep(netdev)) {
> + if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
> adapter->total_tx_bytes = 0;
> adapter->total_tx_packets = 0;
> adapter->total_rx_bytes = 0;
> adapter->total_rx_packets = 0;
> - __netif_rx_schedule(netdev);
> + __netif_rx_schedule(netdev, &adapter->napi);
> } else {
> atomic_dec(&adapter->irq_sem);
> }
> @@ -1212,12 +1212,12 @@ static irqreturn_t e1000_intr(int irq, void *data)
> mod_timer(&adapter->watchdog_timer, jiffies + 1);
> }
>
> - if (netif_rx_schedule_prep(netdev)) {
> + if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
> adapter->total_tx_bytes = 0;
> adapter->total_tx_packets = 0;
> adapter->total_rx_bytes = 0;
> adapter->total_rx_packets = 0;
> - __netif_rx_schedule(netdev);
> + __netif_rx_schedule(netdev, &adapter->napi);
> } else {
> atomic_dec(&adapter->irq_sem);
> }
> @@ -1662,10 +1662,10 @@ set_itr_now:
> * e1000_clean - NAPI Rx polling callback
> * @adapter: board private structure
> **/
> -static int e1000_clean(struct net_device *poll_dev, int *budget)
> +static int e1000_clean(struct napi_struct *napi, int budget)
> {
> - struct e1000_adapter *adapter;
> - int work_to_do = min(*budget, poll_dev->quota);
> + struct e1000_adapter *adapter = container_of(napi, struct
> e1000_adapter, napi);
> + struct net_device *poll_dev = adapter->netdev;
> int tx_cleaned = 0, work_done = 0;
>
> /* Must NOT use netdev_priv macro here. */
> @@ -1684,25 +1684,19 @@ static int e1000_clean(struct net_device *poll_dev,
> int *budget)
> spin_unlock(&adapter->tx_queue_lock);
> }
>
> - adapter->clean_rx(adapter, &work_done, work_to_do);
> - *budget -= work_done;
> - poll_dev->quota -= work_done;
> + adapter->clean_rx(adapter, &work_done, budget);
>
> /* If no Tx and not enough Rx work done, exit the polling mode */
> - if ((!tx_cleaned && (work_done == 0)) ||
> + if ((!tx_cleaned && (work_done < budget)) ||
Hi,
sorry to say that, but this change since last your patch changes nothing on my
machine (ksoftirq spinning at 100 % of CPU usage), I have some traces for you if
it helps:
SysRq : Show Regs
CPU 0:
Modules linked in: floppy sr_mod ehci_hcd cdrom rtc_cmos rtc_core usbhid rtc_lib
Pid: 4, comm: ksoftirqd/0 Not tainted 2.6.23-rc4-mm1_64 #24
RIP: 0010:[] []
e1000_clean_rx_irq+0x273/0x320
RSP: :80703e18 EFLAGS: 0202
RAX: 8100032b0700 RBX: 80703ea8 RCX:
RDX: RSI: 0001 RDI: 810003097f60
RBP: 80703d90 R08: 810002b85340 R09: 0002
R10: 0002 R11: 8100032b0700 R12: 8020c1f1
R13: 80703d90 R14: 810004eac020 R15:
FS: () GS:806ad000() knlGS:
CS: 0010 DS: 0018 ES: 0018 CR0: 8005003b
CR2: 445d9978 CR3: 04c49000 CR4: 06e0
DR0: DR1: DR2:
DR3: DR6: 0ff0 DR7: 0400
Call Trace:
[] e1000_clean_rx_irq+0x256/0x320
[] e1000_clean+0x109/0x250
[] hrtimer_run_queues+0x33/0x1b0
[] net_rx_action+0xd7/0x190
[] __do_softirq+0x74/0xf0
[] call_softirq+0x1c/0x30
[]
[PATCH] [-MM, FIX V4] e1000e: incorporate napi_struct changes from net-2.6.24.git
This incorporates the new napi_struct changes into e1000e. Included
bugfix for ifdown hang from Krishna Kumar for e1000.
Disabling polling is no longer needed at init time, so remove
napi_disable() call from _probe().
This also fixes an endless polling loop where the driver signalled
"polling done" improperly back to the stack.
Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
---
drivers/net/e1000e/e1000.h |2 ++
drivers/net/e1000e/netdev.c | 40
2 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index c57e35a..d2499bb 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -187,6 +187,8 @@ struct e1000_adapter {
struct e1000_ring *tx_ring /* One per active queue */
cacheline_aligned_in_smp;
+ struct napi_struct napi;
+
unsigned long tx_queue_len;
unsigned int restart_queue;
u32 txd_cmd;
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 372da46..eeb40cc 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1149,12 +1149,12 @@ static irqreturn_t e1000_intr_msi(int irq, void *data)
mod_timer(&adapter->watchdog_timer, jiffies + 1);
}
- if (netif_rx_schedule_prep(netdev)) {
+ if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
adapter->total_tx_bytes = 0;
adapter->total_tx_packets = 0;
adapter->total_rx_bytes = 0;
adapter->total_rx_packets = 0;
- __netif_rx_schedule(netdev);
+ __netif_rx_schedule(netdev, &adapter->napi);
} else {
atomic_dec(&adapter->irq_sem);
}
@@ -1212,12 +1212,12 @@ static irqreturn_t e1000_intr(int irq, void *data)
mod_timer(&adapter->watchdog_timer, jiffies + 1);
}
- if (netif_rx_schedule_prep(netdev)) {
+ if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
adapter->total_tx_bytes = 0;
adapter->total_tx_packets = 0;
adapter->total_rx_bytes = 0;
adapter->total_rx_packets = 0;
- __netif_rx_schedule(netdev);
+ __netif_rx_schedule(netdev, &adapter->napi);
} else {
atomic_dec(&adapter->irq_sem);
}
@@ -1662,10 +1662,10 @@ set_itr_now:
* e1000_clean - NAPI Rx polling callback
* @adapter: board private structure
**/
-static int e1000_clean(struct net_device *poll_dev, int *budget)
+static int e1000_clean(struct napi_struct *napi, int budget)
{
- struct e1000_adapter *adapter;
- int work_to_do = min(*budget, poll_dev->quota);
+ struct e1000_adapter *adapter = container_of(napi, struct
e1000_adapter, napi);
+ struct net_device *poll_dev = adapter->netdev;
int tx_cleaned = 0, work_done = 0;
/* Must NOT use netdev_priv macro here. */
@@ -1684,25 +1684,19 @@ static int e1000_clean(struct net_device *poll_dev, int
*budget)
spin_unlock(&adapter->tx_queue_lock);
}
- adapter->clean_rx(adapter, &work_done, work_to_do);
- *budget -= work_done;
- poll_dev->quota -= work_done;
+ adapter->clean_rx(adapter, &work_done, budget);
/* If no Tx and not enough Rx work done, exit the polling mode */
- if ((!tx_cleaned && (work_done == 0)) ||
+ if ((!tx_cleaned && (work_done < budget)) ||
!netif_running(poll_dev)) {
quit_polling:
if (adapter->itr_setting & 3)
e1000_set_itr(adapter);
- netif_rx_complete(poll_dev);
- if (test_bit(__E1000_DOWN, &adapter->state))
- atomic_dec(&adapter->irq_sem);
- else
- e1000_irq_enable(adapter);
- return 0;
+ netif_rx_complete(poll_dev, napi);
+ e1000_irq_enable(adapter);
}
- return 1;
+ return work_done;
}
static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
@@ -2439,7 +2433,7 @@ int e1000e_up(struct e1000_adapter *adapter)
clear_bit(__E1000_DOWN, &adapter->state);
- netif_poll_enable(adapter->netdev);
+ napi_enable(&adapter->napi);
e1000_irq_enable(adapter);
/* fire a link change interrupt to start the watchdog */
@@ -2472,7 +2466,7 @@ void e1000e_down(struct e1000_adapter *adapter)
e1e_flush();
msleep(10);
- netif_poll_disable(netdev);
+ napi_disable(&adapter->napi);
e1000_irq_disable(adapter);
del_timer_sync(&adapter->watchdog_timer);
@@ -2605,7 +2599,7 @@ static int e1000_open(struct net_device *netdev)
/* From here on the code is the same as e1000e_up() */
clear_bit(__E1000_DOWN, &adapter->state);
- netif_poll_enable
