From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Paul Blakey <paulb@mellanox.com>
Cc: Jiri Pirko <jiri@mellanox.com>, Roi Dayan <roid@mellanox.com>,
Yossi Kuperman <yossiku@mellanox.com>,
Oz Shlomo <ozsh@mellanox.com>,
netdev@vger.kernel.org, David Miller <davem@davemloft.net>,
Aaron Conole <aconole@redhat.com>, Zhike Wang <wangzhike@jd.com>,
Rony Efraim <ronye@mellanox.com>,
nst-kernel@redhat.com, John Hurley <john.hurley@netronome.com>,
Simon Horman <simon.horman@netronome.com>,
Justin Pettit <jpettit@ovn.org>
Subject: Re: [PATCH net-next v5 1/4] net/sched: Introduce action ct
Date: Mon, 8 Jul 2019 10:42:08 -0300 [thread overview]
Message-ID: <20190708134208.GD3390@localhost.localdomain> (raw)
In-Reply-To: <1562575880-30891-2-git-send-email-paulb@mellanox.com>
On Mon, Jul 08, 2019 at 11:51:17AM +0300, Paul Blakey wrote:
..
> +static int tcf_ct_handle_fragments(struct net *net, struct sk_buff *skb,
> + u8 family, u16 zone)
> +{
> + enum ip_conntrack_info ctinfo;
> + struct nf_conn *ct;
> + int err = 0;
> + bool frag;
> +
> + /* Previously seen (loopback)? Ignore. */
> + ct = nf_ct_get(skb, &ctinfo);
> + if ((ct && !nf_ct_is_template(ct)) || ctinfo == IP_CT_UNTRACKED)
> + return 0;
> +
> + if (family == NFPROTO_IPV4)
> + err = tcf_ct_ipv4_is_fragment(skb, &frag);
> + else
> + err = tcf_ct_ipv6_is_fragment(skb, &frag);
> + if (err || !frag)
> + return err;
> +
> + skb_get(skb);
> +
> + if (family == NFPROTO_IPV4) {
> + enum ip_defrag_users user = IP_DEFRAG_CONNTRACK_IN + zone;
> +
> + memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));
> + local_bh_disable();
> + err = ip_defrag(net, skb, user);
> + local_bh_enable();
> + if (err && err != -EINPROGRESS)
> + goto out_free;
> + } else { /* NFPROTO_IPV6 */
> + enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
> +
> + memset(IP6CB(skb), 0, sizeof(struct inet6_skb_parm));
> + err = nf_ct_frag6_gather(net, skb, user);
This doesn't build without IPv6 enabled.
ERROR: "nf_ct_frag6_gather" [net/sched/act_ct.ko] undefined!
We need to (copy and pasted):
@@ -179,7 +179,9 @@ static int tcf_ct_handle_fragments(struct net *net, struct sk_buff *skb,
local_bh_enable();
if (err && err != -EINPROGRESS)
goto out_free;
- } else { /* NFPROTO_IPV6 */
+ }
+#if IS_ENABLED(IPV6)
+ else { /* NFPROTO_IPV6 */
enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
memset(IP6CB(skb), 0, sizeof(struct inet6_skb_parm));
@@ -187,6 +189,7 @@ static int tcf_ct_handle_fragments(struct net *net, struct sk_buff *skb,
if (err && err != -EINPROGRESS)
goto out_free;
}
+#endif
skb_clear_hash(skb);
skb->ignore_df = 1;
> + if (err && err != -EINPROGRESS)
> + goto out_free;
> + }
> +
> + skb_clear_hash(skb);
> + skb->ignore_df = 1;
> + return err;
> +
> +out_free:
> + kfree_skb(skb);
> + return err;
> +}
next prev parent reply other threads:[~2019-07-08 13:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-08 8:51 [PATCH net-next v5 0/4] net/sched: Introduce tc connection tracking Paul Blakey
2019-07-08 8:51 ` [PATCH net-next v5 1/4] net/sched: Introduce action ct Paul Blakey
2019-07-08 13:42 ` Marcelo Ricardo Leitner [this message]
2019-07-08 15:28 ` Florian Westphal
2019-07-09 7:00 ` Paul Blakey
2019-07-08 8:51 ` [PATCH net-next v5 2/4] net/flow_dissector: add connection tracking dissection Paul Blakey
2019-07-08 8:51 ` [PATCH net-next v5 3/4] net/sched: cls_flower: Add matching on conntrack info Paul Blakey
2019-07-08 8:51 ` [PATCH net-next v5 4/4] tc-tests: Add tc action ct tests Paul Blakey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190708134208.GD3390@localhost.localdomain \
--to=marcelo.leitner@gmail.com \
--cc=aconole@redhat.com \
--cc=davem@davemloft.net \
--cc=jiri@mellanox.com \
--cc=john.hurley@netronome.com \
--cc=jpettit@ovn.org \
--cc=netdev@vger.kernel.org \
--cc=nst-kernel@redhat.com \
--cc=ozsh@mellanox.com \
--cc=paulb@mellanox.com \
--cc=roid@mellanox.com \
--cc=ronye@mellanox.com \
--cc=simon.horman@netronome.com \
--cc=wangzhike@jd.com \
--cc=yossiku@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).