[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAPWQB7FYJOEhGuK8Yzo0RfAq4ex_X5msRWMjuAuDspbz=tkPqA@mail.gmail.com>
Date: Wed, 9 Mar 2016 18:37:15 -0800
From: Joe Stringer <joe@....org>
To: Jarno Rajahalme <jarno@....org>
Cc: netfilter-devel@...r.kernel.org, netdev <netdev@...r.kernel.org>,
ovs dev <dev@...nvswitch.org>
Subject: Re: [PATCH nf-next v9 7/8] openvswitch: Delay conntrack helper call
for new connections.
On 9 March 2016 at 15:10, Jarno Rajahalme <jarno@....org> wrote:
> There is no need to help connections that are not confirmed, so we can
> delay helping new connections to the time when they are confirmed.
> This change is needed for NAT support, and having this as a separate
> patch will make the following NAT patch a bit easier to review.
>
> Signed-off-by: Jarno Rajahalme <jarno@....org>
> ---
> net/openvswitch/conntrack.c | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
> index 92613de..5711f80 100644
> --- a/net/openvswitch/conntrack.c
> +++ b/net/openvswitch/conntrack.c
<snip>
> @@ -506,11 +510,17 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
> return -ENOENT;
>
> ovs_ct_update_key(skb, info, key, true);
> + }
>
> - if (ovs_ct_helper(skb, info->family) != NF_ACCEPT) {
> - WARN_ONCE(1, "helper rejected packet");
> - return -EINVAL;
> - }
> + /* Call the helper only if we did nf_conntrack_in() above ('!cached')
> + * for confirmed connections, but only when committing for unconfirmed
> + * connections.
> + */
Minor nit, try this wording for readibility?
/* Call the helper only if:
* - nf_conntrack_in() was executed above ("!cached") for a confirmed
connection, or
* - When committing an unconfirmed connection
*/
Powered by blists - more mailing lists