* [PATCH net-next] bnx2x: increase inner ip id during encapsulated tso
@ 2013-03-22 1:38 Dmitry Kravkov
2013-03-22 3:38 ` Eric Dumazet
2013-03-22 4:34 ` Eric Dumazet
0 siblings, 2 replies; 4+ messages in thread
From: Dmitry Kravkov @ 2013-03-22 1:38 UTC (permalink / raw)
To: davem, netdev
Cc: Dmitry Kravkov, Eilon Greenstein, Ariel Elior,
Maciej Zenczykowski, Jesse Gross
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 <dmitry@broadcom.com>
CC: Eilon Greenstein <eilong@broadcom.com>
CC: Ariel Elior <ariele@broadcom.com>
CC: Maciej Zenczykowski <maze@google.com>
CC: Jesse Gross <jesse@nicira.com>
---
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(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 3f5cd7c..352e58e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -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(
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 10b0748..2c6a2a6 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -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);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index 5bdc1d6..32a9609 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -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;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
index 35479da..43c00bc 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
@@ -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. */
--
1.7.7.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] bnx2x: increase inner ip id during encapsulated tso
2013-03-22 1:38 [PATCH net-next] bnx2x: increase inner ip id during encapsulated tso Dmitry Kravkov
@ 2013-03-22 3:38 ` Eric Dumazet
2013-03-22 4:34 ` Eric Dumazet
1 sibling, 0 replies; 4+ messages in thread
From: Eric Dumazet @ 2013-03-22 3:38 UTC (permalink / raw)
To: Dmitry Kravkov
Cc: davem, netdev, Eilon Greenstein, Ariel Elior, Maciej Zenczykowski,
Jesse Gross
On Fri, 2013-03-22 at 03:38 +0200, Dmitry Kravkov wrote:
> 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 <dmitry@broadcom.com>
> CC: Eilon Greenstein <eilong@broadcom.com>
> CC: Ariel Elior <ariele@broadcom.com>
> CC: Maciej Zenczykowski <maze@google.com>
> CC: Jesse Gross <jesse@nicira.com>
> ---
Thanks for CC me :(
I'll test this in the following hour, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] bnx2x: increase inner ip id during encapsulated tso
2013-03-22 1:38 [PATCH net-next] bnx2x: increase inner ip id during encapsulated tso Dmitry Kravkov
2013-03-22 3:38 ` Eric Dumazet
@ 2013-03-22 4:34 ` Eric Dumazet
2013-03-22 14:23 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Eric Dumazet @ 2013-03-22 4:34 UTC (permalink / raw)
To: Dmitry Kravkov
Cc: davem, netdev, Eilon Greenstein, Ariel Elior, Maciej Zenczykowski,
Jesse Gross
On Fri, 2013-03-22 at 03:38 +0200, Dmitry Kravkov wrote:
> 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 <dmitry@broadcom.com>
> CC: Eilon Greenstein <eilong@broadcom.com>
> CC: Ariel Elior <ariele@broadcom.com>
> CC: Maciej Zenczykowski <maze@google.com>
> CC: Jesse Gross <jesse@nicira.com>
> ---
> 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(-)
Fine, GRO is back
Reported-by: Eric Dumazet <edumazet@google.com>
Tested-by: Eric Dumazet <edumazet@google.com>
Thanks !
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] bnx2x: increase inner ip id during encapsulated tso
2013-03-22 4:34 ` Eric Dumazet
@ 2013-03-22 14:23 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2013-03-22 14:23 UTC (permalink / raw)
To: eric.dumazet; +Cc: dmitry, netdev, eilong, ariele, maze, jesse
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 21 Mar 2013 21:34:34 -0700
> On Fri, 2013-03-22 at 03:38 +0200, Dmitry Kravkov wrote:
>> 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 <dmitry@broadcom.com>
>> CC: Eilon Greenstein <eilong@broadcom.com>
>> CC: Ariel Elior <ariele@broadcom.com>
>> CC: Maciej Zenczykowski <maze@google.com>
>> CC: Jesse Gross <jesse@nicira.com>
>> ---
>> 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(-)
>
> Fine, GRO is back
>
> Reported-by: Eric Dumazet <edumazet@google.com>
> Tested-by: Eric Dumazet <edumazet@google.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-03-22 14:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-22 1:38 [PATCH net-next] bnx2x: increase inner ip id during encapsulated tso Dmitry Kravkov
2013-03-22 3:38 ` Eric Dumazet
2013-03-22 4:34 ` Eric Dumazet
2013-03-22 14:23 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).