X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport-netdev.c;h=3239135f09d74dee89fa4d5ff892c40383028ef6;hb=d5ffa7f2fedbd3f9a4156f78e5fe344cc51dbedf;hp=11faf8ad11b8157c7ad2940b2064e1b3d450a8cc;hpb=2d8916e58fe0592c2c0f3161f4287ce962269b7f;p=openvswitch

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index 11faf8ad..3239135f 100644
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -22,12 +22,15 @@
 #include "vport-internal_dev.h"
 #include "vport-netdev.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) && \
+    !defined(HAVE_VLAN_BUG_WORKAROUND)
 #include <linux/module.h>
 
 static int vlan_tso __read_mostly = 0;
 module_param(vlan_tso, int, 0644);
 MODULE_PARM_DESC(vlan_tso, "Enable TSO for VLAN packets");
+#else
+#define vlan_tso true
 #endif
 
 /* If the native device stats aren't 64 bit use the vport stats tracking instead. */
@@ -35,7 +38,23 @@ MODULE_PARM_DESC(vlan_tso, "Enable TSO for VLAN packets");
 
 static void netdev_port_receive(struct vport *vport, struct sk_buff *skb);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
+/* Called with rcu_read_lock and bottom-halves disabled. */
+static rx_handler_result_t netdev_frame_hook(struct sk_buff **pskb)
+{
+	struct sk_buff *skb = *pskb;
+	struct vport *vport;
+
+	if (unlikely(skb->pkt_type == PACKET_LOOPBACK))
+		return RX_HANDLER_PASS;
+
+	vport = netdev_get_vport(skb->dev);
+
+	netdev_port_receive(vport, skb);
+
+	return RX_HANDLER_CONSUMED;
+}
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
 /* Called with rcu_read_lock and bottom-halves disabled. */
 static struct sk_buff *netdev_frame_hook(struct sk_buff *skb)
 {
@@ -249,6 +268,11 @@ int netdev_get_mtu(const struct vport *vport)
 /* Must be called with rcu_read_lock. */
 static void netdev_port_receive(struct vport *vport, struct sk_buff *skb)
 {
+	if (unlikely(!vport)) {
+		kfree_skb(skb);
+		return;
+	}
+
 	/* Make our own copy of the packet.  Otherwise we will mangle the
 	 * packet for anyone who came before us (e.g. tcpdump via AF_PACKET).
 	 * (No one comes after us, since we tell handle_bridge() that we took
@@ -260,35 +284,44 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb)
 	skb_warn_if_lro(skb);
 
 	skb_push(skb, ETH_HLEN);
-	compute_ip_summed(skb, false);
+
+	if (unlikely(compute_ip_summed(skb, false))) {
+		kfree_skb(skb);
+		return;
+	}
 	vlan_copy_skb_tci(skb);
 
 	vport_receive(vport, skb);
 }
 
+static bool dev_supports_vlan_tx(struct net_device *dev)
+{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)
+	/* Software fallback means every device supports vlan_tci on TX. */
+	return true;
+#elif defined(HAVE_VLAN_BUG_WORKAROUND)
+	return dev->features & NETIF_F_HW_VLAN_TX;
+#else
+	/* Assume that the driver is buggy. */
+	return false;
+#endif
+}
+
 static int netdev_send(struct vport *vport, struct sk_buff *skb)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	int len;
 
 	skb->dev = netdev_vport->dev;
-	forward_ip_summed(skb);
+	forward_ip_summed(skb, true);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
-	if (vlan_tx_tag_present(skb)) {
-		int err;
+	if (vlan_tx_tag_present(skb) && !dev_supports_vlan_tx(skb->dev)) {
 		int features = 0;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
 		features = skb->dev->features & skb->dev->vlan_features;
 #endif
 
-		err = vswitch_skb_checksum_setup(skb);
-		if (unlikely(err)) {
-			kfree_skb(skb);
-			return 0;
-		}
-
 		if (!vlan_tso)
 			features &= ~(NETIF_F_TSO | NETIF_F_TSO6 |
 				      NETIF_F_UFO | NETIF_F_FSO);
@@ -310,10 +343,12 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb)
 				goto tag;
 			}
 
-			kfree_skb(skb);
-			skb = nskb;
-			if (IS_ERR(skb))
+			if (IS_ERR(nskb)) {
+				kfree_skb(skb);
 				return 0;
+			}
+			consume_skb(skb);
+			skb = nskb;
 
 			len = 0;
 			do {
@@ -339,7 +374,6 @@ tag:
 			return 0;
 		vlan_set_tci(skb, 0);
 	}
-#endif
 
 	len = skb->len;
 	dev_queue_xmit(skb);