X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fflow.c;h=73222954fd3a8c3779308b62a9215178b771924d;hb=c3636ffc10a2a016b89d05c9456b3fdc030d444c;hp=9d7fbc9b9f31c92a39daff6f230ee3cb4935345d;hpb=df2c07f4338faac04f4969f243fe4e8083b309ac;p=openvswitch diff --git a/datapath/flow.c b/datapath/flow.c index 9d7fbc9b..73222954 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -172,12 +173,12 @@ void flow_used(struct sw_flow *flow, struct sk_buff *skb) tcp_flags = *(tcp + TCP_FLAGS_OFFSET) & TCP_FLAG_MASK; } - spin_lock_bh(&flow->lock); + spin_lock(&flow->lock); flow->used = jiffies; flow->packet_count++; flow->byte_count += skb->len; flow->tcp_flags |= tcp_flags; - spin_unlock_bh(&flow->lock); + spin_unlock(&flow->lock); } struct sw_flow_actions *flow_actions_alloc(const struct nlattr *actions) @@ -216,14 +217,153 @@ struct sw_flow *flow_alloc(void) return flow; } -void flow_free_tbl(struct tbl_node *node) +static struct hlist_head __rcu *find_bucket(struct flow_table * table, u32 hash) { - struct sw_flow *flow = flow_cast(node); + return flex_array_get(table->buckets, + (hash & (table->n_buckets - 1))); +} + +static struct flex_array __rcu *alloc_buckets(unsigned int n_buckets) +{ + struct flex_array __rcu * buckets; + int i, err; + + buckets = flex_array_alloc(sizeof(struct hlist_head *), + n_buckets, GFP_KERNEL); + if (!buckets) + return NULL; + + err = flex_array_prealloc(buckets, 0, n_buckets, GFP_KERNEL); + if (err) { + flex_array_free(buckets); + return NULL; + } + + for (i = 0; i < n_buckets; i++) + INIT_HLIST_HEAD((struct hlist_head *) + flex_array_get(buckets, i)); + + return buckets; +} + +static void free_buckets(struct flex_array * buckets) +{ + flex_array_free(buckets); +} + +struct flow_table *flow_tbl_alloc(int new_size) +{ + struct flow_table *table = kmalloc(sizeof(*table), GFP_KERNEL); + + if (!table) + return NULL; + + table->buckets = alloc_buckets(new_size); + + if (!table->buckets) { + kfree(table); + return NULL; + } + table->n_buckets = new_size; + table->count = 0; + + return table; +} +static void flow_free(struct sw_flow *flow) +{ flow->dead = true; flow_put(flow); } +void flow_tbl_destroy(struct flow_table *table) +{ + int i; + + if (!table) + return; + + for (i = 0; i < table->n_buckets; i++) { + struct sw_flow *flow; + struct hlist_head *head = flex_array_get(table->buckets, i); + struct hlist_node *node, *n; + + hlist_for_each_entry_safe(flow, node, n, head, hash_node) { + hlist_del_init_rcu(&flow->hash_node); + flow_free(flow); + } + } + + free_buckets(table->buckets); + kfree(table); +} + +static void flow_tbl_destroy_rcu_cb(struct rcu_head *rcu) +{ + struct flow_table *table = container_of(rcu, struct flow_table, rcu); + + flow_tbl_destroy(table); +} + +void flow_tbl_deferred_destroy(struct flow_table *table) +{ + if (!table) + return; + + call_rcu(&table->rcu, flow_tbl_destroy_rcu_cb); +} + +struct sw_flow *flow_tbl_next(struct flow_table *table, u32 *bucket, u32 *last) +{ + struct sw_flow *flow; + struct hlist_head *head; + struct hlist_node *n; + int i; + + while (*bucket < table->n_buckets) { + i = 0; + head = flex_array_get(table->buckets, *bucket); + hlist_for_each_entry_rcu(flow, n, head, hash_node) { + if (i < *last) { + i++; + continue; + } + *last = i + 1; + return flow; + } + (*bucket)++; + *last = 0; + } + + return NULL; +} + +struct flow_table *flow_tbl_expand(struct flow_table *table) +{ + struct flow_table *new_table; + int n_buckets = table->n_buckets * 2; + int i; + + new_table = flow_tbl_alloc(n_buckets); + if (!new_table) + return ERR_PTR(-ENOMEM); + + for (i = 0; i < table->n_buckets; i++) { + struct sw_flow *flow; + struct hlist_head *head; + struct hlist_node *n, *pos; + + head = flex_array_get(table->buckets, i); + + hlist_for_each_entry_safe(flow, n, pos, head, hash_node) { + hlist_del_init_rcu(&flow->hash_node); + flow_tbl_insert(new_table, flow); + } + } + + return new_table; +} + /* RCU callback used by flow_deferred_free. */ static void rcu_free_flow_callback(struct rcu_head *rcu) { @@ -589,12 +729,43 @@ u32 flow_hash(const struct sw_flow_key *key, int key_len) return jhash2((u32*)key, DIV_ROUND_UP(key_len, sizeof(u32)), hash_seed); } -int flow_cmp(const struct tbl_node *node, void *key2_, int len) +struct sw_flow * flow_tbl_lookup(struct flow_table *table, + struct sw_flow_key *key, int key_len) { - const struct sw_flow_key *key1 = &flow_cast(node)->key; - const struct sw_flow_key *key2 = key2_; + struct sw_flow *flow; + struct hlist_node *n; + struct hlist_head *head; + u32 hash; + + hash = flow_hash(key, key_len); + + head = find_bucket(table, hash); + hlist_for_each_entry_rcu(flow, n, head, hash_node) { - return !memcmp(key1, key2, len); + if (flow->hash == hash && + !memcmp(&flow->key, key, key_len)) { + return flow; + } + } + return NULL; +} + +void flow_tbl_insert(struct flow_table *table, struct sw_flow *flow) +{ + struct hlist_head *head; + + head = find_bucket(table, flow->hash); + hlist_add_head_rcu(&flow->hash_node, head); + table->count++; +} + +void flow_tbl_remove(struct flow_table *table, struct sw_flow *flow) +{ + if (!hlist_unhashed(&flow->hash_node)) { + hlist_del_init_rcu(&flow->hash_node); + table->count--; + BUG_ON(table->count < 0); + } } /* The size of the argument for each %OVS_KEY_ATTR_* Netlink attribute. */ @@ -624,7 +795,7 @@ static const u32 key_lens[OVS_KEY_ATTR_MAX + 1] = { * This state machine accepts the following forms, with [] for optional * elements and | for alternatives: * - * [tun_id] in_port ethernet [8021q] [ethertype \ + * [tun_id] [in_port] ethernet [8021q] [ethertype \ * [IPv4 [TCP|UDP|ICMP] | IPv6 [TCP|UDP|ICMPv6 [ND]] | ARP]] */ int flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp, @@ -637,6 +808,7 @@ int flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp, int key_len; memset(swkey, 0, sizeof(*swkey)); + swkey->eth.in_port = USHRT_MAX; swkey->eth.type = htons(ETH_P_802_2); key_len = SW_FLOW_KEY_OFFSET(eth); @@ -671,6 +843,8 @@ int flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp, swkey->eth.in_port = nla_get_u32(nla); break; + case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_ETHERNET): + case TRANSITION(OVS_KEY_ATTR_TUN_ID, OVS_KEY_ATTR_ETHERNET): case TRANSITION(OVS_KEY_ATTR_IN_PORT, OVS_KEY_ATTR_ETHERNET): eth_key = nla_data(nla); memcpy(swkey->eth.src, eth_key->eth_src, ETH_ALEN); @@ -888,6 +1062,7 @@ int flow_metadata_from_nlattrs(u16 *in_port, __be64 *tun_id, u16 prev_type; int rem; + *in_port = USHRT_MAX; *tun_id = 0; prev_type = OVS_KEY_ATTR_UNSPEC; @@ -910,18 +1085,13 @@ int flow_metadata_from_nlattrs(u16 *in_port, __be64 *tun_id, break; default: - goto done; + return 0; } prev_type = type; } if (rem) return -EINVAL; - -done: - if (prev_type == OVS_KEY_ATTR_UNSPEC || - prev_type == OVS_KEY_ATTR_TUN_ID) - return -EINVAL; return 0; } @@ -938,7 +1108,8 @@ int flow_to_nlattrs(const struct sw_flow_key *swkey, struct sk_buff *skb) if (swkey->eth.tun_id != cpu_to_be64(0)) NLA_PUT_BE64(skb, OVS_KEY_ATTR_TUN_ID, swkey->eth.tun_id); - NLA_PUT_U32(skb, OVS_KEY_ATTR_IN_PORT, swkey->eth.in_port); + if (swkey->eth.in_port != USHRT_MAX) + NLA_PUT_U32(skb, OVS_KEY_ATTR_IN_PORT, swkey->eth.in_port); nla = nla_reserve(skb, OVS_KEY_ATTR_ETHERNET, sizeof(*eth_key)); if (!nla)