/* 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)
{
- 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)
{
- netdev_port_receive(p, *pskb);
+ netdev_port_receive((struct vport *)p, *pskb);
return 1;
}
#else
#error
#endif
+#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.
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)
{
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) {
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;
}
{
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_get_stats(const struct vport *vport, struct odp_vport_stats *stats)
{
const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+ struct rtnl_link_stats64 *netdev_stats, storage;
+
+ netdev_stats = dev_get_stats(netdev_vport->dev, &storage);
+#else
const struct net_device_stats *netdev_stats;
netdev_stats = dev_get_stats(netdev_vport->dev);
+#endif
stats->rx_bytes = netdev_stats->rx_bytes;
stats->rx_packets = netdev_stats->rx_packets;
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;
}
/* 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);
/* Returns null if this device is not attached to a datapath. */
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 = {
.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
*/
typeof(br_should_route_hook) br_should_route_hook;
EXPORT_SYMBOL(br_should_route_hook);
+#endif
git://git.onelab.eu / sliver-openvswitch.git / blobdiff