110-net_fix_multiqueue_selection.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. From: Eric Dumazet <[email protected]>
  2. commit 416186fbf8c5b4e4465 ("net: Split core bits of netdev_pick_tx
  3. into __netdev_pick_tx") added a bug that disables caching of queue
  4. index in the socket.
  5. This is the source of packet reorders for TCP flows, and
  6. again this is happening more often when using FQ pacing.
  7. Old code was doing
  8. if (queue_index != old_index)
  9. sk_tx_queue_set(sk, queue_index);
  10. Alexander renamed the variables but forgot to change sk_tx_queue_set()
  11. 2nd parameter.
  12. if (queue_index != new_index)
  13. sk_tx_queue_set(sk, queue_index);
  14. This means we store -1 over and over in sk->sk_tx_queue_mapping
  15. Signed-off-by: Eric Dumazet <[email protected]>
  16. Cc: Alexander Duyck <[email protected]>
  17. Acked-by: Alexander Duyck <[email protected]>
  18. ---
  19. net/core/flow_dissector.c | 2 +-
  20. 1 file changed, 1 insertion(+), 1 deletion(-)
  21. --- a/net/core/flow_dissector.c
  22. +++ b/net/core/flow_dissector.c
  23. @@ -347,7 +347,7 @@ u16 __netdev_pick_tx(struct net_device *
  24. if (queue_index != new_index && sk &&
  25. rcu_access_pointer(sk->sk_dst_cache))
  26. - sk_tx_queue_set(sk, queue_index);
  27. + sk_tx_queue_set(sk, new_index);
  28. queue_index = new_index;
  29. }