| Message ID | 54E62855.5080201@oracle.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On (02/19/15 13:15), David L Stevens wrote: > An error return from __vnet_tx_trigger() sets the TX descriptor to > VIO_DESC_FREE while leaving port->tx_bufs[txi].skb set. This leads > to a BUG_ON() the next time this descriptor is used. > > This patch frees the pending skb when getting a trigger error to > match the VIO_DESC_FREE state. > > Signed-off-by: David L Stevens <david.stevens@oracle.com> Acked-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> -- 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: David L Stevens <david.stevens@oracle.com> Date: Thu, 19 Feb 2015 13:15:49 -0500 > An error return from __vnet_tx_trigger() sets the TX descriptor to > VIO_DESC_FREE while leaving port->tx_bufs[txi].skb set. This leads > to a BUG_ON() the next time this descriptor is used. > > This patch frees the pending skb when getting a trigger error to > match the VIO_DESC_FREE state. > > Signed-off-by: David L Stevens <david.stevens@oracle.com> Applied, thanks David. -- 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/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c index 2b10b85..0943fb3 100644 --- a/drivers/net/ethernet/sun/sunvnet.c +++ b/drivers/net/ethernet/sun/sunvnet.c @@ -1414,6 +1414,8 @@ static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev) if (unlikely(err < 0)) { netdev_info(dev, "TX trigger error %d\n", err); d->hdr.state = VIO_DESC_FREE; + skb = port->tx_bufs[txi].skb; + port->tx_bufs[txi].skb = NULL; dev->stats.tx_carrier_errors++; goto out_dropped; }
An error return from __vnet_tx_trigger() sets the TX descriptor to VIO_DESC_FREE while leaving port->tx_bufs[txi].skb set. This leads to a BUG_ON() the next time this descriptor is used. This patch frees the pending skb when getting a trigger error to match the VIO_DESC_FREE state. Signed-off-by: David L Stevens <david.stevens@oracle.com> --- drivers/net/ethernet/sun/sunvnet.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)