netfilter: nft_meta: add support for slave device matching
Subsystems (2)
Florian Westphal
maintainercover netfilter: nft_meta: add support for slave device matching
Martin Willi recently proposed addition of new xt_slavedev module to allow matching the real interface within a VRF domain.
This adds an nft equivalent:
meta sdif "realdev" accept
meta sdifname "realdev" accept
In case packet had no vrf slave, sdif stores 0 or "" name, just like 'oif/oifname' would on input.
sdif(name) is restricted to the ipv4/ipv6 input and forward hooks, as it depends on ip(6) stack parsing/storing info in skb->cb[].
Because meta main eval function is now exceeding more than 200 LOC, the first patches are diet work to debloat the function by using helpers where appropriate.
Last patch adds the sdif/sdifname functionality.
Function old new delta nft_meta_get_eval_pkttype_lo - 588 +588 nft_meta_get_eval_time - 404 +404 nft_meta_get_eval_skugid - 397 +397 nft_meta_get_eval_cgroup - 234 +234 nft_meta_get_eval_sif - 148 +148 nft_meta_get_eval_kind - 138 +138 nft_meta_get_eval_sifname - 91 +91 nft_meta_get_validate 111 169 +58 nft_prandom_u32 - 20 +20
nft_meta_get_eval 2904 1261 -1643
Total: Before=6076, After=6511, chg +7.16%
Florian Westphal
maintainerPATCH 1/9 netfilter: nft_meta: move time handling to helper
reduce size of the (large) meta evaluation function.
--- net/netfilter/nft_meta.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)
net/netfilter/nft_meta.c +22 -6
@@ -33,8 +33,9 @@ static DEFINE_PER_CPU(struct rnd_state, nft_prandom_state); -static u8 nft_meta_weekday (time64_t secs) +static u8 nft_meta_weekday (void ) { +time64_t secs =ktime_get_real_seconds ();unsigned int dse;u8 wday;
@@ -56,6 +57,25 @@ static u32 nft_meta_hour(time64_t secs) + tm.tm_sec; } +static noinline_for_stack void +nft_meta_get_eval_time (enum nft_meta_keys key, +u32 *dest) +{ +switch (key) { +case NFT_META_TIME_NS : +nft_reg_store64 (dest,ktime_get_real_ns ()); +break ; +case NFT_META_TIME_DAY : +nft_reg_store8 (dest,nft_meta_weekday ()); +break ; +case NFT_META_TIME_HOUR : + *dest =nft_meta_hour (ktime_get_real_seconds ()); +break ; +default : +break ; + } +} +void nft_meta_get_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt)
@@ -247,13 +267,9 @@ void nft_meta_get_eval(const struct nft_expr *expr,strncpy ((char *)dest, out->rtnl_link_ops->kind,IFNAMSIZ );break ;case NFT_META_TIME_NS : -nft_reg_store64 (dest,ktime_get_real_ns ()); -break ;case NFT_META_TIME_DAY : -nft_reg_store8 (dest,nft_meta_weekday (ktime_get_real_seconds ())); -break ;case NFT_META_TIME_HOUR : - *dest =nft_meta_hour (ktime_get_real_seconds ()); +nft_meta_get_eval_time (priv->key, dest);break ;default :WARN_ON (1 );
Signature · 1 line
2.24.1
Florian Westphal
maintainerPATCH 2/9 netfilter: nft_meta: move pkttype handling to helper
In reply to Florian WestphalWhen pkttype is loopback, nft_meta performs guesswork to detect broad/multicast packets. Place this in a helper, this is hardly a hot path.
--- net/netfilter/nft_meta.c | 90 +++++++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 39 deletions(-)
net/netfilter/nft_meta.c +51 -39
@@ -76,6 +76,56 @@ nft_meta_get_eval_time(enum nft_meta_keys key, } } +static noinline bool +nft_meta_get_eval_pkttype_lo (const struct nft_pktinfo *pkt, +u32 *dest) +{ +const struct sk_buff *skb = pkt->skb; + +switch (nft_pf (pkt)) { +case NFPROTO_IPV4 : +if (ipv4_is_multicast (ip_hdr (skb)->daddr)) +nft_reg_store8 (dest,PACKET_MULTICAST ); +else +nft_reg_store8 (dest,PACKET_BROADCAST ); +break ; +case NFPROTO_IPV6 : +nft_reg_store8 (dest,PACKET_MULTICAST ); +break ; +case NFPROTO_NETDEV : +switch (skb->protocol) { +case htons (ETH_P_IP ): { +int noff =skb_network_offset (skb); +struct iphdr *iph, _iph; + + iph =skb_header_pointer (skb, noff, +sizeof (_iph), &_iph); +if (!iph) +return false; + +if (ipv4_is_multicast (iph->daddr)) +nft_reg_store8 (dest,PACKET_MULTICAST ); +else +nft_reg_store8 (dest,PACKET_BROADCAST ); + +break ; + } +case htons (ETH_P_IPV6 ): +nft_reg_store8 (dest,PACKET_MULTICAST ); +break ; +default : +WARN_ON_ONCE (1 ); +return false; + } +break ; +default : +WARN_ON_ONCE (1 ); +return false; + } + +return true; +} +void nft_meta_get_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt)
@@ -183,46 +233,8 @@ void nft_meta_get_eval(const struct nft_expr *expr,break ; } -switch (nft_pf (pkt)) { -case NFPROTO_IPV4 : -if (ipv4_is_multicast (ip_hdr (skb)->daddr)) -nft_reg_store8 (dest,PACKET_MULTICAST ); -else -nft_reg_store8 (dest,PACKET_BROADCAST ); -break ; -case NFPROTO_IPV6 : -nft_reg_store8 (dest,PACKET_MULTICAST ); -break ; -case NFPROTO_NETDEV : -switch (skb->protocol) { -case htons (ETH_P_IP ): { -int noff =skb_network_offset (skb); -struct iphdr *iph, _iph; - - iph =skb_header_pointer (skb, noff, -sizeof (_iph), &_iph); -if (!iph) - goto err; - -if (ipv4_is_multicast (iph->daddr)) -nft_reg_store8 (dest,PACKET_MULTICAST ); -else -nft_reg_store8 (dest,PACKET_BROADCAST ); - -break ; - } -case htons (ETH_P_IPV6 ): -nft_reg_store8 (dest,PACKET_MULTICAST ); -break ; -default : -WARN_ON_ONCE (1 ); - goto err; - } -break ; -default : -WARN_ON_ONCE (1 ); +if (!nft_meta_get_eval_pkttype_lo (pkt, dest)) goto err; - }break ;case NFT_META_CPU : *dest =raw_smp_processor_id ();
Signature · 1 line
2.24.1
Florian Westphal
maintainerPATCH 3/9 netfilter: nft_meta: move sk uid/git handling to helper
In reply to Florian WestphalNot a hot path. Also, both have copy&paste case statements, so use a common helper for both.
--- net/netfilter/nft_meta.c | 65 ++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 29 deletions(-)
net/netfilter/nft_meta.c +36 -29
@@ -126,6 +126,41 @@ nft_meta_get_eval_pkttype_lo(const struct nft_pktinfo *pkt,return true; } +static noinline bool +nft_meta_get_eval_skugid (enum nft_meta_keys key, +u32 *dest, +const struct nft_pktinfo *pkt) +{ +struct sock *sk =skb_to_full_sk (pkt->skb); +struct socket *sock; + +if (!sk || !sk_fullsock (sk) || !net_eq (nft_net (pkt),sock_net (sk))) +return false; + +read_lock_bh (&sk->sk_callback_lock); + sock = sk->sk_socket; +if (!sock || !sock->file) { +read_unlock_bh (&sk->sk_callback_lock); +return false; + } + +switch (key) { +case NFT_META_SKUID : + *dest =from_kuid_munged (&init_user_ns, + sock->file->f_cred->fsuid); +break ; +case NFT_META_SKGID : + *dest =from_kgid_munged (&init_user_ns, + sock->file->f_cred->fsgid); +break ; +default : +break ; + } + +read_unlock_bh (&sk->sk_callback_lock); +return true; +} +void nft_meta_get_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt)
@@ -180,37 +215,9 @@ void nft_meta_get_eval(const struct nft_expr *expr,nft_reg_store16 (dest, out->type);break ;case NFT_META_SKUID : - sk =skb_to_full_sk (skb); -if (!sk || !sk_fullsock (sk) || - !net_eq (nft_net (pkt),sock_net (sk))) - goto err; - -read_lock_bh (&sk->sk_callback_lock); -if (sk->sk_socket ==NULL || - sk->sk_socket->file ==NULL ) { -read_unlock_bh (&sk->sk_callback_lock); - goto err; - } - - *dest =from_kuid_munged (&init_user_ns, - sk->sk_socket->file->f_cred->fsuid); -read_unlock_bh (&sk->sk_callback_lock); -break ;case NFT_META_SKGID : - sk =skb_to_full_sk (skb); -if (!sk || !sk_fullsock (sk) || - !net_eq (nft_net (pkt),sock_net (sk))) +if (!nft_meta_get_eval_skugid (priv->key, dest, pkt)) goto err; - -read_lock_bh (&sk->sk_callback_lock); -if (sk->sk_socket ==NULL || - sk->sk_socket->file ==NULL ) { -read_unlock_bh (&sk->sk_callback_lock); - goto err; - } - *dest =from_kgid_munged (&init_user_ns, - sk->sk_socket->file->f_cred->fsgid); -read_unlock_bh (&sk->sk_callback_lock);break ;#ifdef CONFIG_IP_ROUTE_CLASSID case NFT_META_RTCLASSID : {
Signature · 1 line
2.24.1
Florian Westphal
maintainerPATCH 4/9 netfilter: nft_meta: move cgroup handling to helper
In reply to Florian WestphalReduce size of main eval function.
--- net/netfilter/nft_meta.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
net/netfilter/nft_meta.c +15 -5
@@ -161,6 +161,20 @@ nft_meta_get_eval_skugid(enum nft_meta_keys key,return true; } +#ifdef CONFIG_CGROUP_NET_CLASSID +static noinline bool +nft_meta_get_eval_cgroup (u32 *dest,const struct nft_pktinfo *pkt) +{ +struct sock *sk =skb_to_full_sk (pkt->skb); + +if (!sk || !sk_fullsock (sk) || !net_eq (nft_net (pkt),sock_net (sk))) +return false; + + *dest =sock_cgroup_classid (&sk->sk_cgrp_data); +return true; +} +#endif +void nft_meta_get_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt)
@@ -168,7 +182,6 @@ void nft_meta_get_eval(const struct nft_expr *expr,const struct nft_meta *priv =nft_expr_priv (expr);const struct sk_buff *skb = pkt->skb;const struct net_device *in =nft_in (pkt), *out =nft_out (pkt); -struct sock *sk;u32 *dest = ®s->data[priv->dreg];switch (priv->key) {
@@ -258,11 +271,8 @@ void nft_meta_get_eval(const struct nft_expr *expr,break ;#ifdef CONFIG_CGROUP_NET_CLASSID case NFT_META_CGROUP : - sk =skb_to_full_sk (skb); -if (!sk || !sk_fullsock (sk) || - !net_eq (nft_net (pkt),sock_net (sk))) +if (!nft_meta_get_eval_cgroup (dest, pkt)) goto err; - *dest =sock_cgroup_classid (&sk->sk_cgrp_data);break ;#endif case NFT_META_PRANDOM : {
Signature · 1 line
2.24.1
Florian Westphal
maintainerPATCH 5/9 netfilter: nft_meta: move interface kind handling to helper
In reply to Florian Westphalcheckpatch complains about == NULL checks in original code, so use !in instead.
--- net/netfilter/nft_meta.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-)
net/netfilter/nft_meta.c +25 -6
@@ -175,6 +175,30 @@ nft_meta_get_eval_cgroup(u32 *dest, const struct nft_pktinfo *pkt) }#endif +static noinline bool nft_meta_get_eval_kind(enum nft_meta_keys key, +u32 *dest, +const struct nft_pktinfo *pkt) +{ +const struct net_device *in =nft_in (pkt), *out =nft_out (pkt); + +switch (key) { +case NFT_META_IIFKIND : +if (!in || !in->rtnl_link_ops) +return false; +strncpy ((char *)dest, in->rtnl_link_ops->kind,IFNAMSIZ ); +break ; +case NFT_META_OIFKIND : +if (!out || !out->rtnl_link_ops) +return false; +strncpy ((char *)dest, out->rtnl_link_ops->kind,IFNAMSIZ ); +break ; +default : +return false; + } + +return true; +} +void nft_meta_get_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt)
@@ -286,14 +310,9 @@ void nft_meta_get_eval(const struct nft_expr *expr,break ;#endif case NFT_META_IIFKIND : -if (in ==NULL || in->rtnl_link_ops ==NULL ) - goto err; -strncpy ((char *)dest, in->rtnl_link_ops->kind,IFNAMSIZ ); -break ;case NFT_META_OIFKIND : -if (out ==NULL || out->rtnl_link_ops ==NULL ) +if (!nft_meta_get_eval_kind (priv->key, dest, pkt)) goto err; -strncpy ((char *)dest, out->rtnl_link_ops->kind,IFNAMSIZ );break ;case NFT_META_TIME_NS :case NFT_META_TIME_DAY :
Signature · 1 line
2.24.1
Florian Westphal
maintainerPATCH 6/9 netfilter: nft_meta: move all interface related keys to helper
In reply to Florian WestphalReduces repetiveness and reduces size of meta eval function.
--- net/netfilter/nft_meta.c | 95 +++++++++++++++++++++++++++++----------- 1 file changed, 70 insertions(+), 25 deletions(-)
net/netfilter/nft_meta.c +70 -25
@@ -199,13 +199,79 @@ static noinline bool nft_meta_get_eval_kind(enum nft_meta_keys key,return true; } +static void nft_meta_store_ifindex (u32 *dest,const struct net_device *dev) +{ + *dest = dev ? dev->ifindex :0 ; +} + +static void nft_meta_store_ifname (u32 *dest,const struct net_device *dev) +{ +strncpy ((char *)dest, dev ? dev->name :"" ,IFNAMSIZ ); +} + +static bool nft_meta_store_iftype (u32 *dest,const struct net_device *dev) +{ +if (!dev) +return false; + +nft_reg_store16 (dest, dev->type); +return true; +} + +static bool nft_meta_store_ifgroup (u32 *dest,const struct net_device *dev) +{ +if (!dev) +return false; + + *dest = dev->group; +return true; +} + +static bool nft_meta_get_eval_ifname (enum nft_meta_keys key,u32 *dest, +const struct nft_pktinfo *pkt) +{ +switch (key) { +case NFT_META_IIFNAME : +nft_meta_store_ifname (dest,nft_in (pkt)); +break ; +case NFT_META_OIFNAME : +nft_meta_store_ifname (dest,nft_out (pkt)); +break ; +case NFT_META_IIF : +nft_meta_store_ifindex (dest,nft_in (pkt)); +break ; +case NFT_META_OIF : +nft_meta_store_ifindex (dest,nft_out (pkt)); +break ; +case NFT_META_IIFTYPE : +if (!nft_meta_store_iftype (dest,nft_in (pkt))) +return false; +break ; +case NFT_META_OIFTYPE : +if (!nft_meta_store_iftype (dest,nft_out (pkt))) +return false; +break ; +case NFT_META_IIFGROUP : +if (!nft_meta_store_ifgroup (dest,nft_out (pkt))) +return false; +break ; +case NFT_META_OIFGROUP : +if (!nft_meta_store_ifgroup (dest,nft_out (pkt))) +return false; +break ; +default : +return false; + } + +return true; +} +void nft_meta_get_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt) {const struct nft_meta *priv =nft_expr_priv (expr);const struct sk_buff *skb = pkt->skb; -const struct net_device *in =nft_in (pkt), *out =nft_out (pkt);u32 *dest = ®s->data[priv->dreg];switch (priv->key) {
@@ -230,26 +296,15 @@ void nft_meta_get_eval(const struct nft_expr *expr, *dest = skb->mark;break ;case NFT_META_IIF : - *dest = in ? in->ifindex :0 ; -break ;case NFT_META_OIF : - *dest = out ? out->ifindex :0 ; -break ;case NFT_META_IIFNAME : -strncpy ((char *)dest, in ? in->name :"" ,IFNAMSIZ ); -break ;case NFT_META_OIFNAME : -strncpy ((char *)dest, out ? out->name :"" ,IFNAMSIZ ); -break ;case NFT_META_IIFTYPE : -if (in ==NULL ) - goto err; -nft_reg_store16 (dest, in->type); -break ;case NFT_META_OIFTYPE : -if (out ==NULL ) +case NFT_META_IIFGROUP : +case NFT_META_OIFGROUP : +if (!nft_meta_get_eval_ifname (priv->key, dest, pkt)) goto err; -nft_reg_store16 (dest, out->type);break ;case NFT_META_SKUID :case NFT_META_SKGID :
@@ -283,16 +338,6 @@ void nft_meta_get_eval(const struct nft_expr *expr,case NFT_META_CPU : *dest =raw_smp_processor_id ();break ; -case NFT_META_IIFGROUP : -if (in ==NULL ) - goto err; - *dest = in->group; -break ; -case NFT_META_OIFGROUP : -if (out ==NULL ) - goto err; - *dest = out->group; -break ;#ifdef CONFIG_CGROUP_NET_CLASSID case NFT_META_CGROUP :if (!nft_meta_get_eval_cgroup (dest, pkt))
Signature · 1 line
2.24.1
Florian Westphal
maintainerPATCH 7/9 netfilter: nft_meta: place prandom handling in a helper
In reply to Florian WestphalMove this out of the main eval loop, the numgen expression provides a better alternative to meta random.
--- net/netfilter/nft_meta.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
net/netfilter/nft_meta.c +9 -4
@@ -266,6 +266,13 @@ static bool nft_meta_get_eval_ifname(enum nft_meta_keys key, u32 *dest,return true; } +static noinline u32 nft_prandom_u32(void) +{ +struct rnd_state *state =this_cpu_ptr (&nft_prandom_state); + +return prandom_u32_state (state); +} +void nft_meta_get_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt)
@@ -344,11 +351,9 @@ void nft_meta_get_eval(const struct nft_expr *expr, goto err;break ;#endif -case NFT_META_PRANDOM : { -struct rnd_state *state =this_cpu_ptr (&nft_prandom_state); - *dest =prandom_u32_state (state); +case NFT_META_PRANDOM : + *dest =nft_prandom_u32 ();break ; - }#ifdef CONFIG_XFRM case NFT_META_SECPATH :nft_reg_store8 (dest,secpath_exists (skb));
Signature · 1 line
2.24.1
Florian Westphal
maintainerPATCH 8/9 netfilter: nft_meta: place rtclassid handling in a helper
In reply to Florian Westphalskb_dst is an inline helper with a WARN_ON(), so this is a bit more code than it looks like.
--- net/netfilter/nft_meta.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
net/netfilter/nft_meta.c +16 -6
@@ -273,6 +273,20 @@ static noinline u32 nft_prandom_u32(void)return prandom_u32_state (state); } +#ifdef CONFIG_IP_ROUTE_CLASSID +static noinline bool +nft_meta_get_eval_rtclassid (const struct sk_buff *skb,u32 *dest) +{ +const struct dst_entry *dst =skb_dst (skb); + +if (!dst) +return false; + + *dest = dst->tclassid; +return true; +} +#endif +void nft_meta_get_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt)
@@ -319,14 +333,10 @@ void nft_meta_get_eval(const struct nft_expr *expr, goto err;break ;#ifdef CONFIG_IP_ROUTE_CLASSID -case NFT_META_RTCLASSID : { -const struct dst_entry *dst =skb_dst (skb); - -if (dst ==NULL ) +case NFT_META_RTCLASSID : +if (!nft_meta_get_eval_rtclassid (skb, dest)) goto err; - *dest = dst->tclassid;break ; - }#endif #ifdef CONFIG_NETWORK_SECMARK case NFT_META_SECMARK :
Signature · 1 line
2.24.1
Florian Westphal
maintainerPATCH 9/9 netfilter: nft_meta: add support for slave device ifindex matching
In reply to Florian WestphalAllow to match on vrf slave ifindex or name.
In case there was no slave interface involved, store 0 in the destination register just like existing iif/oif matching.
sdif(name) is restricted to the ipv4/ipv6 input and forward hooks, as it depends on ip(6) stack parsing/storing info in skb->cb[].
--- include/uapi/linux/netfilter/nf_tables.h | 4 ++ net/netfilter/nft_meta.c | 76 +++++++++++++++++++++--- 2 files changed, 73 insertions(+), 7 deletions(-)
include/uapi/linux/netfilter/nf_tables.h +4 -0
@@ -805,6 +805,8 @@ enum nft_exthdr_attributes {* @NFT_META_TIME_NS: time since epoch (in nanoseconds) * @NFT_META_TIME_DAY: day of week (from 0 = Sunday to 6 = Saturday) * @NFT_META_TIME_HOUR: hour of day (in seconds) +* @NFT_META_SDIF: slave device interface index +* @NFT_META_SDIFNAME: slave device interface name */ enum nft_meta_keys {NFT_META_LEN ,
@@ -840,6 +842,8 @@ enum nft_meta_keys {NFT_META_TIME_NS ,NFT_META_TIME_DAY ,NFT_META_TIME_HOUR , +NFT_META_SDIF , + NFT_META_SDIFNAME, };/**
net/netfilter/nft_meta.c +69 -7
121 lines not on this page · raw message
Signature · 1 line
2.24.1
Re: [PATCH nf-next 9/9] netfilter: nft_meta: add support for slave device ifindex matching
Quoted 8 lines · Florian Westphal
Allow to match on vrf slave ifindex or name.
In case there was no slave interface involved, store 0 in the destination register just like existing iif/oif matching.
sdif(name) is restricted to the ipv4/ipv6 input and forward hooks, as it depends on ip(6) stack parsing/storing info in skb->cb[].
Quoted 9 lines
Cc Martin Willi <[email protected]>Cc David Ahern <[email protected]>Cc Shrijeet Mukherjee <[email protected]>Signed-off-by Florian Westphal <[email protected]>--- include/uapi/linux/netfilter/nf_tables.h | 4 ++ net/netfilter/nft_meta.c | 76 +++++++++++++++++++++--- 2 files changed, 73 insertions(+), 7 deletions(-)
do you have an example that you can share?
Florian Westphal
maintainerRe: [PATCH nf-next 9/9] netfilter: nft_meta: add support for slave device ifindex matching
Quoted 19 lines · David Ahern
Quoted 8 lines · Florian Westphal
Allow to match on vrf slave ifindex or name.
In case there was no slave interface involved, store 0 in the destination register just like existing iif/oif matching.
sdif(name) is restricted to the ipv4/ipv6 input and forward hooks, as it depends on ip(6) stack parsing/storing info in skb->cb[].
Quoted 9 lines
Cc Martin Willi <[email protected]>Cc David Ahern <[email protected]>Cc Shrijeet Mukherjee <[email protected]>Signed-off-by Florian Westphal <[email protected]>--- include/uapi/linux/netfilter/nf_tables.h | 4 ++ net/netfilter/nft_meta.c | 76 +++++++++++++++++++++--- 2 files changed, 73 insertions(+), 7 deletions(-)
Quoted 1 line
do you have an example that you can share?
nft add rule inet filter input meta sdifname "eth0" accept
so its similar to existing iif(name) that test for the input device.
This is the nft equivalent for the "slavedev" match that Martin proposed here:
Re: [PATCH nf-next 9/9] netfilter: nft_meta: add support for slave device ifindex matching
Quoted 22 lines · Florian Westphal
Quoted 19 lines · David Ahern
Quoted 8 lines · Florian Westphal
Allow to match on vrf slave ifindex or name.
In case there was no slave interface involved, store 0 in the destination register just like existing iif/oif matching.
sdif(name) is restricted to the ipv4/ipv6 input and forward hooks, as it depends on ip(6) stack parsing/storing info in skb->cb[].
Quoted 9 lines
Cc Martin Willi <[email protected]>Cc David Ahern <[email protected]>Cc Shrijeet Mukherjee <[email protected]>Signed-off-by Florian Westphal <[email protected]>--- include/uapi/linux/netfilter/nf_tables.h | 4 ++ net/netfilter/nft_meta.c | 76 +++++++++++++++++++++--- 2 files changed, 73 insertions(+), 7 deletions(-)Quoted 1 line
do you have an example that you can share?
Quoted 9 lines
nft add rule inet filter input meta sdifname "eth0" accept
so its similar to existing iif(name) that test for the input device.
This is the nft equivalent for the "slavedev" match that Martin proposed here:
Thanks for the example. I still have not found the time to get up to speed with nft. I am glad to see netfilter matches on the enslaved interface with VRF; it's a much needed feature.
Pablo Neira Ayuso
maintainerQuoted 11 lines · Florian Westphal
Martin Willi recently proposed addition of new
xt_slavedevmodule to allow matching the real interface within a VRF domain.This adds an nft equivalent:
meta sdif "realdev" accept
meta sdifname "realdev" acceptIn case packet had no vrf slave, sdif stores 0 or "" name, just like 'oif/oifname' would on input.
Quoted 8 lines
sdif(name) is restricted to the ipv4/ipv6 input and forward hooks, as it depends on ip(6) stack parsing/storing info in skb->cb[].
Because meta main eval function is now exceeding more than 200 LOC, the first patches are diet work to debloat the function by using helpers where appropriate.
Last patch adds the sdif/sdifname functionality.
Series applied, thanks Florian.