Merge branch 'mainstream'

[sliver-openvswitch.git] / datapath / flow_table.h

diff --git a/datapath/flow_table.h b/datapath/flow_table.h
index ca8a582..ee86953 100644 (file)
--- a/datapath/flow_table.h
+++ b/datapath/flow_table.h
@@ -36,6 +36,17 @@
 
 #include "flow.h"
 
+struct mask_cache_entry {
+       u32 skb_hash;
+       u32 mask_index;
+};
+
+struct mask_array {
+       struct rcu_head rcu;
+       int count, max;
+       struct sw_flow_mask __rcu *masks[];
+};
+
 struct table_instance {
        struct flex_array *buckets;
        unsigned int n_buckets;
@@ -47,7 +58,8 @@ struct table_instance {
 
 struct flow_table {
        struct table_instance __rcu *ti;
-       struct list_head mask_list;
+       struct mask_cache_entry __percpu *mask_cache;
+       struct mask_array __rcu *mask_array;
        unsigned long last_rehash;
        unsigned int count;
 };
@@ -62,7 +74,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,
@@ -72,8 +84,9 @@ int  ovs_flow_tbl_num_masks(const struct flow_table *table);
 struct sw_flow *ovs_flow_tbl_dump_next(struct table_instance *table,
                                       u32 *bucket, u32 *idx);
 struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *,
-                                   const struct sw_flow_key *,
-                                   u32 *n_mask_hit);
+                                         const struct sw_flow_key *,
+                                         u32 skb_hash,
+                                         u32 *n_mask_hit);
 struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *,
                                    const struct sw_flow_key *);