X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-internal_dev.c;h=b9e54ab1f9a98ee36db2088d4ef72407f34a270a;hb=6d9e6eb44fc82ae985e6e8db4f156ba56f8bea39;hp=eca2a60b4fa8ecfdadfaada52e6e3ef44f703cbc;hpb=fceb2a5bb2063023777fc75c68a2670b5169fa13;p=sliver-openvswitch.git diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c index eca2a60b4..b9e54ab1f 100644 --- a/datapath/vport-internal_dev.c +++ b/datapath/vport-internal_dev.c @@ -10,9 +10,10 @@ #include #include #include -#include #include +#include +#include "checksum.h" #include "datapath.h" #include "vport-generic.h" #include "vport-internal_dev.h" @@ -37,7 +38,7 @@ static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev struct net_device_stats *stats = &internal_dev_priv(netdev)->stats; if (vport) { - struct odp_vport_stats vport_stats; + struct rtnl_link_stats64 vport_stats; vport_get_stats(vport, &vport_stats); @@ -70,20 +71,10 @@ static int internal_dev_mac_addr(struct net_device *dev, void *p) /* Called with rcu_read_lock and bottom-halves disabled. */ static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) { - struct vport *vport = internal_dev_get_vport(netdev); - - /* We need our own clone. */ - skb = skb_share_check(skb, GFP_ATOMIC); - if (!skb) { - vport_record_error(vport, VPORT_E_RX_DROPPED); - return 0; - } - - skb_reset_mac_header(skb); compute_ip_summed(skb, true); + OVS_CB(skb)->flow = NULL; - vport_receive(vport, skb); - + vport_receive(internal_dev_priv(netdev)->vport, skb); return 0; } @@ -102,14 +93,10 @@ static int internal_dev_stop(struct net_device *netdev) static void internal_dev_getinfo(struct net_device *netdev, struct ethtool_drvinfo *info) { - struct dp_port *dp_port = vport_get_dp_port(internal_dev_get_vport(netdev)); - strcpy(info->driver, "openvswitch"); - if (dp_port) - sprintf(info->bus_info, "%d.%d", dp_port->dp->dp_idx, dp_port->port_no); } -static struct ethtool_ops internal_dev_ethtool_ops = { +static const struct ethtool_ops internal_dev_ethtool_ops = { .get_drvinfo = internal_dev_getinfo, .get_link = ethtool_op_get_link, .get_sg = ethtool_op_get_sg, @@ -122,25 +109,18 @@ static struct ethtool_ops internal_dev_ethtool_ops = { static int internal_dev_change_mtu(struct net_device *netdev, int new_mtu) { - struct dp_port *dp_port = vport_get_dp_port(internal_dev_get_vport(netdev)); + struct vport *vport = internal_dev_get_vport(netdev); if (new_mtu < 68) return -EINVAL; - if (dp_port) { - if (new_mtu > dp_min_mtu(dp_port->dp)) - return -EINVAL; - } + if (new_mtu > dp_min_mtu(vport->dp)) + return -EINVAL; netdev->mtu = new_mtu; return 0; } -static void internal_dev_free(struct net_device *netdev) -{ - free_netdev(netdev); -} - static int internal_dev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) { if (dp_ioctl_hook) @@ -177,26 +157,25 @@ static void do_setup(struct net_device *netdev) netdev->change_mtu = internal_dev_change_mtu; #endif - netdev->destructor = internal_dev_free; + netdev->destructor = free_netdev; 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_HIGHDMA - | NETIF_F_HW_CSUM | NETIF_F_TSO; + netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST | + NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO; vport_gen_rand_ether_addr(netdev->dev_addr); } -static struct vport *internal_dev_create(const char *name, - const void __user *config) +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); + vport = vport_alloc(sizeof(struct netdev_vport), &internal_vport_ops, parms); if (IS_ERR(vport)) { err = PTR_ERR(vport); goto error; @@ -204,7 +183,7 @@ static struct vport *internal_dev_create(const char *name, netdev_vport = netdev_vport_priv(vport); - netdev_vport->dev = alloc_netdev(sizeof(struct internal_dev), 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; @@ -217,6 +196,9 @@ static struct vport *internal_dev_create(const char *name, if (err) goto error_free_netdev; + dev_set_promiscuity(netdev_vport->dev, 1); + netif_start_queue(netdev_vport->dev); + return vport; error_free_netdev: @@ -231,36 +213,11 @@ static int internal_dev_destroy(struct vport *vport) { struct netdev_vport *netdev_vport = netdev_vport_priv(vport); - unregister_netdevice(netdev_vport->dev); - vport_free(vport); - - return 0; -} - -static int internal_dev_attach(struct vport *vport) -{ - struct netdev_vport *netdev_vport = netdev_vport_priv(vport); - - dev_set_promiscuity(netdev_vport->dev, 1); - - /* It would make sense to assign dev->br_port here too, but - * that causes packets received on internal ports to get caught - * in netdev_frame_hook(). In turn netdev_frame_hook() can reject them - * back to the network stack, but that's a waste of time. */ - - return 0; -} - -static int internal_dev_detach(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); - /* Make sure that no packets arrive from now on, since - * internal_dev_xmit() will try to find itself through - * p->dp->ports[], and we're about to set that to null. */ - netif_tx_disable(netdev_vport->dev); + unregister_netdevice(netdev_vport->dev); + vport_free(vport); return 0; } @@ -279,18 +236,19 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb) netif_rx(skb); else netif_rx_ni(skb); + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) netdev->last_rx = jiffies; +#endif return len; } -struct vport_ops internal_vport_ops = { +const struct vport_ops internal_vport_ops = { .type = "internal", - .flags = VPORT_F_REQUIRED | VPORT_F_GEN_STATS, + .flags = VPORT_F_REQUIRED | VPORT_F_GEN_STATS | VPORT_F_FLOW, .create = internal_dev_create, .destroy = internal_dev_destroy, - .attach = internal_dev_attach, - .detach = internal_dev_detach, .set_mtu = netdev_set_mtu, .set_addr = netdev_set_addr, .get_name = netdev_get_name, @@ -321,6 +279,8 @@ int is_internal_vport(const struct vport *vport) struct vport *internal_dev_get_vport(struct net_device *netdev) { - struct internal_dev *internal_dev = internal_dev_priv(netdev); - return rcu_dereference(internal_dev->vport); + if (!is_internal_dev(netdev)) + return NULL; + + return internal_dev_priv(netdev)->vport; }