X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-internal_dev.c;h=637d712d8d371a475ab017c1f9f4f609ac4455ab;hb=HEAD;hp=1df61801179a0871f46072dbfce71a236f5cf7ce;hpb=057dd6d279c20e88f98bbe8328383564391bbc8f;p=sliver-openvswitch.git diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c index 1df618011..637d712d8 100644 --- a/datapath/vport-internal_dev.c +++ b/datapath/vport-internal_dev.c @@ -1,80 +1,83 @@ /* - * Copyright (c) 2009, 2010, 2011 Nicira Networks. - * Distributed under the terms of the GNU GPL version 2. + * Copyright (c) 2007-2012 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 +#include #include #include #include #include +#include #include #include -#include "checksum.h" +#include +#include + #include "datapath.h" -#include "vport-generic.h" +#include "vlan.h" #include "vport-internal_dev.h" #include "vport-netdev.h" struct internal_dev { struct vport *vport; - struct net_device_stats stats; }; -static inline struct internal_dev *internal_dev_priv(struct net_device *netdev) +static struct internal_dev *internal_dev_priv(struct net_device *netdev) { return netdev_priv(netdev); } -/* This function is only called by the kernel network layer. It is not a vport - * get_stats() function. If a vport get_stats() function is defined that - * results in this being called it will cause infinite recursion. */ +/* This function is only called by the kernel network layer.*/ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +static struct rtnl_link_stats64 *internal_dev_get_stats(struct net_device *netdev, + struct rtnl_link_stats64 *stats) +{ +#else static struct net_device_stats *internal_dev_sys_stats(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 rtnl_link_stats64 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; - stats->collisions = vport_stats.collisions; - } + struct net_device_stats *stats = &netdev->stats; +#endif + struct vport *vport = ovs_internal_dev_get_vport(netdev); + struct ovs_vport_stats vport_stats; + + ovs_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; -} - -/* Called with rcu_read_lock and bottom-halves disabled. */ +/* Called with rcu_read_lock_bh. */ static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) { - compute_ip_summed(skb, true); - OVS_CB(skb)->flow = NULL; - - vport_receive(internal_dev_priv(netdev)->vport, skb); + rcu_read_lock(); + ovs_vport_receive(internal_dev_priv(netdev)->vport, skb, NULL); + rcu_read_unlock(); return 0; } @@ -93,79 +96,74 @@ 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 = { .get_drvinfo = internal_dev_getinfo, .get_link = ethtool_op_get_link, +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) .get_sg = ethtool_op_get_sg, .set_sg = ethtool_op_set_sg, .get_tx_csum = ethtool_op_get_tx_csum, .set_tx_csum = ethtool_op_set_tx_hw_csum, .get_tso = ethtool_op_get_tso, .set_tso = ethtool_op_set_tso, +#endif }; static int internal_dev_change_mtu(struct net_device *netdev, int new_mtu) { - struct vport *vport = internal_dev_get_vport(netdev); - if (new_mtu < 68) return -EINVAL; - if (new_mtu > dp_min_mtu(vport->dp)) - return -EINVAL; - netdev->mtu = 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); } -#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, +#else .ndo_get_stats = internal_dev_sys_stats, -}; #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->destructor = free_netdev; + 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->flags = IFF_BROADCAST | IFF_MULTICAST; 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; - vport_gen_rand_ether_addr(netdev->dev_addr); + netdev->vlan_features = netdev->features; + 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 + eth_hw_addr_random(netdev); } static struct vport *internal_dev_create(const struct vport_parms *parms) @@ -175,7 +173,8 @@ static struct vport *internal_dev_create(const struct vport_parms *parms) struct internal_dev *internal_dev; int err; - vport = vport_alloc(sizeof(struct netdev_vport), &internal_vport_ops, parms); + vport = ovs_vport_alloc(sizeof(struct netdev_vport), + &ovs_internal_vport_ops, parms); if (IS_ERR(vport)) { err = PTR_ERR(vport); goto error; @@ -183,44 +182,53 @@ static struct vport *internal_dev_create(const struct vport_parms *parms) netdev_vport = netdev_vport_priv(vport); - netdev_vport->dev = alloc_netdev(sizeof(struct internal_dev), parms->name, do_setup); + netdev_vport->dev = alloc_netdev(sizeof(struct internal_dev), + parms->name, do_setup); if (!netdev_vport->dev) { err = -ENOMEM; goto error_free_vport; } + dev_net_set(netdev_vport->dev, ovs_dp_get_net(vport->dp)); internal_dev = internal_dev_priv(netdev_vport->dev); internal_dev->vport = vport; + /* Restrict bridge port to current netns. */ + 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: - vport_free(vport); + ovs_vport_free(vport); error: return ERR_PTR(err); } -static int internal_dev_destroy(struct vport *vport) +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(netdev_vport->dev); /* unregister_netdevice() waits for an RCU grace period. */ - vport_free(vport); + unregister_netdevice(netdev_vport->dev); - return 0; + rtnl_unlock(); } static int internal_dev_recv(struct vport *vport, struct sk_buff *skb) @@ -228,59 +236,54 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb) struct net_device *netdev = netdev_vport_priv(vport)->dev; int len; - skb->dev = netdev; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) + 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); + skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN); - if (in_interrupt()) - netif_rx(skb); - else - netif_rx_ni(skb); - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) - netdev->last_rx = jiffies; -#endif + netif_rx(skb); return len; } -const struct vport_ops internal_vport_ops = { - .type = ODP_VPORT_TYPE_INTERNAL, - .flags = VPORT_F_REQUIRED | VPORT_F_GEN_STATS | VPORT_F_FLOW, +const struct vport_ops ovs_internal_vport_ops = { + .type = OVS_VPORT_TYPE_INTERNAL, .create = internal_dev_create, .destroy = internal_dev_destroy, - .set_mtu = netdev_set_mtu, - .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_iflink = netdev_get_iflink, - .get_mtu = netdev_get_mtu, + .get_name = ovs_netdev_get_name, .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) -{ - return vport->ops == &internal_vport_ops; } -struct vport *internal_dev_get_vport(struct net_device *netdev) +struct vport *ovs_internal_dev_get_vport(struct net_device *netdev) { - if (!is_internal_dev(netdev)) + if (!ovs_is_internal_dev(netdev)) return NULL; return internal_dev_priv(netdev)->vport;