Commit 33acd755 authored by Luo bin's avatar Luo bin Committed by David S. Miller
Browse files

hinic: add vxlan segmentation and cs offload support 



Add NETIF_F_GSO_UDP_TUNNEL and NETIF_F_GSO_UDP_TUNNEL_CSUM features
to support vxlan segmentation and checksum offload. Ipip and ipv6
tunnel packets are regarded as non-tunnel pkt for hw and as for other
type of tunnel pkts, checksum offload is disabled.

Signed-off-by: default avatarLuo bin <luobin9@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3694707

drivers/net/ethernet/huawei/hinic/hinic_main.c

+6 −1
Original line number Diff line number Diff line
@@ -929,11 +929,16 @@ static void netdev_features_init(struct net_device *netdev) 
	netdev->hw_features = NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM |

			      NETIF_F_IPV6_CSUM | NETIF_F_TSO | NETIF_F_TSO6 |

			      NETIF_F_RXCSUM | NETIF_F_LRO |

			      NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;

			      NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |

			      NETIF_F_GSO_UDP_TUNNEL | NETIF_F_GSO_UDP_TUNNEL_CSUM;



	netdev->vlan_features = netdev->hw_features;



	netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_CTAG_FILTER;



	netdev->hw_enc_features = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_SCTP_CRC |

				  NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN |

				  NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_GSO_UDP_TUNNEL;

}



static void hinic_refresh_nic_cfg(struct hinic_dev *nic_dev)

drivers/net/ethernet/huawei/hinic/hinic_tx.c

+40 −11
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ static int offload_csum(struct hinic_sq_task *task, u32 *queue_info, 
	enum hinic_l4_offload_type l4_offload;

	u32 offset, l4_len, network_hdr_len;

	enum hinic_l3_offload_type l3_type;

	u32 tunnel_type = NOT_TUNNEL;

	union hinic_l3 ip;

	union hinic_l4 l4;

	u8 l4_proto;
@@ -367,27 +368,55 @@ static int offload_csum(struct hinic_sq_task *task, u32 *queue_info, 
	if (skb->encapsulation) {

		u32 l4_tunnel_len;



		tunnel_type = TUNNEL_UDP_NO_CSUM;

		ip.hdr = skb_network_header(skb);



		if (ip.v4->version == 4)

		if (ip.v4->version == 4) {

			l3_type = IPV4_PKT_NO_CHKSUM_OFFLOAD;

		else if (ip.v4->version == 6)

			l4_proto = ip.v4->protocol;

		} else if (ip.v4->version == 6) {

			unsigned char *exthdr;

			__be16 frag_off;

			l3_type = IPV6_PKT;

		else

			tunnel_type = TUNNEL_UDP_CSUM;

			exthdr = ip.hdr + sizeof(*ip.v6);

			l4_proto = ip.v6->nexthdr;

			l4.hdr = skb_transport_header(skb);

			if (l4.hdr != exthdr)

				ipv6_skip_exthdr(skb, exthdr - skb->data,

						 &l4_proto, &frag_off);

		} else {

			l3_type = L3TYPE_UNKNOWN;

			l4_proto = IPPROTO_RAW;

		}



		hinic_task_set_outter_l3(task, l3_type,

					 skb_network_header_len(skb));



		switch (l4_proto) {

		case IPPROTO_UDP:

			l4_tunnel_len = skb_inner_network_offset(skb) -

					skb_transport_offset(skb);



		hinic_task_set_tunnel_l4(task, TUNNEL_UDP_NO_CSUM,

					 l4_tunnel_len);



			ip.hdr = skb_inner_network_header(skb);

			l4.hdr = skb_inner_transport_header(skb);

			network_hdr_len = skb_inner_network_header_len(skb);

			break;

		case IPPROTO_IPIP:

		case IPPROTO_IPV6:

			tunnel_type = NOT_TUNNEL;

			l4_tunnel_len = 0;



			ip.hdr = skb_inner_network_header(skb);

			l4.hdr = skb_transport_header(skb);

			network_hdr_len = skb_network_header_len(skb);

			break;

		default:

			/* Unsupported tunnel packet, disable csum offload */

			skb_checksum_help(skb);

			return 0;

		}



		hinic_task_set_tunnel_l4(task, tunnel_type, l4_tunnel_len);

	} else {

		ip.hdr = skb_network_header(skb);

		l4.hdr = skb_transport_header(skb);