| Message ID | 1288242390-28574-1-git-send-email-nacc@us.ibm.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Le mercredi 27 octobre 2010 à 22:06 -0700, Nishanth Aravamudan a écrit : > Hi Eric, > > Something like the following?: > > Thanks, > Nish Yes, probably, but I dont have the hardware so cannot test. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 28.10.2010 [07:18:30 +0200], Eric Dumazet wrote: > Le mercredi 27 octobre 2010 à 22:06 -0700, Nishanth Aravamudan a écrit : > > Hi Eric, > > > > Something like the following?: > > > > Thanks, > > Nish > > Yes, probably, but I dont have the hardware so cannot test. Sorry, should have been clearer. I do have the hardware, tested with the patch, it does work. Wanted to make sure that it made sense to the maintainers, of course, but: Tested-by: Nishanth Aravamudan <nacc@us.ibm.com> Can be added, if needed. Thanks, Nish
On 10/27/2010 10:06 PM, Nishanth Aravamudan wrote: > Hi Eric, > > Something like the following?: > > Thanks, > Nish > > > Along the same lines as "cxgb4: fix crash due to manipulating queues > before registration" (8f6d9f40476895571df039b6f1f5230ec7faebad), before > commit "net: allocate tx queues in register_netdevice" > netif_tx_stop_all_queues and related functions could be used between > device allocation and registration but now only after registration. > cxgb4 has such a call before registration and crashes now. Move it > after register_netdev. > > Signed-off-by: Nishanth Aravamudan<nacc@us.ibm.com> Acked-by: Divy Le Ray <divy@chelsio.com> > Cc: eric.dumazet@gmail.com > Cc: sonnyrao@us.ibm.com > Cc: Divy Le Ray<divy@chelsio.com> > Cc: Dimitris Michailidis<dm@chelsio.com> > Cc: netdev@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > --- > drivers/net/cxgb3/cxgb3_main.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c > index 4e3c123..96c70a5 100644 > --- a/drivers/net/cxgb3/cxgb3_main.c > +++ b/drivers/net/cxgb3/cxgb3_main.c > @@ -3301,7 +3301,6 @@ static int __devinit init_one(struct pci_dev *pdev, > pi->rx_offload = T3_RX_CSUM | T3_LRO; > pi->port_id = i; > netif_carrier_off(netdev); > - netif_tx_stop_all_queues(netdev); > netdev->irq = pdev->irq; > netdev->mem_start = mmio_start; > netdev->mem_end = mmio_start + mmio_len - 1; > @@ -3342,6 +3341,7 @@ static int __devinit init_one(struct pci_dev *pdev, > adapter->name = adapter->port[i]->name; > > __set_bit(i,&adapter->registered_device_map); > + netif_tx_stop_all_queues(adapter->port[i]); > } > } > if (!adapter->registered_device_map) { -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Nishanth Aravamudan <nacc@us.ibm.com> Date: Wed, 27 Oct 2010 22:23:49 -0700 > On 28.10.2010 [07:18:30 +0200], Eric Dumazet wrote: >> Le mercredi 27 octobre 2010 à 22:06 -0700, Nishanth Aravamudan a écrit : >> > Hi Eric, >> > >> > Something like the following?: >> > >> > Thanks, >> > Nish >> >> Yes, probably, but I dont have the hardware so cannot test. > > Sorry, should have been clearer. I do have the hardware, tested with the > patch, it does work. Wanted to make sure that it made sense to the > maintainers, of course, but: > > Tested-by: Nishanth Aravamudan <nacc@us.ibm.com> Applied, thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Divy Le Ray <divy@chelsio.com> Date: Wed, 27 Oct 2010 23:35:29 -0700 > On 10/27/2010 10:06 PM, Nishanth Aravamudan wrote: >> Hi Eric, >> >> Something like the following?: >> >> Thanks, >> Nish >> >> >> Along the same lines as "cxgb4: fix crash due to manipulating queues >> before registration" (8f6d9f40476895571df039b6f1f5230ec7faebad), >> before >> commit "net: allocate tx queues in register_netdevice" >> netif_tx_stop_all_queues and related functions could be used between >> device allocation and registration but now only after registration. >> cxgb4 has such a call before registration and crashes now. Move it >> after register_netdev. >> >> Signed-off-by: Nishanth Aravamudan<nacc@us.ibm.com> > > Acked-by: Divy Le Ray <divy@chelsio.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 4e3c123..96c70a5 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c @@ -3301,7 +3301,6 @@ static int __devinit init_one(struct pci_dev *pdev, pi->rx_offload = T3_RX_CSUM | T3_LRO; pi->port_id = i; netif_carrier_off(netdev); - netif_tx_stop_all_queues(netdev); netdev->irq = pdev->irq; netdev->mem_start = mmio_start; netdev->mem_end = mmio_start + mmio_len - 1; @@ -3342,6 +3341,7 @@ static int __devinit init_one(struct pci_dev *pdev, adapter->name = adapter->port[i]->name; __set_bit(i, &adapter->registered_device_map); + netif_tx_stop_all_queues(adapter->port[i]); } } if (!adapter->registered_device_map) {
Hi Eric, Something like the following?: Thanks, Nish Along the same lines as "cxgb4: fix crash due to manipulating queues before registration" (8f6d9f40476895571df039b6f1f5230ec7faebad), before commit "net: allocate tx queues in register_netdevice" netif_tx_stop_all_queues and related functions could be used between device allocation and registration but now only after registration. cxgb4 has such a call before registration and crashes now. Move it after register_netdev. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Cc: eric.dumazet@gmail.com Cc: sonnyrao@us.ibm.com Cc: Divy Le Ray <divy@chelsio.com> Cc: Dimitris Michailidis <dm@chelsio.com> Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/net/cxgb3/cxgb3_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)