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 <pshelar@nicira.com>
Acked-by: Thomas Graf <tgraf@redhat.com>

diff --git a/datapath/datapath.c b/datapath/datapath.c
index aa4c109..fcaafd1 100644 (file)
--- 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);
 
 {
        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);
        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:
 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);
 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_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);
 }
 
        call_rcu(&dp->rcu, destroy_dp_rcu);
 }
 

diff --git a/datapath/flow_table.c b/datapath/flow_table.c
index 159572b..be2d7d5 100644 (file)
--- a/datapath/flow_table.c
+++ b/datapath/flow_table.c
@@ -259,11 +259,13 @@ skip_flows:
                __table_instance_destroy(ti);
 }
 
                __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,
 }
 
 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 ca8a582..ddf0c01 100644 (file)
--- 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);
 
 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,
 int ovs_flow_tbl_flush(struct flow_table *flow_table);
 
 int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow,