X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=46497c690a446a6a27418aba9d5b9ca92c501d1d;hb=a01ef04ced0d3e04e7d5e5038ef76c861b5c1da3;hp=06e1006a88c3a668be2ddfad7a47944ac8cd6d4c;hpb=fb8c93473efacd67a50117d0f2a3084f2d96ceca;p=sliver-openvswitch.git diff --git a/datapath/datapath.c b/datapath/datapath.c index 06e1006a8..46497c690 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -326,8 +325,6 @@ static void do_destroy_dp(struct datapath *dp) 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); @@ -543,40 +540,45 @@ void dp_process_received_packet(struct dp_port *p, struct sk_buff *skb) struct datapath *dp = p->dp; struct dp_stats_percpu *stats; int stats_counter_off; - struct odp_flow_key key; - struct tbl_node *flow_node; - struct sw_flow *flow; struct sw_flow_actions *acts; struct loop_counter *loop; int error; OVS_CB(skb)->dp_port = p; - /* Extract flow from 'skb' into 'key'. */ - error = flow_extract(skb, p ? p->port_no : ODPP_NONE, &key); - if (unlikely(error)) { - kfree_skb(skb); - return; - } + if (!OVS_CB(skb)->flow) { + struct odp_flow_key key; + struct tbl_node *flow_node; + bool is_frag; - if (OVS_CB(skb)->is_frag && dp->drop_frags) { - kfree_skb(skb); - stats_counter_off = offsetof(struct dp_stats_percpu, n_frags); - goto out; - } + /* 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); + return; + } - /* 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; + if (is_frag && dp->drop_frags) { + kfree_skb(skb); + stats_counter_off = offsetof(struct dp_stats_percpu, n_frags); + goto out; + } + + /* 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; + } + + OVS_CB(skb)->flow = flow_cast(flow_node); } - flow = flow_cast(flow_node); - flow_used(flow, skb); + flow_used(OVS_CB(skb)->flow, skb); - acts = rcu_dereference(flow->sf_acts); + acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts); /* Check whether we've looped too much. */ loop = &get_cpu_var(dp_loop_counters).counters[!!in_interrupt()]; @@ -588,7 +590,8 @@ void dp_process_received_packet(struct dp_port *p, struct sk_buff *skb) } /* Execute actions. */ - execute_actions(dp, skb, &key, acts->actions, acts->n_actions, GFP_ATOMIC); + execute_actions(dp, skb, &OVS_CB(skb)->flow->key, acts->actions, + acts->n_actions, GFP_ATOMIC); stats_counter_off = offsetof(struct dp_stats_percpu, n_hit); /* Check whether sub-actions looped too much. */ @@ -901,25 +904,36 @@ static int validate_actions(const struct sw_flow_actions *actions) for (i = 0; i < actions->n_actions; i++) { const union odp_action *a = &actions->actions[i]; + __be16 mask; + switch (a->type) { - case ODPAT_OUTPUT: - if (a->output.port >= DP_MAX_PORTS) - return -EINVAL; + 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_GROUP: - if (a->output_group.group >= DP_MAX_GROUPS) + case ODPAT_OUTPUT: + if (a->output.port >= DP_MAX_PORTS) return -EINVAL; break; - case ODPAT_SET_VLAN_VID: - if (a->vlan_vid.vlan_vid & htons(~VLAN_VID_MASK)) + case ODPAT_SET_DL_TCI: + mask = a->dl_tci.mask; + if (mask != htons(VLAN_VID_MASK) && + mask != htons(VLAN_PCP_MASK) && + mask != htons(VLAN_VID_MASK | VLAN_PCP_MASK)) return -EINVAL; - break; - - case ODPAT_SET_VLAN_PCP: - if (a->vlan_pcp.vlan_pcp - & ~(VLAN_PCP_MASK >> VLAN_PCP_SHIFT)) + if (a->dl_tci.tci & ~mask) return -EINVAL; break; @@ -929,9 +943,7 @@ static int validate_actions(const struct sw_flow_actions *actions) break; default: - if (a->type >= ODPAT_N_ACTIONS) - return -EOPNOTSUPP; - break; + return -EOPNOTSUPP; } } @@ -1028,8 +1040,6 @@ static int do_put_flow(struct datapath *dp, struct odp_flow_put *uf, struct tbl *table; int error; - memset(uf->flow.key.reserved, 0, sizeof uf->flow.key.reserved); - table = rcu_dereference(dp->table); flow_node = tbl_lookup(table, &uf->flow.key, flow_hash(&uf->flow.key), flow_cmp); if (!flow_node) { @@ -1188,7 +1198,6 @@ static struct sw_flow *do_del_flow(struct datapath *dp, struct odp_flow_key *key struct tbl_node *flow_node; int error; - memset(key->reserved, 0, sizeof key->reserved); flow_node = tbl_lookup(table, key, flow_hash(key), flow_cmp); if (!flow_node) return ERR_PTR(-ENOENT); @@ -1238,7 +1247,6 @@ static int do_query_flows(struct datapath *dp, const struct odp_flowvec *flowvec if (copy_from_user(&uf, ufp, sizeof uf)) return -EFAULT; - memset(uf.key.reserved, 0, sizeof uf.key.reserved); flow_node = tbl_lookup(table, &uf.key, flow_hash(&uf.key), flow_cmp); if (!flow_node) @@ -1320,6 +1328,7 @@ static int do_execute(struct datapath *dp, const struct odp_execute *execute) struct sk_buff *skb; struct sw_flow_actions *actions; struct ethhdr *eth; + bool is_frag; int err; err = -EINVAL; @@ -1346,11 +1355,6 @@ static int do_execute(struct datapath *dp, const struct odp_execute *execute) if (!skb) goto error_free_actions; - if (execute->in_port < DP_MAX_PORTS) - OVS_CB(skb)->dp_port = dp->ports[execute->in_port]; - else - OVS_CB(skb)->dp_port = NULL; - err = -EFAULT; if (copy_from_user(skb_put(skb, execute->length), execute->data, execute->length)) @@ -1367,7 +1371,7 @@ static int do_execute(struct datapath *dp, const struct odp_execute *execute) else skb->protocol = htons(ETH_P_802_2); - err = flow_extract(skb, execute->in_port, &key); + err = flow_extract(skb, -1, &key, &is_frag); if (err) goto error_free_skb; @@ -1408,7 +1412,6 @@ static int get_dp_stats(struct datapath *dp, struct odp_stats __user *statsp) 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 *percpu_stats; @@ -1568,87 +1571,6 @@ static int list_ports(struct datapath *dp, struct odp_portvec __user *upv) return put_user(retval, &upv->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 do_set_port_group(struct datapath *dp, u16 __user *ports, - int n_ports, int group) -{ - struct dp_port_group *new_group, *old_group; - int error; - - error = -EINVAL; - if (n_ports > DP_MAX_PORTS || group >= DP_MAX_GROUPS) - goto error; - - error = -ENOMEM; - new_group = kmalloc(sizeof *new_group + sizeof(u16) * n_ports, GFP_KERNEL); - if (!new_group) - goto error; - - new_group->n_ports = n_ports; - error = -EFAULT; - if (copy_from_user(new_group->ports, ports, sizeof(u16) * n_ports)) - goto error_free; - - old_group = rcu_dereference(dp->groups[group]); - rcu_assign_pointer(dp->groups[group], new_group); - if (old_group) - call_rcu(&old_group->rcu, free_port_group); - return 0; - -error_free: - kfree(new_group); -error: - return error; -} - -static int set_port_group(struct datapath *dp, - const struct odp_port_group __user *upg) -{ - struct odp_port_group pg; - - if (copy_from_user(&pg, upg, sizeof pg)) - return -EFAULT; - - return do_set_port_group(dp, pg.ports, pg.n_ports, pg.group); -} - -static int do_get_port_group(struct datapath *dp, - u16 __user *ports, int n_ports, int group, - u16 __user *n_portsp) -{ - struct dp_port_group *g; - u16 n_copy; - - if (group >= DP_MAX_GROUPS) - return -EINVAL; - - g = dp->groups[group]; - n_copy = g ? min_t(int, g->n_ports, n_ports) : 0; - if (n_copy && copy_to_user(ports, g->ports, n_copy * sizeof(u16))) - return -EFAULT; - - if (put_user(g ? g->n_ports : 0, n_portsp)) - return -EFAULT; - - return 0; -} - -static int get_port_group(struct datapath *dp, struct odp_port_group __user *upg) -{ - struct odp_port_group pg; - - if (copy_from_user(&pg, upg, sizeof pg)) - return -EFAULT; - - return do_get_port_group(dp, pg.ports, pg.n_ports, pg.group, &upg->n_ports); -} - static int get_listen_mask(const struct file *f) { return (long)f->private_data; @@ -1783,14 +1705,6 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd, err = list_ports(dp, (struct odp_portvec __user *)argp); break; - case ODP_PORT_GROUP_SET: - err = set_port_group(dp, (struct odp_port_group __user *)argp); - break; - - case ODP_PORT_GROUP_GET: - err = get_port_group(dp, (struct odp_port_group __user *)argp); - break; - case ODP_FLOW_FLUSH: err = flush_flows(dp); break; @@ -1850,27 +1764,6 @@ static int compat_list_ports(struct datapath *dp, struct compat_odp_portvec __us return put_user(retval, &upv->n_ports); } -static int compat_set_port_group(struct datapath *dp, const struct compat_odp_port_group __user *upg) -{ - struct compat_odp_port_group pg; - - if (copy_from_user(&pg, upg, sizeof pg)) - return -EFAULT; - - return do_set_port_group(dp, compat_ptr(pg.ports), pg.n_ports, pg.group); -} - -static int compat_get_port_group(struct datapath *dp, struct compat_odp_port_group __user *upg) -{ - struct compat_odp_port_group pg; - - if (copy_from_user(&pg, upg, sizeof pg)) - return -EFAULT; - - return do_get_port_group(dp, compat_ptr(pg.ports), pg.n_ports, - pg.group, &upg->n_ports); -} - static int compat_get_flow(struct odp_flow *flow, const struct compat_odp_flow __user *compat) { compat_uptr_t actions; @@ -2046,7 +1939,6 @@ static int compat_execute(struct datapath *dp, const struct compat_odp_execute _ compat_uptr_t data; if (!access_ok(VERIFY_READ, uexecute, sizeof(struct compat_odp_execute)) || - __get_user(execute.in_port, &uexecute->in_port) || __get_user(actions, &uexecute->actions) || __get_user(execute.n_actions, &uexecute->n_actions) || __get_user(data, &uexecute->data) || @@ -2109,14 +2001,6 @@ static long openvswitch_compat_ioctl(struct file *f, unsigned int cmd, unsigned err = compat_list_ports(dp, compat_ptr(argp)); break; - case ODP_PORT_GROUP_SET32: - err = compat_set_port_group(dp, compat_ptr(argp)); - break; - - case ODP_PORT_GROUP_GET32: - err = compat_get_port_group(dp, compat_ptr(argp)); - break; - case ODP_FLOW_PUT32: err = compat_put_flow(dp, compat_ptr(argp)); break;