From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: marcmicalizzi@gmail.com, Florian Westphal <fw@strlen.de>
Subject: [PATCH nf 3/5] netfilter: nft_flow_offload: don't offload when sequence numbers need adjustment
Date: Tue, 21 May 2019 13:24:32 +0200 [thread overview]
Message-ID: <20190521112434.11767-4-fw@strlen.de> (raw)
In-Reply-To: <20190521112434.11767-1-fw@strlen.de>
We can't deal with tcp sequence number rewrite in flow_offload.
While at it, simplify helper check, we only need to know if the extension
is present, we don't need the helper data.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
net/netfilter/nft_flow_offload.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c
index bde63d9c3c4e..c97c03c3939a 100644
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
@@ -12,7 +12,6 @@
#include <net/netfilter/nf_conntrack_core.h>
#include <linux/netfilter/nf_conntrack_common.h>
#include <net/netfilter/nf_flow_table.h>
-#include <net/netfilter/nf_conntrack_helper.h>
struct nft_flow_offload {
struct nft_flowtable *flowtable;
@@ -67,7 +66,6 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,
{
struct nft_flow_offload *priv = nft_expr_priv(expr);
struct nf_flowtable *flowtable = &priv->flowtable->data;
- const struct nf_conn_help *help;
enum ip_conntrack_info ctinfo;
struct nf_flow_route route;
struct flow_offload *flow;
@@ -93,8 +91,8 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,
goto out;
}
- help = nfct_help(ct);
- if (help)
+ if (nf_ct_ext_exist(ct, NF_CT_EXT_HELPER) ||
+ ct->status & IPS_SEQ_ADJUST)
goto out;
if (!nf_ct_is_confirmed(ct))
--
2.21.0
next prev parent reply other threads:[~2019-05-21 11:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-21 11:24 [PATCH nf 0/5] netfilter: flow table fixes Florian Westphal
2019-05-21 11:24 ` [PATCH nf 1/5] netfilter: nf_flow_table: ignore DF bit setting Florian Westphal
2019-05-21 11:24 ` [PATCH nf 2/5] netfilter: nft_flow_offload: set liberal tracking mode for tcp Florian Westphal
2019-05-21 11:24 ` Florian Westphal [this message]
2019-05-21 11:24 ` [PATCH nf 4/5] netfilter: nft_flow_offload: IPCB is only valid for ipv4 family Florian Westphal
2019-05-21 11:24 ` [PATCH nf 5/5] selftests: netfilter: add flowtable test script Florian Westphal
2019-05-22 8:55 ` [PATCH nf 0/5] netfilter: flow table fixes Pablo Neira Ayuso
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=20190521112434.11767-4-fw@strlen.de \
--to=fw@strlen.de \
--cc=marcmicalizzi@gmail.com \
--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).