X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport-netdev.c;h=1773a09b98ce6418062b3220fd9b1d741be71300;hb=c9cdd3d3a7139dc618ea603010bf6c73d2b4e21e;hp=980df01f5713f739ddbd338851221d3a4715be7c;hpb=f2459fe7d91c4c325dfaa3ed18f56200b63ae27e;p=openvswitch

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index 980df01f..1773a09b 100644
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -22,84 +22,26 @@
 
 #include "compat.h"
 
-struct vport_ops netdev_vport_ops;
+/* If the native device stats aren't 64 bit use the vport stats tracking instead. */
+#define USE_VPORT_STATS (sizeof(((struct net_device_stats *)0)->rx_bytes) < sizeof(u64))
 
 static void netdev_port_receive(struct net_bridge_port *, struct sk_buff *);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-static struct llc_sap *netdev_stp_sap;
-
-static int
-netdev_stp_rcv(struct sk_buff *skb, struct net_device *dev,
-		      struct packet_type *pt, struct net_device *orig_dev)
-{
-	/* We don't really care about STP packets, we just listen for them for
-	 * mutual exclusion with the bridge module, so this just discards
-	 * them. */
-	kfree_skb(skb);
-	return 0;
-}
-
-static int
-netdev_avoid_bridge_init(void)
-{
-	/* Register to receive STP packets because the bridge module also
-	 * attempts to do so.  Since there can only be a single listener for a
-	 * given protocol, this provides mutual exclusion against the bridge
-	 * module, preventing both of them from being loaded at the same
-	 * time. */
-	netdev_stp_sap = llc_sap_open(LLC_SAP_BSPAN, netdev_stp_rcv);
-	if (!netdev_stp_sap) {
-		printk(KERN_ERR "openvswitch: can't register sap for STP (probably the bridge module is loaded)\n");
-		return -EADDRINUSE;
-	}
-	return 0;
-}
-
-static void
-netdev_avoid_bridge_exit(void)
-{
-	llc_sap_put(netdev_stp_sap);
-}
-#else  /* Linux 2.6.27 or later. */
-static int
-netdev_avoid_bridge_init(void)
-{
-	/* Linux 2.6.27 introduces a way for multiple clients to register for
-	 * STP packets, which interferes with what we try to do above.
-	 * Instead, just check whether there's a bridge hook defined.  This is
-	 * not as safe--the bridge module is willing to load over the top of
-	 * us--but it provides a little bit of protection. */
-	if (br_handle_frame_hook) {
-		printk(KERN_ERR "openvswitch: bridge module is loaded, cannot load over it\n");
-		return -EADDRINUSE;
-	}
-	return 0;
-}
-
-static void
-netdev_avoid_bridge_exit(void)
-{
-	/* Nothing to do. */
-}
-#endif	/* Linux 2.6.27 or later */
-
 /*
  * Used as br_handle_frame_hook.  (Cannot run bridge at the same time, even on
  * different set of devices!)
  */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 /* Called with rcu_read_lock and bottom-halves disabled. */
-static struct sk_buff *
-netdev_frame_hook(struct net_bridge_port *p, struct sk_buff *skb)
+static struct sk_buff *netdev_frame_hook(struct net_bridge_port *p,
+					 struct sk_buff *skb)
 {
 	netdev_port_receive(p, skb);
 	return NULL;
 }
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 /* Called with rcu_read_lock and bottom-halves disabled. */
-static int
-netdev_frame_hook(struct net_bridge_port *p, struct sk_buff **pskb)
+static int netdev_frame_hook(struct net_bridge_port *p, struct sk_buff **pskb)
 {
 	netdev_port_receive(p, *pskb);
 	return 1;
@@ -108,15 +50,8 @@ netdev_frame_hook(struct net_bridge_port *p, struct sk_buff **pskb)
 #error
 #endif
 
-static int
-netdev_init(void)
+static int netdev_init(void)
 {
-	int err;
-
-	err = netdev_avoid_bridge_init();
-	if (err)
-		return err;
-
 	/* Hook into callback used by the bridge to intercept packets.
 	 * Parasites we are. */
 	br_handle_frame_hook = netdev_frame_hook;
@@ -124,15 +59,12 @@ netdev_init(void)
 	return 0;
 }
 
-static void
-netdev_exit(void)
+static void netdev_exit(void)
 {
 	br_handle_frame_hook = NULL;
-	netdev_avoid_bridge_exit();
 }
 
-static struct vport *
-netdev_create(const char *name, const void __user *config)
+static struct vport *netdev_create(const char *name, const void __user *config)
 {
 	struct vport *vport;
 	struct netdev_vport *netdev_vport;
@@ -164,6 +96,16 @@ netdev_create(const char *name, const void __user *config)
 		goto error_put;
 	}
 
+	/* If we are using the vport stats layer initialize it to the current
+	 * values so we are roughly consistent with the device stats. */
+	if (USE_VPORT_STATS) {
+		struct odp_vport_stats stats;
+
+		err = netdev_get_stats(vport, &stats);
+		if (!err)
+			vport_set_stats(vport, &stats);
+	}
+
 	return vport;
 
 error_put:
@@ -174,8 +116,7 @@ error:
 	return ERR_PTR(err);
 }
 
-static int
-netdev_destroy(struct vport *vport)
+static int netdev_destroy(struct vport *vport)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 
@@ -185,8 +126,7 @@ netdev_destroy(struct vport *vport)
 	return 0;
 }
 
-static int
-netdev_attach(struct vport *vport)
+static int netdev_attach(struct vport *vport)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 
@@ -197,8 +137,7 @@ netdev_attach(struct vport *vport)
 	return 0;
 }
 
