bnx2x: increase inner ip id during encapsulated tso
PATCH 1/1 bnx2x: increase inner ip id during encapsulated tso
57712/578xx devices during handling of encapsulated TSO can properly increase ip id for only one ip header. The patch selects inner header to be increased.
---
tested over 1bc277f79
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 22 ++++++++++------------ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 ++ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 3 ++- 4 files changed, 15 insertions(+), 13 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +10 -12
@@ -3464,30 +3464,28 @@ static void bnx2x_update_pbds_gso_enc(struct sk_buff *skb, u16 *global_data, u32 xmit_type) { -u16 inner_hlen_w =0 ; +u16 hlen_w =0 ;u8 outerip_off, outerip_len =0 ; - -/* IP len */ - inner_hlen_w = (skb_inner_transport_header (skb) - -skb_inner_network_header (skb)) >>1 ; +/* from outer IP to transport */ + hlen_w = (skb_inner_transport_header (skb) - +skb_network_header (skb)) >>1 ;/* transport len */ if (xmit_type &XMIT_CSUM_TCP ) - inner_hlen_w +=inner_tcp_hdrlen (skb) >>1 ; + hlen_w +=inner_tcp_hdrlen (skb) >>1 ;else - inner_hlen_w +=sizeof (struct udphdr ) >>1 ; + hlen_w +=sizeof (struct udphdr ) >>1 ; - pbd2->fw_ip_hdr_to_payload_w = inner_hlen_w; + pbd2->fw_ip_hdr_to_payload_w = hlen_w;if (xmit_type &XMIT_CSUM_ENC_V4 ) { -struct iphdr *iph =inner_ip_hdr (skb); - +struct iphdr *iph =ip_hdr (skb); pbd2->fw_ip_csum_wo_len_flags_frag =bswab16 (csum_fold ((~iph->check) - iph->tot_len - iph->frag_off)); }else { pbd2->fw_ip_hdr_to_payload_w = - inner_hlen_w - ((sizeof (struct ipv6hdr )) >>1 ); + hlen_w - ((sizeof (struct ipv6hdr )) >>1 ); } pbd2->tcp_send_seq =bswab32 (inner_tcp_hdr (skb)->seq);
@@ -3495,7 +3493,7 @@ static void bnx2x_update_pbds_gso_enc(struct sk_buff *skb, pbd2->tcp_flags =pbd_tcp_flags (inner_tcp_hdr (skb)); if (xmit_type & XMIT_GSO_V4) { - pbd2->hw_ip_id = bswab16(ip_hdr(skb)->id); + pbd2->hw_ip_id = bswab16(inner_ip_hdr(skb)->id); pbd_e2->data.tunnel_data.pseudo_csum = bswab16(~csum_tcpudp_magic(
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1 -0
@@ -2962,6 +2962,7 @@ static unsigned long bnx2x_get_common_flags(struct bnx2x *bp,__set_bit (BNX2X_Q_FLG_ZERO_STATS , &flags);__set_bit (BNX2X_Q_FLG_PCSUM_ON_PKT , &flags); +__set_bit (BNX2X_Q_FLG_TUN_INC_INNER_IP_ID , &flags);#ifdef BNX2X_STOP_ON_ERROR __set_bit (BNX2X_Q_FLG_TX_SEC , &flags);
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +2 -0
@@ -4432,6 +4432,8 @@ static void bnx2x_q_fill_init_tx_data(struct bnx2x_queue_sp_obj *o, tx_data->force_default_pri_flg =test_bit (BNX2X_Q_FLG_FORCE_DEFAULT_PRI , flags); + tx_data->tunnel_lso_inc_ip_id = +test_bit (BNX2X_Q_FLG_TUN_INC_INNER_IP_ID , flags); tx_data->tunnel_non_lso_pcsum_location =test_bit (BNX2X_Q_FLG_PCSUM_ON_PKT , flags) ?PCSUM_ON_PKT :PCSUM_ON_BD ;
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h +2 -1
@@ -828,7 +828,8 @@ enum {BNX2X_Q_FLG_ANTI_SPOOF ,BNX2X_Q_FLG_SILENT_VLAN_REM ,BNX2X_Q_FLG_FORCE_DEFAULT_PRI , - BNX2X_Q_FLG_PCSUM_ON_PKT +BNX2X_Q_FLG_PCSUM_ON_PKT , + BNX2X_Q_FLG_TUN_INC_INNER_IP_ID };/* Queue type options: queue type may be a compination of below. */
Signature · 1 line
1.7.7.2
Quoted 10 lines · Dmitry Kravkov
57712/578xx devices during handling of encapsulated TSO can properly increase ip id for only one ip header. The patch selects inner header to be increased.
Signed-off-by Dmitry Kravkov <[email protected]>CC Eilon Greenstein <[email protected]>CC Ariel Elior <[email protected]>CC Maciej Zenczykowski <[email protected]>CC Jesse Gross <[email protected]>---
Thanks for CC me :(
I'll test this in the following hour, thanks!
Quoted 9 lines · Dmitry Kravkov
57712/578xx devices during handling of encapsulated TSO can properly increase ip id for only one ip header. The patch selects inner header to be increased.
Signed-off-by Dmitry Kravkov <[email protected]>CC Eilon Greenstein <[email protected]>CC Ariel Elior <[email protected]>CC Maciej Zenczykowski <[email protected]>CC Jesse Gross <[email protected]>
Quoted 8 lines
---
tested over1bc277f79--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 22 ++++++++++------------ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 ++ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 3 ++- 4 files changed, 15 insertions(+), 13 deletions(-)
Fine, GRO is back
Thanks !
From: Eric Dumazet <[email protected]>
Date: Thu, 21 Mar 2013 21:34:34 -0700
Quoted 19 lines · Dmitry Kravkov
Quoted 9 lines
57712/578xx devices during handling of encapsulated TSO can properly increase ip id for only one ip header. The patch selects inner header to be increased.
Signed-off-by Dmitry Kravkov <[email protected]>CC Eilon Greenstein <[email protected]>CC Ariel Elior <[email protected]>CC Maciej Zenczykowski <[email protected]>CC Jesse Gross <[email protected]>Quoted 8 lines
---
tested over1bc277f79--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 22 ++++++++++------------ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 ++ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 3 ++- 4 files changed, 15 insertions(+), 13 deletions(-)
Quoted 4 lines
Fine, GRO is back
Reported-by Eric Dumazet <[email protected]>Tested-by Eric Dumazet <[email protected]>
Applied.