net: flow_dissector: avoid indirect call to DSA .flow_dissect for generic case

With the recent mitigations against speculative execution exploits,
indirect function calls are more expensive and it would be good to avoid
them where possible.

In the case of DSA, most switch taggers will shift the EtherType and
next headers by a fixed amount equal to that tag's length in bytes.
So we can use a generic procedure to determine that, without calling
into custom tagger code. However we still leave the flow_dissect method
inside struct dsa_device_ops as an override for the generic function.

Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 13cc4c0..e21950a 100644 (file)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -932,8 +932,14 @@ bool __skb_flow_dissect(const struct net *net,
                        int offset = 0;
 
                        ops = skb->dev->dsa_ptr->tag_ops;
-                       if (ops->flow_dissect) {
-                               ops->flow_dissect(skb, &proto, &offset);
+                       /* Tail taggers don't break flow dissection */
+                       if (!ops->tail_tag) {
+                               if (ops->flow_dissect)
+                                       ops->flow_dissect(skb, &proto, &offset);
+                               else
+                                       dsa_tag_generic_flow_dissect(skb,
+                                                                    &proto,
+                                                                    &offset);
                                hlen -= offset;
                                nhoff += offset;
                        }