net: dsa: sja1105: Don't store frame type in skb->cb

Due to a confusion I thought that eth_type_trans() was called by the
network stack whereas it can actually be called by network drivers to
figure out the skb protocol and next packet_type handlers.

In light of the above, it is not safe to store the frame type from the
DSA tagger's .filter callback (first entry point on RX path), since GRO
is yet to be invoked on the received traffic.  Hence it is very likely
that the skb->cb will actually get overwritten between eth_type_trans()
and the actual DSA packet_type handler.

Of course, what this patch fixes is the actual overwriting of the
SJA1105_SKB_CB(skb)->type field from the GRO layer, which made all
frames be seen as SJA1105_FRAME_TYPE_NORMAL (0).

Fixes: 227d07a07ef1 ("net: dsa: sja1105: Add support for traffic through standalone ports")
Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/dsa/sja1105.h b/include/linux/dsa/sja1105.h
index 603a02e5a8cbcd2da7e91bf991158aeaed24a40f..e46e18c47d41c221bf9ca75a965e8f3c6a72e852 100644 (file)
--- a/include/linux/dsa/sja1105.h
+++ b/include/linux/dsa/sja1105.h
@@ -20,18 +20,6 @@
 #define SJA1105_LINKLOCAL_FILTER_B             0x011B19000000ull
 #define SJA1105_LINKLOCAL_FILTER_B_MASK                0xFFFFFF000000ull
 
-enum sja1105_frame_type {
-       SJA1105_FRAME_TYPE_NORMAL = 0,
-       SJA1105_FRAME_TYPE_LINK_LOCAL,
-};
-
-struct sja1105_skb_cb {
-       enum sja1105_frame_type type;
-};
-
-#define SJA1105_SKB_CB(skb) \
-       ((struct sja1105_skb_cb *)DSA_SKB_CB_PRIV(skb))
-
 struct sja1105_port {
        struct dsa_port *dp;
        int mgmt_slot;

diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c
index 969402c7dbf1af96f441d8ae0fa5675ab86b2a63..d43737e6c3fb714237a0af380cc68c7a3154aa3d 100644 (file)
--- a/net/dsa/tag_sja1105.c
+++ b/net/dsa/tag_sja1105.c
@@ -28,14 +28,10 @@ static inline bool sja1105_is_link_local(const struct sk_buff *skb)
  */
 static bool sja1105_filter(const struct sk_buff *skb, struct net_device *dev)
 {
-       if (sja1105_is_link_local(skb)) {
-               SJA1105_SKB_CB(skb)->type = SJA1105_FRAME_TYPE_LINK_LOCAL;
+       if (sja1105_is_link_local(skb))
                return true;
-       }
-       if (!dsa_port_is_vlan_filtering(dev->dsa_ptr)) {
-               SJA1105_SKB_CB(skb)->type = SJA1105_FRAME_TYPE_NORMAL;
+       if (!dsa_port_is_vlan_filtering(dev->dsa_ptr))
                return true;
-       }
        return false;
 }
 
@@ -84,7 +80,7 @@ static struct sk_buff *sja1105_rcv(struct sk_buff *skb,
 
        skb->offload_fwd_mark = 1;
 
-       if (SJA1105_SKB_CB(skb)->type == SJA1105_FRAME_TYPE_LINK_LOCAL) {
+       if (sja1105_is_link_local(skb)) {
                /* Management traffic path. Switch embeds the switch ID and
                 * port ID into bytes of the destination MAC, courtesy of
                 * the incl_srcpt options.