Netfilter updates for net-next
Subsystems (3)
Pablo Neira Ayuso
maintainercover Netfilter updates for net-next
Hi,
The following patchset contains Netfilter updates for net-next:
1) Remove #ifdef pollution around nf_ingress(), from Lukas Wunner.
2) Document ingress hook in netdevice, also from Lukas.
3) Remove htons() in tunnel metadata port netlink attributes, from Xin Long.
4) Missing erspan netlink attribute validation also from Xin Long.
5) Missing erspan version in tunnel, from Xin Long.
6) Missing attribute nest in NFTA_TUNNEL_KEY_OPTS_{VXLAN,ERSPAN} Patch from Xin Long.
7) Missing nla_nest_cancel() in tunnel netlink dump path, from Xin Long.
8) Remove two exported conntrack symbols with no clients, from Florian Westphal.
9) Add nft_meta_get_eval_time() helper to nft_meta, from Florian.
10) Add nft_meta_pkttype helper for loopback, also from Florian.
11) Add nft_meta_socket uid helper, from Florian Westphal.
12) Add nft_meta_cgroup helper, from Florian.
13) Add nft_meta_ifkind helper, from Florian.
14) Group all interface related meta selector, from Florian.
15) Add nft_prandom_u32() helper, from Florian.
16) Add nft_meta_rtclassid helper, from Florian.
17) Add support for matching on the slave device index, from Florian.
This batch, among other things, contains updates for the netfilter tunnel netlink interface: This extension is still incomplete and lacking proper userspace support which is actually my fault, I did not find the time to go back and finish this. This update is breaking tunnel UAPI in some aspects to fix it but do it better sooner than never.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
Thank you.
----------------------------------------------------------------
The following changes since commit 6f6dded1385cfb564de85f86126f1c054c8f47b1:
Merge branch 'WireGuard-CI-and-housekeeping' (2019-12-16 19:22:22 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git HEAD
for you to fetch changes up to c14ceb0ec727187f71a487a592ffa91767fed66e:
netfilter: nft_meta: add support for slave device ifindex matching (2019-12-26 17:41:34 +0100)
----------------------------------------------------------------
Florian Westphal (10):
netfilter: conntrack: remove two export symbols
netfilter: nft_meta: move time handling to helper
netfilter: nft_meta: move pkttype handling to helper
netfilter: nft_meta: move sk uid/git handling to helper
netfilter: nft_meta: move cgroup handling to helper
netfilter: nft_meta: move interface kind handling to helper
netfilter: nft_meta: move all interface related keys to helper
netfilter: nft_meta: place prandom handling in a helper
netfilter: nft_meta: place rtclassid handling in a helper
netfilter: nft_meta: add support for slave device ifindex matching
Lukas Wunner (2):
netfilter: Clean up unnecessary #ifdef
netfilter: Document ingress hook
Xin Long (5):
netfilter: nft_tunnel: no need to call htons() when dumping ports
netfilter: nft_tunnel: add the missing ERSPAN_VERSION nla_policy
netfilter: nft_tunnel: also dump ERSPAN_VERSION
netfilter: nft_tunnel: also dump OPTS_ERSPAN/VXLAN
netfilter: nft_tunnel: add the missing nla_nest_cancel()
include/linux/netdevice.h | 1 + include/uapi/linux/netfilter/nf_tables.h | 4 + net/core/dev.c | 2 - net/netfilter/nf_conntrack_core.c | 1 - net/netfilter/nf_conntrack_extend.c | 1 - net/netfilter/nft_meta.c | 440 ++++++++++++++++++++++--------- net/netfilter/nft_tunnel.c | 52 +++- 7 files changed, 357 insertions(+), 144 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/17 netfilter: Clean up unnecessary #ifdef
From: Lukas Wunner <[email protected]>
If CONFIG_NETFILTER_INGRESS is not enabled, nf_ingress() becomes a no-op because it solely contains an if-clause calling nf_hook_ingress_active(), for which an empty inline stub exists in <linux/netfilter_ingress.h>.
All the symbols used in the if-clause's body are still available even if CONFIG_NETFILTER_INGRESS is not enabled.
The additional "#ifdef CONFIG_NETFILTER_INGRESS" in nf_ingress() is thus unnecessary, so drop it.
--- net/core/dev.c | 2 -- 1 file changed, 2 deletions(-)
net/core/dev.c +0 -2
@@ -4932,7 +4932,6 @@ static bool skb_pfmemalloc_protocol(struct sk_buff *skb)static inline int nf_ingress (struct sk_buff *skb,struct packet_type **pt_prev,int *ret,struct net_device *orig_dev) { -#ifdef CONFIG_NETFILTER_INGRESS if (nf_hook_ingress_active (skb)) {int ingress_retval;
@@ -4946,7 +4945,6 @@ static inline int nf_ingress(struct sk_buff *skb, struct packet_type **pt_prev,rcu_read_unlock ();return ingress_retval; } -#endif /* CONFIG_NETFILTER_INGRESS */ return 0 ; }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/17 netfilter: Document ingress hook
In reply to Pablo Neira AyusoFrom: Lukas Wunner <[email protected]>
Amend kerneldoc of struct net_device to fix a "make htmldocs" warning:
include/linux/netdevice.h:2045: warning: Function parameter or member 'nf_hooks_ingress' not described in 'net_device'
--- include/linux/netdevice.h | 1 + 1 file changed, 1 insertion(+)
include/linux/netdevice.h +1 -0
@@ -1708,6 +1708,7 @@ enum netdev_priv_flags {* @miniq_ingress: ingress/clsact qdisc specific data for * ingress processing * @ingress_queue: XXX: need comments on this one +* @nf_hooks_ingress: netfilter hooks executed for ingress packets * @broadcast: hw bcast address * * @rx_cpu_rmap: CPU reverse-mapping for RX completion interrupts,
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/17 netfilter: nft_tunnel: no need to call htons() when dumping ports
In reply to Pablo Neira AyusoFrom: Xin Long <[email protected]>
info->key.tp_src and tp_dst are __be16, when using nla_put_be16() to dump them, htons() is not needed, so remove it in this patch.
--- net/netfilter/nft_tunnel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/nft_tunnel.c +2 -2
@@ -501,8 +501,8 @@ static int nft_tunnel_opts_dump(struct sk_buff *skb,static int nft_tunnel_ports_dump (struct sk_buff *skb,struct ip_tunnel_info *info) { -if (nla_put_be16 (skb,NFTA_TUNNEL_KEY_SPORT ,htons (info->key.tp_src)) <0 || -nla_put_be16 (skb,NFTA_TUNNEL_KEY_DPORT ,htons (info->key.tp_dst)) <0 ) +if (nla_put_be16 (skb,NFTA_TUNNEL_KEY_SPORT , info->key.tp_src) <0 || +nla_put_be16 (skb,NFTA_TUNNEL_KEY_DPORT , info->key.tp_dst) <0 )return -1 ;return 0 ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 4/17 netfilter: nft_tunnel: add the missing ERSPAN_VERSION nla_policy
In reply to Pablo Neira AyusoFrom: Xin Long <[email protected]>
ERSPAN_VERSION is an attribute parsed in kernel side, nla_policy type should be added for it, like other attributes.
--- net/netfilter/nft_tunnel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nft_tunnel.c +2 -1
@@ -248,8 +248,9 @@ static int nft_tunnel_obj_vxlan_init(const struct nlattr *attr, }static const struct nla_policy nft_tunnel_opts_erspan_policy[NFTA_TUNNEL_KEY_ERSPAN_MAX +1 ] = { + [NFTA_TUNNEL_KEY_ERSPAN_VERSION ] = { .type =NLA_U32 }, [NFTA_TUNNEL_KEY_ERSPAN_V1_INDEX ] = { .type =NLA_U32 }, - [NFTA_TUNNEL_KEY_ERSPAN_V2_DIR ] = { .type =NLA_U8 }, + [NFTA_TUNNEL_KEY_ERSPAN_V2_DIR ] = { .type =NLA_U8 }, [NFTA_TUNNEL_KEY_ERSPAN_V2_HWID ] = { .type =NLA_U8 }, };
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 5/17 netfilter: nft_tunnel: also dump ERSPAN_VERSION
In reply to Pablo Neira AyusoFrom: Xin Long <[email protected]>
This is not necessary, but it'll be easier to parse in userspace, also given that other places like act_tunnel_key, cls_flower and ip_tunnel_core are also doing so.
--- net/netfilter/nft_tunnel.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nft_tunnel.c +3 -0
@@ -479,6 +479,9 @@ static int nft_tunnel_opts_dump(struct sk_buff *skb, htonl(opts->u.vxlan.gbp)))return -1 ; }else if (opts->flags &TUNNEL_ERSPAN_OPT ) { +if (nla_put_be32 (skb,NFTA_TUNNEL_KEY_ERSPAN_VERSION , +htonl (opts->u.erspan.version))) +return -1 ;switch (opts->u.erspan.version) {case ERSPAN_VERSION : if (nla_put_be32(skb, NFTA_TUNNEL_KEY_ERSPAN_V1_INDEX,
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 6/17 netfilter: nft_tunnel: also dump OPTS_ERSPAN/VXLAN
In reply to Pablo Neira AyusoFrom: Xin Long <[email protected]>
This patch is to add the nest attr OPTS_ERSPAN/VXLAN when dumping KEY_OPTS, and it would be helpful when parsing in userpace. Also, this is needed for supporting multiple geneve opts in the future patches.
--- net/netfilter/nft_tunnel.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
net/netfilter/nft_tunnel.c +9 -1
@@ -468,17 +468,24 @@ static int nft_tunnel_opts_dump(struct sk_buff *skb, struct nft_tunnel_obj *priv) {struct nft_tunnel_opts *opts = &priv->opts; -struct nlattr *nest; +struct nlattr *nest, *inner; nest =nla_nest_start_noflag (skb,NFTA_TUNNEL_KEY_OPTS );if (!nest)return -1 ;if (opts->flags &TUNNEL_VXLAN_OPT ) { + inner =nla_nest_start_noflag (skb,NFTA_TUNNEL_KEY_OPTS_VXLAN ); +if (!inner) +return -1 ;if (nla_put_be32 (skb,NFTA_TUNNEL_KEY_VXLAN_GBP ,htonl (opts->u.vxlan.gbp)))return -1 ; +nla_nest_end (skb, inner); }else if (opts->flags &TUNNEL_ERSPAN_OPT ) { + inner =nla_nest_start_noflag (skb,NFTA_TUNNEL_KEY_OPTS_ERSPAN ); +if (!inner) +return -1 ;if (nla_put_be32 (skb,NFTA_TUNNEL_KEY_ERSPAN_VERSION ,htonl (opts->u.erspan.version)))return -1 ;
@@ -496,6 +503,7 @@ static int nft_tunnel_opts_dump(struct sk_buff *skb,return -1 ;break ; } +nla_nest_end (skb, inner); }nla_nest_end (skb, nest);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 7/17 netfilter: nft_tunnel: add the missing nla_nest_cancel()
In reply to Pablo Neira AyusoFrom: Xin Long <[email protected]>
When nla_put_xxx() fails under nla_nest_start_noflag(), nla_nest_cancel() should be called, so that the skb can be trimmed properly.
--- net/netfilter/nft_tunnel.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-)
net/netfilter/nft_tunnel.c +26 -12
@@ -443,10 +443,15 @@ static int nft_tunnel_ip_dump(struct sk_buff *skb, struct ip_tunnel_info *info)if (!nest)return -1 ; -if (nla_put_in6_addr (skb,NFTA_TUNNEL_KEY_IP6_SRC , &info->key.u.ipv6.src) <0 || -nla_put_in6_addr (skb,NFTA_TUNNEL_KEY_IP6_DST , &info->key.u.ipv6.dst) <0 || -nla_put_be32 (skb,NFTA_TUNNEL_KEY_IP6_FLOWLABEL , info->key.label)) +if (nla_put_in6_addr (skb,NFTA_TUNNEL_KEY_IP6_SRC , + &info->key.u.ipv6.src) <0 || +nla_put_in6_addr (skb,NFTA_TUNNEL_KEY_IP6_DST , + &info->key.u.ipv6.dst) <0 || +nla_put_be32 (skb,NFTA_TUNNEL_KEY_IP6_FLOWLABEL , + info->key.label)) { +nla_nest_cancel (skb, nest);return -1 ; + }nla_nest_end (skb, nest); }else {
@@ -454,9 +459,13 @@ static int nft_tunnel_ip_dump(struct sk_buff *skb, struct ip_tunnel_info *info)if (!nest)return -1 ; -if (nla_put_in_addr (skb,NFTA_TUNNEL_KEY_IP_SRC , info->key.u.ipv4.src) <0 || -nla_put_in_addr (skb,NFTA_TUNNEL_KEY_IP_DST , info->key.u.ipv4.dst) <0 ) +if (nla_put_in_addr (skb,NFTA_TUNNEL_KEY_IP_SRC , + info->key.u.ipv4.src) <0 || +nla_put_in_addr (skb,NFTA_TUNNEL_KEY_IP_DST , + info->key.u.ipv4.dst) <0 ) { +nla_nest_cancel (skb, nest);return -1 ; + }nla_nest_end (skb, nest); }
@@ -477,37 +486,42 @@ static int nft_tunnel_opts_dump(struct sk_buff *skb,if (opts->flags &TUNNEL_VXLAN_OPT ) { inner =nla_nest_start_noflag (skb,NFTA_TUNNEL_KEY_OPTS_VXLAN );if (!inner) -return -1 ; + goto failure;if (nla_put_be32 (skb,NFTA_TUNNEL_KEY_VXLAN_GBP ,htonl (opts->u.vxlan.gbp))) -return -1 ; + goto inner_failure;nla_nest_end (skb, inner); }else if (opts->flags &TUNNEL_ERSPAN_OPT ) { inner =nla_nest_start_noflag (skb,NFTA_TUNNEL_KEY_OPTS_ERSPAN );if (!inner) -return -1 ; + goto failure;if (nla_put_be32 (skb,NFTA_TUNNEL_KEY_ERSPAN_VERSION ,htonl (opts->u.erspan.version))) -return -1 ; + goto inner_failure;switch (opts->u.erspan.version) {case ERSPAN_VERSION :if (nla_put_be32 (skb,NFTA_TUNNEL_KEY_ERSPAN_V1_INDEX , opts->u.erspan.u.index)) -return -1 ; + goto inner_failure;break ;case ERSPAN_VERSION2 :if (nla_put_u8 (skb,NFTA_TUNNEL_KEY_ERSPAN_V2_HWID ,get_hwid (&opts->u.erspan.u.md2)) ||nla_put_u8 (skb,NFTA_TUNNEL_KEY_ERSPAN_V2_DIR , opts->u.erspan.u.md2.dir)) -return -1 ; + goto inner_failure;break ; }nla_nest_end (skb, inner); }nla_nest_end (skb, nest); -return 0 ; + +inner_failure: +nla_nest_cancel (skb, inner); +failure: +nla_nest_cancel (skb, nest); +return -1 ; } static int nft_tunnel_ports_dump(struct sk_buff *skb,
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 8/17 netfilter: conntrack: remove two export symbols
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Not used anywhere, remove them.
--- net/netfilter/nf_conntrack_core.c | 1 - net/netfilter/nf_conntrack_extend.c | 1 - 2 files changed, 2 deletions(-)
net/netfilter/nf_conntrack_core.c +0 -1
@@ -2333,7 +2333,6 @@ int nf_conntrack_set_hashsize(const char *val, const struct kernel_param *kp)return nf_conntrack_hash_resize (hashsize); } -EXPORT_SYMBOL_GPL (nf_conntrack_set_hashsize); static __always_inline unsigned int total_extension_size(void) {
net/netfilter/nf_conntrack_extend.c +0 -1
@@ -37,7 +37,6 @@ void nf_ct_ext_destroy(struct nf_conn *ct)kfree (ct->ext); } -EXPORT_SYMBOL (nf_ct_ext_destroy);void *nf_ct_ext_add (struct nf_conn *ct,enum nf_ct_ext_id id,gfp_t gfp) {
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 9/17 netfilter: nft_meta: move time handling to helper
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
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.11.0
Pablo Neira Ayuso
maintainerPATCH 10/17 netfilter: nft_meta: move pkttype handling to helper
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
When 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.11.0
Pablo Neira Ayuso
maintainerPATCH 11/17 netfilter: nft_meta: move sk uid/git handling to helper
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Not 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.11.0
Pablo Neira Ayuso
maintainerPATCH 12/17 netfilter: nft_meta: move cgroup handling to helper
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Reduce 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.11.0
Pablo Neira Ayuso
maintainerPATCH 13/17 netfilter: nft_meta: move interface kind handling to helper
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
checkpatch 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.11.0
Pablo Neira Ayuso
maintainerPATCH 14/17 netfilter: nft_meta: move all interface related keys to helper
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Reduces 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.11.0
Pablo Neira Ayuso
maintainerPATCH 15/17 netfilter: nft_meta: place prandom handling in a helper
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Move 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.11.0
Pablo Neira Ayuso
maintainerPATCH 16/17 netfilter: nft_meta: place rtclassid handling in a helper
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
skb_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.11.0
Pablo Neira Ayuso
maintainerPATCH 17/17 netfilter: nft_meta: add support for slave device ifindex matching
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
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[].
--- 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.11.0
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Mon, 30 Dec 2019 12:21:26 +0100
Quoted 1 line
The following patchset contains Netfilter updates for net-next:
...
Quoted 9 lines
This batch, among other things, contains updates for the netfilter tunnel netlink interface: This extension is still incomplete and lacking proper userspace support which is actually my fault, I did not find the time to go back and finish this. This update is breaking tunnel UAPI in some aspects to fix it but do it better sooner than never.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
Pulled, thanks Pablo.