Message ID | 20130918220819.GA11989@electric-eye.fr.zoreil.com |
---|---|
State | RFC, archived |
Delegated to: | David Miller |
Headers | show |
On Thu, 2013-09-19 at 00:08 +0200, Francois Romieu wrote: > Igor Gnatenko <i.gnatenko.brain@gmail.com> : > > Since 136d8f377e1575463b47840bc5f1b22d94bf8f63 commit we have kernel > > panic on: > > 01:05.0 Ethernet controller [0200]: Marvell Technology Group Ltd. > > > > Screen: https://www.dropbox.com/s/mu3t3wxpxbn4ou5/IMAG0507.jpg > > > > RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1008323 > > Does the ugly stuff below against mainline make a difference ? > > Note to testers: use a size argument above 500 for 'ping' to > exercize the relevant code path. Reported-and-tested-by: Vasiliy Glazov <vascom2@gmail.com> Bisected-by: Igor Gnatenko <i.gnatenko.brain@gmail.com> > > diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c > index ef94a59..aa85a3f 100644 > --- a/drivers/net/ethernet/marvell/skge.c > +++ b/drivers/net/ethernet/marvell/skge.c > @@ -3086,6 +3086,7 @@ static struct sk_buff *skge_rx_get(struct net_device *dev, > PCI_DMA_FROMDEVICE); > skge_rx_reuse(e, skge->rx_buf_size); > } else { > + struct skge_element ee = *e; > struct sk_buff *nskb; > > nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size); > @@ -3098,10 +3099,10 @@ static struct sk_buff *skge_rx_get(struct net_device *dev, > } > > pci_unmap_single(skge->hw->pdev, > - dma_unmap_addr(e, mapaddr), > - dma_unmap_len(e, maplen), > + dma_unmap_addr(&ee, mapaddr), > + dma_unmap_len(&ee, maplen), > PCI_DMA_FROMDEVICE); > - skb = e->skb; > + skb = ee.skb; > prefetch(skb->data); > } > Yes. This patch fixes problem. ping www.ru -s 500 works fine.
Please, send patch.
On 09/19/2013 05:03 AM, Igor Gnatenko wrote: > Please, send patch. > The patch is in mainline as of 3.12-rc2 as commit: Author: Mikulas Patocka <mpatocka@redhat.com> Date: Thu Sep 19 14:13:17 2013 -0400 skge: fix broken driver I don't see that the commit was Cc'd to stable. Mikulas, we might need to send a request directly to the stable maintainers and reqeust that the commit be pulled into stable, in case they didn't notice the request in the commit message. -- 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 Tue, 24 Sep 2013, Joseph Salisbury wrote: > On 09/19/2013 05:03 AM, Igor Gnatenko wrote: > > Please, send patch. > > > The patch is in mainline as of 3.12-rc2 as commit: > > Author: Mikulas Patocka <mpatocka@redhat.com> > Date: Thu Sep 19 14:13:17 2013 -0400 > > skge: fix broken driver > > I don't see that the commit was Cc'd to stable. Mikulas, we might need > to send a request directly to the stable maintainers and reqeust that > the commit be pulled into stable, in case they didn't notice the request > in the commit message. The patch needs to be added to 3.11 stable tree. David Miller's networking tree has a rule that it doesn't want "Cc: stable@kernel.org" in patches submitted through it. So, David hopefully submits the patch to the stable tree on his own. Mikulas -- 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/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c index ef94a59..aa85a3f 100644 --- a/drivers/net/ethernet/marvell/skge.c +++ b/drivers/net/ethernet/marvell/skge.c @@ -3086,6 +3086,7 @@ static struct sk_buff *skge_rx_get(struct net_device *dev, PCI_DMA_FROMDEVICE); skge_rx_reuse(e, skge->rx_buf_size); } else { + struct skge_element ee = *e; struct sk_buff *nskb; nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size); @@ -3098,10 +3099,10 @@ static struct sk_buff *skge_rx_get(struct net_device *dev, } pci_unmap_single(skge->hw->pdev, - dma_unmap_addr(e, mapaddr), - dma_unmap_len(e, maplen), + dma_unmap_addr(&ee, mapaddr), + dma_unmap_len(&ee, maplen), PCI_DMA_FROMDEVICE); - skb = e->skb; + skb = ee.skb; prefetch(skb->data); }