ixgbevf: Handle extended IPv6 headers in tx path
Subsystems (2)
PATCH v2 1/1 ixgbevf: Handle extended IPv6 headers in tx path
Check for and handle IPv6 extended headers so that tx checksum offload can be done. Also use skb_checksum_help for unexpected cases. Thanks to Tom Herbert for noticing these problems. Thanks to Alexander Duyck for seeing how to coalesce the error handling into one location.
Reported-by Tom Herbert <[email protected]>
Signed-off-by Mark Rustad <[email protected]>
---
Changes in V2:
- Reworked to be like the ixgbe version
--- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 22 +++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +14 -8
@@ -3347,6 +3347,7 @@ static void ixgbevf_tx_csum(struct ixgbevf_ring *tx_ring,if (skb->ip_summed ==CHECKSUM_PARTIAL ) {u8 l4_hdr =0 ; +__be16 frag_off;switch (first->protocol) {case htons (ETH_P_IP ):
@@ -3357,13 +3358,16 @@ static void ixgbevf_tx_csum(struct ixgbevf_ring *tx_ring,case htons (ETH_P_IPV6 ): vlan_macip_lens |=skb_network_header_len (skb); l4_hdr =ipv6_hdr (skb)->nexthdr; +if (likely (skb_network_header_len (skb) == +sizeof (struct ipv6hdr ))) +break ; +ipv6_skip_exthdr (skb,skb_network_offset (skb) + +sizeof (struct ipv6hdr ), + &l4_hdr, &frag_off); +if (unlikely (frag_off)) + l4_hdr =NEXTHDR_FRAGMENT ;break ;default : -if (unlikely (net_ratelimit ())) { -dev_warn (tx_ring->dev, -"partial checksum but proto=%x!\n" , - first->protocol); - }break ; }
@@ -3385,16 +3389,18 @@ static void ixgbevf_tx_csum(struct ixgbevf_ring *tx_ring,default :if (unlikely (net_ratelimit ())) {dev_warn (tx_ring->dev, -"partial checksum but l4 proto=%x!\n" , - l4_hdr); +"partial checksum, l3 proto=%x, l4 proto=%x\n" , + first->protocol, l4_hdr); } -break ; +skb_checksum_help (skb); + goto no_csum; }/* update TX checksum flag */ first->tx_flags |=IXGBE_TX_FLAGS_CSUM ; } +no_csum:/* vlan_macip_lens: MACLEN, VLAN tag */ vlan_macip_lens |=skb_network_offset (skb) <<IXGBE_ADVTXD_MACLEN_SHIFT ; vlan_macip_lens |= first->tx_flags &IXGBE_TX_FLAGS_VLAN_MASK ;