Message ID | 1403141893-21735-1-git-send-email-prashant@broadcom.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Prashant Sreedharan <prashant@broadcom.com> Date: Wed, 18 Jun 2014 18:38:13 -0700 > Commit d3f6f3a1d818410c17445bce4f4caab52eb102f1 "tg3: Prevent page > allocation failure during TSO workaround" modified driver logic > to use tg3_tso_bug() for any TSO fragment that hits hardware bug > conditions thus the patch increased the scope of work for tg3_tso_bug() > to cover devices that support NETIF_F_TSO6 as well. Prior to the > patch, tg3_tso_bug() would only be used on devices supporting > NETIF_F_TSO. > > A regression was introduced for IPv6 packets requiring the workaround. > To properly perform GSO on SKBs with TCPV6 gso_type, we need to call > skb_gso_segment() with NETIF_F_TSO6 feature flag cleared, or the > function will return NULL and cause a kernel oops as tg3 is not handling > a NULL return value. This patch fixes the problem. > > Signed-off-by: Prashant Sreedharan <prashant@broadcom.com> > Signed-off-by: Michael Chan <mchan@broadcom.com> Applied and queued up for -stable, thanks. -- 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 Thu, 2014-06-19 at 20:56 -0700, David Miller wrote: > From: Prashant Sreedharan <prashant@broadcom.com> > Date: Wed, 18 Jun 2014 18:38:13 -0700 > > > Commit d3f6f3a1d818410c17445bce4f4caab52eb102f1 "tg3: Prevent page > > allocation failure during TSO workaround" modified driver logic > > to use tg3_tso_bug() for any TSO fragment that hits hardware bug > > conditions thus the patch increased the scope of work for tg3_tso_bug() > > to cover devices that support NETIF_F_TSO6 as well. Prior to the > > patch, tg3_tso_bug() would only be used on devices supporting > > NETIF_F_TSO. > > > > A regression was introduced for IPv6 packets requiring the workaround. > > To properly perform GSO on SKBs with TCPV6 gso_type, we need to call > > skb_gso_segment() with NETIF_F_TSO6 feature flag cleared, or the > > function will return NULL and cause a kernel oops as tg3 is not handling > > a NULL return value. This patch fixes the problem. > > > > Signed-off-by: Prashant Sreedharan <prashant@broadcom.com> > > Signed-off-by: Michael Chan <mchan@broadcom.com> > > Applied and queued up for -stable, thanks. David, the regression is only in the net tree. It doesn't hurt to send the patch to -stable, but not necessary. -- 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: Michael Chan <mchan@broadcom.com> Date: Thu, 19 Jun 2014 22:11:25 -0700 > David, the regression is only in the net tree. It doesn't hurt to send > the patch to -stable, but not necessary. Ok, I've dequeued it. -- 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/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index cd92c49..ccb0023 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -7859,8 +7859,8 @@ static int tg3_tso_bug(struct tg3 *tp, struct sk_buff *skb) netif_wake_queue(tp->dev); } - segs = skb_gso_segment(skb, tp->dev->features & ~NETIF_F_TSO); - if (IS_ERR(segs)) + segs = skb_gso_segment(skb, tp->dev->features & ~(NETIF_F_TSO | NETIF_F_TSO6)); + if (IS_ERR(segs) || !segs) goto tg3_tso_bug_end; do {