-static int
-netdev_detach(struct vport *vport)
+static int netdev_detach(struct vport *vport)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 
@@ -208,15 +147,13 @@ netdev_detach(struct vport *vport)
 	return 0;
 }
 
-int
-netdev_set_mtu(struct vport *vport, int mtu)
+int netdev_set_mtu(struct vport *vport, int mtu)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	return dev_set_mtu(netdev_vport->dev, mtu);
 }
 
-int
-netdev_set_addr(struct vport *vport, const unsigned char *addr)
+int netdev_set_addr(struct vport *vport, const unsigned char *addr)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	struct sockaddr sa;
@@ -227,29 +164,25 @@ netdev_set_addr(struct vport *vport, const unsigned char *addr)
 	return dev_set_mac_address(netdev_vport->dev, &sa);
 }
 
-const char *
-netdev_get_name(const struct vport *vport)
+const char *netdev_get_name(const struct vport *vport)
 {
 	const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	return netdev_vport->dev->name;
 }
 
-const unsigned char *
-netdev_get_addr(const struct vport *vport)
+const unsigned char *netdev_get_addr(const struct vport *vport)
 {
 	const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	return netdev_vport->dev->dev_addr;
 }
 
-struct kobject *
-netdev_get_kobj(const struct vport *vport)
+struct kobject *netdev_get_kobj(const struct vport *vport)
 {
 	const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	return &netdev_vport->dev->NETDEV_DEV_MEMBER.kobj;
 }
 
-int
-netdev_get_stats(const struct vport *vport, struct odp_vport_stats *stats)
+int netdev_get_stats(const struct vport *vport, struct odp_vport_stats *stats)
 {
 	const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	const struct net_device_stats *netdev_stats;
@@ -272,51 +205,44 @@ netdev_get_stats(const struct vport *vport, struct odp_vport_stats *stats)
 	return 0;
 }
 
-unsigned
-netdev_get_dev_flags(const struct vport *vport)
+unsigned netdev_get_dev_flags(const struct vport *vport)
 {
 	const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	return dev_get_flags(netdev_vport->dev);
 }
 
-int
-netdev_is_running(const struct vport *vport)
+int netdev_is_running(const struct vport *vport)
 {
 	const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	return netif_running(netdev_vport->dev);
 }
 
-unsigned char
-netdev_get_operstate(const struct vport *vport)
+unsigned char netdev_get_operstate(const struct vport *vport)
 {
 	const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	return netdev_vport->dev->operstate;
 }
 
-int
-netdev_get_ifindex(const struct vport *vport)
+int netdev_get_ifindex(const struct vport *vport)
 {
 	const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	return netdev_vport->dev->ifindex;
 }
 
-int
-netdev_get_iflink(const struct vport *vport)
+int netdev_get_iflink(const struct vport *vport)
 {
 	const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	return netdev_vport->dev->iflink;
 }
 
-int
-netdev_get_mtu(const struct vport *vport)
+int netdev_get_mtu(const struct vport *vport)
 {
 	const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	return netdev_vport->dev->mtu;
 }
 
 /* Must be called with rcu_read_lock. */
-static void
-netdev_port_receive(struct net_bridge_port *p, struct sk_buff *skb)
+static void netdev_port_receive(struct net_bridge_port *p, struct sk_buff *skb)
 {
 	struct vport *vport = (struct vport *)p;
 
@@ -325,18 +251,20 @@ netdev_port_receive(struct net_bridge_port *p, struct sk_buff *skb)
 	 * (No one comes after us, since we tell handle_bridge() that we took
 	 * the packet.) */
 	skb = skb_share_check(skb, GFP_ATOMIC);
-	if (!skb)
+	if (unlikely(!skb))
 		return;
 
+	skb_warn_if_lro(skb);
+
 	/* Push the Ethernet header back on. */
 	skb_push(skb, ETH_HLEN);
 	skb_reset_mac_header(skb);
+	compute_ip_summed(skb, false);
 
 	vport_receive(vport, skb);
 }
 
-static int
-netdev_send(struct vport *vport, struct sk_buff *skb)
+static int netdev_send(struct vport *vport, struct sk_buff *skb)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 	int len = skb->len;
@@ -349,15 +277,15 @@ netdev_send(struct vport *vport, struct sk_buff *skb)
 }
 
 /* Returns null if this device is not attached to a datapath. */
-struct vport *
-netdev_get_vport(struct net_device *dev)
+struct vport *netdev_get_vport(struct net_device *dev)
 {
 	return (struct vport *)dev->br_port;
 }
 
 struct vport_ops netdev_vport_ops = {
 	.type		= "netdev",
-	.flags		= VPORT_F_REQUIRED,
+	.flags          = (VPORT_F_REQUIRED |
+			  (USE_VPORT_STATS ? VPORT_F_GEN_STATS : 0)),
 	.init		= netdev_init,
 	.exit		= netdev_exit,
 	.create		= netdev_create,
@@ -378,3 +306,19 @@ struct vport_ops netdev_vport_ops = {
 	.get_mtu	= netdev_get_mtu,
 	.send		= netdev_send,
 };
+
+/*
+ * Open vSwitch cannot safely coexist with the Linux bridge module on any
+ * released version of Linux, because there is only a single bridge hook
+ * function and only a single br_port member in struct net_device.
+ *
+ * Declaring and exporting this symbol enforces mutual exclusion.  The bridge
+ * module also exports the same symbol, so the module loader will refuse to
+ * load both modules at the same time (e.g. "bridge: exports duplicate symbol
+ * br_should_route_hook (owned by openvswitch_mod)").
+ *
+ * The use of "typeof" here avoids the need to track changes in the type of
+ * br_should_route_hook over various kernel versions.
+ */
+typeof(br_should_route_hook) br_should_route_hook;
+EXPORT_SYMBOL(br_should_route_hook);