On Mon, 14 Oct 2019 10:37:43 -0700 Yi-Hung Wei <[email protected]> wrote:
> From: Flavio Leitner <[email protected]> > > upstream patch: > > commit fa7e428c6b7ed3281610511a2b2ec716d9894be8 > Author: Flavio Leitner <[email protected]> > Date: Mon Mar 25 15:58:31 2019 -0300 > > openvswitch: add seqadj extension when NAT is used. > > When the conntrack is initialized, there is no helper attached > yet so the nat info initialization (nf_nat_setup_info) skips > adding the seqadj ext. > > A helper is attached later when the conntrack is not confirmed > but is going to be committed. In this case, if NAT is needed then > adds the seqadj ext as well. > > Fixes: 16ec3d4fbb96 ("openvswitch: Fix cached ct with helper.") > Signed-off-by: Flavio Leitner <[email protected]> > Acked-by: Pravin B Shelar <[email protected]> > Signed-off-by: David S. Miller <[email protected]> > > Signed-off-by: Yi-Hung Wei <[email protected]> LGTM fbl > --- > datapath/conntrack.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/datapath/conntrack.c b/datapath/conntrack.c > index 291d4f4723d9..1b345a03e704 100644 > --- a/datapath/conntrack.c > +++ b/datapath/conntrack.c > @@ -1063,6 +1063,12 @@ static int __ovs_ct_lookup(struct net *net, > struct sw_flow_key *key, GFP_ATOMIC); > if (err) > return err; > + > + /* helper installed, add seqadj if NAT is > required */ > + if (info->nat && !nfct_seqadj(ct)) { > + if (!nfct_seqadj_ext_add(ct)) > + return -EINVAL; > + } > } > > /* Call the helper only if: _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
