netfilter: add netfilter hooks to track SRv6-encapsulated flows
Subsystems (5)
v3 cover netfilter: add netfilter hooks to track SRv6-encapsulated flows
Tunneling protocols such as VXLAN or IPIP are implemented using virtual network devices (vxlan0 or ipip0). Therefore, conntrack can record both inner flows and outer flows correctly. In contrast, SRv6 is implemented using lightweight tunnel infrastructure. Therefore, SRv6 packets are encapsulated and decapsulated without passing through virtual network device. Due to the following problems caused by this, conntrack can't record both inner flows and outer flows correctly.
First problem is caused when SRv6 packets are encapsulated. In VXLAN, at first, packets received are passed to nf_conntrack_in called from ip_rcv/ipv6_rcv. These packets are sent to virtual network device and these flows are confirmed in ip_output/ip6_output. However, in SRv6, at first, packets are passed to nf_conntrack_in, encapsulated and flows are confirmed in ipv6_output even if inner packets are IPv4. Therefore, IPv6 conntrack needs to be enabled to track IPv4 inner flow.
Second problem is caused when SRv6 packets are decapsulated. If IPv6 conntrack is enabled, SRv6 packets are passed to nf_conntrack_in called from ipv6_rcv. Even if inner packets are passed to nf_conntrack_in after packets are decapsulated, flow aren't tracked because skb->_nfct is already set. Therefore, IPv6 conntrack needs to be disabled to track IPv4 flow when packets are decapsulated.
This patch series solves these problems and allows conntrack to record inner flows correctly. It introduces netfilter hooks to srv6 lwtunnel and srv6local lwtunnel. It also introduces new sysctl toggle to turn on lightweight tunnel netfilter hooks.
v3: fix warning in nf_conntrack_lwtunnel.c
v2: introduce nf_ct_lwtunnel_enabled static_key and sysctl toggle to turn
on lightweight tunnel netfilter hooks
Ryoga Saito (2):
netfilter: add new sysctl toggle for lightweight tunnel netfilter
hooks
netfilter: add netfilter hooks to SRv6 data plane
.../networking/nf_conntrack-sysctl.rst | 7 ++ include/net/lwtunnel.h | 2 + include/net/netfilter/nf_conntrack.h | 4 + net/core/lwtunnel.c | 3 + net/ipv6/seg6_iptunnel.c | 68 ++++++++++- net/ipv6/seg6_local.c | 115 ++++++++++++------ net/netfilter/Makefile | 2 +- net/netfilter/nf_conntrack_lwtunnel.c | 52 ++++++++ net/netfilter/nf_conntrack_standalone.c | 8 ++ 9 files changed, 218 insertions(+), 43 deletions(-) create mode 100644 net/netfilter/nf_conntrack_lwtunnel.c
Signature · 1 line
2.25.1
PATCH v3 1/2 netfilter: add new sysctl toggle for lightweight tunnel netfilter hooks
This patch introduces new sysctl toggle for enabling lightweight tunnel netfilter hooks.
--- .../networking/nf_conntrack-sysctl.rst | 7 +++ include/net/lwtunnel.h | 2 + include/net/netfilter/nf_conntrack.h | 4 ++ net/core/lwtunnel.c | 3 ++ net/netfilter/Makefile | 2 +- net/netfilter/nf_conntrack_lwtunnel.c | 52 +++++++++++++++++++ net/netfilter/nf_conntrack_standalone.c | 8 +++ 7 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 net/netfilter/nf_conntrack_lwtunnel.c
Documentation/networking/nf_conntrack-sysctl.rst +7 -0
@@ -30,6 +30,13 @@ nf_conntrack_checksum - BOOLEAN in INVALID state. If this is enabled, such packets will not be considered for connection tracking. +nf_conntrack_lwtunnel - BOOLEAN + - 0 - disabled (default) + - not 0 - enabled + + If this option is enabled, the lightweight tunnel netfilter hooks are + enabled. This option cannot be disabled once it is enabled. + nf_conntrack_count - INTEGER (read-only) Number of currently allocated flow entries.
include/net/lwtunnel.h +2 -0
@@ -51,6 +51,8 @@ struct lwtunnel_encap_ops { };#ifdef CONFIG_LWTUNNEL +DECLARE_STATIC_KEY_FALSE (nf_ct_lwtunnel_enabled); +void lwtstate_free (struct lwtunnel_state *lws); static inline struct lwtunnel_state *
include/net/netfilter/nf_conntrack.h +4 -0
@@ -360,4 +360,8 @@ static inline struct nf_conntrack_net *nf_ct_pernet(const struct net *net)#define MODULE_ALIAS_NFCT_HELPER (helper) \ MODULE_ALIAS("nfct-helper-" helper) +int nf_conntrack_lwtunnel_sysctl_handler (struct ctl_table *table,int write, +void *buffer,size_t *lenp, +loff_t *ppos); +#endif /* _NF_CONNTRACK_H */
net/core/lwtunnel.c +3 -0
@@ -23,6 +23,9 @@#include <net/ip6_fib.h> #include <net/rtnh.h> +DEFINE_STATIC_KEY_FALSE (nf_ct_lwtunnel_enabled); +EXPORT_SYMBOL_GPL (nf_ct_lwtunnel_enabled); +#ifdef CONFIG_MODULES static const char *lwtunnel_encap_str (enum lwtunnel_encap_types encap_type)
net/netfilter/Makefile +1 -1
@@ -4,7 +4,7 @@ netfilter-objs := core.o nf_log.o nf_queue.o nf_sockopt.o utils.o nf_conntrack-y := nf_conntrack_core.o nf_conntrack_standalone.o nf_conntrack_expect.o nf_conntrack_helper.o \ nf_conntrack_proto.o nf_conntrack_proto_generic.o nf_conntrack_proto_tcp.o nf_conntrack_proto_udp.o \ nf_conntrack_proto_icmp.o \ - nf_conntrack_extend.o nf_conntrack_acct.o nf_conntrack_seqadj.o + nf_conntrack_extend.o nf_conntrack_acct.o nf_conntrack_seqadj.o nf_conntrack_lwtunnel.o nf_conntrack-$(subst m,y,$(CONFIG_IPV6)) += nf_conntrack_proto_icmpv6.o nf_conntrack-$(CONFIG_NF_CONNTRACK_TIMEOUT) += nf_conntrack_timeout.o
net/netfilter/nf_conntrack_lwtunnel.c new file +52 -0
53 lines not on this page · raw message
net/netfilter/nf_conntrack_standalone.c +8 -0
@@ -552,6 +552,7 @@ enum nf_ct_sysctl_index {NF_SYSCTL_CT_COUNT ,NF_SYSCTL_CT_BUCKETS ,NF_SYSCTL_CT_CHECKSUM , +NF_SYSCTL_CT_LWTUNNEL ,NF_SYSCTL_CT_LOG_INVALID ,NF_SYSCTL_CT_EXPECT_MAX , NF_SYSCTL_CT_ACCT,
@@ -650,6 +651,13 @@ static struct ctl_table nf_ct_sysctl_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, + [NF_SYSCTL_CT_LWTUNNEL] = { + .procname = "nf_conntrack_lwtunnel", + .data = NULL, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = nf_conntrack_lwtunnel_sysctl_handler, + }, [NF_SYSCTL_CT_LOG_INVALID] = { .procname = "nf_conntrack_log_invalid", .data = &init_net.ct.sysctl_log_invalid,
Signature · 1 line
2.25.1
kernel test robot
build botRe: [PATCH v3 1/2] netfilter: add new sysctl toggle for lightweight tunnel netfilter hooks
Thank you for the patch! Yet something to improve:
Hi Ryoga,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on nf-next/master]
[also build test ERROR on nf/master ipvs/master linus/master v5.14-rc3 next-20210730] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Ryoga-Saito/netfilter-add-new-sysctl-toggle-for-lightweight-tunnel-netfilter-hooks/20210730-002403 base: https://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git master config: x86_64-defconfig (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce (this is a W=1 build): # https://github.com/0day-ci/linux/commit/c406e7bc7831acf318fd8217b94d2d9bc1f62deb git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Ryoga-Saito/netfilter-add-new-sysctl-toggle-for-lightweight-tunnel-netfilter-hooks/20210730-002403 git checkout c406e7bc7831acf318fd8217b94d2d9bc1f62deb # save the attached .config to linux build tree mkdir build_dir make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from include/linux/static_key.h:1,
from arch/x86/include/asm/nospec-branch.h:6,
from arch/x86/include/asm/irqflags.h:9,
from include/linux/irqflags.h:16,
from include/linux/rcupdate.h:26,
from include/linux/sysctl.h:26,
from net/netfilter/nf_conntrack_lwtunnel.c:3:
net/netfilter/nf_conntrack_lwtunnel.c: In function 'nf_conntrack_lwtunnel_get':
>> net/netfilter/nf_conntrack_lwtunnel.c:9:30: error: 'nf_ct_lwtunnel_enabled' undeclared (first use in this function)
9 | if (static_branch_unlikely(&nf_ct_lwtunnel_enabled))
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/jump_label.h:484:43: note: in definition of macro 'static_branch_unlikely'
484 | if (__builtin_types_compatible_p(typeof(*x), struct static_key_true)) \
| ^
net/netfilter/nf_conntrack_lwtunnel.c:9:30: note: each undeclared identifier is reported only once for each function it appears in
9 | if (static_branch_unlikely(&nf_ct_lwtunnel_enabled))
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/jump_label.h:484:43: note: in definition of macro 'static_branch_unlikely'
484 | if (__builtin_types_compatible_p(typeof(*x), struct static_key_true)) \
| ^
net/netfilter/nf_conntrack_lwtunnel.c: In function 'nf_conntrack_lwtunnel_set':
net/netfilter/nf_conntrack_lwtunnel.c:17:30: error: 'nf_ct_lwtunnel_enabled' undeclared (first use in this function)
17 | if (static_branch_unlikely(&nf_ct_lwtunnel_enabled)) {
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/jump_label.h:484:43: note: in definition of macro 'static_branch_unlikely'
484 | if (__builtin_types_compatible_p(typeof(*x), struct static_key_true)) \
| ^vim +/nf_ct_lwtunnel_enabled +9 net/netfilter/nf_conntrack_lwtunnel.c
6
7 static inline int nf_conntrack_lwtunnel_get(void)
8 {
> 9 if (static_branch_unlikely(&nf_ct_lwtunnel_enabled))
10 return 1;
11 else
12 return 0;
13 }
14 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v3 2/2 netfilter: add netfilter hooks to SRv6 data plane
In reply to Ryoga SaitoThis patch introduces netfilter hooks for solving the problem that conntrack couldn't record both inner flows and outer flows.
--- net/ipv6/seg6_iptunnel.c | 68 +++++++++++++++++++++-- net/ipv6/seg6_local.c | 115 +++++++++++++++++++++++++++------------ 2 files changed, 141 insertions(+), 42 deletions(-)
net/ipv6/seg6_iptunnel.c +62 -6
@@ -26,6 +26,7 @@#ifdef CONFIG_IPV6_SEG6_HMAC #include <net/seg6_hmac.h> #endif +#include <net/netfilter/nf_conntrack.h> static size_t seg6_lwt_headroom (struct seg6_iptunnel_encap *tuninfo) {
@@ -295,25 +296,33 @@ static int seg6_do_srh(struct sk_buff *skb)ipv6_hdr (skb)->payload_len =htons (skb->len -sizeof (struct ipv6hdr ));skb_set_transport_header (skb,sizeof (struct ipv6hdr )); +nf_reset_ct (skb);return 0 ; } -static int seg6_input (struct sk_buff *skb) +static int seg6_input_finish (struct net *net,struct sock *sk, +struct sk_buff *skb) +{ +return dst_input (skb); +} + +static int seg6_input_core (struct net *net,struct sock *sk, +struct sk_buff *skb) {struct dst_entry *orig_dst =skb_dst (skb);struct dst_entry *dst =NULL ; -struct seg6_lwt *slwt; +struct seg6_lwt *slwt =NULL ;int err; + slwt =seg6_lwt_lwtunnel (orig_dst->lwtstate); + err =seg6_do_srh (skb);if (unlikely (err)) {kfree_skb (skb);return err; } - slwt =seg6_lwt_lwtunnel (orig_dst->lwtstate); -preempt_disable (); dst =dst_cache_get (&slwt->cache);preempt_enable ();
@@ -337,10 +346,35 @@ static int seg6_input(struct sk_buff *skb)if (unlikely (err))return err; -return dst_input (skb); +if (static_branch_unlikely (&nf_ct_lwtunnel_enabled)) +return NF_HOOK (NFPROTO_IPV6 ,NF_INET_LOCAL_OUT , +dev_net (skb->dev),NULL , skb,NULL , +skb_dst (skb)->dev, seg6_input_finish); + +return seg6_input_finish (dev_net (skb->dev),NULL , skb); } -static int seg6_output (struct net *net,struct sock *sk,struct sk_buff *skb) +static int seg6_input (struct sk_buff *skb) +{ +int proto; + +if (skb->protocol ==htons (ETH_P_IPV6 )) + proto =NFPROTO_IPV6 ; +else if (skb->protocol ==htons (ETH_P_IP )) + proto =NFPROTO_IPV4 ; +else +return -EINVAL ; + +if (static_branch_unlikely (&nf_ct_lwtunnel_enabled)) +return NF_HOOK (proto,NF_INET_POST_ROUTING ,dev_net (skb->dev), +NULL , skb,NULL ,skb_dst (skb)->dev, + seg6_input_core); + +return seg6_input_core (dev_net (skb->dev),NULL , skb); +} + +static int seg6_output_core (struct net *net,struct sock *sk, +struct sk_buff *skb) {struct dst_entry *orig_dst =skb_dst (skb);struct dst_entry *dst =NULL ;
@@ -387,12 +421,34 @@ static int seg6_output(struct net *net, struct sock *sk, struct sk_buff *skb)if (unlikely (err)) goto drop; +if (static_branch_unlikely (&nf_ct_lwtunnel_enabled)) +return NF_HOOK (NFPROTO_IPV6 ,NF_INET_LOCAL_OUT , net, sk, skb, +NULL ,skb_dst (skb)->dev, dst_output); +return dst_output (net, sk, skb); drop:kfree_skb (skb);return err; } +static int seg6_output (struct net *net,struct sock *sk,struct sk_buff *skb) +{ +int proto; + +if (skb->protocol ==htons (ETH_P_IPV6 )) + proto =NFPROTO_IPV6 ; +else if (skb->protocol ==htons (ETH_P_IP )) + proto =NFPROTO_IPV4 ; +else +return -EINVAL ; + +if (static_branch_unlikely (&nf_ct_lwtunnel_enabled)) +return NF_HOOK (proto,NF_INET_POST_ROUTING , net, sk, skb,NULL , +skb_dst (skb)->dev, seg6_output_core); + +return seg6_output_core (net, sk, skb); +} + static int seg6_build_state(struct net *net, struct nlattr *nla, unsigned int family, const void *cfg, struct lwtunnel_state **ts,
net/ipv6/seg6_local.c +79 -36
186 lines not on this page · raw message
Signature · 1 line
2.25.1