From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH nf-next 10/10] netfilter: handle NF_REPEAT from nf_conntrack_in()
Date: Thu, 3 Nov 2016 13:37:52 +0100 [thread overview]
Message-ID: <1478176672-1334-10-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1478176672-1334-1-git-send-email-pablo@netfilter.org>
NF_REPEAT is only needed from nf_conntrack_in() under a very specific
case required by the TCP protocol tracker, we can handle this case
without returning to the core hook path. Handling of NF_REPEAT from the
nf_reinject() is left untouched.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
v1: New patch, not posted before, to get rid of NF_REPEAT handling from the
core.
net/netfilter/core.c | 2 --
net/netfilter/nf_conntrack_core.c | 11 ++++++-----
net/openvswitch/conntrack.c | 8 ++------
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index bd9272eeccb5..de30e08d58f2 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -322,8 +322,6 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state,
if (ret == 0)
ret = -EPERM;
return ret;
- case NF_REPEAT:
- continue;
case NF_QUEUE:
ret = nf_queue(skb, state, &entry, verdict);
if (ret == 1 && entry)
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index df2f5a3901df..de4b8a75f30b 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1305,7 +1305,7 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,
if (skb->nfct)
goto out;
}
-
+repeat:
ct = resolve_normal_ct(net, tmpl, skb, dataoff, pf, protonum,
l3proto, l4proto, &set_reply, &ctinfo);
if (!ct) {
@@ -1345,11 +1345,12 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,
nf_conntrack_event_cache(IPCT_REPLY, ct);
out:
if (tmpl) {
- /* Special case: we have to repeat this hook, assign the
- * template again to this packet. We assume that this packet
- * has no conntrack assigned. This is used by nf_ct_tcp. */
+ /* Special case: TCP tracker reports an attempt to reopen a
+ * closed/aborted connection. We have to go back and create a
+ * fresh conntrack.
+ */
if (ret == NF_REPEAT)
- skb->nfct = (struct nf_conntrack *)tmpl;
+ goto repeat;
else
nf_ct_put(tmpl);
}
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 31045ef44a82..9b8a028b7dad 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -725,12 +725,8 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
skb->nfctinfo = IP_CT_NEW;
}
- /* Repeat if requested, see nf_iterate(). */
- do {
- err = nf_conntrack_in(net, info->family,
- NF_INET_PRE_ROUTING, skb);
- } while (err == NF_REPEAT);
-
+ err = nf_conntrack_in(net, info->family,
+ NF_INET_PRE_ROUTING, skb);
if (err != NF_ACCEPT)
return -ENOENT;
--
2.1.4
prev parent reply other threads:[~2016-11-03 12:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-03 12:37 [PATCH nf-next,v2 01/10] netfilter: get rid of useless debugging from core Pablo Neira Ayuso
2016-11-03 12:37 ` [PATCH nf-next,v2 02/10] netfilter: remove comments that predate rcu days Pablo Neira Ayuso
2016-11-03 12:37 ` [PATCH nf-next,v2 03/10] netfilter: kill NF_HOOK_THRESH() and state->tresh Pablo Neira Ayuso
2016-11-03 12:37 ` [PATCH nf-next,v2 04/10] netfilter: deprecate NF_STOP Pablo Neira Ayuso
2016-11-03 12:37 ` [PATCH nf-next,v2 05/10] netfilter: x_tables: move hook state into xt_action_param structure Pablo Neira Ayuso
2016-11-03 12:37 ` [PATCH nf-next,v2 06/10] netfilter: nf_tables: use hook state from " Pablo Neira Ayuso
2016-11-03 12:37 ` [PATCH nf-next,v2 07/10] netfilter: use switch() to handle verdict cases from nf_hook_slow() Pablo Neira Ayuso
2016-11-03 12:37 ` [PATCH nf-next,v2 08/10] netfilter: remove hook_entries field from nf_hook_state Pablo Neira Ayuso
2016-11-03 12:37 ` [PATCH nf-next,v2 09/10] netfilter: merge nf_iterate() into nf_hook_slow() Pablo Neira Ayuso
2016-11-03 12:37 ` Pablo Neira Ayuso [this message]
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=1478176672-1334-10-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
/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).