datapath: update exact match lookup hash value to avoid hash collision

Currently, the exact match cache lookup uses 'skb->hash' as an index.
In most cases, this value will be the same for pre and post
recirculation lookup, threshing the exact match cache. This patch
avoid this hash collision by using the rehashed value, by mixing in
in the 'recirc_id', as the lookup index.

Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>

diff --git a/datapath/flow_table.c b/datapath/flow_table.c
index 2f8f3fbe7cf382f067e8bfee9b30c0e9f7dd9a25..8dad4c2220f4cea8429be60fb6e7d38d865914b4 100644 (file)
--- a/datapath/flow_table.c
+++ b/datapath/flow_table.c
@@ -575,7 +575,7 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,
        struct table_instance *ti = rcu_dereference(tbl->ti);
        struct mask_cache_entry *entries, *ce;
        struct sw_flow *flow;
-       u32 hash = skb_hash;
+       u32 hash;
        int seg;
 
        *n_mask_hit = 0;
@@ -585,7 +585,14 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,
                return flow_lookup(tbl, ti, ma, key, n_mask_hit, &mask_index);
        }
 
+       /* Pre and post recirulation flows usually have the same skb_hash
+        * value. To avoid hash collisions, rehash the 'skb_hash' with
+        * 'recirc_id'.  */
+       if (key->recirc_id)
+               skb_hash = jhash_1word(skb_hash, key->recirc_id);
+
        ce = NULL;
+       hash = skb_hash;
        entries = this_cpu_ptr(tbl->mask_cache);
 
        /* Find the cache entry 'ce' to operate on. */