diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2014-01-31 09:43:23 -0800 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2014-02-04 22:21:45 -0800 |
| commit | e4c6d7595403e943a3afc334eb8c0efcd840043a (patch) | |
| tree | 66cff145611dcd24a267ace5e6e48b86b4747dcf | |
| parent | 45fb9c35b27c9982e9a55d04ed0a5230a2d0b306 (diff) | |
openvswitch: Fix ovs_flow_free() ovs-lock assert.
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>
| -rw-r--r-- | net/openvswitch/flow_table.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index bd14052ed342..3c268b3d71c3 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -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--; |