Commit 702821f4 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: revert 8728c544 ("net: dev_pick_tx() fix")

commit 8728c544 ("net: dev_pick_tx() fix") and commit
b6fe83e9 ("bonding: refine IFF_XMIT_DST_RELEASE capability")
are quite incompatible : Queue selection is disabled because skb
dst was dropped before entering bonding device.

This causes major performance regression, mainly because TCP packets
for a given flow can be sent to multiple queues.

This is particularly visible when using the new FQ packet scheduler
with MQ + FQ setup on the slaves.

We can safely revert the first commit now that 416186fb

("net: Split core bits of netdev_pick_tx into __netdev_pick_tx")
properly caps the queue_index.
Reported-by: default avatarXi Wang <>
Diagnosed-by: default avatarXi Wang <>
Signed-off-by: default avatarEric Dumazet <>
Cc: Tom Herbert <>
Cc: Alexander Duyck <>
Cc: Denys Fedorysychenko <>
Signed-off-by: default avatarDavid S. Miller <>
parent 25ad6117
......@@ -346,14 +346,9 @@ u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb)
if (new_index < 0)
new_index = skb_tx_hash(dev, skb);
if (queue_index != new_index && sk) {
struct dst_entry *dst =
rcu_dereference_check(sk->sk_dst_cache, 1);
if (dst && skb_dst(skb) == dst)
sk_tx_queue_set(sk, queue_index);
if (queue_index != new_index && sk &&
sk_tx_queue_set(sk, queue_index);
queue_index = new_index;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment