On 07/14/2017 11:42 AM, Joe Stringer wrote:
On 14 July 2017 at 09:10, Greg Rose <gvrose8...@gmail.com> wrote: > When there is an established connection in direction A->B, it is > possible to receive a packet on port B which then executes > ct(commit,force) without first performing ct() - ie, a lookup. > In this case, we would expect that this packet can delete the existing > entry so that we can commit a connection with direction B->A. However, > currently we only perform a check in skb_nfct_cached() for whether > OVS_CS_F_TRACKED is set and OVS_CS_F_INVALID is not set, ie that a > lookup previously occurred. In the above scenario, a lookup has not > occurred but we should still be able to statelessly look up the > existing entry and potentially delete the entry if it is in the > opposite direction. > > This patch extends the check to also hint that if the action has the > force flag set, then we will lookup the existing entry so that the > force check at the end of skb_nfct_cached has the ability to delete > the connection. > > Fixes: dd41d330b03 ("openvswitch: Add force commit.") > CC: Pravin Shelar <pshe...@nicira.com> > CC: d...@openvswitch.org > Signed-off-by: Joe Stringer <j...@ovn.org> > Signed-off-by: Greg Rose <gvrose8...@gmail.com> > --- > net/openvswitch/conntrack.c | 50 +++++++++++++++++++++++++++++++-------------- > 1 file changed, 35 insertions(+), 15 deletions(-) > > diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c > index 08679eb..1260f2b 100644 > --- a/net/openvswitch/conntrack.c > +++ b/net/openvswitch/conntrack.c > @@ -629,6 +629,33 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key, > return ct; > } > > +struct nf_conn *ovs_ct_executed(struct net *net, > + const struct sw_flow_key *key, > + const struct ovs_conntrack_info *info, > + struct sk_buff *skb, > + bool *ct_executed)Actually, some compilers will report this new warning: net/openvswitch/conntrack.c:632:16: warning: symbol 'ovs_ct_executed' was not declared. Should it be static? Could you make this function static and repost? Thanks.
Yes, I just saw that too. Need to update my compiler for my primary build machine. I'll send a V2... Thanks! - Greg
