Skip to content

Commit

Permalink
openvswitch: Fix ovs_flow_free() ovs-lock assert.
Browse files Browse the repository at this point in the history
ovs_flow_free() is not called under ovs-lock during packet
execute path (ovs_packet_cmd_execute()). Since packet execute
does not touch flow->mask, there is no need to take that
lock either. So move assert in case where flow->mask is checked.

Found by code inspection.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
  • Loading branch information
Pravin B Shelar authored and Jesse Gross committed Feb 5, 2014
1 parent 45fb9c3 commit e4c6d75
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions net/openvswitch/flow_table.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,13 @@ void ovs_flow_free(struct sw_flow *flow, bool deferred)
if (!flow)
return;

ASSERT_OVSL();

if (flow->mask) {
struct sw_flow_mask *mask = flow->mask;

/* ovs-lock is required to protect mask-refcount and
* mask list.
*/
ASSERT_OVSL();
BUG_ON(!mask->ref_count);
mask->ref_count--;

Expand Down

0 comments on commit e4c6d75

Please sign in to comment.