Pablo Neira Ayuso says: ==================== netfilter/ipvs updates for net-next The following patchset contains Netfilter updates for your net-next tree, this includes the NAT redirection support for nf_tables, the cgroup support for nft meta and conntrack zone support for the connlimit match. Coming after those, a bunch of sparse warning fixes, missing netns bits and cleanups. More specifically, they are: 1) Prepare IPv4 and IPv6 NAT redirect code to use it from nf_tables, patches from Arturo Borrero. 2) Introduce the nf_tables redir expression, from Arturo Borrero. 3) Remove an unnecessary assignment in ip_vs_xmit/__ip_vs_get_out_rt(). Patch from Alex Gartrell. 4) Add nft_log_dereference() macro to the nf_log infrastructure, patch from Marcelo Leitner. 5) Add some extra validation when registering logger families, also from Marcelo. 6) Some spelling cleanups from stephen hemminger. 7) Fix sparse warning in nf_logger_find_get(). 8) Add cgroup support to nf_tables meta, patch from Ana Rey. 9) A Kconfig fix for the new redir expression and fix sparse warnings in the new redir expression. 10) Fix several sparse warnings in the netfilter tree, from Florian Westphal. 11) Reduce verbosity when OOM in nfnetlink_log. User can basically do nothing when this situation occurs. 12) Add conntrack zone support to xt_connlimit, again from Florian. 13) Add netnamespace support to the h323 conntrack helper, contributed by Vasily Averin. 14) Remove unnecessary nul-pointer checks before free_percpu() and module_put(), from Markus Elfring. 15) Use pr_fmt in nfnetlink_log, again patch from Marcelo Leitner. ====================
Showing the changes to include/uapi/linux (1 of 38 files). Show all
Unified · Split
| @@ -579,6 +579,7 @@ enum nft_exthdr_attributes { · 578 unmodified lines | ||
| 579 | 579 | * @NFT_META_CPU: cpu id through smp_processor_id() |
| 580 | 580 | * @NFT_META_IIFGROUP: packet input interface group |
| 581 | 581 | * @NFT_META_OIFGROUP: packet output interface group |
| 582 | + * @NFT_META_CGROUP: socket control group (skb->sk->sk_classid) | |
| 582 | 583 | */ |
| 583 | 584 | enum nft_meta_keys { |
| 584 | 585 | NFT_META_LEN, |
| @@ -604,6 +605,7 @@ enum nft_meta_keys { · 19 unmodified lines | ||
| 604 | 605 | NFT_META_CPU, |
| 605 | 606 | NFT_META_IIFGROUP, |
| 606 | 607 | NFT_META_OIFGROUP, |
| 608 | + NFT_META_CGROUP, | |
| 607 | 609 | }; |
| 608 | 610 | |
| 609 | 611 | /** |
| @@ -837,6 +839,22 @@ enum nft_masq_attributes { · 227 unmodified lines | ||
| 837 | 839 | }; |
| 838 | 840 | #define NFTA_MASQ_MAX (__NFTA_MASQ_MAX - 1) |
| 839 | 841 | |
| 842 | +/** | |
| 843 | + * enum nft_redir_attributes - nf_tables redirect expression netlink attributes | |
| 844 | + * | |
| 845 | + * @NFTA_REDIR_REG_PROTO_MIN: source register of proto range start (NLA_U32: nft_registers) | |
| 846 | + * @NFTA_REDIR_REG_PROTO_MAX: source register of proto range end (NLA_U32: nft_registers) | |
| 847 | + * @NFTA_REDIR_FLAGS: NAT flags (see NF_NAT_RANGE_* in linux/netfilter/nf_nat.h) (NLA_U32) | |
| 848 | + */ | |
| 849 | +enum nft_redir_attributes { | |
| 850 | + NFTA_REDIR_UNSPEC, | |
| 851 | + NFTA_REDIR_REG_PROTO_MIN, | |
| 852 | + NFTA_REDIR_REG_PROTO_MAX, | |
| 853 | + NFTA_REDIR_FLAGS, | |
| 854 | + __NFTA_REDIR_MAX | |
| 855 | +}; | |
| 856 | +#define NFTA_REDIR_MAX (__NFTA_REDIR_MAX - 1) | |
| 857 | + | |
| 840 | 858 | /** |
| 841 | 859 | * enum nft_gen_attributes - nf_tables ruleset generation attributes |
| 842 | 860 | * |