Patchwork bnx2x: record rx queue for LRO packets

login
register
mail settings
Submitter Eric Dumazet
Date Oct. 12, 2013, 9:08 p.m.
Message ID <1381612114.3392.14.camel@edumazet-glaptop.roam.corp.google.com>
Download mbox | patch
Permalink /patch/283020/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - Oct. 12, 2013, 9:08 p.m.
From: Eric Dumazet <edumazet@google.com>

RPS support is kind of broken on bnx2x, because only non LRO packets
get proper rx queue information. This triggers reorders, as it seems
bnx2x like to generate a non LRO packet for segment including TCP PUSH
flag : (this might be pure coincidence, but all the reorders I've
seen involve segments with a PUSH)

11:13:34.335847 IP A > B: . 415808:447136(31328) ack 1 win 457 <nop,nop,timestamp 3789336 3985797>
11:13:34.335992 IP A > B: . 447136:448560(1424) ack 1 win 457 <nop,nop,timestamp 3789336 3985797>
11:13:34.336391 IP A > B: . 448560:479888(31328) ack 1 win 457 <nop,nop,timestamp 3789337 3985797>
11:13:34.336425 IP A > B: P 511216:512640(1424) ack 1 win 457 <nop,nop,timestamp 3789337 3985798>
11:13:34.336423 IP A > B: . 479888:511216(31328) ack 1 win 457 <nop,nop,timestamp 3789337 3985798>
11:13:34.336924 IP A > B: . 512640:543968(31328) ack 1 win 457 <nop,nop,timestamp 3789337 3985798>
11:13:34.336963 IP A > B: . 543968:575296(31328) ack 1 win 457 <nop,nop,timestamp 3789337 3985798>

We must call skb_record_rx_queue() to properly give to RPS (and more
generally for TX queue selection on forward path) the receive queue
information.

Similar fix is needed for skb_mark_napi_id(), but will be handled
in a separate patch to ease stable backports.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Eilon Greenstein <eilong@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c |    1 +
 1 file changed, 1 insertion(+)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dmitry Kravkov - Oct. 13, 2013, 6:23 a.m.
> -----Original Message-----

> From: netdev-owner@vger.kernel.org [mailto:netdev-

> owner@vger.kernel.org] On Behalf Of Eric Dumazet

> Sent: Sunday, October 13, 2013 12:09 AM

> To: David Miller

> Cc: netdev; Eilon Greenstein; Willem de Bruijn

> Subject: [PATCH] bnx2x: record rx queue for LRO packets

> 

> From: Eric Dumazet <edumazet@google.com>

> 

> RPS support is kind of broken on bnx2x, because only non LRO packets get

> proper rx queue information. This triggers reorders, as it seems bnx2x like to

> generate a non LRO packet for segment including TCP PUSH flag : (this might

> be pure coincidence, but all the reorders I've seen involve segments with a

> PUSH)

> 

> 11:13:34.335847 IP A > B: . 415808:447136(31328) ack 1 win 457

> <nop,nop,timestamp 3789336 3985797>

> 11:13:34.335992 IP A > B: . 447136:448560(1424) ack 1 win 457

> <nop,nop,timestamp 3789336 3985797>

> 11:13:34.336391 IP A > B: . 448560:479888(31328) ack 1 win 457

> <nop,nop,timestamp 3789337 3985797>

> 11:13:34.336425 IP A > B: P 511216:512640(1424) ack 1 win 457

> <nop,nop,timestamp 3789337 3985798>

> 11:13:34.336423 IP A > B: . 479888:511216(31328) ack 1 win 457

> <nop,nop,timestamp 3789337 3985798>

> 11:13:34.336924 IP A > B: . 512640:543968(31328) ack 1 win 457

> <nop,nop,timestamp 3789337 3985798>

> 11:13:34.336963 IP A > B: . 543968:575296(31328) ack 1 win 457

> <nop,nop,timestamp 3789337 3985798>

> 

> We must call skb_record_rx_queue() to properly give to RPS (and more

> generally for TX queue selection on forward path) the receive queue

> information.

> 

> Similar fix is needed for skb_mark_napi_id(), but will be handled in a

> separate patch to ease stable backports.

> 

> Signed-off-by: Eric Dumazet <edumazet@google.com>

> Cc: Willem de Bruijn <willemb@google.com>

> Cc: Eilon Greenstein <eilong@broadcom.com>

> ---

>  drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c |    1 +

>  1 file changed, 1 insertion(+)



Thanks!

Acked-by: Dmitry Kravkov <dmitry@broadcom.com>
David Miller - Oct. 17, 2013, 7:43 p.m.
From: "Dmitry Kravkov" <dmitry@broadcom.com>
Date: Sun, 13 Oct 2013 06:23:31 +0000

>> -----Original Message-----
>> From: netdev-owner@vger.kernel.org [mailto:netdev-
>> owner@vger.kernel.org] On Behalf Of Eric Dumazet
>> Sent: Sunday, October 13, 2013 12:09 AM
>> To: David Miller
>> Cc: netdev; Eilon Greenstein; Willem de Bruijn
>> Subject: [PATCH] bnx2x: record rx queue for LRO packets
>> 
>> From: Eric Dumazet <edumazet@google.com>
>> 
>> RPS support is kind of broken on bnx2x, because only non LRO packets get
>> proper rx queue information. This triggers reorders, as it seems bnx2x like to
>> generate a non LRO packet for segment including TCP PUSH flag : (this might
>> be pure coincidence, but all the reorders I've seen involve segments with a
>> PUSH)
>> 
>> 11:13:34.335847 IP A > B: . 415808:447136(31328) ack 1 win 457
>> <nop,nop,timestamp 3789336 3985797>
>> 11:13:34.335992 IP A > B: . 447136:448560(1424) ack 1 win 457
>> <nop,nop,timestamp 3789336 3985797>
>> 11:13:34.336391 IP A > B: . 448560:479888(31328) ack 1 win 457
>> <nop,nop,timestamp 3789337 3985797>
>> 11:13:34.336425 IP A > B: P 511216:512640(1424) ack 1 win 457
>> <nop,nop,timestamp 3789337 3985798>
>> 11:13:34.336423 IP A > B: . 479888:511216(31328) ack 1 win 457
>> <nop,nop,timestamp 3789337 3985798>
>> 11:13:34.336924 IP A > B: . 512640:543968(31328) ack 1 win 457
>> <nop,nop,timestamp 3789337 3985798>
>> 11:13:34.336963 IP A > B: . 543968:575296(31328) ack 1 win 457
>> <nop,nop,timestamp 3789337 3985798>
>> 
>> We must call skb_record_rx_queue() to properly give to RPS (and more
>> generally for TX queue selection on forward path) the receive queue
>> information.
>> 
>> Similar fix is needed for skb_mark_napi_id(), but will be handled in a
>> separate patch to ease stable backports.
>> 
>> Signed-off-by: Eric Dumazet <edumazet@google.com>
 ...
> Acked-by: Dmitry Kravkov <dmitry@broadcom.com>
> 

Applied, thanks everyone.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 0c64122..6e46cff 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -681,6 +681,7 @@  static void bnx2x_gro_receive(struct bnx2x *bp, struct bnx2x_fastpath *fp,
 		}
 	}
 #endif
+	skb_record_rx_queue(skb, fp->rx_queue);
 	napi_gro_receive(&fp->napi, skb);
 }