From f45e8f36cf79f314ab34c67437bb4e01a0264573 Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Fri, 21 Jun 2013 17:22:57 -0700 Subject: [PATCH] new fix --- datapath/flow.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/datapath/flow.c b/datapath/flow.c index af55c74..ad8d62c 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -443,7 +443,7 @@ static void free_buckets(struct flex_array *buckets) flex_array_free(buckets); } -struct flow_table *ovs_flow_tbl_alloc(int new_size) +static struct flow_table *__flow_tbl_alloc(int new_size) { struct flow_table *table = kmalloc(sizeof(*table), GFP_KERNEL); @@ -495,6 +495,24 @@ skip_flows: kfree(table); } +struct flow_table *ovs_flow_tbl_alloc(int new_size) +{ + struct flow_table *table = __flow_tbl_alloc(new_size); + + if (!table) + return NULL; + + table->mask_list = kmalloc(sizeof(struct list_head), GFP_KERNEL); + if (!table->mask_list) { + table->keep_flows = true; + __flow_tbl_destroy(table); + return NULL; + } + INIT_LIST_HEAD(table->mask_list); + + return table; +} + static void flow_tbl_destroy_rcu_cb(struct rcu_head *rcu) { struct flow_table *table = container_of(rcu, struct flow_table, rcu); @@ -576,7 +594,7 @@ static struct flow_table *__flow_tbl_rehash(struct flow_table *table, int n_buck { struct flow_table *new_table; - new_table = ovs_flow_tbl_alloc(n_buckets); + new_table = __flow_tbl_alloc(n_buckets); if (!new_table) return ERR_PTR(-ENOMEM); @@ -1871,16 +1889,7 @@ struct sw_flow_mask *ovs_sw_flow_mask_find(const struct flow_table *tbl, */ void ovs_sw_flow_mask_insert(struct flow_table *tbl, struct sw_flow_mask *mask) { - if (!tbl->mask_list) { - tbl->mask_list = (struct list_head *) - kmalloc(sizeof(struct list_head), GFP_KERNEL); - - if (tbl->mask_list) - INIT_LIST_HEAD(tbl->mask_list); - } - - if (tbl->mask_list) - list_add_rcu(&mask->list, tbl->mask_list); + list_add_rcu(&mask->list, tbl->mask_list); } /** -- 1.7.9.5