X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=cc7672058cecbd309445bddf9d629fd5f84fd00b;hb=2d7ce2ee1af5c4925ebbc681bb72e660d87faa71;hp=1b5f57f8b2d67d19e2d8b01b7d7e673bd7d79445;hpb=6d91c2fb6c169ac84ace876a4c34929cb84e26ae;p=sliver-openvswitch.git diff --git a/datapath/datapath.c b/datapath/datapath.c index 1b5f57f8b..cc7672058 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2008, 2009 Nicira Networks. + * Copyright (c) 2007, 2008, 2009, 2010 Nicira Networks. * Distributed under the terms of the GNU GPL version 2. * * Significant portions of this file may be copied from parts of the Linux @@ -8,11 +8,12 @@ /* Functions for managing the dp interface/device. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include #include -#include #include #include #include @@ -21,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -29,50 +29,48 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include #include #include -#include #include -#include +#include +#include #include "openvswitch/datapath-protocol.h" +#include "checksum.h" #include "datapath.h" #include "actions.h" -#include "dp_dev.h" #include "flow.h" +#include "loop_counter.h" +#include "odp-compat.h" +#include "table.h" +#include "vport-internal_dev.h" #include "compat.h" - int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd); EXPORT_SYMBOL(dp_ioctl_hook); /* Datapaths. Protected on the read side by rcu_read_lock, on the write side - * by dp_mutex. dp_mutex is almost completely redundant with genl_mutex - * maintained by the Generic Netlink code, but the timeout path needs mutual - * exclusion too. + * by dp_mutex. * * dp_mutex nests inside the RTNL lock: if you need both you must take the RTNL * lock first. * - * It is safe to access the datapath and net_bridge_port structures with just + * It is safe to access the datapath and vport structures with just * dp_mutex. */ static struct datapath *dps[ODP_MAX]; static DEFINE_MUTEX(dp_mutex); -/* Number of milliseconds between runs of the maintenance thread. */ -#define MAINT_SLEEP_MSECS 1000 - -static int new_nbp(struct datapath *, struct net_device *, int port_no); +static int new_vport(struct datapath *, struct odp_port *, int port_no); /* Must be called with rcu_read_lock or dp_mutex. */ struct datapath *get_dp(int dp_idx) @@ -83,7 +81,7 @@ struct datapath *get_dp(int dp_idx) } EXPORT_SYMBOL_GPL(get_dp); -struct datapath *get_dp_locked(int dp_idx) +static struct datapath *get_dp_locked(int dp_idx) { struct datapath *dp; @@ -95,6 +93,12 @@ struct datapath *get_dp_locked(int dp_idx) return dp; } +/* Must be called with rcu_read_lock or RTNL lock. */ +const char *dp_name(const struct datapath *dp) +{ + return vport_get_name(dp->ports[ODPP_LOCAL]); +} + static inline size_t br_nlmsg_size(void) { return NLMSG_ALIGN(sizeof(struct ifinfomsg)) @@ -107,14 +111,21 @@ static inline size_t br_nlmsg_size(void) } static int dp_fill_ifinfo(struct sk_buff *skb, - const struct net_bridge_port *port, + const struct vport *port, int event, unsigned int flags) { const struct datapath *dp = port->dp; - const struct net_device *dev = port->dev; + int ifindex = vport_get_ifindex(port); + int iflink = vport_get_iflink(port); struct ifinfomsg *hdr; struct nlmsghdr *nlh; + if (ifindex < 0) + return ifindex; + + if (iflink < 0) + return iflink; + nlh = nlmsg_put(skb, 0, 0, event, sizeof(*hdr), flags); if (nlh == NULL) return -EMSGSIZE; @@ -122,24 +133,25 @@ static int dp_fill_ifinfo(struct sk_buff *skb, hdr = nlmsg_data(nlh); hdr->ifi_family = AF_BRIDGE; hdr->__ifi_pad = 0; - hdr->ifi_type = dev->type; - hdr->ifi_index = dev->ifindex; - hdr->ifi_flags = dev_get_flags(dev); + hdr->ifi_type = ARPHRD_ETHER; + hdr->ifi_index = ifindex; + hdr->ifi_flags = vport_get_flags(port); hdr->ifi_change = 0; - NLA_PUT_STRING(skb, IFLA_IFNAME, dev->name); - NLA_PUT_U32(skb, IFLA_MASTER, dp->ports[ODPP_LOCAL]->dev->ifindex); - NLA_PUT_U32(skb, IFLA_MTU, dev->mtu); + NLA_PUT_STRING(skb, IFLA_IFNAME, vport_get_name(port)); + NLA_PUT_U32(skb, IFLA_MASTER, vport_get_ifindex(dp->ports[ODPP_LOCAL])); + NLA_PUT_U32(skb, IFLA_MTU, vport_get_mtu(port)); #ifdef IFLA_OPERSTATE NLA_PUT_U8(skb, IFLA_OPERSTATE, - netif_running(dev) ? dev->operstate : IF_OPER_DOWN); + vport_is_running(port) + ? vport_get_operstate(port) + : IF_OPER_DOWN); #endif - if (dev->addr_len) - NLA_PUT(skb, IFLA_ADDRESS, dev->addr_len, dev->dev_addr); + NLA_PUT(skb, IFLA_ADDRESS, ETH_ALEN, vport_get_addr(port)); - if (dev->ifindex != dev->iflink) - NLA_PUT_U32(skb, IFLA_LINK, dev->iflink); + if (ifindex != iflink) + NLA_PUT_U32(skb, IFLA_LINK,iflink); return nlmsg_end(skb, nlh); @@ -148,9 +160,8 @@ nla_put_failure: return -EMSGSIZE; } -static void dp_ifinfo_notify(int event, struct net_bridge_port *port) +static void dp_ifinfo_notify(int event, struct vport *port) { - struct net *net = dev_net(port->dev); struct sk_buff *skb; int err = -ENOBUFS; @@ -165,11 +176,11 @@ static void dp_ifinfo_notify(int event, struct net_bridge_port *port) kfree_skb(skb); goto errout; } - rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL, GFP_KERNEL); + rtnl_notify(skb, &init_net, 0, RTNLGRP_LINK, NULL, GFP_KERNEL); return; errout: if (err < 0) - rtnl_set_sk_err(net, RTNLGRP_LINK, err); + rtnl_set_sk_err(&init_net, RTNLGRP_LINK, err); } static void release_dp(struct kobject *kobj) @@ -178,23 +189,27 @@ static void release_dp(struct kobject *kobj) kfree(dp); } -struct kobj_type dp_ktype = { +static struct kobj_type dp_ktype = { .release = release_dp }; static int create_dp(int dp_idx, const char __user *devnamep) { - struct net_device *dp_dev; + struct odp_port internal_dev_port; char devname[IFNAMSIZ]; struct datapath *dp; int err; int i; if (devnamep) { - err = -EFAULT; - if (strncpy_from_user(devname, devnamep, IFNAMSIZ - 1) < 0) + int retval = strncpy_from_user(devname, devnamep, IFNAMSIZ); + if (retval < 0) { + err = -EFAULT; goto err; - devname[IFNAMSIZ - 1] = '\0'; + } else if (retval >= IFNAMSIZ) { + err = -ENAMETOOLONG; + goto err; + } } else { snprintf(devname, sizeof devname, "of%d", dp_idx); } @@ -225,26 +240,24 @@ static int create_dp(int dp_idx, const char __user *devnamep) /* Initialize kobject for bridge. This will be added as * /sys/class/net//brif later, if sysfs is enabled. */ - kobject_set_name(&dp->ifobj, SYSFS_BRIDGE_PORT_SUBDIR); /* "brif" */ dp->ifobj.kset = NULL; - dp->ifobj.parent = NULL; kobject_init(&dp->ifobj, &dp_ktype); /* Allocate table. */ err = -ENOMEM; - rcu_assign_pointer(dp->table, dp_table_create(DP_L1_SIZE)); + rcu_assign_pointer(dp->table, tbl_create(0)); if (!dp->table) goto err_free_dp; /* Set up our datapath device. */ - dp_dev = dp_dev_create(dp, devname, ODPP_LOCAL); - err = PTR_ERR(dp_dev); - if (IS_ERR(dp_dev)) - goto err_destroy_table; - - err = new_nbp(dp, dp_dev, ODPP_LOCAL); + BUILD_BUG_ON(sizeof(internal_dev_port.devname) != sizeof(devname)); + strcpy(internal_dev_port.devname, devname); + strcpy(internal_dev_port.type, "internal"); + err = new_vport(dp, &internal_dev_port, ODPP_LOCAL); if (err) { - dp_dev_destroy(dp_dev); + if (err == -EBUSY) + err = -EEXIST; + goto err_destroy_table; } @@ -254,19 +267,17 @@ static int create_dp(int dp_idx, const char __user *devnamep) goto err_destroy_local_port; rcu_assign_pointer(dps[dp_idx], dp); + dp_sysfs_add_dp(dp); + mutex_unlock(&dp_mutex); rtnl_unlock(); -#ifdef SUPPORT_SYSFS - dp_sysfs_add_dp(dp); -#endif - return 0; err_destroy_local_port: - dp_del_port(dp->ports[ODPP_LOCAL]); + dp_detach_port(dp->ports[ODPP_LOCAL]); err_destroy_table: - dp_table_destroy(dp->table, 0); + tbl_destroy(dp->table, NULL); err_free_dp: kfree(dp); err_put_module: @@ -280,27 +291,23 @@ err: static void do_destroy_dp(struct datapath *dp) { - struct net_bridge_port *p, *n; + struct vport *p, *n; int i; list_for_each_entry_safe (p, n, &dp->port_list, node) if (p->port_no != ODPP_LOCAL) - dp_del_port(p); + dp_detach_port(p); -#ifdef SUPPORT_SYSFS dp_sysfs_del_dp(dp); -#endif rcu_assign_pointer(dps[dp->dp_idx], NULL); - dp_del_port(dp->ports[ODPP_LOCAL]); + dp_detach_port(dp->ports[ODPP_LOCAL]); - dp_table_destroy(dp->table, 1); + tbl_destroy(dp->table, flow_free_tbl); for (i = 0; i < DP_N_QUEUES; i++) skb_queue_purge(&dp->queues[i]); - for (i = 0; i < DP_MAX_GROUPS; i++) - kfree(dp->groups[i]); free_percpu(dp->stats_percpu); kobject_put(&dp->ifobj); module_put(THIS_MODULE); @@ -327,63 +334,36 @@ err_unlock: return err; } -static void release_nbp(struct kobject *kobj) -{ - struct net_bridge_port *p = container_of(kobj, struct net_bridge_port, kobj); - kfree(p); -} - -struct kobj_type brport_ktype = { -#ifdef SUPPORT_SYSFS - .sysfs_ops = &brport_sysfs_ops, -#endif - .release = release_nbp -}; - /* Called with RTNL lock and dp_mutex. */ -static int new_nbp(struct datapath *dp, struct net_device *dev, int port_no) +static int new_vport(struct datapath *dp, struct odp_port *odp_port, int port_no) { - struct net_bridge_port *p; + struct vport_parms parms; + struct vport *vport; - if (dev->br_port != NULL) - return -EBUSY; + parms.name = odp_port->devname; + parms.type = odp_port->type; + parms.config = odp_port->config; + parms.dp = dp; + parms.port_no = port_no; - p = kzalloc(sizeof(*p), GFP_KERNEL); - if (!p) - return -ENOMEM; + vport_lock(); + vport = vport_add(&parms); + vport_unlock(); - dev_set_promiscuity(dev, 1); - dev_hold(dev); - p->port_no = port_no; - p->dp = dp; - p->dev = dev; - if (!is_dp_dev(dev)) - rcu_assign_pointer(dev->br_port, p); - else { - /* It would make sense to assign dev->br_port here too, but - * that causes packets received on internal ports to get caught - * in dp_frame_hook(). In turn dp_frame_hook() can reject them - * back to network stack, but that's a waste of time. */ - } - rcu_assign_pointer(dp->ports[port_no], p); - list_add_rcu(&p->node, &dp->port_list); - dp->n_ports++; + if (IS_ERR(vport)) + return PTR_ERR(vport); - /* Initialize kobject for bridge. This will be added as - * /sys/class/net//brport later, if sysfs is enabled. */ - kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR); /* "brport" */ - p->kobj.kset = NULL; - p->kobj.parent = &p->dev->NETDEV_DEV_MEMBER.kobj; - kobject_init(&p->kobj, &brport_ktype); + rcu_assign_pointer(dp->ports[port_no], vport); + list_add_rcu(&vport->node, &dp->port_list); + dp->n_ports++; - dp_ifinfo_notify(RTM_NEWLINK, p); + dp_ifinfo_notify(RTM_NEWLINK, vport); return 0; } -static int add_port(int dp_idx, struct odp_port __user *portp) +static int attach_port(int dp_idx, struct odp_port __user *portp) { - struct net_device *dev; struct datapath *dp; struct odp_port port; int port_no; @@ -393,11 +373,7 @@ static int add_port(int dp_idx, struct odp_port __user *portp) if (copy_from_user(&port, portp, sizeof port)) goto out; port.devname[IFNAMSIZ - 1] = '\0'; - port_no = port.port; - - err = -EINVAL; - if (port_no < 0 || port_no >= DP_MAX_PORTS) - goto out; + port.type[VPORT_TYPE_SIZE - 1] = '\0'; rtnl_lock(); dp = get_dp_locked(dp_idx); @@ -405,38 +381,22 @@ static int add_port(int dp_idx, struct odp_port __user *portp) if (!dp) goto out_unlock_rtnl; - err = -EEXIST; - if (dp->ports[port_no]) - goto out_unlock_dp; - - if (!(port.flags & ODP_PORT_INTERNAL)) { - err = -ENODEV; - dev = dev_get_by_name(&init_net, port.devname); - if (!dev) - goto out_unlock_dp; - - err = -EINVAL; - if (dev->flags & IFF_LOOPBACK || dev->type != ARPHRD_ETHER || - is_dp_dev(dev)) - goto out_put; - } else { - dev = dp_dev_create(dp, port.devname, port_no); - err = PTR_ERR(dev); - if (IS_ERR(dev)) - goto out_unlock_dp; - dev_hold(dev); - } + for (port_no = 1; port_no < DP_MAX_PORTS; port_no++) + if (!dp->ports[port_no]) + goto got_port_no; + err = -EFBIG; + goto out_unlock_dp; - err = new_nbp(dp, dev, port_no); +got_port_no: + err = new_vport(dp, &port, port_no); if (err) - goto out_put; + goto out_unlock_dp; -#ifdef SUPPORT_SYSFS + set_internal_devs_mtu(dp); dp_sysfs_add_if(dp->ports[port_no]); -#endif -out_put: - dev_put(dev); + err = put_user(port_no, &portp->port); + out_unlock_dp: mutex_unlock(&dp->mutex); out_unlock_rtnl: @@ -445,47 +405,33 @@ out: return err; } -int dp_del_port(struct net_bridge_port *p) +int dp_detach_port(struct vport *p) { + int err; + ASSERT_RTNL(); -#ifdef SUPPORT_SYSFS if (p->port_no != ODPP_LOCAL) dp_sysfs_del_if(p); -#endif dp_ifinfo_notify(RTM_DELLINK, p); - p->dp->n_ports--; - - if (is_dp_dev(p->dev)) { - /* Make sure that no packets arrive from now on, since - * dp_dev_xmit() will try to find itself through - * p->dp->ports[], and we're about to set that to null. */ - netif_tx_disable(p->dev); - } - /* First drop references to device. */ - dev_set_promiscuity(p->dev, -1); + p->dp->n_ports--; list_del_rcu(&p->node); rcu_assign_pointer(p->dp->ports[p->port_no], NULL); - rcu_assign_pointer(p->dev->br_port, NULL); - - /* Then wait until no one is still using it, and destroy it. */ - synchronize_rcu(); - if (is_dp_dev(p->dev)) - dp_dev_destroy(p->dev); - dev_put(p->dev); - kobject_put(&p->kobj); + /* Then destroy it. */ + vport_lock(); + err = vport_del(p); + vport_unlock(); - return 0; + return err; } -static int del_port(int dp_idx, int port_no) +static int detach_port(int dp_idx, int port_no) { - struct net_bridge_port *p; + struct vport *p; struct datapath *dp; - LIST_HEAD(dp_devs); int err; err = -EINVAL; @@ -503,7 +449,7 @@ static int del_port(int dp_idx, int port_no) if (!p) goto out_unlock_dp; - err = dp_del_port(p); + err = dp_detach_port(p); out_unlock_dp: mutex_unlock(&dp->mutex); @@ -514,289 +460,269 @@ out: } /* Must be called with rcu_read_lock. */ -static void -do_port_input(struct net_bridge_port *p, struct sk_buff *skb) -{ - /* 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) - return; - - /* Push the Ethernet header back on. */ - skb_push(skb, ETH_HLEN); - skb_reset_mac_header(skb); - dp_process_received_packet(skb, p); -} - -/* Must be called with rcu_read_lock and with bottom-halves disabled. */ -void dp_process_received_packet(struct sk_buff *skb, struct net_bridge_port *p) +void dp_process_received_packet(struct vport *p, struct sk_buff *skb) { struct datapath *dp = p->dp; struct dp_stats_percpu *stats; - struct odp_flow_key key; - struct sw_flow *flow; + int stats_counter_off; + struct sw_flow_actions *acts; + struct loop_counter *loop; + int error; - WARN_ON_ONCE(skb_shared(skb)); + OVS_CB(skb)->vport = p; - /* BHs are off so we don't have to use get_cpu()/put_cpu() here. */ - stats = percpu_ptr(dp->stats_percpu, smp_processor_id()); + if (!OVS_CB(skb)->flow) { + struct odp_flow_key key; + struct tbl_node *flow_node; + bool is_frag; - if (flow_extract(skb, p ? p->port_no : ODPP_NONE, &key)) { - if (dp->drop_frags) { + /* Extract flow from 'skb' into 'key'. */ + error = flow_extract(skb, p ? p->port_no : ODPP_NONE, &key, &is_frag); + if (unlikely(error)) { kfree_skb(skb); - stats->n_frags++; return; } - } - flow = dp_table_lookup(rcu_dereference(dp->table), &key); - if (flow) { - struct sw_flow_actions *acts = rcu_dereference(flow->sf_acts); - flow_used(flow, skb); - execute_actions(dp, skb, &key, acts->actions, acts->n_actions, - GFP_ATOMIC); - stats->n_hit++; - } else { - stats->n_missed++; - dp_output_control(dp, skb, _ODPL_MISS_NR, 0); - } -} + if (is_frag && dp->drop_frags) { + kfree_skb(skb); + stats_counter_off = offsetof(struct dp_stats_percpu, n_frags); + goto out; + } -/* - * 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 *dp_frame_hook(struct net_bridge_port *p, - struct sk_buff *skb) -{ - do_port_input(p, skb); - return NULL; -} -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -/* Called with rcu_read_lock and bottom-halves disabled. */ -static int dp_frame_hook(struct net_bridge_port *p, struct sk_buff **pskb) -{ - do_port_input(p, *pskb); - return 1; -} -#else -#error -#endif + /* Look up flow. */ + flow_node = tbl_lookup(rcu_dereference(dp->table), &key, + flow_hash(&key), flow_cmp); + if (unlikely(!flow_node)) { + dp_output_control(dp, skb, _ODPL_MISS_NR, OVS_CB(skb)->tun_id); + stats_counter_off = offsetof(struct dp_stats_percpu, n_missed); + goto out; + } -#ifdef CONFIG_XEN -/* This code is copied verbatim from net/dev/core.c in Xen's - * linux-2.6.18-92.1.10.el5.xs5.0.0.394.644. We can't call those functions - * directly because they aren't exported. */ -static int skb_pull_up_to(struct sk_buff *skb, void *ptr) -{ - if (ptr < (void *)skb->tail) - return 1; - if (__pskb_pull_tail(skb, - ptr - (void *)skb->data - skb_headlen(skb))) { - return 1; - } else { - return 0; + OVS_CB(skb)->flow = flow_cast(flow_node); } -} -int skb_checksum_setup(struct sk_buff *skb) -{ - if (skb->proto_csum_blank) { - if (skb->protocol != htons(ETH_P_IP)) - goto out; - if (!skb_pull_up_to(skb, skb->nh.iph + 1)) - goto out; - skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl; - switch (skb->nh.iph->protocol) { - case IPPROTO_TCP: - skb->csum = offsetof(struct tcphdr, check); - break; - case IPPROTO_UDP: - skb->csum = offsetof(struct udphdr, check); - break; - default: - if (net_ratelimit()) - printk(KERN_ERR "Attempting to checksum a non-" - "TCP/UDP packet, dropping a protocol" - " %d packet", skb->nh.iph->protocol); - goto out; - } - if (!skb_pull_up_to(skb, skb->h.raw + skb->csum + 2)) - goto out; - skb->ip_summed = CHECKSUM_HW; - skb->proto_csum_blank = 0; + flow_used(OVS_CB(skb)->flow, skb); + + acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts); + + /* Check whether we've looped too much. */ + loop = loop_get_counter(); + if (unlikely(++loop->count > MAX_LOOPS)) + loop->looping = true; + if (unlikely(loop->looping)) { + loop_suppress(dp, acts); + goto out_loop; } - return 0; + + /* Execute actions. */ + execute_actions(dp, skb, &OVS_CB(skb)->flow->key, acts->actions, + acts->actions_len); + stats_counter_off = offsetof(struct dp_stats_percpu, n_hit); + + /* Check whether sub-actions looped too much. */ + if (unlikely(loop->looping)) + loop_suppress(dp, acts); + +out_loop: + /* Decrement loop counter. */ + if (!--loop->count) + loop->looping = false; + loop_put_counter(); + out: - return -EPROTO; + /* Update datapath statistics. */ + local_bh_disable(); + stats = per_cpu_ptr(dp->stats_percpu, smp_processor_id()); + + write_seqcount_begin(&stats->seqlock); + (*(u64 *)((u8 *)stats + stats_counter_off))++; + write_seqcount_end(&stats->seqlock); + + local_bh_enable(); } -#endif -int -dp_output_control(struct datapath *dp, struct sk_buff *skb, int queue_no, - u32 arg) +/* Append each packet in 'skb' list to 'queue'. There will be only one packet + * unless we broke up a GSO packet. */ +static int queue_control_packets(struct sk_buff *skb, struct sk_buff_head *queue, + int queue_no, u64 arg) { - struct dp_stats_percpu *stats; - struct sk_buff_head *queue; + struct sk_buff *nskb; int port_no; int err; - WARN_ON_ONCE(skb_shared(skb)); - BUG_ON(queue_no != _ODPL_MISS_NR && queue_no != _ODPL_ACTION_NR); - - queue = &dp->queues[queue_no]; - err = -ENOBUFS; - if (skb_queue_len(queue) >= DP_MAX_QUEUE_LEN) - goto err_kfree_skb; - - /* If a checksum-deferred packet is forwarded to the controller, - * correct the pointers and checksum. This happens on a regular basis - * only on Xen (the CHECKSUM_HW case), on which VMs can pass up packets - * that do not have their checksum computed. We also implement it for - * the non-Xen case, but it is difficult to trigger or test this case - * there, hence the WARN_ON_ONCE(). - */ - err = skb_checksum_setup(skb); - if (err) - goto err_kfree_skb; -#ifndef CHECKSUM_HW - if (skb->ip_summed == CHECKSUM_PARTIAL) { - WARN_ON_ONCE(1); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) - /* Until 2.6.22, the start of the transport header was also the - * start of data to be checksummed. Linux 2.6.22 introduced - * the csum_start field for this purpose, but we should point - * the transport header to it anyway for backward - * compatibility, as dev_queue_xmit() does even in 2.6.28. */ - skb_set_transport_header(skb, skb->csum_start - - skb_headroom(skb)); -#endif - err = skb_checksum_help(skb); - if (err) - goto err_kfree_skb; - } -#else - if (skb->ip_summed == CHECKSUM_HW) { - err = skb_checksum_help(skb, 0); - if (err) - goto err_kfree_skb; - } -#endif - - /* Break apart GSO packets into their component pieces. Otherwise - * userspace may try to stuff a 64kB packet into a 1500-byte MTU. */ - if (skb_is_gso(skb)) { - struct sk_buff *nskb = skb_gso_segment(skb, 0); - if (nskb) { - kfree_skb(skb); - skb = nskb; - if (unlikely(IS_ERR(skb))) { - err = PTR_ERR(skb); - goto err; - } - } else { - /* XXX This case might not be possible. It's hard to - * tell from the skb_gso_segment() code and comment. */ - } - } - - /* Figure out port number. */ - port_no = ODPP_LOCAL; - if (skb->dev) { - if (skb->dev->br_port) - port_no = skb->dev->br_port->port_no; - else if (is_dp_dev(skb->dev)) - port_no = dp_dev_priv(skb->dev)->port_no; - } + if (OVS_CB(skb)->vport) + port_no = OVS_CB(skb)->vport->port_no; + else + port_no = ODPP_LOCAL; - /* Append each packet to queue. There will be only one packet unless - * we broke up a GSO packet above. */ do { struct odp_msg *header; - struct sk_buff *nskb = skb->next; + + nskb = skb->next; skb->next = NULL; err = skb_cow(skb, sizeof *header); - if (err) { - while (nskb) { - kfree_skb(skb); - skb = nskb; - nskb = skb->next; - } - goto err_kfree_skb; - } + if (err) + goto err_kfree_skbs; header = (struct odp_msg*)__skb_push(skb, sizeof *header); header->type = queue_no; header->length = skb->len; header->port = port_no; - header->reserved = 0; header->arg = arg; skb_queue_tail(queue, skb); skb = nskb; } while (skb); + return 0; + +err_kfree_skbs: + kfree_skb(skb); + while ((skb = nskb) != NULL) { + nskb = skb->next; + kfree_skb(skb); + } + return err; +} + +int dp_output_control(struct datapath *dp, struct sk_buff *skb, int queue_no, + u64 arg) +{ + struct dp_stats_percpu *stats; + struct sk_buff_head *queue; + int err; + + WARN_ON_ONCE(skb_shared(skb)); + BUG_ON(queue_no != _ODPL_MISS_NR && queue_no != _ODPL_ACTION_NR && queue_no != _ODPL_SFLOW_NR); + queue = &dp->queues[queue_no]; + err = -ENOBUFS; + if (skb_queue_len(queue) >= DP_MAX_QUEUE_LEN) + goto err_kfree_skb; + + forward_ip_summed(skb); + + err = vswitch_skb_checksum_setup(skb); + if (err) + goto err_kfree_skb; + + /* Break apart GSO packets into their component pieces. Otherwise + * userspace may try to stuff a 64kB packet into a 1500-byte MTU. */ + if (skb_is_gso(skb)) { + struct sk_buff *nskb = skb_gso_segment(skb, NETIF_F_SG | NETIF_F_HW_CSUM); + + kfree_skb(skb); + skb = nskb; + if (unlikely(IS_ERR(skb))) { + err = PTR_ERR(skb); + goto err; + } + } + err = queue_control_packets(skb, queue, queue_no, arg); wake_up_interruptible(&dp->waitqueue); - return 0; + return err; err_kfree_skb: kfree_skb(skb); err: - stats = percpu_ptr(dp->stats_percpu, get_cpu()); + local_bh_disable(); + stats = per_cpu_ptr(dp->stats_percpu, smp_processor_id()); + + write_seqcount_begin(&stats->seqlock); stats->n_lost++; - put_cpu(); + write_seqcount_end(&stats->seqlock); + + local_bh_enable(); return err; } static int flush_flows(struct datapath *dp) { - dp->n_flows = 0; - return dp_table_flush(dp); + struct tbl *old_table = rcu_dereference(dp->table); + struct tbl *new_table; + + new_table = tbl_create(0); + if (!new_table) + return -ENOMEM; + + rcu_assign_pointer(dp->table, new_table); + + tbl_deferred_destroy(old_table, flow_free_tbl); + + return 0; } -static int validate_actions(const struct sw_flow_actions *actions) +static int validate_actions(const struct nlattr *actions, u32 actions_len) { - unsigned int i; - - for (i = 0; i < actions->n_actions; i++) { - const union odp_action *a = &actions->actions[i]; - switch (a->type) { - case ODPAT_OUTPUT: - if (a->output.port >= DP_MAX_PORTS) - return -EINVAL; - break; + const struct nlattr *a; + int rem; + + nla_for_each_attr(a, actions, actions_len, rem) { + static const u32 action_lens[ODPAT_MAX + 1] = { + [ODPAT_OUTPUT] = 4, + [ODPAT_CONTROLLER] = 8, + [ODPAT_SET_DL_TCI] = 2, + [ODPAT_STRIP_VLAN] = 0, + [ODPAT_SET_DL_SRC] = ETH_ALEN, + [ODPAT_SET_DL_DST] = ETH_ALEN, + [ODPAT_SET_NW_SRC] = 4, + [ODPAT_SET_NW_DST] = 4, + [ODPAT_SET_NW_TOS] = 1, + [ODPAT_SET_TP_SRC] = 2, + [ODPAT_SET_TP_DST] = 2, + [ODPAT_SET_TUNNEL] = 8, + [ODPAT_SET_PRIORITY] = 4, + [ODPAT_POP_PRIORITY] = 0, + [ODPAT_DROP_SPOOFED_ARP] = 0, + }; + int type = nla_type(a); + + if (type > ODPAT_MAX || nla_len(a) != action_lens[type]) + return -EINVAL; + + switch (type) { + case ODPAT_UNSPEC: + return -EINVAL; - case ODPAT_OUTPUT_GROUP: - if (a->output_group.group >= DP_MAX_GROUPS) + case ODPAT_CONTROLLER: + case ODPAT_STRIP_VLAN: + case ODPAT_SET_DL_SRC: + case ODPAT_SET_DL_DST: + case ODPAT_SET_NW_SRC: + case ODPAT_SET_NW_DST: + case ODPAT_SET_TP_SRC: + case ODPAT_SET_TP_DST: + case ODPAT_SET_TUNNEL: + case ODPAT_SET_PRIORITY: + case ODPAT_POP_PRIORITY: + case ODPAT_DROP_SPOOFED_ARP: + /* No validation needed. */ + break; + + case ODPAT_OUTPUT: + if (nla_get_u32(a) >= DP_MAX_PORTS) + return -EINVAL; + + case ODPAT_SET_DL_TCI: + if (nla_get_be16(a) & htons(VLAN_CFI_MASK)) return -EINVAL; - break; + break; - case ODPAT_SET_VLAN_VID: - if (a->vlan_vid.vlan_vid & htons(~VLAN_VID_MASK)) - return -EINVAL; - break; + case ODPAT_SET_NW_TOS: + if (nla_get_u8(a) & INET_ECN_MASK) + return -EINVAL; + break; - case ODPAT_SET_VLAN_PCP: - if (a->vlan_pcp.vlan_pcp - & ~(VLAN_PCP_MASK >> VLAN_PCP_SHIFT)) - return -EINVAL; - break; + default: + return -EOPNOTSUPP; + } + } - default: - if (a->type >= ODPAT_N_ACTIONS) - return -EOPNOTSUPP; - break; - } - } + if (rem > 0) + return -EINVAL; - return 0; + return 0; } static struct sw_flow_actions *get_actions(const struct odp_flow *flow) @@ -804,16 +730,15 @@ static struct sw_flow_actions *get_actions(const struct odp_flow *flow) struct sw_flow_actions *actions; int error; - actions = flow_actions_alloc(flow->n_actions); + actions = flow_actions_alloc(flow->actions_len); error = PTR_ERR(actions); if (IS_ERR(actions)) goto error; error = -EFAULT; - if (copy_from_user(actions->actions, flow->actions, - flow->n_actions * sizeof(union odp_action))) + if (copy_from_user(actions->actions, flow->actions, flow->actions_len)) goto error_free_actions; - error = validate_actions(actions); + error = validate_actions(actions->actions, actions->actions_len); if (error) goto error_free_actions; @@ -827,104 +752,119 @@ error: static void get_stats(struct sw_flow *flow, struct odp_flow_stats *stats) { - if (flow->used.tv_sec) { - stats->used_sec = flow->used.tv_sec; - stats->used_nsec = flow->used.tv_nsec; + if (flow->used) { + struct timespec offset_ts, used, now_mono; + + ktime_get_ts(&now_mono); + jiffies_to_timespec(jiffies - flow->used, &offset_ts); + set_normalized_timespec(&used, now_mono.tv_sec - offset_ts.tv_sec, + now_mono.tv_nsec - offset_ts.tv_nsec); + + stats->used_sec = used.tv_sec; + stats->used_nsec = used.tv_nsec; } else { stats->used_sec = 0; stats->used_nsec = 0; } + stats->n_packets = flow->packet_count; stats->n_bytes = flow->byte_count; - stats->ip_tos = flow->ip_tos; + stats->reserved = 0; stats->tcp_flags = flow->tcp_flags; + stats->error = 0; } static void clear_stats(struct sw_flow *flow) { - flow->used.tv_sec = flow->used.tv_nsec = 0; + flow->used = 0; flow->tcp_flags = 0; - flow->ip_tos = 0; flow->packet_count = 0; flow->byte_count = 0; } -static int put_flow(struct datapath *dp, struct odp_flow_put __user *ufp) +static int expand_table(struct datapath *dp) { - struct odp_flow_put uf; + struct tbl *old_table = rcu_dereference(dp->table); + struct tbl *new_table; + + new_table = tbl_expand(old_table); + if (IS_ERR(new_table)) + return PTR_ERR(new_table); + + rcu_assign_pointer(dp->table, new_table); + tbl_deferred_destroy(old_table, NULL); + + return 0; +} + +static int do_put_flow(struct datapath *dp, struct odp_flow_put *uf, + struct odp_flow_stats *stats) +{ + struct tbl_node *flow_node; struct sw_flow *flow; - struct dp_table *table; - struct odp_flow_stats stats; + struct tbl *table; int error; - error = -EFAULT; - if (copy_from_user(&uf, ufp, sizeof(struct odp_flow_put))) - goto error; - uf.flow.key.reserved = 0; - table = rcu_dereference(dp->table); - flow = dp_table_lookup(table, &uf.flow.key); - if (!flow) { + flow_node = tbl_lookup(table, &uf->flow.key, flow_hash(&uf->flow.key), flow_cmp); + if (!flow_node) { /* No such flow. */ struct sw_flow_actions *acts; error = -ENOENT; - if (!(uf.flags & ODPPF_CREATE)) + if (!(uf->flags & ODPPF_CREATE)) goto error; /* Expand table, if necessary, to make room. */ - if (dp->n_flows >= table->n_buckets) { - error = -ENOSPC; - if (table->n_buckets >= DP_MAX_BUCKETS) - goto error; - - error = dp_table_expand(dp); + if (tbl_count(table) >= tbl_n_buckets(table)) { + error = expand_table(dp); if (error) goto error; table = rcu_dereference(dp->table); } /* Allocate flow. */ - error = -ENOMEM; - flow = kmem_cache_alloc(flow_cache, GFP_KERNEL); - if (flow == NULL) + flow = flow_alloc(); + if (IS_ERR(flow)) { + error = PTR_ERR(flow); goto error; - flow->key = uf.flow.key; - spin_lock_init(&flow->lock); + } + flow->key = uf->flow.key; clear_stats(flow); /* Obtain actions. */ - acts = get_actions(&uf.flow); + acts = get_actions(&uf->flow); error = PTR_ERR(acts); if (IS_ERR(acts)) goto error_free_flow; rcu_assign_pointer(flow->sf_acts, acts); /* Put flow in bucket. */ - error = dp_table_insert(table, flow); + error = tbl_insert(table, &flow->tbl_node, flow_hash(&flow->key)); if (error) goto error_free_flow_acts; - dp->n_flows++; - memset(&stats, 0, sizeof(struct odp_flow_stats)); + + memset(stats, 0, sizeof(struct odp_flow_stats)); } else { /* We found a matching flow. */ struct sw_flow_actions *old_acts, *new_acts; - unsigned long int flags; + + flow = flow_cast(flow_node); /* Bail out if we're not allowed to modify an existing flow. */ error = -EEXIST; - if (!(uf.flags & ODPPF_MODIFY)) + if (!(uf->flags & ODPPF_MODIFY)) goto error; /* Swap actions. */ - new_acts = get_actions(&uf.flow); + new_acts = get_actions(&uf->flow); error = PTR_ERR(new_acts); if (IS_ERR(new_acts)) goto error; old_acts = rcu_dereference(flow->sf_acts); - if (old_acts->n_actions != new_acts->n_actions || + if (old_acts->actions_len != new_acts->actions_len || memcmp(old_acts->actions, new_acts->actions, - sizeof(union odp_action) * old_acts->n_actions)) { + old_acts->actions_len)) { rcu_assign_pointer(flow->sf_acts, new_acts); flow_deferred_free_acts(old_acts); } else { @@ -932,47 +872,71 @@ static int put_flow(struct datapath *dp, struct odp_flow_put __user *ufp) } /* Fetch stats, then clear them if necessary. */ - spin_lock_irqsave(&flow->lock, flags); - get_stats(flow, &stats); - if (uf.flags & ODPPF_ZERO_STATS) + spin_lock_bh(&flow->lock); + get_stats(flow, stats); + if (uf->flags & ODPPF_ZERO_STATS) clear_stats(flow); - spin_unlock_irqrestore(&flow->lock, flags); + spin_unlock_bh(&flow->lock); } - /* Copy stats to userspace. */ - if (__copy_to_user(&ufp->flow.stats, &stats, - sizeof(struct odp_flow_stats))) - return -EFAULT; return 0; error_free_flow_acts: kfree(flow->sf_acts); error_free_flow: - kmem_cache_free(flow_cache, flow); + flow->sf_acts = NULL; + flow_put(flow); error: return error; } -static int put_actions(const struct sw_flow *flow, struct odp_flow __user *ufp) +static int put_flow(struct datapath *dp, struct odp_flow_put __user *ufp) +{ + struct odp_flow_stats stats; + struct odp_flow_put uf; + int error; + + if (copy_from_user(&uf, ufp, sizeof(struct odp_flow_put))) + return -EFAULT; + + error = do_put_flow(dp, &uf, &stats); + if (error) + return error; + + if (copy_to_user(&ufp->flow.stats, &stats, + sizeof(struct odp_flow_stats))) + return -EFAULT; + + return 0; +} + +static int do_answer_query(struct sw_flow *flow, u32 query_flags, + struct odp_flow_stats __user *ustats, + struct nlattr __user *actions, + u32 __user *actions_lenp) { - union odp_action __user *actions; struct sw_flow_actions *sf_acts; - u32 n_actions; + struct odp_flow_stats stats; + u32 actions_len; + + spin_lock_bh(&flow->lock); + get_stats(flow, &stats); + if (query_flags & ODPFF_ZERO_TCP_FLAGS) + flow->tcp_flags = 0; + + spin_unlock_bh(&flow->lock); - if (__get_user(actions, &ufp->actions) || - __get_user(n_actions, &ufp->n_actions)) + if (copy_to_user(ustats, &stats, sizeof(struct odp_flow_stats)) || + get_user(actions_len, actions_lenp)) return -EFAULT; - if (!n_actions) + if (!actions_len) return 0; - if (ufp->n_actions > INT_MAX / sizeof(union odp_action)) - return -EINVAL; sf_acts = rcu_dereference(flow->sf_acts); - if (__put_user(sf_acts->n_actions, &ufp->n_actions) || + if (put_user(sf_acts->actions_len, actions_lenp) || (actions && copy_to_user(actions, sf_acts->actions, - sizeof(union odp_action) * - min(sf_acts->n_actions, n_actions)))) + min(sf_acts->actions_len, actions_len)))) return -EFAULT; return 0; @@ -981,82 +945,73 @@ static int put_actions(const struct sw_flow *flow, struct odp_flow __user *ufp) static int answer_query(struct sw_flow *flow, u32 query_flags, struct odp_flow __user *ufp) { - struct odp_flow_stats stats; - unsigned long int flags; + struct nlattr *actions; - spin_lock_irqsave(&flow->lock, flags); - get_stats(flow, &stats); + if (get_user(actions, &ufp->actions)) + return -EFAULT; - if (query_flags & ODPFF_ZERO_TCP_FLAGS) { - flow->tcp_flags = 0; - } - spin_unlock_irqrestore(&flow->lock, flags); + return do_answer_query(flow, query_flags, + &ufp->stats, actions, &ufp->actions_len); +} - if (__copy_to_user(&ufp->stats, &stats, sizeof(struct odp_flow_stats))) - return -EFAULT; - return put_actions(flow, ufp); +static struct sw_flow *do_del_flow(struct datapath *dp, struct odp_flow_key *key) +{ + struct tbl *table = rcu_dereference(dp->table); + struct tbl_node *flow_node; + int error; + + flow_node = tbl_lookup(table, key, flow_hash(key), flow_cmp); + if (!flow_node) + return ERR_PTR(-ENOENT); + + error = tbl_remove(table, flow_node); + if (error) + return ERR_PTR(error); + + /* XXX Returned flow_node's statistics might lose a few packets, since + * other CPUs can be using this flow. We used to synchronize_rcu() to + * make sure that we get completely accurate stats, but that blows our + * performance, badly. */ + return flow_cast(flow_node); } -static int del_or_query_flow(struct datapath *dp, - struct odp_flow __user *ufp, - unsigned int cmd) +static int del_flow(struct datapath *dp, struct odp_flow __user *ufp) { - struct dp_table *table = rcu_dereference(dp->table); - struct odp_flow uf; struct sw_flow *flow; + struct odp_flow uf; int error; - error = -EFAULT; if (copy_from_user(&uf, ufp, sizeof uf)) - goto error; - uf.key.reserved = 0; + return -EFAULT; - flow = dp_table_lookup(table, &uf.key); - error = -ENOENT; - if (!flow) - goto error; + flow = do_del_flow(dp, &uf.key); + if (IS_ERR(flow)) + return PTR_ERR(flow); - if (cmd == ODP_FLOW_DEL) { - /* XXX redundant lookup */ - error = dp_table_delete(table, flow); - if (error) - goto error; - - /* XXX These statistics might lose a few packets, since other - * CPUs can be using this flow. We used to synchronize_rcu() - * to make sure that we get completely accurate stats, but that - * blows our performance, badly. */ - dp->n_flows--; - error = answer_query(flow, 0, ufp); - flow_deferred_free(flow); - } else { - error = answer_query(flow, uf.flags, ufp); - } - -error: + error = answer_query(flow, 0, ufp); + flow_deferred_free(flow); return error; } -static int query_multiple_flows(struct datapath *dp, - const struct odp_flowvec *flowvec) +static int do_query_flows(struct datapath *dp, const struct odp_flowvec *flowvec) { - struct dp_table *table = rcu_dereference(dp->table); - int i; + struct tbl *table = rcu_dereference(dp->table); + u32 i; + for (i = 0; i < flowvec->n_flows; i++) { - struct __user odp_flow *ufp = &flowvec->flows[i]; + struct odp_flow __user *ufp = &flowvec->flows[i]; struct odp_flow uf; - struct sw_flow *flow; + struct tbl_node *flow_node; int error; - if (__copy_from_user(&uf, ufp, sizeof uf)) + if (copy_from_user(&uf, ufp, sizeof uf)) return -EFAULT; - uf.key.reserved = 0; - flow = dp_table_lookup(table, &uf.key); - if (!flow) - error = __clear_user(&ufp->stats, sizeof ufp->stats); + flow_node = tbl_lookup(table, &uf.key, flow_hash(&uf.key), flow_cmp); + if (!flow_node) + error = put_user(ENOENT, &ufp->stats.error); else - error = answer_query(flow, 0, ufp); + error = answer_query(flow_cast(flow_node), uf.flags, ufp); if (error) return -EFAULT; } @@ -1065,17 +1020,18 @@ static int query_multiple_flows(struct datapath *dp, struct list_flows_cbdata { struct odp_flow __user *uflows; - int n_flows; - int listed_flows; + u32 n_flows; + u32 listed_flows; }; -static int list_flow(struct sw_flow *flow, void *cbdata_) +static int list_flow(struct tbl_node *node, void *cbdata_) { + struct sw_flow *flow = flow_cast(node); struct list_flows_cbdata *cbdata = cbdata_; struct odp_flow __user *ufp = &cbdata->uflows[cbdata->listed_flows++]; int error; - if (__copy_to_user(&ufp->key, &flow->key, sizeof flow->key)) + if (copy_to_user(&ufp->key, &flow->key, sizeof flow->key)) return -EFAULT; error = answer_query(flow, 0, ufp); if (error) @@ -1086,7 +1042,7 @@ static int list_flow(struct sw_flow *flow, void *cbdata_) return 0; } -static int list_flows(struct datapath *dp, const struct odp_flowvec *flowvec) +static int do_list_flows(struct datapath *dp, const struct odp_flowvec *flowvec) { struct list_flows_cbdata cbdata; int error; @@ -1097,8 +1053,8 @@ static int list_flows(struct datapath *dp, const struct odp_flowvec *flowvec) cbdata.uflows = flowvec->flows; cbdata.n_flows = flowvec->n_flows; cbdata.listed_flows = 0; - error = dp_table_foreach(rcu_dereference(dp->table), - list_flow, &cbdata); + + error = tbl_foreach(rcu_dereference(dp->table), list_flow, &cbdata); return error ? error : cbdata.listed_flows; } @@ -1111,83 +1067,74 @@ static int do_flowvec_ioctl(struct datapath *dp, unsigned long argp, int retval; uflowvec = (struct odp_flowvec __user *)argp; - if (!access_ok(VERIFY_WRITE, uflowvec, sizeof *uflowvec) || - copy_from_user(&flowvec, uflowvec, sizeof flowvec)) + if (copy_from_user(&flowvec, uflowvec, sizeof flowvec)) return -EFAULT; if (flowvec.n_flows > INT_MAX / sizeof(struct odp_flow)) return -EINVAL; - if (!access_ok(VERIFY_WRITE, flowvec.flows, - flowvec.n_flows * sizeof(struct odp_flow))) - return -EFAULT; - retval = function(dp, &flowvec); return (retval < 0 ? retval : retval == flowvec.n_flows ? 0 - : __put_user(retval, &uflowvec->n_flows)); + : put_user(retval, &uflowvec->n_flows)); } -static int do_execute(struct datapath *dp, const struct odp_execute *executep) +static int do_execute(struct datapath *dp, const struct odp_execute *execute) { - struct odp_execute execute; struct odp_flow_key key; struct sk_buff *skb; struct sw_flow_actions *actions; struct ethhdr *eth; + bool is_frag; int err; - err = -EFAULT; - if (copy_from_user(&execute, executep, sizeof execute)) - goto error; - err = -EINVAL; - if (execute.length < ETH_HLEN || execute.length > 65535) + if (execute->length < ETH_HLEN || execute->length > 65535) goto error; - err = -ENOMEM; - actions = flow_actions_alloc(execute.n_actions); - if (!actions) + actions = flow_actions_alloc(execute->actions_len); + if (IS_ERR(actions)) { + err = PTR_ERR(actions); goto error; + } err = -EFAULT; - if (copy_from_user(actions->actions, execute.actions, - execute.n_actions * sizeof *execute.actions)) + if (copy_from_user(actions->actions, execute->actions, execute->actions_len)) goto error_free_actions; - err = validate_actions(actions); + err = validate_actions(actions->actions, execute->actions_len); if (err) goto error_free_actions; err = -ENOMEM; - skb = alloc_skb(execute.length, GFP_KERNEL); + skb = alloc_skb(execute->length, GFP_KERNEL); if (!skb) goto error_free_actions; - if (execute.in_port < DP_MAX_PORTS) { - struct net_bridge_port *p = dp->ports[execute.in_port]; - if (p) - skb->dev = p->dev; - } err = -EFAULT; - if (copy_from_user(skb_put(skb, execute.length), execute.data, - execute.length)) + if (copy_from_user(skb_put(skb, execute->length), execute->data, + execute->length)) goto error_free_skb; skb_reset_mac_header(skb); eth = eth_hdr(skb); - /* Normally, setting the skb 'protocol' field would be handled by a - * call to eth_type_trans(), but it assumes there's a sending - * device, which we may not have. */ + /* Normally, setting the skb 'protocol' field would be handled by a + * call to eth_type_trans(), but it assumes there's a sending + * device, which we may not have. */ if (ntohs(eth->h_proto) >= 1536) skb->protocol = eth->h_proto; else skb->protocol = htons(ETH_P_802_2); - flow_extract(skb, execute.in_port, &key); - err = execute_actions(dp, skb, &key, actions->actions, - actions->n_actions, GFP_KERNEL); + err = flow_extract(skb, -1, &key, &is_frag); + if (err) + goto error_free_skb; + + rcu_read_lock(); + err = execute_actions(dp, skb, &key, actions->actions, actions->actions_len); + rcu_read_unlock(); + kfree(actions); return err; @@ -1199,26 +1146,44 @@ error: return err; } -static int -get_dp_stats(struct datapath *dp, struct odp_stats __user *statsp) +static int execute_packet(struct datapath *dp, const struct odp_execute __user *executep) +{ + struct odp_execute execute; + + if (copy_from_user(&execute, executep, sizeof execute)) + return -EFAULT; + + return do_execute(dp, &execute); +} + +static int get_dp_stats(struct datapath *dp, struct odp_stats __user *statsp) { + struct tbl *table = rcu_dereference(dp->table); struct odp_stats stats; int i; - stats.n_flows = dp->n_flows; - stats.cur_capacity = rcu_dereference(dp->table)->n_buckets; - stats.max_capacity = DP_MAX_BUCKETS; + stats.n_flows = tbl_count(table); + stats.cur_capacity = tbl_n_buckets(table); + stats.max_capacity = TBL_MAX_BUCKETS; stats.n_ports = dp->n_ports; stats.max_ports = DP_MAX_PORTS; - stats.max_groups = DP_MAX_GROUPS; stats.n_frags = stats.n_hit = stats.n_missed = stats.n_lost = 0; for_each_possible_cpu(i) { - const struct dp_stats_percpu *s; - s = percpu_ptr(dp->stats_percpu, i); - stats.n_frags += s->n_frags; - stats.n_hit += s->n_hit; - stats.n_missed += s->n_missed; - stats.n_lost += s->n_lost; + const struct dp_stats_percpu *percpu_stats; + struct dp_stats_percpu local_stats; + unsigned seqcount; + + percpu_stats = per_cpu_ptr(dp->stats_percpu, i); + + do { + seqcount = read_seqcount_begin(&percpu_stats->seqlock); + local_stats = *percpu_stats; + } while (read_seqcount_retry(&percpu_stats->seqlock, seqcount)); + + stats.n_frags += local_stats.n_frags; + stats.n_hit += local_stats.n_hit; + stats.n_missed += local_stats.n_missed; + stats.n_lost += local_stats.n_lost; } stats.max_miss_queue = DP_MAX_QUEUE_LEN; stats.max_action_queue = DP_MAX_QUEUE_LEN; @@ -1228,164 +1193,134 @@ get_dp_stats(struct datapath *dp, struct odp_stats __user *statsp) /* MTU of the dp pseudo-device: ETH_DATA_LEN or the minimum of the ports */ int dp_min_mtu(const struct datapath *dp) { - struct net_bridge_port *p; + struct vport *p; int mtu = 0; ASSERT_RTNL(); list_for_each_entry_rcu (p, &dp->port_list, node) { - struct net_device *dev = p->dev; + int dev_mtu; /* Skip any internal ports, since that's what we're trying to * set. */ - if (is_dp_dev(dev)) + if (is_internal_vport(p)) continue; - if (!mtu || dev->mtu < mtu) - mtu = dev->mtu; + dev_mtu = vport_get_mtu(p); + if (!mtu || dev_mtu < mtu) + mtu = dev_mtu; } return mtu ? mtu : ETH_DATA_LEN; } -static int -put_port(const struct net_bridge_port *p, struct odp_port __user *uop) +/* Sets the MTU of all datapath devices to the minimum of the ports. Must + * be called with RTNL lock. */ +void set_internal_devs_mtu(const struct datapath *dp) +{ + struct vport *p; + int mtu; + + ASSERT_RTNL(); + + mtu = dp_min_mtu(dp); + + list_for_each_entry_rcu (p, &dp->port_list, node) { + if (is_internal_vport(p)) + vport_set_mtu(p, mtu); + } +} + +static int put_port(const struct vport *p, struct odp_port __user *uop) { struct odp_port op; + memset(&op, 0, sizeof op); - strncpy(op.devname, p->dev->name, sizeof op.devname); + + rcu_read_lock(); + strncpy(op.devname, vport_get_name(p), sizeof op.devname); + strncpy(op.type, vport_get_type(p), sizeof op.type); + rcu_read_unlock(); + op.port = p->port_no; - op.flags = is_dp_dev(p->dev) ? ODP_PORT_INTERNAL : 0; + return copy_to_user(uop, &op, sizeof op) ? -EFAULT : 0; } -static int -query_port(struct datapath *dp, struct odp_port __user *uport) +static int query_port(struct datapath *dp, struct odp_port __user *uport) { struct odp_port port; if (copy_from_user(&port, uport, sizeof port)) return -EFAULT; + if (port.devname[0]) { - struct net_bridge_port *p; - struct net_device *dev; - int err; + struct vport *vport; + int err = 0; port.devname[IFNAMSIZ - 1] = '\0'; - dev = dev_get_by_name(&init_net, port.devname); - if (!dev) - return -ENODEV; + vport_lock(); + rcu_read_lock(); - p = dev->br_port; - if (!p && is_dp_dev(dev)) { - struct dp_dev *dp_dev = dp_dev_priv(dev); - if (dp_dev->dp == dp) - p = dp->ports[dp_dev->port_no]; + vport = vport_locate(port.devname); + if (!vport) { + err = -ENODEV; + goto error_unlock; + } + if (vport->dp != dp) { + err = -ENOENT; + goto error_unlock; } - err = p && p->dp == dp ? put_port(p, uport) : -ENOENT; - dev_put(dev); - return err; + port.port = vport->port_no; + +error_unlock: + rcu_read_unlock(); + vport_unlock(); + + if (err) + return err; } else { if (port.port >= DP_MAX_PORTS) return -EINVAL; if (!dp->ports[port.port]) return -ENOENT; - return put_port(dp->ports[port.port], uport); } + + return put_port(dp->ports[port.port], uport); } -static int -list_ports(struct datapath *dp, struct odp_portvec __user *pvp) +static int do_list_ports(struct datapath *dp, struct odp_port __user *uports, + int n_ports) { - struct odp_portvec pv; - struct net_bridge_port *p; - int idx; - - if (copy_from_user(&pv, pvp, sizeof pv)) - return -EFAULT; + int idx = 0; + if (n_ports) { + struct vport *p; - idx = 0; - if (pv.n_ports) { list_for_each_entry_rcu (p, &dp->port_list, node) { - if (put_port(p, &pv.ports[idx])) + if (put_port(p, &uports[idx])) return -EFAULT; - if (idx++ >= pv.n_ports) + if (idx++ >= n_ports) break; } } - return put_user(idx, &pvp->n_ports); -} - -/* RCU callback for freeing a dp_port_group */ -static void free_port_group(struct rcu_head *rcu) -{ - struct dp_port_group *g = container_of(rcu, struct dp_port_group, rcu); - kfree(g); -} - -static int -set_port_group(struct datapath *dp, const struct odp_port_group __user *upg) -{ - struct odp_port_group pg; - struct dp_port_group *new_group, *old_group; - int error; - - error = -EFAULT; - if (copy_from_user(&pg, upg, sizeof pg)) - goto error; - - error = -EINVAL; - if (pg.n_ports > DP_MAX_PORTS || pg.group >= DP_MAX_GROUPS) - goto error; - - error = -ENOMEM; - new_group = kmalloc(sizeof *new_group + sizeof(u16) * pg.n_ports, - GFP_KERNEL); - if (!new_group) - goto error; - - new_group->n_ports = pg.n_ports; - error = -EFAULT; - if (copy_from_user(new_group->ports, pg.ports, - sizeof(u16) * pg.n_ports)) - goto error_free; - - old_group = rcu_dereference(dp->groups[pg.group]); - rcu_assign_pointer(dp->groups[pg.group], new_group); - if (old_group) - call_rcu(&old_group->rcu, free_port_group); - return 0; - -error_free: - kfree(new_group); -error: - return error; + return idx; } -static int -get_port_group(struct datapath *dp, struct odp_port_group *upg) +static int list_ports(struct datapath *dp, struct odp_portvec __user *upv) { - struct odp_port_group pg; - struct dp_port_group *g; - u16 n_copy; - - if (copy_from_user(&pg, upg, sizeof pg)) - return -EFAULT; - - if (pg.group >= DP_MAX_GROUPS) - return -EINVAL; + struct odp_portvec pv; + int retval; - g = dp->groups[pg.group]; - n_copy = g ? min_t(int, g->n_ports, pg.n_ports) : 0; - if (n_copy && copy_to_user(pg.ports, g->ports, n_copy * sizeof(u16))) + if (copy_from_user(&pv, upv, sizeof pv)) return -EFAULT; - if (put_user(g ? g->n_ports : 0, &upg->n_ports)) - return -EFAULT; + retval = do_list_ports(dp, pv.ports, pv.n_ports); + if (retval < 0) + return retval; - return 0; + return put_user(retval, &upv->n_ports); } static int get_listen_mask(const struct file *f) @@ -1404,29 +1339,62 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd, int dp_idx = iminor(f->f_dentry->d_inode); struct datapath *dp; int drop_frags, listeners, port_no; + unsigned int sflow_probability; int err; /* Handle commands with special locking requirements up front. */ switch (cmd) { case ODP_DP_CREATE: - return create_dp(dp_idx, (char __user *)argp); + err = create_dp(dp_idx, (char __user *)argp); + goto exit; case ODP_DP_DESTROY: - return destroy_dp(dp_idx); + err = destroy_dp(dp_idx); + goto exit; - case ODP_PORT_ADD: - return add_port(dp_idx, (struct odp_port __user *)argp); + case ODP_VPORT_ATTACH: + err = attach_port(dp_idx, (struct odp_port __user *)argp); + goto exit; - case ODP_PORT_DEL: + case ODP_VPORT_DETACH: err = get_user(port_no, (int __user *)argp); - if (err) - break; - return del_port(dp_idx, port_no); + if (!err) + err = detach_port(dp_idx, port_no); + goto exit; + + case ODP_VPORT_MOD: + err = vport_user_mod((struct odp_port __user *)argp); + goto exit; + + case ODP_VPORT_STATS_GET: + err = vport_user_stats_get((struct odp_vport_stats_req __user *)argp); + goto exit; + + case ODP_VPORT_STATS_SET: + err = vport_user_stats_set((struct odp_vport_stats_req __user *)argp); + goto exit; + + case ODP_VPORT_ETHER_GET: + err = vport_user_ether_get((struct odp_vport_ether __user *)argp); + goto exit; + + case ODP_VPORT_ETHER_SET: + err = vport_user_ether_set((struct odp_vport_ether __user *)argp); + goto exit; + + case ODP_VPORT_MTU_GET: + err = vport_user_mtu_get((struct odp_vport_mtu __user *)argp); + goto exit; + + case ODP_VPORT_MTU_SET: + err = vport_user_mtu_set((struct odp_vport_mtu __user *)argp); + goto exit; } dp = get_dp_locked(dp_idx); + err = -ENODEV; if (!dp) - return -ENODEV; + goto exit; switch (cmd) { case ODP_DP_STATS: @@ -1463,20 +1431,22 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd, set_listen_mask(f, listeners); break; - case ODP_PORT_QUERY: - err = query_port(dp, (struct odp_port __user *)argp); + case ODP_GET_SFLOW_PROBABILITY: + err = put_user(dp->sflow_probability, (unsigned int __user *)argp); break; - case ODP_PORT_LIST: - err = list_ports(dp, (struct odp_portvec __user *)argp); + case ODP_SET_SFLOW_PROBABILITY: + err = get_user(sflow_probability, (unsigned int __user *)argp); + if (!err) + dp->sflow_probability = sflow_probability; break; - case ODP_PORT_GROUP_SET: - err = set_port_group(dp, (struct odp_port_group __user *)argp); + case ODP_VPORT_QUERY: + err = query_port(dp, (struct odp_port __user *)argp); break; - case ODP_PORT_GROUP_GET: - err = get_port_group(dp, (struct odp_port_group __user *)argp); + case ODP_VPORT_LIST: + err = list_ports(dp, (struct odp_portvec __user *)argp); break; case ODP_FLOW_FLUSH: @@ -1488,21 +1458,19 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd, break; case ODP_FLOW_DEL: - case ODP_FLOW_GET: - err = del_or_query_flow(dp, (struct odp_flow __user *)argp, - cmd); + err = del_flow(dp, (struct odp_flow __user *)argp); break; - case ODP_FLOW_GET_MULTIPLE: - err = do_flowvec_ioctl(dp, argp, query_multiple_flows); + case ODP_FLOW_GET: + err = do_flowvec_ioctl(dp, argp, do_query_flows); break; case ODP_FLOW_LIST: - err = do_flowvec_ioctl(dp, argp, list_flows); + err = do_flowvec_ioctl(dp, argp, do_list_flows); break; case ODP_EXECUTE: - err = do_execute(dp, (struct odp_execute __user *)argp); + err = execute_packet(dp, (struct odp_execute __user *)argp); break; default: @@ -1510,6 +1478,7 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd, break; } mutex_unlock(&dp->mutex); +exit: return err; } @@ -1523,16 +1492,378 @@ static int dp_has_packet_of_interest(struct datapath *dp, int listeners) return 0; } -ssize_t openvswitch_read(struct file *f, char __user *buf, size_t nbytes, - loff_t *ppos) +#ifdef CONFIG_COMPAT +static int compat_list_ports(struct datapath *dp, struct compat_odp_portvec __user *upv) +{ + struct compat_odp_portvec pv; + int retval; + + if (copy_from_user(&pv, upv, sizeof pv)) + return -EFAULT; + + retval = do_list_ports(dp, compat_ptr(pv.ports), pv.n_ports); + if (retval < 0) + return retval; + + return put_user(retval, &upv->n_ports); +} + +static int compat_get_flow(struct odp_flow *flow, const struct compat_odp_flow __user *compat) +{ + compat_uptr_t actions; + + if (!access_ok(VERIFY_READ, compat, sizeof(struct compat_odp_flow)) || + __copy_from_user(&flow->stats, &compat->stats, sizeof(struct odp_flow_stats)) || + __copy_from_user(&flow->key, &compat->key, sizeof(struct odp_flow_key)) || + __get_user(actions, &compat->actions) || + __get_user(flow->actions_len, &compat->actions_len) || + __get_user(flow->flags, &compat->flags)) + return -EFAULT; + + flow->actions = compat_ptr(actions); + return 0; +} + +static int compat_put_flow(struct datapath *dp, struct compat_odp_flow_put __user *ufp) +{ + struct odp_flow_stats stats; + struct odp_flow_put fp; + int error; + + if (compat_get_flow(&fp.flow, &ufp->flow) || + get_user(fp.flags, &ufp->flags)) + return -EFAULT; + + error = do_put_flow(dp, &fp, &stats); + if (error) + return error; + + if (copy_to_user(&ufp->flow.stats, &stats, + sizeof(struct odp_flow_stats))) + return -EFAULT; + + return 0; +} + +static int compat_answer_query(struct sw_flow *flow, u32 query_flags, + struct compat_odp_flow __user *ufp) +{ + compat_uptr_t actions; + + if (get_user(actions, &ufp->actions)) + return -EFAULT; + + return do_answer_query(flow, query_flags, &ufp->stats, + compat_ptr(actions), &ufp->actions_len); +} + +static int compat_del_flow(struct datapath *dp, struct compat_odp_flow __user *ufp) +{ + struct sw_flow *flow; + struct odp_flow uf; + int error; + + if (compat_get_flow(&uf, ufp)) + return -EFAULT; + + flow = do_del_flow(dp, &uf.key); + if (IS_ERR(flow)) + return PTR_ERR(flow); + + error = compat_answer_query(flow, 0, ufp); + flow_deferred_free(flow); + return error; +} + +static int compat_query_flows(struct datapath *dp, struct compat_odp_flow *flows, u32 n_flows) +{ + struct tbl *table = rcu_dereference(dp->table); + u32 i; + + for (i = 0; i < n_flows; i++) { + struct compat_odp_flow __user *ufp = &flows[i]; + struct odp_flow uf; + struct tbl_node *flow_node; + int error; + + if (compat_get_flow(&uf, ufp)) + return -EFAULT; + + flow_node = tbl_lookup(table, &uf.key, flow_hash(&uf.key), flow_cmp); + if (!flow_node) + error = put_user(ENOENT, &ufp->stats.error); + else + error = compat_answer_query(flow_cast(flow_node), uf.flags, ufp); + if (error) + return -EFAULT; + } + return n_flows; +} + +struct compat_list_flows_cbdata { + struct compat_odp_flow __user *uflows; + u32 n_flows; + u32 listed_flows; +}; + +static int compat_list_flow(struct tbl_node *node, void *cbdata_) +{ + struct sw_flow *flow = flow_cast(node); + struct compat_list_flows_cbdata *cbdata = cbdata_; + struct compat_odp_flow __user *ufp = &cbdata->uflows[cbdata->listed_flows++]; + int error; + + if (copy_to_user(&ufp->key, &flow->key, sizeof flow->key)) + return -EFAULT; + error = compat_answer_query(flow, 0, ufp); + if (error) + return error; + + if (cbdata->listed_flows >= cbdata->n_flows) + return cbdata->listed_flows; + return 0; +} + +static int compat_list_flows(struct datapath *dp, struct compat_odp_flow *flows, u32 n_flows) +{ + struct compat_list_flows_cbdata cbdata; + int error; + + if (!n_flows) + return 0; + + cbdata.uflows = flows; + cbdata.n_flows = n_flows; + cbdata.listed_flows = 0; + + error = tbl_foreach(rcu_dereference(dp->table), compat_list_flow, &cbdata); + return error ? error : cbdata.listed_flows; +} + +static int compat_flowvec_ioctl(struct datapath *dp, unsigned long argp, + int (*function)(struct datapath *, + struct compat_odp_flow *, + u32 n_flows)) +{ + struct compat_odp_flowvec __user *uflowvec; + struct compat_odp_flow __user *flows; + struct compat_odp_flowvec flowvec; + int retval; + + uflowvec = compat_ptr(argp); + if (!access_ok(VERIFY_WRITE, uflowvec, sizeof *uflowvec) || + copy_from_user(&flowvec, uflowvec, sizeof flowvec)) + return -EFAULT; + + if (flowvec.n_flows > INT_MAX / sizeof(struct compat_odp_flow)) + return -EINVAL; + + flows = compat_ptr(flowvec.flows); + if (!access_ok(VERIFY_WRITE, flows, + flowvec.n_flows * sizeof(struct compat_odp_flow))) + return -EFAULT; + + retval = function(dp, flows, flowvec.n_flows); + return (retval < 0 ? retval + : retval == flowvec.n_flows ? 0 + : put_user(retval, &uflowvec->n_flows)); +} + +static int compat_execute(struct datapath *dp, const struct compat_odp_execute __user *uexecute) +{ + struct odp_execute execute; + compat_uptr_t actions; + compat_uptr_t data; + + if (!access_ok(VERIFY_READ, uexecute, sizeof(struct compat_odp_execute)) || + __get_user(actions, &uexecute->actions) || + __get_user(execute.actions_len, &uexecute->actions_len) || + __get_user(data, &uexecute->data) || + __get_user(execute.length, &uexecute->length)) + return -EFAULT; + + execute.actions = compat_ptr(actions); + execute.data = compat_ptr(data); + + return do_execute(dp, &execute); +} + +static long openvswitch_compat_ioctl(struct file *f, unsigned int cmd, unsigned long argp) +{ + int dp_idx = iminor(f->f_dentry->d_inode); + struct datapath *dp; + int err; + + switch (cmd) { + case ODP_DP_DESTROY: + case ODP_FLOW_FLUSH: + /* Ioctls that don't need any translation at all. */ + return openvswitch_ioctl(f, cmd, argp); + + case ODP_DP_CREATE: + case ODP_VPORT_ATTACH: + case ODP_VPORT_DETACH: + case ODP_VPORT_MOD: + case ODP_VPORT_MTU_SET: + case ODP_VPORT_MTU_GET: + case ODP_VPORT_ETHER_SET: + case ODP_VPORT_ETHER_GET: + case ODP_VPORT_STATS_SET: + case ODP_VPORT_STATS_GET: + case ODP_DP_STATS: + case ODP_GET_DROP_FRAGS: + case ODP_SET_DROP_FRAGS: + case ODP_SET_LISTEN_MASK: + case ODP_GET_LISTEN_MASK: + case ODP_SET_SFLOW_PROBABILITY: + case ODP_GET_SFLOW_PROBABILITY: + case ODP_VPORT_QUERY: + /* Ioctls that just need their pointer argument extended. */ + return openvswitch_ioctl(f, cmd, (unsigned long)compat_ptr(argp)); + } + + dp = get_dp_locked(dp_idx); + err = -ENODEV; + if (!dp) + goto exit; + + switch (cmd) { + case ODP_VPORT_LIST32: + err = compat_list_ports(dp, compat_ptr(argp)); + break; + + case ODP_FLOW_PUT32: + err = compat_put_flow(dp, compat_ptr(argp)); + break; + + case ODP_FLOW_DEL32: + err = compat_del_flow(dp, compat_ptr(argp)); + break; + + case ODP_FLOW_GET32: + err = compat_flowvec_ioctl(dp, argp, compat_query_flows); + break; + + case ODP_FLOW_LIST32: + err = compat_flowvec_ioctl(dp, argp, compat_list_flows); + break; + + case ODP_EXECUTE32: + err = compat_execute(dp, compat_ptr(argp)); + break; + + default: + err = -ENOIOCTLCMD; + break; + } + mutex_unlock(&dp->mutex); +exit: + return err; +} +#endif + +/* Unfortunately this function is not exported so this is a verbatim copy + * from net/core/datagram.c in 2.6.30. */ +static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, + u8 __user *to, int len, + __wsum *csump) +{ + int start = skb_headlen(skb); + int pos = 0; + int i, copy = start - offset; + + /* Copy header. */ + if (copy > 0) { + int err = 0; + if (copy > len) + copy = len; + *csump = csum_and_copy_to_user(skb->data + offset, to, copy, + *csump, &err); + if (err) + goto fault; + if ((len -= copy) == 0) + return 0; + offset += copy; + to += copy; + pos = copy; + } + + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { + int end; + + WARN_ON(start > offset + len); + + end = start + skb_shinfo(skb)->frags[i].size; + if ((copy = end - offset) > 0) { + __wsum csum2; + int err = 0; + u8 *vaddr; + skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; + struct page *page = frag->page; + + if (copy > len) + copy = len; + vaddr = kmap(page); + csum2 = csum_and_copy_to_user(vaddr + + frag->page_offset + + offset - start, + to, copy, 0, &err); + kunmap(page); + if (err) + goto fault; + *csump = csum_block_add(*csump, csum2, pos); + if (!(len -= copy)) + return 0; + offset += copy; + to += copy; + pos += copy; + } + start = end; + } + + if (skb_shinfo(skb)->frag_list) { + struct sk_buff *list = skb_shinfo(skb)->frag_list; + + for (; list; list=list->next) { + int end; + + WARN_ON(start > offset + len); + + end = start + list->len; + if ((copy = end - offset) > 0) { + __wsum csum2 = 0; + if (copy > len) + copy = len; + if (skb_copy_and_csum_datagram(list, + offset - start, + to, copy, + &csum2)) + goto fault; + *csump = csum_block_add(*csump, csum2, pos); + if ((len -= copy) == 0) + return 0; + offset += copy; + to += copy; + pos += copy; + } + start = end; + } + } + if (!len) + return 0; + +fault: + return -EFAULT; +} + +static ssize_t openvswitch_read(struct file *f, char __user *buf, + size_t nbytes, loff_t *ppos) { - /* XXX is there sufficient synchronization here? */ int listeners = get_listen_mask(f); int dp_idx = iminor(f->f_dentry->d_inode); - struct datapath *dp = get_dp(dp_idx); + struct datapath *dp = get_dp_locked(dp_idx); struct sk_buff *skb; - struct iovec __user iov; - size_t copy_bytes; + size_t copy_bytes, tot_copy_bytes; int retval; if (!dp) @@ -1567,23 +1898,56 @@ ssize_t openvswitch_read(struct file *f, char __user *buf, size_t nbytes, } } success: - copy_bytes = min_t(size_t, skb->len, nbytes); - iov.iov_base = buf; - iov.iov_len = copy_bytes; - retval = skb_copy_datagram_iovec(skb, 0, &iov, iov.iov_len); + mutex_unlock(&dp->mutex); + + copy_bytes = tot_copy_bytes = min_t(size_t, skb->len, nbytes); + + retval = 0; + if (skb->ip_summed == CHECKSUM_PARTIAL) { + if (copy_bytes == skb->len) { + __wsum csum = 0; + u16 csum_start, csum_offset; + + get_skb_csum_pointers(skb, &csum_start, &csum_offset); + BUG_ON(csum_start >= skb_headlen(skb)); + retval = skb_copy_and_csum_datagram(skb, csum_start, buf + csum_start, + copy_bytes - csum_start, &csum); + if (!retval) { + __sum16 __user *csump; + + copy_bytes = csum_start; + csump = (__sum16 __user *)(buf + csum_start + csum_offset); + + BUG_ON((char *)csump + sizeof(__sum16) > buf + nbytes); + put_user(csum_fold(csum), csump); + } + } else + retval = skb_checksum_help(skb); + } + + if (!retval) { + struct iovec __user iov; + + iov.iov_base = buf; + iov.iov_len = copy_bytes; + retval = skb_copy_datagram_iovec(skb, 0, &iov, iov.iov_len); + } + if (!retval) - retval = copy_bytes; + retval = tot_copy_bytes; + kfree_skb(skb); + return retval; error: + mutex_unlock(&dp->mutex); return retval; } static unsigned int openvswitch_poll(struct file *file, poll_table *wait) { - /* XXX is there sufficient synchronization here? */ int dp_idx = iminor(file->f_dentry->d_inode); - struct datapath *dp = get_dp(dp_idx); + struct datapath *dp = get_dp_locked(dp_idx); unsigned int mask; if (dp) { @@ -1591,70 +1955,55 @@ static unsigned int openvswitch_poll(struct file *file, poll_table *wait) poll_wait(file, &dp->waitqueue, wait); if (dp_has_packet_of_interest(dp, get_listen_mask(file))) mask |= POLLIN | POLLRDNORM; + mutex_unlock(&dp->mutex); } else { mask = POLLIN | POLLRDNORM | POLLHUP; } return mask; } -struct file_operations openvswitch_fops = { - /* XXX .aio_read = openvswitch_aio_read, */ +static struct file_operations openvswitch_fops = { .read = openvswitch_read, .poll = openvswitch_poll, .unlocked_ioctl = openvswitch_ioctl, - /* XXX .fasync = openvswitch_fasync, */ +#ifdef CONFIG_COMPAT + .compat_ioctl = openvswitch_compat_ioctl, +#endif }; static int major; -static struct llc_sap *dp_stp_sap; - -static int dp_stp_rcv(struct sk_buff *skb, struct net_device *dev, - struct packet_type *pt, struct net_device *orig_dev) -{ - /* We don't really care about STP packets, we just listen for them for - * mutual exclusion with the bridge module, so this just discards - * them. */ - kfree_skb(skb); - return 0; -} static int __init dp_init(void) { + struct sk_buff *dummy_skb; int err; - printk("Open vSwitch %s, built "__DATE__" "__TIME__"\n", VERSION BUILDNR); + BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > sizeof(dummy_skb->cb)); - /* Register to receive STP packets because the bridge module also - * attempts to do so. Since there can only be a single listener for a - * given protocol, this provides mutual exclusion against the bridge - * module, preventing both of them from being loaded at the same - * time. */ - dp_stp_sap = llc_sap_open(LLC_SAP_BSPAN, dp_stp_rcv); - if (!dp_stp_sap) { - printk(KERN_ERR "openvswitch: can't register sap for STP (probably the bridge module is loaded)\n"); - return -EADDRINUSE; - } + printk("Open vSwitch %s, built "__DATE__" "__TIME__"\n", VERSION BUILDNR); err = flow_init(); if (err) goto error; - err = register_netdevice_notifier(&dp_device_notifier); + err = vport_init(); if (err) goto error_flow_exit; + err = register_netdevice_notifier(&dp_device_notifier); + if (err) + goto error_vport_exit; + major = register_chrdev(0, "openvswitch", &openvswitch_fops); if (err < 0) goto error_unreg_notifier; - /* Hook into callback used by the bridge to intercept packets. - * Parasites we are. */ - br_handle_frame_hook = dp_frame_hook; - return 0; error_unreg_notifier: unregister_netdevice_notifier(&dp_device_notifier); +error_vport_exit: + vport_exit(); error_flow_exit: flow_exit(); error: @@ -1666,9 +2015,8 @@ static void dp_cleanup(void) rcu_barrier(); unregister_chrdev(major, "openvswitch"); unregister_netdevice_notifier(&dp_device_notifier); + vport_exit(); flow_exit(); - br_handle_frame_hook = NULL; - llc_sap_put(dp_stp_sap); } module_init(dp_init);