net: dsa: Add support for deferred xmit

Some hardware needs to take work to get convinced to receive frames on
the CPU port (such as the sja1105 which takes temporary L2 forwarding
rules over SPI that last for a single frame). Such work needs a
sleepable context, and because the regular .ndo_start_xmit is atomic,
this cannot be done in the tagger. So introduce a generic DSA mechanism
that sets up a transmit skb queue and a workqueue for deferred
transmission.

The new driver callback (.port_deferred_xmit) is in dsa_switch and not
in the tagger because the operations that require sleeping typically
also involve interacting with the hardware, and not simply skb
manipulations. Therefore having it there simplifies the structure a bit
and makes it unnecessary to export functions from the driver to the
tagger.

The driver is responsible of calling dsa_enqueue_skb which transfers it
to the master netdevice. This is so that it has a chance of performing
some more work afterwards, such as cleanup or TX timestamping.

To tell DSA that skb xmit deferral is required, I have thought about
changing the return type of the tagger .xmit from struct sk_buff * into
a enum dsa_tx_t that could potentially encode a DSA_XMIT_DEFER value.

But the trailer tagger is reallocating every skb on xmit and therefore
making a valid use of the pointer return value. So instead of reworking
the API in complicated ways, right now a boolean property in the newly
introduced DSA_SKB_CB is set.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index d628587e0bdec5dfea835293dae5749d655c4282..0260b73938e2d3d557890f3ec7b5cbf91b6fb235 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -85,6 +85,7 @@ struct dsa_device_ops {
 
 struct dsa_skb_cb {
        struct sk_buff *clone;
+       bool deferred_xmit;
 };
 
 struct __dsa_skb_cb {
@@ -205,6 +206,10 @@ struct dsa_port {
        struct net_device       *bridge_dev;
        struct devlink_port     devlink_port;
        struct phylink          *pl;
+
+       struct work_struct      xmit_work;
+       struct sk_buff_head     xmit_queue;
+
        /*
         * Original copy of the master netdev ethtool_ops
         */
@@ -539,6 +544,12 @@ struct dsa_switch_ops {
                                 struct sk_buff *clone, unsigned int type);
        bool    (*port_rxtstamp)(struct dsa_switch *ds, int port,
                                 struct sk_buff *skb, unsigned int type);
+
+       /*
+        * Deferred frame Tx
+        */
+       netdev_tx_t (*port_deferred_xmit)(struct dsa_switch *ds, int port,
+                                         struct sk_buff *skb);
 };
 
 struct dsa_switch_driver {
@@ -634,6 +645,7 @@ static inline int call_dsa_notifiers(unsigned long val, struct net_device *dev,
 #define BRCM_TAG_GET_QUEUE(v)          ((v) & 0xff)
 
 
+netdev_tx_t dsa_enqueue_skb(struct sk_buff *skb, struct net_device *dev);
 int dsa_port_get_phy_strings(struct dsa_port *dp, uint8_t *data);
 int dsa_port_get_ethtool_phy_stats(struct dsa_port *dp, uint64_t *data);
 int dsa_port_get_phy_sset_count(struct dsa_port *dp);

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index b434f5ff55abb9706048631a9245656d5da68cbe..8f122232464608fc01dd6a5d95962ec494579620 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -174,6 +174,8 @@ int dsa_slave_resume(struct net_device *slave_dev);
 int dsa_slave_register_notifier(void);
 void dsa_slave_unregister_notifier(void);
 
+void *dsa_defer_xmit(struct sk_buff *skb, struct net_device *dev);
+
 static inline struct dsa_port *dsa_slave_to_port(const struct net_device *dev)
 {
        struct dsa_slave_priv *p = netdev_priv(dev);

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 6ce2fdb64db0f8b7fe169fee796c1b2fdd95311a..316bce9e0fbf44b57b5f1e90b6a40a1347e82b17 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -120,6 +120,9 @@ static int dsa_slave_close(struct net_device *dev)
        struct net_device *master = dsa_slave_to_master(dev);
        struct dsa_port *dp = dsa_slave_to_port(dev);
 
+       cancel_work_sync(&dp->xmit_work);
+       skb_queue_purge(&dp->xmit_queue);
+
        phylink_stop(dp->pl);
 
        dsa_port_disable(dp);
@@ -430,6 +433,24 @@ static void dsa_skb_tx_timestamp(struct dsa_slave_priv *p,
        kfree_skb(clone);
 }
 
+netdev_tx_t dsa_enqueue_skb(struct sk_buff *skb, struct net_device *dev)
+{
+       /* SKB for netpoll still need to be mangled with the protocol-specific
+        * tag to be successfully transmitted
+        */
+       if (unlikely(netpoll_tx_running(dev)))
+               return dsa_slave_netpoll_send_skb(dev, skb);
+
+       /* Queue the SKB for transmission on the parent interface, but
+        * do not modify its EtherType
+        */
+       skb->dev = dsa_slave_to_master(dev);
+       dev_queue_xmit(skb);
+
+       return NETDEV_TX_OK;
+}
+EXPORT_SYMBOL_GPL(dsa_enqueue_skb);
+
 static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct dsa_slave_priv *p = netdev_priv(dev);
@@ -452,23 +473,37 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev)
         */
        nskb = p->xmit(skb, dev);
        if (!nskb) {
-               kfree_skb(skb);
+               if (!DSA_SKB_CB(skb)->deferred_xmit)
+                       kfree_skb(skb);
                return NETDEV_TX_OK;
        }
 
-       /* SKB for netpoll still need to be mangled with the protocol-specific
-        * tag to be successfully transmitted
-        */
-       if (unlikely(netpoll_tx_running(dev)))
-               return dsa_slave_netpoll_send_skb(dev, nskb);
+       return dsa_enqueue_skb(nskb, dev);
+}
 
-       /* Queue the SKB for transmission on the parent interface, but
-        * do not modify its EtherType
-        */
-       nskb->dev = dsa_slave_to_master(dev);
-       dev_queue_xmit(nskb);
+void *dsa_defer_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+       struct dsa_port *dp = dsa_slave_to_port(dev);
 
-       return NETDEV_TX_OK;
+       DSA_SKB_CB(skb)->deferred_xmit = true;
+
+       skb_queue_tail(&dp->xmit_queue, skb);
+       schedule_work(&dp->xmit_work);
+       return NULL;
+}
+EXPORT_SYMBOL_GPL(dsa_defer_xmit);
+
+static void dsa_port_xmit_work(struct work_struct *work)
+{
+       struct dsa_port *dp = container_of(work, struct dsa_port, xmit_work);
+       struct dsa_switch *ds = dp->ds;
+       struct sk_buff *skb;
+
+       if (unlikely(!ds->ops->port_deferred_xmit))
+               return;
+
+       while ((skb = skb_dequeue(&dp->xmit_queue)) != NULL)
+               ds->ops->port_deferred_xmit(ds, dp->index, skb);
 }
 
 /* ethtool operations *******************************************************/
@@ -1318,6 +1353,9 @@ int dsa_slave_suspend(struct net_device *slave_dev)
        if (!netif_running(slave_dev))
                return 0;
 
+       cancel_work_sync(&dp->xmit_work);
+       skb_queue_purge(&dp->xmit_queue);
+
        netif_device_detach(slave_dev);
 
        rtnl_lock();
@@ -1405,6 +1443,8 @@ int dsa_slave_create(struct dsa_port *port)
        }
        p->dp = port;
        INIT_LIST_HEAD(&p->mall_tc_list);
+       INIT_WORK(&port->xmit_work, dsa_port_xmit_work);
+       skb_queue_head_init(&port->xmit_queue);
        p->xmit = cpu_dp->tag_ops->xmit;
        port->slave = slave_dev;