X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-internal_dev.c;h=637d712d8d371a475ab017c1f9f4f609ac4455ab;hb=ec988646afe6aee6a63d6894a3e9b50f715d5941;hp=46b78d226d20d5729b05b7a3bb1fda91c2f26d4d;hpb=2a4999f3f33467f4fa22ed6e5b06350615fb2dac;p=sliver-openvswitch.git diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c index 46b78d226..637d712d8 100644 --- a/datapath/vport-internal_dev.c +++ b/datapath/vport-internal_dev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2012 Nicira Networks. + * Copyright (c) 2007-2012 Nicira, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -22,25 +22,20 @@ #include #include #include +#include #include #include -#include "checksum.h" +#include +#include + #include "datapath.h" #include "vlan.h" -#include "vport-generic.h" #include "vport-internal_dev.h" #include "vport-netdev.h" -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) -#define HAVE_NET_DEVICE_OPS -#endif - struct internal_dev { struct vport *vport; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - struct net_device_stats stats; -#endif }; static struct internal_dev *internal_dev_priv(struct net_device *netdev) @@ -56,11 +51,7 @@ static struct rtnl_link_stats64 *internal_dev_get_stats(struct net_device *netde #else static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - struct net_device_stats *stats = &internal_dev_priv(netdev)->stats; -#else struct net_device_stats *stats = &netdev->stats; -#endif #endif struct vport *vport = ovs_internal_dev_get_vport(netdev); struct ovs_vport_stats vport_stats; @@ -81,29 +72,11 @@ static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev return stats; } -static int internal_dev_mac_addr(struct net_device *dev, void *p) -{ - struct sockaddr *addr = p; - - if (!is_valid_ether_addr(addr->sa_data)) - return -EADDRNOTAVAIL; - memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); - return 0; -} - /* Called with rcu_read_lock_bh. */ static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) { - if (unlikely(compute_ip_summed(skb, true))) { - kfree_skb(skb); - return 0; - } - - vlan_copy_skb_tci(skb); - OVS_CB(skb)->flow = NULL; - rcu_read_lock(); - ovs_vport_receive(internal_dev_priv(netdev)->vport, skb); + ovs_vport_receive(internal_dev_priv(netdev)->vport, skb, NULL); rcu_read_unlock(); return 0; } @@ -123,7 +96,7 @@ static int internal_dev_stop(struct net_device *netdev) static void internal_dev_getinfo(struct net_device *netdev, struct ethtool_drvinfo *info) { - strcpy(info->driver, "openvswitch"); + strlcpy(info->driver, "openvswitch", sizeof(info->driver)); } static const struct ethtool_ops internal_dev_ethtool_ops = { @@ -148,15 +121,6 @@ static int internal_dev_change_mtu(struct net_device *netdev, int new_mtu) return 0; } -static int internal_dev_do_ioctl(struct net_device *dev, - struct ifreq *ifr, int cmd) -{ - if (ovs_dp_ioctl_hook) - return ovs_dp_ioctl_hook(dev, ifr, cmd); - - return -EOPNOTSUPP; -} - static void internal_dev_destructor(struct net_device *dev) { struct vport *vport = ovs_internal_dev_get_vport(dev); @@ -165,13 +129,11 @@ static void internal_dev_destructor(struct net_device *dev) free_netdev(dev); } -#ifdef HAVE_NET_DEVICE_OPS static const struct net_device_ops internal_dev_netdev_ops = { .ndo_open = internal_dev_open, .ndo_stop = internal_dev_stop, .ndo_start_xmit = internal_dev_xmit, - .ndo_set_mac_address = internal_dev_mac_addr, - .ndo_do_ioctl = internal_dev_do_ioctl, + .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = internal_dev_change_mtu, #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) .ndo_get_stats64 = internal_dev_get_stats, @@ -179,41 +141,29 @@ static const struct net_device_ops internal_dev_netdev_ops = { .ndo_get_stats = internal_dev_sys_stats, #endif }; -#endif static void do_setup(struct net_device *netdev) { ether_setup(netdev); -#ifdef HAVE_NET_DEVICE_OPS netdev->netdev_ops = &internal_dev_netdev_ops; -#else - netdev->do_ioctl = internal_dev_do_ioctl; - netdev->get_stats = internal_dev_sys_stats; - netdev->hard_start_xmit = internal_dev_xmit; - netdev->open = internal_dev_open; - netdev->stop = internal_dev_stop; - netdev->set_mac_address = internal_dev_mac_addr; - netdev->change_mtu = internal_dev_change_mtu; -#endif netdev->priv_flags &= ~IFF_TX_SKB_SHARING; + netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE; netdev->destructor = internal_dev_destructor; SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops); netdev->tx_queue_len = 0; netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST | - NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO; + NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_GSO_SOFTWARE; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) netdev->vlan_features = netdev->features; - netdev->features |= NETIF_F_HW_VLAN_TX; -#endif + netdev->features |= NETIF_F_HW_VLAN_CTAG_TX; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) netdev->hw_features = netdev->features & ~NETIF_F_LLTX; #endif - random_ether_addr(netdev->dev_addr); + eth_hw_addr_random(netdev); } static struct vport *internal_dev_create(const struct vport_parms *parms) @@ -247,16 +197,19 @@ static struct vport *internal_dev_create(const struct vport_parms *parms) if (vport->port_no == OVSP_LOCAL) netdev_vport->dev->features |= NETIF_F_NETNS_LOCAL; + rtnl_lock(); err = register_netdevice(netdev_vport->dev); if (err) goto error_free_netdev; dev_set_promiscuity(netdev_vport->dev, 1); + rtnl_unlock(); netif_start_queue(netdev_vport->dev); return vport; error_free_netdev: + rtnl_unlock(); free_netdev(netdev_vport->dev); error_free_vport: ovs_vport_free(vport); @@ -269,10 +222,13 @@ static void internal_dev_destroy(struct vport *vport) struct netdev_vport *netdev_vport = netdev_vport_priv(vport); netif_stop_queue(netdev_vport->dev); + rtnl_lock(); dev_set_promiscuity(netdev_vport->dev, -1); /* unregister_netdevice() waits for an RCU grace period. */ unregister_netdevice(netdev_vport->dev); + + rtnl_unlock(); } static int internal_dev_recv(struct vport *vport, struct sk_buff *skb) @@ -281,49 +237,48 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb) int len; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) - if (unlikely(vlan_deaccel_tag(skb))) - return 0; + if (vlan_tx_tag_present(skb)) { + if (unlikely(!__vlan_put_tag(skb, + skb->vlan_proto, + vlan_tx_tag_get(skb)))) + return 0; + + if (skb->ip_summed == CHECKSUM_COMPLETE) + skb->csum = csum_add(skb->csum, + csum_partial(skb->data + (2 * ETH_ALEN), + VLAN_HLEN, 0)); + + vlan_set_tci(skb, 0); + } #endif len = skb->len; + + skb_dst_drop(skb); + nf_reset(skb); + secpath_reset(skb); + skb->dev = netdev; skb->pkt_type = PACKET_HOST; skb->protocol = eth_type_trans(skb, netdev); - forward_ip_summed(skb, false); + skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN); netif_rx(skb); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) - netdev->last_rx = jiffies; -#endif - return len; } const struct vport_ops ovs_internal_vport_ops = { .type = OVS_VPORT_TYPE_INTERNAL, - .flags = VPORT_F_REQUIRED | VPORT_F_FLOW, .create = internal_dev_create, .destroy = internal_dev_destroy, - .set_addr = ovs_netdev_set_addr, .get_name = ovs_netdev_get_name, - .get_addr = ovs_netdev_get_addr, - .get_kobj = ovs_netdev_get_kobj, - .get_dev_flags = ovs_netdev_get_dev_flags, - .is_running = ovs_netdev_is_running, - .get_operstate = ovs_netdev_get_operstate, - .get_ifindex = ovs_netdev_get_ifindex, - .get_mtu = ovs_netdev_get_mtu, .send = internal_dev_recv, }; int ovs_is_internal_dev(const struct net_device *netdev) { -#ifdef HAVE_NET_DEVICE_OPS return netdev->netdev_ops == &internal_dev_netdev_ops; -#else - return netdev->open == internal_dev_open; -#endif } struct vport *ovs_internal_dev_get_vport(struct net_device *netdev)