X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-netdev.c;h=fce9b3978df8cd638cc900b464300319190cc875;hb=16d40e2aaab1f067e452f36fac9bf0214310bf33;hp=72d2928d5f2e95156931e22e6e092bd9fba229dc;hpb=b4d76c80a078dcf641f36aa3b3b50a5667a27e16;p=sliver-openvswitch.git

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index 72d2928d5..fce9b3978 100644
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -25,34 +25,55 @@
 /* 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 *);
+static void netdev_port_receive(struct vport *vport, struct sk_buff *skb);
 
+#if 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)
+{
+	struct vport *vport;
+
+	if (unlikely(skb->pkt_type == PACKET_LOOPBACK))
+		return skb;
+
+	vport = netdev_get_vport(skb->dev);
+
+	netdev_port_receive(vport, skb);
+
+	return NULL;
+}
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 /*
  * 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);
+	netdev_port_receive((struct vport *)p, skb);
 	return NULL;
 }
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+/*
+ * Used as br_handle_frame_hook.  (Cannot run bridge at the same time, even on
+ * different set of devices!)
+ */
 /* 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);
+	netdev_port_receive((struct vport *)p, *pskb);
 	return 1;
 }
 #else
 #error
 #endif
 
-static int
-netdev_init(void)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+static int netdev_init(void) { return 0; }
+static void netdev_exit(void) { }
+#else
+static int netdev_init(void)
 {
 	/* Hook into callback used by the bridge to intercept packets.
 	 * Parasites we are. */
@@ -61,14 +82,13 @@ netdev_init(void)
 	return 0;
 }
 
-static void
-netdev_exit(void)
+static void netdev_exit(void)
 {
 	br_handle_frame_hook = NULL;
 }
+#endif
 
-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;
@@ -95,11 +115,6 @@ netdev_create(const char *name, const void __user *config)
 		goto error_put;
 	}
 
-	if (netdev_vport->dev->br_port) {
-		err = -EBUSY;
-		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) {
@@ -120,8 +135,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);
 
@@ -131,38 +145,41 @@ 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);
+	int err;
+
+	err = netdev_rx_handler_register(netdev_vport->dev, netdev_frame_hook,
+					 vport);
+	if (err)
+		return err;
 
 	dev_set_promiscuity(netdev_vport->dev, 1);
 	dev_disable_lro(netdev_vport->dev);
-	rcu_assign_pointer(netdev_vport->dev->br_port, (struct net_bridge_port *)vport);
+	netdev_vport->dev->priv_flags |= IFF_OVS_DATAPATH;
 
 	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);
 
-	rcu_assign_pointer(netdev_vport->dev->br_port, NULL);
+	netdev_vport->dev->priv_flags &= ~IFF_OVS_DATAPATH;
+	netdev_rx_handler_unregister(netdev_vport->dev);
 	dev_set_promiscuity(netdev_vport->dev, -1);
 
 	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;
@@ -173,34 +190,30 @@ 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;
+	struct rtnl_link_stats64 *netdev_stats, storage;
 
-	netdev_stats = dev_get_stats(netdev_vport->dev);
+	netdev_stats = dev_get_stats(netdev_vport->dev, &storage);
 
 	stats->rx_bytes		= netdev_stats->rx_bytes;
 	stats->rx_packets	= netdev_stats->rx_packets;
@@ -218,62 +231,55 @@ 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 vport *vport, struct sk_buff *skb)
 {
-	struct vport *vport = (struct vport *)p;
-
 	/* 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
 	 * 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);
@@ -282,8 +288,7 @@ netdev_port_receive(struct net_bridge_port *p, struct sk_buff *skb)
 	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;
@@ -296,10 +301,20 @@ 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;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+	/* XXX: The bridge code may have registered the data.
+	 * So check that the handler pointer is the datapath's.
+	 * Once the merge is done and IFF_OVS_DATAPATH stops
+	 * being the same value as IFF_BRIDGE_PORT the check can
+	 * simply be netdev_vport->dev->priv_flags & IFF_OVS_DATAPATH. */
+	if (rcu_dereference(dev->rx_handler) != netdev_frame_hook)
+		return NULL;
+	return (struct vport *)rcu_dereference(dev->rx_handler_data);
+#else
+	return (struct vport *)rcu_dereference(dev->br_port);
+#endif
 }
 
 struct vport_ops netdev_vport_ops = {
@@ -327,10 +342,12 @@ struct vport_ops netdev_vport_ops = {
 	.send		= netdev_send,
 };
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
 /*
- * 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.
+ * In kernels earlier than 2.6.36, 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
@@ -342,3 +359,4 @@ struct vport_ops netdev_vport_ops = {
  */
 typeof(br_should_route_hook) br_should_route_hook;
 EXPORT_SYMBOL(br_should_route_hook);
+#endif