Commit 43e66528 authored by John Crispin's avatar John Crispin Committed by David S. Miller

net-next: dsa: fix flow dissection

RPS and probably other kernel features are currently broken on some if not
all DSA devices. The root cause of this is that skb_hash will call the
flow_dissector. At this point the skb still contains the magic switch
header and the skb->protocol field is not set up to the correct 802.3
value yet. By the time the tag specific code is called, removing the header
and properly setting the protocol an invalid hash is already set. In the
case of the mt7530 this will result in all flows always having the same
hash.
Signed-off-by: default avatarMuciri Gatimu <muciri@openmesh.com>
Signed-off-by: default avatarShashidhar Lakkavalli <shashidhar.lakkavalli@openmesh.com>
Signed-off-by: default avatarJohn Crispin <john@phrozen.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2dd592b2
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <net/dsa.h>
#include <net/ip.h> #include <net/ip.h>
#include <net/ipv6.h> #include <net/ipv6.h>
#include <net/gre.h> #include <net/gre.h>
...@@ -440,6 +441,17 @@ bool __skb_flow_dissect(const struct sk_buff *skb, ...@@ -440,6 +441,17 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
skb->vlan_proto : skb->protocol; skb->vlan_proto : skb->protocol;
nhoff = skb_network_offset(skb); nhoff = skb_network_offset(skb);
hlen = skb_headlen(skb); hlen = skb_headlen(skb);
if (unlikely(netdev_uses_dsa(skb->dev))) {
const struct dsa_device_ops *ops;
int offset;
ops = skb->dev->dsa_ptr->tag_ops;
if (ops->flow_dissect &&
!ops->flow_dissect(skb, &proto, &offset)) {
hlen -= offset;
nhoff += offset;
}
}
} }
/* It is ensured by skb_flow_dissector_init() that control key will /* It is ensured by skb_flow_dissector_init() that control key will
......
Markdown is supported
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