From e379e4d167e31d1cd5f7b86fff091a2e09ff6e45 Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Wed, 23 Apr 2014 08:33:38 -0700 Subject: [PATCH] datapath: Move table destroy to dp-rcu callback. Ths simplifies flow-table-destroy API. This change is required for following patches. Signed-off-by: Pravin B Shelar Acked-by: Thomas Graf --- datapath/datapath.c | 5 ++--- datapath/flow_table.c | 8 +++++--- datapath/flow_table.h | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/datapath/datapath.c b/datapath/datapath.c index aa4c1097e..fcaafd169 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -187,6 +187,7 @@ static void destroy_dp_rcu(struct rcu_head *rcu) { struct datapath *dp = container_of(rcu, struct datapath, rcu); + ovs_flow_tbl_destroy(&dp->table); free_percpu(dp->stats_percpu); release_net(ovs_dp_get_net(dp)); kfree(dp->ports); @@ -1447,7 +1448,7 @@ err_destroy_ports_array: err_destroy_percpu: free_percpu(dp->stats_percpu); err_destroy_table: - ovs_flow_tbl_destroy(&dp->table, false); + ovs_flow_tbl_destroy(&dp->table); err_free_dp: release_net(ovs_dp_get_net(dp)); kfree(dp); @@ -1479,8 +1480,6 @@ static void __dp_destroy(struct datapath *dp) ovs_dp_detach_port(ovs_vport_ovsl(dp, OVSP_LOCAL)); /* RCU destroy the flow table */ - ovs_flow_tbl_destroy(&dp->table, true); - call_rcu(&dp->rcu, destroy_dp_rcu); } diff --git a/datapath/flow_table.c b/datapath/flow_table.c index 159572b59..be2d7d51f 100644 --- a/datapath/flow_table.c +++ b/datapath/flow_table.c @@ -259,11 +259,13 @@ skip_flows: __table_instance_destroy(ti); } -void ovs_flow_tbl_destroy(struct flow_table *table, bool deferred) +/* No need for locking this function is called from RCU callback or + * error path. */ +void ovs_flow_tbl_destroy(struct flow_table *table) { - struct table_instance *ti = ovsl_dereference(table->ti); + struct table_instance *ti = (struct table_instance __force *)table->ti; - table_instance_destroy(ti, deferred); + table_instance_destroy(ti, false); } struct sw_flow *ovs_flow_tbl_dump_next(struct table_instance *ti, diff --git a/datapath/flow_table.h b/datapath/flow_table.h index ca8a5820f..ddf0c01e2 100644 --- a/datapath/flow_table.h +++ b/datapath/flow_table.h @@ -62,7 +62,7 @@ void ovs_flow_free(struct sw_flow *, bool deferred); int ovs_flow_tbl_init(struct flow_table *); int ovs_flow_tbl_count(struct flow_table *table); -void ovs_flow_tbl_destroy(struct flow_table *table, bool deferred); +void ovs_flow_tbl_destroy(struct flow_table *table); int ovs_flow_tbl_flush(struct flow_table *flow_table); int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow, -- 2.43.0