From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Subject: Re: [PATCH net 4/5] openvswitch: Fix ovs_flow_free() ovs-lock assert. Date: Mon, 03 Feb 2014 20:42:06 +0400 Message-ID: <52EFC6DE.3070603@cogentembedded.com> References: <1391389686-34303-1-git-send-email-jesse@nicira.com> <1391389686-34303-5-git-send-email-jesse@nicira.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dev-yBygre7rU0SM8Zsap4Y0gw@public.gmane.org To: Jesse Gross , David Miller Return-path: In-Reply-To: <1391389686-34303-5-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org Errors-To: dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org List-Id: netdev.vger.kernel.org Hello. On 03-02-2014 5:08, Jesse Gross wrote: > From: Pravin B Shelar > 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 > Signed-off-by: Jesse Gross > --- > net/openvswitch/flow_table.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c > index bd14052..ad0bda0 100644 > --- a/net/openvswitch/flow_table.c > +++ b/net/openvswitch/flow_table.c > @@ -158,11 +158,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. */ Networking multi-line comment style is: /* bla * bla */ WBR, Sergei