net: dsa: change dsa_ptr for a dsa_port

With DSA, a master net device (CPU facing interface) has a dsa_ptr
pointer to which hangs a dsa_switch_tree. This is not correct because a
master interface is wired to a dedicated switch port, and because we can
theoretically have several master interfaces pointing to several CPU
ports of the same switch fabric.

Change the master interface's dsa_ptr for the CPU dsa_port pointer.
This is a step towards supporting multiple CPU ports.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index f535779d9dc1dfe36934c2abba4e43d053ac5d6f..e1d6ef130611dac7c361359177c58bf17701a950 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -55,7 +55,7 @@
 struct netpoll_info;
 struct device;
 struct phy_device;
-struct dsa_switch_tree;
+struct dsa_port;
 
 /* 802.11 specific */
 struct wireless_dev;
@@ -1752,7 +1752,7 @@ struct net_device {
        struct vlan_info __rcu  *vlan_info;
 #endif
 #if IS_ENABLED(CONFIG_NET_DSA)
-       struct dsa_switch_tree  *dsa_ptr;
+       struct dsa_port         *dsa_ptr;
 #endif
 #if IS_ENABLED(CONFIG_TIPC)
        struct tipc_bearer __rcu *tipc_ptr;

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 81c852e3282176259262213b348ce351ff3631ae..51ca2a524a27b5bb420437bfc0b10e38c7e1887a 100644 (file)
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -160,12 +160,12 @@ EXPORT_SYMBOL_GPL(dsa_dev_to_net_device);
 static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
                          struct packet_type *pt, struct net_device *unused)
 {
-       struct dsa_switch_tree *dst = dev->dsa_ptr;
+       struct dsa_port *cpu_dp = dev->dsa_ptr;
        struct sk_buff *nskb = NULL;
        struct pcpu_sw_netstats *s;
        struct dsa_slave_priv *p;
 
-       if (unlikely(dst == NULL)) {
+       if (unlikely(!cpu_dp)) {
                kfree_skb(skb);
                return 0;
        }
@@ -174,7 +174,7 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
        if (!skb)
                return 0;
 
-       nskb = dst->rcv(skb, dev, pt);
+       nskb = cpu_dp->rcv(skb, dev, pt);
        if (!nskb) {
                kfree_skb(skb);
                return 0;

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index b71e3bb478e43c554065a317f032d35b2f0f9243..62302558f38c083038c8ba626f2a09cd0751d840 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -438,7 +438,7 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst)
         * sent to the tag format's receive function.
         */
        wmb();
-       dst->cpu_dp->netdev->dsa_ptr = dst;
+       dst->cpu_dp->netdev->dsa_ptr = dst->cpu_dp;
 
        err = dsa_master_ethtool_setup(dst->cpu_dp->netdev);
        if (err)

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 9397291bb3aae86dd37f517fe791b6e35b913a64..2850077cc9ccb54134e770f983456993304657ec 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -116,7 +116,8 @@ void dsa_master_ethtool_restore(struct net_device *dev);
 static inline struct net_device *dsa_master_get_slave(struct net_device *dev,
                                                      int device, int port)
 {
-       struct dsa_switch_tree *dst = dev->dsa_ptr;
+       struct dsa_port *cpu_dp = dev->dsa_ptr;
+       struct dsa_switch_tree *dst = cpu_dp->dst;
        struct dsa_switch *ds;
 
        if (device < 0 || device >= DSA_MAX_SWITCHES)

diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c
index 96c7e3f8b8bb86ea12cabe4115993bdbfb7b26c9..71917505a5ccf3c760da428bda06384d9be450cb 100644 (file)
--- a/net/dsa/legacy.c
+++ b/net/dsa/legacy.c
@@ -607,7 +607,7 @@ static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev,
         * sent to the tag format's receive function.
         */
        wmb();
-       dev->dsa_ptr = dst;
+       dev->dsa_ptr = dst->cpu_dp;
 
        return dsa_master_ethtool_setup(dst->cpu_dp->netdev);
 }

diff --git a/net/dsa/master.c b/net/dsa/master.c
index ef15d35f1574bfd9bd72da4b5fb7191949752adf..5f3f57e372e0258a54bac4bf422f20d4e3e2c9cf 100644 (file)
--- a/net/dsa/master.c
+++ b/net/dsa/master.c
@@ -16,8 +16,7 @@ static void dsa_master_get_ethtool_stats(struct net_device *dev,
                                         struct ethtool_stats *stats,
                                         uint64_t *data)
 {
-       struct dsa_switch_tree *dst = dev->dsa_ptr;
-       struct dsa_port *cpu_dp = dst->cpu_dp;
+       struct dsa_port *cpu_dp = dev->dsa_ptr;
        const struct ethtool_ops *ops = cpu_dp->orig_ethtool_ops;
        struct dsa_switch *ds = cpu_dp->ds;
        int port = cpu_dp->index;
@@ -34,8 +33,7 @@ static void dsa_master_get_ethtool_stats(struct net_device *dev,
 
 static int dsa_master_get_sset_count(struct net_device *dev, int sset)
 {
-       struct dsa_switch_tree *dst = dev->dsa_ptr;
-       struct dsa_port *cpu_dp = dst->cpu_dp;
+       struct dsa_port *cpu_dp = dev->dsa_ptr;
        const struct ethtool_ops *ops = cpu_dp->orig_ethtool_ops;
        struct dsa_switch *ds = cpu_dp->ds;
        int count = 0;
@@ -52,8 +50,7 @@ static int dsa_master_get_sset_count(struct net_device *dev, int sset)
 static void dsa_master_get_strings(struct net_device *dev, uint32_t stringset,
                                   uint8_t *data)
 {
-       struct dsa_switch_tree *dst = dev->dsa_ptr;
-       struct dsa_port *cpu_dp = dst->cpu_dp;
+       struct dsa_port *cpu_dp = dev->dsa_ptr;
        const struct ethtool_ops *ops = cpu_dp->orig_ethtool_ops;
        struct dsa_switch *ds = cpu_dp->ds;
        int port = cpu_dp->index;
@@ -90,8 +87,7 @@ static void dsa_master_get_strings(struct net_device *dev, uint32_t stringset,
 
 int dsa_master_ethtool_setup(struct net_device *dev)
 {
-       struct dsa_switch_tree *dst = dev->dsa_ptr;
-       struct dsa_port *cpu_dp = dst->cpu_dp;
+       struct dsa_port *cpu_dp = dev->dsa_ptr;
        struct dsa_switch *ds = cpu_dp->ds;
        struct ethtool_ops *ops;
 
@@ -114,8 +110,7 @@ int dsa_master_ethtool_setup(struct net_device *dev)
 
 void dsa_master_ethtool_restore(struct net_device *dev)
 {
-       struct dsa_switch_tree *dst = dev->dsa_ptr;
-       struct dsa_port *cpu_dp = dst->cpu_dp;
+       struct dsa_port *cpu_dp = dev->dsa_ptr;
 
        dev->ethtool_ops = cpu_dp->orig_ethtool_ops;
        cpu_dp->orig_ethtool_ops = NULL;