From fa10709d1e2413ff1b5ad667595338041bbeb76b Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Mon, 27 Jan 2014 18:18:33 -0800 Subject: [PATCH] datapath: 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 Acked-by: Andy Zhou Acked-by: Jesse Gross --- datapath/flow_table.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/datapath/flow_table.c b/datapath/flow_table.c index 2e8557c4d..fa7ad3615 100644 --- a/datapath/flow_table.c +++ b/datapath/flow_table.c @@ -167,11 +167,12 @@ 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--; -- 2.20.1