Commit a2cfb96c authored by Madhuparna Bhowmik's avatar Madhuparna Bhowmik Committed by David S. Miller

flow_table.c: Use built-in RCU list checking

hlist_for_each_entry_rcu() has built-in RCU and lock checking.

Pass cond argument to list_for_each_entry_rcu() to silence
false lockdep warning when CONFIG_PROVE_RCU_LIST is enabled
by default.
Signed-off-by: default avatarMadhuparna Bhowmik <madhuparnabhowmik10@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53742e69
...@@ -585,7 +585,8 @@ static struct sw_flow *masked_flow_lookup(struct table_instance *ti, ...@@ -585,7 +585,8 @@ static struct sw_flow *masked_flow_lookup(struct table_instance *ti,
head = find_bucket(ti, hash); head = find_bucket(ti, hash);
(*n_mask_hit)++; (*n_mask_hit)++;
hlist_for_each_entry_rcu(flow, head, flow_table.node[ti->node_ver]) { hlist_for_each_entry_rcu(flow, head, flow_table.node[ti->node_ver],
lockdep_ovsl_is_held()) {
if (flow->mask == mask && flow->flow_table.hash == hash && if (flow->mask == mask && flow->flow_table.hash == hash &&
flow_cmp_masked_key(flow, &masked_key, &mask->range)) flow_cmp_masked_key(flow, &masked_key, &mask->range))
return flow; return flow;
...@@ -769,7 +770,8 @@ struct sw_flow *ovs_flow_tbl_lookup_ufid(struct flow_table *tbl, ...@@ -769,7 +770,8 @@ struct sw_flow *ovs_flow_tbl_lookup_ufid(struct flow_table *tbl,
hash = ufid_hash(ufid); hash = ufid_hash(ufid);
head = find_bucket(ti, hash); head = find_bucket(ti, hash);
hlist_for_each_entry_rcu(flow, head, ufid_table.node[ti->node_ver]) { hlist_for_each_entry_rcu(flow, head, ufid_table.node[ti->node_ver],
lockdep_ovsl_is_held()) {
if (flow->ufid_table.hash == hash && if (flow->ufid_table.hash == hash &&
ovs_flow_cmp_ufid(flow, ufid)) ovs_flow_cmp_ufid(flow, ufid))
return flow; return flow;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment