Implement 802.1D Spanning Tree Protocol.

[sliver-openvswitch.git] / datapath / dp_dev.c

diff --git a/datapath/dp_dev.c b/datapath/dp_dev.c
index de72dc5..195accb 100644 (file)
--- a/datapath/dp_dev.c
+++ b/datapath/dp_dev.c
@@ -2,6 +2,8 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/rcupdate.h>
+#include <linux/skbuff.h>
+#include <linux/workqueue.h>
 
 #include "datapath.h"
 #include "forward.h"
@@ -9,8 +11,11 @@
 struct dp_dev {
        struct net_device_stats stats;
        struct datapath *dp;
+       struct sk_buff_head xmit_queue;
+       struct work_struct xmit_work;
 };
 
+
 static struct dp_dev *dp_dev_priv(struct net_device *netdev) 
 {
        return netdev_priv(netdev);
@@ -26,9 +31,13 @@ int dp_dev_recv(struct net_device *netdev, struct sk_buff *skb)
 {
        int len = skb->len;
        struct dp_dev *dp_dev = dp_dev_priv(netdev);
+       skb->dev = netdev;
        skb->pkt_type = PACKET_HOST;
        skb->protocol = eth_type_trans(skb, netdev);
-       netif_rx(skb);
+       if (in_interrupt())
+               netif_rx(skb);
+       else
+               netif_rx_ni(skb);
        netdev->last_rx = jiffies;
        dp_dev->stats.rx_packets++;
        dp_dev->stats.rx_bytes += len;
@@ -50,22 +59,42 @@ static int dp_dev_mac_addr(struct net_device *dev, void *p)
 static int dp_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
 {
        struct dp_dev *dp_dev = dp_dev_priv(netdev);
-       struct datapath *dp;
-       rcu_read_lock();
-       dp = dp_dev->dp;
-       if (likely(dp != NULL)) {
-               dp_dev->stats.tx_packets++;
-               dp_dev->stats.tx_bytes += skb->len;
-               skb_reset_mac_header(skb);
-               fwd_port_input(dp->chain, skb, OFPP_LOCAL);
-       } else {
-               dp_dev->stats.tx_dropped++;
-               kfree_skb(skb);
+       struct datapath *dp = dp_dev->dp;
+
+       dp_dev->stats.tx_packets++;
+       dp_dev->stats.tx_bytes += skb->len;
+
+       if (skb_queue_len(&dp_dev->xmit_queue) >= dp->netdev->tx_queue_len) {
+               /* Queue overflow.  Stop transmitter. */
+               netif_stop_queue(dp->netdev);
+
+               /* We won't see all dropped packets individually, so overrun
+                * error is appropriate. */
+               dp_dev->stats.tx_fifo_errors++;
        }
-       rcu_read_unlock();
+       skb_queue_tail(&dp_dev->xmit_queue, skb);
+       dp->netdev->trans_start = jiffies;
+
+       schedule_work(&dp_dev->xmit_work);
+
        return 0;
 }
 
+static void dp_dev_do_xmit(struct work_struct *work)
+{
+       struct dp_dev *dp_dev = container_of(work, struct dp_dev, xmit_work);
+       struct datapath *dp = dp_dev->dp;
+       struct sk_buff *skb;
+
+       while ((skb = skb_dequeue(&dp_dev->xmit_queue)) != NULL) {
+               skb_reset_mac_header(skb);
+               rcu_read_lock();
+               fwd_port_input(dp->chain, skb, dp->local_port);
+               rcu_read_unlock();
+       }
+       netif_wake_queue(dp->netdev);
+}
+
 static int dp_dev_open(struct net_device *netdev)
 {
        netif_start_queue(netdev);
@@ -87,12 +116,15 @@ do_setup(struct net_device *netdev)
        netdev->hard_start_xmit = dp_dev_xmit;
        netdev->open = dp_dev_open;
        netdev->stop = dp_dev_stop;
-       netdev->tx_queue_len = 0;
+       netdev->tx_queue_len = 100;
        netdev->set_mac_address = dp_dev_mac_addr;
 
        netdev->flags = IFF_BROADCAST | IFF_MULTICAST;
 
        random_ether_addr(netdev->dev_addr);
+       netdev->dev_addr[0] = 0x00;
+       netdev->dev_addr[1] = 0x23;
+       netdev->dev_addr[2] = 0x20;
 }
 
 
@@ -116,6 +148,8 @@ int dp_dev_setup(struct datapath *dp)
 
        dp_dev = dp_dev_priv(netdev);
        dp_dev->dp = dp;
+       skb_queue_head_init(&dp_dev->xmit_queue);
+       INIT_WORK(&dp_dev->xmit_work, dp_dev_do_xmit);
        dp->netdev = netdev;
        return 0;
 }
@@ -123,8 +157,10 @@ int dp_dev_setup(struct datapath *dp)
 void dp_dev_destroy(struct datapath *dp)
 {
        struct dp_dev *dp_dev = dp_dev_priv(dp->netdev);
-       dp_dev->dp = NULL;
+
+       netif_tx_disable(dp->netdev);
        synchronize_net();
+       skb_queue_purge(&dp_dev->xmit_queue);
        unregister_netdev(dp->netdev);
        free_netdev(dp->netdev);
 }