openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i40e/i40evf: Consolidate all header changes into TSO function 

This patch goes through and pulls all of the spots where we were updating
either the TCP or IP checksums in the TSO and checksum path into the TSO
function.  The general idea here is that we should only be updating the
header after we verify we have completed a skb_cow_head check to verify the
head is writable.

One other advantage to doing this is that it makes things much more
obvious.  For example, in the case of IPv6 there was one spot where the
offset of the IPv4 header checksum was being updated which is obviously
incorrect.

Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Alexander Duyck 2016-01-24 21:16:35 -08:00 committed by Jeff Kirsher
parent c49a7bc330
commit c777019af1
2 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/net/ethernet/intel/i40e/i40e_txrx.c
View File

@ -2268,8 +2268,11 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
u8 *hdr_len, u64 *cd_type_cmd_tso_mss) u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
{ {
u64 cd_cmd, cd_tso_len, cd_mss; u64 cd_cmd, cd_tso_len, cd_mss;
struct ipv6hdr *ipv6h; union {
struct iphdr *iph; struct iphdr *v4;
struct ipv6hdr *v6;
unsigned char *hdr;
} ip;
union { union {
struct tcphdr *tcp; struct tcphdr *tcp;
unsigned char *hdr; unsigned char *hdr;
@ -2287,16 +2290,29 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
if (err < 0) if (err < 0)
return err; return err;
iph = skb->encapsulation ? inner_ip_hdr(skb) : ip_hdr(skb); ip.hdr = skb_network_header(skb);
ipv6h = skb->encapsulation ? inner_ipv6_hdr(skb) : ipv6_hdr(skb); l4.hdr = skb_transport_header(skb);
l4.hdr = skb->encapsulation ? skb_inner_transport_header(skb) :
skb_transport_header(skb);
if (iph->version == 4) { /* initialize outer IP header fields */
iph->tot_len = 0; if (ip.v4->version == 4) {
iph->check = 0; ip.v4->tot_len = 0;
ip.v4->check = 0;
} else { } else {
ipv6h->payload_len = 0; ip.v6->payload_len = 0;
}
if (skb_shinfo(skb)->gso_type & (SKB_GSO_UDP_TUNNEL | SKB_GSO_GRE)) {
/* reset pointers to inner headers */
ip.hdr = skb_inner_network_header(skb);
l4.hdr = skb_inner_transport_header(skb);
/* initialize inner IP header fields */
if (ip.v4->version == 4) {
ip.v4->tot_len = 0;
ip.v4->check = 0;
} else {
ip.v6->payload_len = 0;
}
} }
/* determine offset of inner transport header */ /* determine offset of inner transport header */
@ -2381,15 +2397,11 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
struct iphdr *this_ip_hdr; struct iphdr *this_ip_hdr;
u32 network_hdr_len; u32 network_hdr_len;
u8 l4_hdr = 0; u8 l4_hdr = 0;
struct udphdr *oudph = NULL;
struct iphdr *oiph = NULL;
u32 l4_tunnel = 0; u32 l4_tunnel = 0;
if (skb->encapsulation) { if (skb->encapsulation) {
switch (ip_hdr(skb)->protocol) { switch (ip_hdr(skb)->protocol) {
case IPPROTO_UDP: case IPPROTO_UDP:
oudph = udp_hdr(skb);
oiph = ip_hdr(skb);
l4_tunnel = I40E_TXD_CTX_UDP_TUNNELING; l4_tunnel = I40E_TXD_CTX_UDP_TUNNELING;
*tx_flags |= I40E_TX_FLAGS_UDP_TUNNEL; *tx_flags |= I40E_TX_FLAGS_UDP_TUNNEL;
break; break;
@ -2407,15 +2419,12 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
if (*tx_flags & I40E_TX_FLAGS_IPV4) { if (*tx_flags & I40E_TX_FLAGS_IPV4) {
if (*tx_flags & I40E_TX_FLAGS_TSO) { if (*tx_flags & I40E_TX_FLAGS_TSO) {
*cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4; *cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4;
ip_hdr(skb)->check = 0;
} else { } else {
*cd_tunneling |= *cd_tunneling |=
I40E_TX_CTX_EXT_IP_IPV4_NO_CSUM; I40E_TX_CTX_EXT_IP_IPV4_NO_CSUM;
} }
} else if (*tx_flags & I40E_TX_FLAGS_IPV6) { } else if (*tx_flags & I40E_TX_FLAGS_IPV6) {
*cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV6; *cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV6;
if (*tx_flags & I40E_TX_FLAGS_TSO)
ip_hdr(skb)->check = 0;
} }
/* Now set the ctx descriptor fields */ /* Now set the ctx descriptor fields */
@ -2444,7 +2453,6 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
*/ */
if (*tx_flags & I40E_TX_FLAGS_TSO) { if (*tx_flags & I40E_TX_FLAGS_TSO) {
*td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM; *td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM;
this_ip_hdr->check = 0;
} else { } else {
*td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4; *td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4;
} }

44
drivers/net/ethernet/intel/i40evf/i40e_txrx.c
View File

@ -1528,8 +1528,11 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
u8 *hdr_len, u64 *cd_type_cmd_tso_mss) u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
{ {
u64 cd_cmd, cd_tso_len, cd_mss; u64 cd_cmd, cd_tso_len, cd_mss;
struct ipv6hdr *ipv6h; union {
struct iphdr *iph; struct iphdr *v4;
struct ipv6hdr *v6;
unsigned char *hdr;
} ip;
union { union {
struct tcphdr *tcp; struct tcphdr *tcp;
unsigned char *hdr; unsigned char *hdr;
@ -1547,16 +1550,29 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
if (err < 0) if (err < 0)
return err; return err;
iph = skb->encapsulation ? inner_ip_hdr(skb) : ip_hdr(skb); ip.hdr = skb_network_header(skb);
ipv6h = skb->encapsulation ? inner_ipv6_hdr(skb) : ipv6_hdr(skb); l4.hdr = skb_transport_header(skb);
l4.hdr = skb->encapsulation ? skb_inner_transport_header(skb) :
skb_transport_header(skb);
if (iph->version == 4) { /* initialize outer IP header fields */
iph->tot_len = 0; if (ip.v4->version == 4) {
iph->check = 0; ip.v4->tot_len = 0;
ip.v4->check = 0;
} else { } else {
ipv6h->payload_len = 0; ip.v6->payload_len = 0;
}
if (skb_shinfo(skb)->gso_type & (SKB_GSO_UDP_TUNNEL | SKB_GSO_GRE)) {
/* reset pointers to inner headers */
ip.hdr = skb_inner_network_header(skb);
l4.hdr = skb_inner_transport_header(skb);
/* initialize inner IP header fields */
if (ip.v4->version == 4) {
ip.v4->tot_len = 0;
ip.v4->check = 0;
} else {
ip.v6->payload_len = 0;
}
} }
/* determine offset of inner transport header */ /* determine offset of inner transport header */
@ -1598,15 +1614,11 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
struct iphdr *this_ip_hdr; struct iphdr *this_ip_hdr;
u32 network_hdr_len; u32 network_hdr_len;
u8 l4_hdr = 0; u8 l4_hdr = 0;
struct udphdr *oudph;
struct iphdr *oiph;
u32 l4_tunnel = 0; u32 l4_tunnel = 0;
if (skb->encapsulation) { if (skb->encapsulation) {
switch (ip_hdr(skb)->protocol) { switch (ip_hdr(skb)->protocol) {
case IPPROTO_UDP: case IPPROTO_UDP:
oudph = udp_hdr(skb);
oiph = ip_hdr(skb);
l4_tunnel = I40E_TXD_CTX_UDP_TUNNELING; l4_tunnel = I40E_TXD_CTX_UDP_TUNNELING;
*tx_flags |= I40E_TX_FLAGS_VXLAN_TUNNEL; *tx_flags |= I40E_TX_FLAGS_VXLAN_TUNNEL;
break; break;
@ -1621,15 +1633,12 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
if (*tx_flags & I40E_TX_FLAGS_IPV4) { if (*tx_flags & I40E_TX_FLAGS_IPV4) {
if (*tx_flags & I40E_TX_FLAGS_TSO) { if (*tx_flags & I40E_TX_FLAGS_TSO) {
*cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4; *cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4;
ip_hdr(skb)->check = 0;
} else { } else {
*cd_tunneling |= *cd_tunneling |=
I40E_TX_CTX_EXT_IP_IPV4_NO_CSUM; I40E_TX_CTX_EXT_IP_IPV4_NO_CSUM;
} }
} else if (*tx_flags & I40E_TX_FLAGS_IPV6) { } else if (*tx_flags & I40E_TX_FLAGS_IPV6) {
*cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV6; *cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV6;
if (*tx_flags & I40E_TX_FLAGS_TSO)
ip_hdr(skb)->check = 0;
} }
/* Now set the ctx descriptor fields */ /* Now set the ctx descriptor fields */
@ -1659,7 +1668,6 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
*/ */
if (*tx_flags & I40E_TX_FLAGS_TSO) { if (*tx_flags & I40E_TX_FLAGS_TSO) {
*td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM; *td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM;
this_ip_hdr->check = 0;
} else { } else {
*td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4; *td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4;
} }