X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=datapath%2Fvport-internal_dev.c;h=7f216792bff070187008c302adc85ea143585ea2;hb=8f79bb4d3999d993424e9578342b4130d10a556c;hp=829bc6f743ba459d33118768558a30d0719e476e;hpb=6f17885b23ef3ff3c9b38de2f22b11bedf55cb1e;p=cascardo%2Fovs.git diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c index 829bc6f74..7f216792b 100644 --- a/datapath/vport-internal_dev.c +++ b/datapath/vport-internal_dev.c @@ -1,9 +1,19 @@ /* - * Copyright (c) 2009, 2010, 2011 Nicira Networks. - * Distributed under the terms of the GNU GPL version 2. + * Copyright (c) 2007-2015 Nicira, Inc. * - * Significant portions of this file may be copied from parts of the Linux - * kernel, by Linus Torvalds and others. + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA */ #include @@ -13,79 +23,53 @@ #include #include #include -#include +#include +#include +#include + +#include +#include +#include -#include "checksum.h" #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; - struct net_device_stats stats; }; -static inline struct internal_dev *internal_dev_priv(struct net_device *netdev) -{ - return netdev_priv(netdev); -} +static struct vport_ops ovs_internal_vport_ops; -/* This function is only called by the kernel network layer.*/ -static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev) +static struct internal_dev *internal_dev_priv(struct net_device *netdev) { - struct vport *vport = internal_dev_get_vport(netdev); - struct net_device_stats *stats = &internal_dev_priv(netdev)->stats; - - if (vport) { - struct ovs_vport_stats vport_stats; - - vport_get_stats(vport, &vport_stats); - - /* The tx and rx stats need to be swapped because the switch - * and host OS have opposite perspectives. */ - stats->rx_packets = vport_stats.tx_packets; - stats->tx_packets = vport_stats.rx_packets; - stats->rx_bytes = vport_stats.tx_bytes; - stats->tx_bytes = vport_stats.rx_bytes; - stats->rx_errors = vport_stats.tx_errors; - stats->tx_errors = vport_stats.rx_errors; - stats->rx_dropped = vport_stats.tx_dropped; - stats->tx_dropped = vport_stats.rx_dropped; - } - - 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; + return netdev_priv(netdev); } /* 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; + int len, err; + len = skb->len; rcu_read_lock(); - vport_receive(internal_dev_priv(netdev)->vport, skb); + err = ovs_vport_receive(internal_dev_priv(netdev)->vport, skb, NULL); rcu_read_unlock(); + + if (likely(!err)) { +#ifdef HAVE_DEV_TSTATS + struct pcpu_sw_netstats *tstats; + + tstats = this_cpu_ptr((struct pcpu_sw_netstats __percpu *)netdev->tstats); + + u64_stats_update_begin(&tstats->syncp); + tstats->tx_bytes += len; + tstats->tx_packets++; + u64_stats_update_end(&tstats->syncp); +#endif + } else { + netdev->stats.tx_errors++; + } return 0; } @@ -104,7 +88,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 = { @@ -129,181 +113,220 @@ 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) +static void internal_dev_destructor(struct net_device *dev) { - if (dp_ioctl_hook) - return dp_ioctl_hook(dev, ifr, cmd); + struct vport *vport = ovs_internal_dev_get_vport(dev); - return -EOPNOTSUPP; + ovs_vport_free(vport); + free_netdev(dev); } -static void internal_dev_destructor(struct net_device *dev) +#ifdef HAVE_DEV_TSTATS +static int internal_dev_init(struct net_device *dev) { - struct vport *vport = internal_dev_get_vport(dev); + dev->tstats = (typeof(dev->tstats)) netdev_alloc_pcpu_stats(struct pcpu_sw_netstats); + if (!dev->tstats) + return -ENOMEM; + return 0; +} - vport_free(vport); - free_netdev(dev); +static void internal_dev_uninit(struct net_device *dev) +{ + free_percpu(dev->tstats); } +#endif -#ifdef HAVE_NET_DEVICE_OPS static const struct net_device_ops internal_dev_netdev_ops = { +#ifdef HAVE_DEV_TSTATS + .ndo_init = internal_dev_init, + .ndo_uninit = internal_dev_uninit, + .ndo_get_stats64 = ip_tunnel_get_stats64, +#endif .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, - .ndo_get_stats = internal_dev_sys_stats, }; -#endif + +static struct rtnl_link_ops internal_dev_link_ops __read_mostly = { + .kind = "openvswitch", +}; 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 | IFF_OPENVSWITCH; netdev->destructor = internal_dev_destructor; - SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops); + netdev->ethtool_ops = &internal_dev_ethtool_ops; + netdev->rtnl_link_ops = &internal_dev_link_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 | NETIF_F_GSO_ENCAP_ALL; -#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(3,8,0) + netdev->hw_enc_features = netdev->features; +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) netdev->hw_features = netdev->features & ~NETIF_F_LLTX; #endif - vport_gen_rand_ether_addr(netdev->dev_addr); + eth_hw_addr_random(netdev); } static struct vport *internal_dev_create(const struct vport_parms *parms) { struct vport *vport; - struct netdev_vport *netdev_vport; struct internal_dev *internal_dev; int err; - vport = vport_alloc(sizeof(struct netdev_vport), &internal_vport_ops, parms); + vport = ovs_vport_alloc(0, &ovs_internal_vport_ops, parms); if (IS_ERR(vport)) { err = PTR_ERR(vport); goto error; } - netdev_vport = netdev_vport_priv(vport); - - netdev_vport->dev = alloc_netdev(sizeof(struct internal_dev), parms->name, do_setup); - if (!netdev_vport->dev) { + vport->dev = alloc_netdev(sizeof(struct internal_dev), + parms->name, NET_NAME_UNKNOWN, do_setup); + if (!vport->dev) { err = -ENOMEM; goto error_free_vport; } - internal_dev = internal_dev_priv(netdev_vport->dev); + dev_net_set(vport->dev, ovs_dp_get_net(vport->dp)); + internal_dev = internal_dev_priv(vport->dev); internal_dev->vport = vport; - err = register_netdevice(netdev_vport->dev); + /* Restrict bridge port to current netns. */ + if (vport->port_no == OVSP_LOCAL) + vport->dev->features |= NETIF_F_NETNS_LOCAL; + + rtnl_lock(); + err = register_netdevice(vport->dev); if (err) goto error_free_netdev; - dev_set_promiscuity(netdev_vport->dev, 1); - netif_start_queue(netdev_vport->dev); + dev_set_promiscuity(vport->dev, 1); + rtnl_unlock(); + netif_start_queue(vport->dev); return vport; error_free_netdev: - free_netdev(netdev_vport->dev); + rtnl_unlock(); + free_netdev(vport->dev); error_free_vport: - vport_free(vport); + ovs_vport_free(vport); error: return ERR_PTR(err); } static void internal_dev_destroy(struct vport *vport) { - struct netdev_vport *netdev_vport = netdev_vport_priv(vport); - - netif_stop_queue(netdev_vport->dev); - dev_set_promiscuity(netdev_vport->dev, -1); + netif_stop_queue(vport->dev); + rtnl_lock(); + dev_set_promiscuity(vport->dev, -1); /* unregister_netdevice() waits for an RCU grace period. */ - unregister_netdevice(netdev_vport->dev); + unregister_netdevice(vport->dev); + + rtnl_unlock(); } -static int internal_dev_recv(struct vport *vport, struct sk_buff *skb) +static netdev_tx_t internal_dev_recv(struct sk_buff *skb) { - struct net_device *netdev = netdev_vport_priv(vport)->dev; - int len; + struct net_device *netdev = skb->dev; +#ifdef HAVE_DEV_TSTATS + struct pcpu_sw_netstats *stats; +#endif + + if (unlikely(!(netdev->flags & IFF_UP))) { + kfree_skb(skb); + netdev->stats.rx_dropped++; + return NETDEV_TX_OK; + } #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) - if (unlikely(vlan_deaccel_tag(skb))) - return 0; + if (skb_vlan_tag_present(skb)) { + if (unlikely(!vlan_insert_tag_set_proto(skb, + skb->vlan_proto, + skb_vlan_tag_get(skb)))) + return NETDEV_TX_OK; + + 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->dev = netdev; + skb_dst_drop(skb); + nf_reset(skb); + secpath_reset(skb); + skb->pkt_type = PACKET_HOST; skb->protocol = eth_type_trans(skb, netdev); - forward_ip_summed(skb, false); - - netif_rx(skb); - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) - netdev->last_rx = jiffies; + skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN); + +#ifdef HAVE_DEV_TSTATS + stats = this_cpu_ptr((struct pcpu_sw_netstats __percpu *)netdev->tstats); + u64_stats_update_begin(&stats->syncp); + stats->rx_packets++; + stats->rx_bytes += skb->len; + u64_stats_update_end(&stats->syncp); #endif - return len; + netif_rx(skb); + return NETDEV_TX_OK; } -const struct vport_ops internal_vport_ops = { +static 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 = netdev_set_addr, - .get_name = netdev_get_name, - .get_addr = netdev_get_addr, - .get_kobj = netdev_get_kobj, - .get_dev_flags = netdev_get_dev_flags, - .is_running = netdev_is_running, - .get_operstate = netdev_get_operstate, - .get_ifindex = netdev_get_ifindex, - .get_mtu = netdev_get_mtu, .send = internal_dev_recv, }; -int is_internal_dev(const struct net_device *netdev) +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 } -int is_internal_vport(const struct vport *vport) +struct vport *ovs_internal_dev_get_vport(struct net_device *netdev) { - return vport->ops == &internal_vport_ops; + if (!ovs_is_internal_dev(netdev)) + return NULL; + + return internal_dev_priv(netdev)->vport; } -struct vport *internal_dev_get_vport(struct net_device *netdev) +int ovs_internal_dev_rtnl_link_register(void) { - if (!is_internal_dev(netdev)) - return NULL; + int err; - return internal_dev_priv(netdev)->vport; + err = rtnl_link_register(&internal_dev_link_ops); + if (err < 0) + return err; + + err = ovs_vport_ops_register(&ovs_internal_vport_ops); + if (err < 0) + rtnl_link_unregister(&internal_dev_link_ops); + + return err; +} + +void ovs_internal_dev_rtnl_link_unregister(void) +{ + ovs_vport_ops_unregister(&ovs_internal_vport_ops); + rtnl_link_unregister(&internal_dev_link_ops); }