Netfilter updates for net-next
Subsystems (5)
Pablo Neira Ayuso
maintainercover Netfilter updates for net-next
Hi,
The following batch contains Netfilter updates for net-next:
1) Replace msecs_to_jiffies() by secs_to_jiffies(), from Easwar Hariharan.
2) Allow to compile xt_cgroup with cgroupsv2 support only, from Michal Koutny.
3) Prepare for sock_cgroup_classid() removal by wrapping it around ifdef, also from Michal Koutny.
4) Disable xtables legacy with PREEMPT_RT, from Sebastian Andrzej Siewior and Florian Westphal.
5) Remove redundant pointer fetch on conntrack template, from Xuanqiang Luo.
6) Re-format one block in the tproxy documentation for consistency, from Chen Linxuan.
7) Expose set element count and type via netlink attributes, from Florian Westphal.
This is an initial batch with updates, more updates coming soon.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git nf-next-25-04-22
Thanks.
----------------------------------------------------------------
The following changes since commit 45bd443bfd8697a7da308c16c3e75e2bb353b3d1:
net: 802: Remove unused p8022 code (2025-04-22 07:04:02 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git tags/nf-next-25-04-22
for you to fetch changes up to 2cbe307c60463dc47bf590bc93709398c4c4b3bb:
netfilter: nf_tables: export set count and backend name to userspace (2025-04-22 22:17:07 +0200)
----------------------------------------------------------------
netfilter pull request 25-04-22
----------------------------------------------------------------
Chen Linxuan (1):
docs: tproxy: fix formatting for nft code block
Easwar Hariharan (1):
netfilter: xt_IDLETIMER: convert timeouts to secs_to_jiffies()
Florian Westphal (1):
netfilter: nf_tables: export set count and backend name to userspace
Michal Koutný (2):
netfilter: xt_cgroup: Make it independent from net_cls
net: cgroup: Guard users of sock_cgroup_classid()
Pablo Neira Ayuso (1):
netfilter: Exclude LEGACY TABLES on PREEMPT_RT.
Xuanqiang Luo (1):
netfilter: conntrack: Remove redundant NFCT_ALIGN call
Documentation/networking/tproxy.rst | 4 ++-- include/uapi/linux/netfilter/nf_tables.h | 4 ++++ net/Kconfig | 10 ++++++++++ net/bridge/netfilter/Kconfig | 8 ++++---- net/ipv4/inet_diag.c | 2 +- net/ipv4/netfilter/Kconfig | 15 ++++++++------- net/ipv6/netfilter/Kconfig | 13 +++++++------ net/netfilter/Kconfig | 2 +- net/netfilter/nf_conntrack_core.c | 4 +--- net/netfilter/nf_tables_api.c | 26 ++++++++++++++++++++++++++ net/netfilter/x_tables.c | 16 +++++++++++----- net/netfilter/xt_IDLETIMER.c | 12 ++++++------ net/netfilter/xt_TCPOPTSTRIP.c | 4 ++-- net/netfilter/xt_cgroup.c | 26 ++++++++++++++++++++++++++ net/netfilter/xt_mark.c | 2 +- 15 files changed, 110 insertions(+), 38 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/7 netfilter: xt_IDLETIMER: convert timeouts to secs_to_jiffies()
From: Easwar Hariharan <[email protected]>
Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced secs_to_jiffies(). As the value here is a multiple of 1000, use secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication.
This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with the following Coccinelle rules:
@depends on patch@
expression E;
@@
-msecs_to_jiffies(E * 1000)
+secs_to_jiffies(E)
-msecs_to_jiffies(E * MSEC_PER_SEC)
+secs_to_jiffies(E)
--- net/netfilter/xt_IDLETIMER.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/netfilter/xt_IDLETIMER.c +6 -6
@@ -168,7 +168,7 @@ static int idletimer_tg_create(struct idletimer_tg_info *info)INIT_WORK (&info->timer->work, idletimer_tg_work);mod_timer (&info->timer->timer, -msecs_to_jiffies (info->timeout *1000 ) + jiffies); +secs_to_jiffies (info->timeout) + jiffies);return 0 ;
@@ -229,7 +229,7 @@ static int idletimer_tg_create_v1(struct idletimer_tg_info_v1 *info) }else {timer_setup (&info->timer->timer, idletimer_tg_expired,0 );mod_timer (&info->timer->timer, -msecs_to_jiffies (info->timeout *1000 ) + jiffies); +secs_to_jiffies (info->timeout) + jiffies); }return 0 ;
@@ -254,7 +254,7 @@ static unsigned int idletimer_tg_target(struct sk_buff *skb, info->label, info->timeout);mod_timer (&info->timer->timer, -msecs_to_jiffies (info->timeout *1000 ) + jiffies); +secs_to_jiffies (info->timeout) + jiffies);return XT_CONTINUE ; }
@@ -275,7 +275,7 @@ static unsigned int idletimer_tg_target_v1(struct sk_buff *skb,alarm_start_relative (&info->timer->alarm, tout); }else {mod_timer (&info->timer->timer, -msecs_to_jiffies (info->timeout *1000 ) + jiffies); +secs_to_jiffies (info->timeout) + jiffies); }return XT_CONTINUE ;
@@ -320,7 +320,7 @@ static int idletimer_tg_checkentry(const struct xt_tgchk_param *par)if (info->timer) { info->timer->refcnt++;mod_timer (&info->timer->timer, -msecs_to_jiffies (info->timeout *1000 ) + jiffies); +secs_to_jiffies (info->timeout) + jiffies);pr_debug ("increased refcnt of timer %s to %u\n" , info->label, info->timer->refcnt);
@@ -382,7 +382,7 @@ static int idletimer_tg_checkentry_v1(const struct xt_tgchk_param *par) } }else {mod_timer (&info->timer->timer, -msecs_to_jiffies (info->timeout *1000 ) + jiffies); +secs_to_jiffies (info->timeout) + jiffies); }pr_debug ("increased refcnt of timer %s to %u\n" , info->label, info->timer->refcnt);
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/7 netfilter: xt_cgroup: Make it independent from net_cls
In reply to Pablo Neira AyusoFrom: Michal Koutný <[email protected]>
The xt_group matching supports the default hierarchy since commit c38c4597e4bf3 ("netfilter: implement xt_cgroup cgroup2 path match"). The cgroup v1 matching (based on clsid) and cgroup v2 matching (based on path) are rather independent. Downgrade the Kconfig dependency to mere CONFIG_SOCK_GROUP_DATA so that xt_group can be built even without CONFIG_NET_CLS_CGROUP for path matching.
Also add a message for users when they attempt to specify any clsid.
--- net/netfilter/Kconfig | 2 +- net/netfilter/xt_cgroup.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-)
net/netfilter/Kconfig +1 -1
@@ -1180,7 +1180,7 @@ config NETFILTER_XT_MATCH_CGROUP tristate '"control group" match support' depends on NETFILTER_ADVANCED depends on CGROUPS - select CGROUP_NET_CLASSID + select SOCK_CGROUP_DATA help Socket/process control group matching allows you to match locally generated packets based on which net_cls control group processes
net/netfilter/xt_cgroup.c +17 -0
@@ -23,6 +23,8 @@ MODULE_DESCRIPTION("Xtables: process control group matching");MODULE_ALIAS ("ipt_cgroup" );MODULE_ALIAS ("ip6t_cgroup" ); +#define NET_CLS_CLASSID_INVALID_MSG "xt_cgroup: classid invalid without net_cls cgroups\n" +static int cgroup_mt_check_v0 (const struct xt_mtchk_param *par) {struct xt_cgroup_info_v0 *info = par->matchinfo;
@@ -30,6 +32,11 @@ static int cgroup_mt_check_v0(const struct xt_mtchk_param *par)if (info->invert & ~1 )return -EINVAL ; +if (!IS_ENABLED (CONFIG_CGROUP_NET_CLASSID )) { +pr_info (NET_CLS_CLASSID_INVALID_MSG ); +return -EINVAL ; + } +return 0 ; }
@@ -51,6 +58,11 @@ static int cgroup_mt_check_v1(const struct xt_mtchk_param *par)return -EINVAL ; } +if (info->has_classid && !IS_ENABLED (CONFIG_CGROUP_NET_CLASSID )) { +pr_info (NET_CLS_CLASSID_INVALID_MSG ); +return -EINVAL ; + } + info->priv =NULL ;if (info->has_path) { cgrp =cgroup_get_from_path (info->path);
@@ -83,6 +95,11 @@ static int cgroup_mt_check_v2(const struct xt_mtchk_param *par)return -EINVAL ; } +if (info->has_classid && !IS_ENABLED (CONFIG_CGROUP_NET_CLASSID )) { +pr_info (NET_CLS_CLASSID_INVALID_MSG ); +return -EINVAL ; + } + info->priv =NULL ;if (info->has_path) { cgrp =cgroup_get_from_path (info->path);
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 3/7 net: cgroup: Guard users of sock_cgroup_classid()
In reply to Pablo Neira AyusoFrom: Michal Koutný <[email protected]>
Exclude code that relies on sock_cgroup_classid() as preparation of removal of the function.
--- net/ipv4/inet_diag.c | 2 +- net/netfilter/xt_cgroup.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)
net/ipv4/inet_diag.c +1 -1
@@ -160,7 +160,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, ext & (1 << (INET_DIAG_TCLASS - 1))) {u32 classid =0 ; -#ifdef CONFIG_SOCK_CGROUP_DATA +#ifdef CONFIG_CGROUP_NET_CLASSID classid =sock_cgroup_classid (&sk->sk_cgrp_data);#endif /* Fallback to socket priority if class id isn't set.
net/netfilter/xt_cgroup.c +9 -0
@@ -117,6 +117,7 @@ static int cgroup_mt_check_v2(const struct xt_mtchk_param *par)static bool cgroup_mt_v0 (const struct sk_buff *skb,struct xt_action_param *par) { +#ifdef CONFIG_CGROUP_NET_CLASSID const struct xt_cgroup_info_v0 *info = par->matchinfo;struct sock *sk = skb->sk;
@@ -125,6 +126,8 @@ cgroup_mt_v0(const struct sk_buff *skb, struct xt_action_param *par)return (info->id ==sock_cgroup_classid (&skb->sk->sk_cgrp_data)) ^ info->invert; +#endif +return false; }static bool cgroup_mt_v1 (const struct sk_buff *skb,struct xt_action_param *par)
@@ -140,9 +143,12 @@ static bool cgroup_mt_v1(const struct sk_buff *skb, struct xt_action_param *par)if (ancestor)return cgroup_is_descendant (sock_cgroup_ptr (skcd), ancestor) ^ info->invert_path; +#ifdef CONFIG_CGROUP_NET_CLASSID else return (info->classid == sock_cgroup_classid(skcd)) ^ info->invert_classid; +#endif +return false; }static bool cgroup_mt_v2 (const struct sk_buff *skb,struct xt_action_param *par)
@@ -158,9 +164,12 @@ static bool cgroup_mt_v2(const struct sk_buff *skb, struct xt_action_param *par)if (ancestor)return cgroup_is_descendant (sock_cgroup_ptr (skcd), ancestor) ^ info->invert_path; +#ifdef CONFIG_CGROUP_NET_CLASSID else return (info->classid == sock_cgroup_classid(skcd)) ^ info->invert_classid; +#endif +return false; }static void cgroup_mt_destroy_v1 (const struct xt_mtdtor_param *par)
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 4/7 netfilter: Exclude LEGACY TABLES on PREEMPT_RT.
In reply to Pablo Neira AyusoThe seqcount xt_recseq is used to synchronize the replacement of xt_table::private in xt_replace_table() against all readers such as ipt_do_table()
To ensure that there is only one writer, the writing side disables bottom halves. The sequence counter can be acquired recursively. Only the first invocation modifies the sequence counter (signaling that a writer is in progress) while the following (recursive) writer does not modify the counter.
The lack of a proper locking mechanism for the sequence counter can lead to live lock on PREEMPT_RT if the high prior reader preempts the writer. Additionally if the per-CPU lock on PREEMPT_RT is removed from local_bh_disable() then there is no synchronisation for the per-CPU sequence counter.
The affected code is "just" the legacy netfilter code which is replaced by "netfilter tables". That code can be disabled without sacrificing functionality because everything is provided by the newer implementation. This will only requires the usage of the "-nft" tools instead of the "-legacy" ones.
The long term plan is to remove the legacy code so lets accelerate the progress.
Relax dependencies on iptables legacy, replace select with depends on, this should cause no harm to existing kernel configs and users can still toggle IP{6}_NF_IPTABLES_LEGACY in any case.
Make EBTABLES_LEGACY, IPTABLES_LEGACY and ARPTABLES depend on NETFILTER_LEGACY. Hide xt_recseq and its users, xt_register_table() and xt_percpu_counter_alloc() behind NETFILTER_LEGACY. Let NETFILTER_LEGACY depend on !PREEMPT_RT.
Replace CONFIG_IP6_NF_MANGLE->CONFIG_IP6_NF_IPTABLES for TCPOPTSTRIP and add CONFIG_NFT_COMPAT_ARP to the MARK target for the IPv6 and ARP target to keep it enabled without the LEGACY code for NFT.
--- net/Kconfig | 10 ++++++++++ net/bridge/netfilter/Kconfig | 8 ++++---- net/ipv4/netfilter/Kconfig | 15 ++++++++------- net/ipv6/netfilter/Kconfig | 13 +++++++------ net/netfilter/x_tables.c | 16 +++++++++++----- net/netfilter/xt_TCPOPTSTRIP.c | 4 ++-- net/netfilter/xt_mark.c | 2 +- 7 files changed, 43 insertions(+), 25 deletions(-)
net/Kconfig +10 -0
@@ -211,6 +211,16 @@ menuconfig NETFILTER if NETFILTER +config NETFILTER_LEGACY + bool "Netfilter legacy tables support" + depends on NETFILTER && !PREEMPT_RT + help + Say Y here if you still require support for legacy tables. This is + required by the legacy tools (iptables-legacy) and is not needed if + you use iptables over nftables (iptales-nft). + Legacy support is not limited to IP, it also includes EBTABLES and + ARPTABLES. + config NETFILTER_ADVANCED bool "Advanced netfilter configuration" depends on NETFILTER
net/bridge/netfilter/Kconfig +4 -4
@@ -42,7 +42,7 @@ config NF_CONNTRACK_BRIDGE # old sockopt interface and eval loop config BRIDGE_NF_EBTABLES_LEGACY tristate "Legacy EBTABLES support" - depends on BRIDGE && NETFILTER_XTABLES + depends on BRIDGE && NETFILTER_XTABLES && NETFILTER_LEGACY default n help Legacy ebtables packet/frame classifier.
@@ -65,7 +65,7 @@ if BRIDGE_NF_EBTABLES # config BRIDGE_EBT_BROUTE tristate "ebt: broute table support" - select BRIDGE_NF_EBTABLES_LEGACY + depends on BRIDGE_NF_EBTABLES_LEGACY help The ebtables broute table is used to define rules that decide between bridging and routing frames, giving Linux the functionality of a
@@ -76,7 +76,7 @@ config BRIDGE_EBT_BROUTE config BRIDGE_EBT_T_FILTER tristate "ebt: filter table support" - select BRIDGE_NF_EBTABLES_LEGACY + depends on BRIDGE_NF_EBTABLES_LEGACY help The ebtables filter table is used to define frame filtering rules at local input, forwarding and local output. See the man page for
@@ -86,7 +86,7 @@ config BRIDGE_EBT_T_FILTER config BRIDGE_EBT_T_NAT tristate "ebt: nat table support" - select BRIDGE_NF_EBTABLES_LEGACY + depends on BRIDGE_NF_EBTABLES_LEGACY help The ebtables nat table is used to define rules that alter the MAC source address (MAC SNAT) or the MAC destination address (MAC DNAT).
net/ipv4/netfilter/Kconfig +8 -7
@@ -14,6 +14,7 @@ config NF_DEFRAG_IPV4 config IP_NF_IPTABLES_LEGACY tristate "Legacy IP tables support" default n + depends on NETFILTER_LEGACY select NETFILTER_XTABLES help iptables is a legacy packet classifier.
@@ -183,7 +184,7 @@ config IP_NF_MATCH_TTL config IP_NF_FILTER tristate "Packet filtering" default m if NETFILTER_ADVANCED=n - select IP_NF_IPTABLES_LEGACY + depends on IP_NF_IPTABLES_LEGACY help Packet filtering defines a table `filter', which has a series of rules for simple packet filtering at local input, forwarding and
@@ -220,10 +221,10 @@ config IP_NF_TARGET_SYNPROXY config IP_NF_NAT tristate "iptables NAT support" depends on NF_CONNTRACK + depends on IP_NF_IPTABLES_LEGACY default m if NETFILTER_ADVANCED=n select NF_NAT select NETFILTER_XT_NAT - select IP_NF_IPTABLES_LEGACY help This enables the `nat' table in iptables. This allows masquerading, port forwarding and other forms of full Network Address Port
@@ -264,7 +265,7 @@ endif # IP_NF_NAT config IP_NF_MANGLE tristate "Packet mangling" default m if NETFILTER_ADVANCED=n - select IP_NF_IPTABLES_LEGACY + depends on IP_NF_IPTABLES_LEGACY help This option adds a `mangle' table to iptables: see the man page for iptables(8). This table is used for various packet alterations
@@ -299,7 +300,7 @@ config IP_NF_TARGET_TTL # raw + specific targets config IP_NF_RAW tristate 'raw table support (required for NOTRACK/TRACE)' - select IP_NF_IPTABLES_LEGACY + depends on IP_NF_IPTABLES_LEGACY help This option adds a `raw' table to iptables. This table is the very first in the netfilter framework and hooks in at the PREROUTING
@@ -313,7 +314,7 @@ config IP_NF_SECURITY tristate "Security table" depends on SECURITY depends on NETFILTER_ADVANCED - select IP_NF_IPTABLES_LEGACY + depends on IP_NF_IPTABLES_LEGACY help This option adds a `security' table to iptables, for use with Mandatory Access Control (MAC) policy.
@@ -325,7 +326,7 @@ endif # IP_NF_IPTABLES # ARP tables config IP_NF_ARPTABLES tristate "Legacy ARPTABLES support" - depends on NETFILTER_XTABLES + depends on NETFILTER_XTABLES && NETFILTER_LEGACY default n help arptables is a legacy packet classifier.
@@ -342,7 +343,7 @@ config IP_NF_ARPFILTER tristate "arptables-legacy packet filtering support" select IP_NF_ARPTABLES select NETFILTER_FAMILY_ARP - depends on NETFILTER_XTABLES + depends on NETFILTER_XTABLES && NETFILTER_LEGACY help ARP packet filtering defines a table `filter', which has a series of rules for simple ARP packet filtering at local input and
net/ipv6/netfilter/Kconfig +7 -6
@@ -9,8 +9,9 @@ menu "IPv6: Netfilter Configuration" # old sockopt interface and eval loop config IP6_NF_IPTABLES_LEGACY tristate "Legacy IP6 tables support" - depends on INET && IPV6 + depends on INET && IPV6 && NETFILTER_LEGACY select NETFILTER_XTABLES + select IP6_NF_IPTABLES default n help ip6tables is a legacy packet classifier.
@@ -197,7 +198,7 @@ config IP6_NF_TARGET_HL config IP6_NF_FILTER tristate "Packet filtering" default m if NETFILTER_ADVANCED=n - select IP6_NF_IPTABLES_LEGACY + depends on IP6_NF_IPTABLES_LEGACY tristate help Packet filtering defines a table `filter', which has a series of
@@ -234,7 +235,7 @@ config IP6_NF_TARGET_SYNPROXY config IP6_NF_MANGLE tristate "Packet mangling" default m if NETFILTER_ADVANCED=n - select IP6_NF_IPTABLES_LEGACY + depends on IP6_NF_IPTABLES_LEGACY help This option adds a `mangle' table to iptables: see the man page for iptables(8). This table is used for various packet alterations
@@ -244,7 +245,7 @@ config IP6_NF_MANGLE config IP6_NF_RAW tristate 'raw table support (required for TRACE)' - select IP6_NF_IPTABLES_LEGACY + depends on IP6_NF_IPTABLES_LEGACY help This option adds a `raw' table to ip6tables. This table is the very first in the netfilter framework and hooks in at the PREROUTING
@@ -258,7 +259,7 @@ config IP6_NF_SECURITY tristate "Security table" depends on SECURITY depends on NETFILTER_ADVANCED - select IP6_NF_IPTABLES_LEGACY + depends on IP6_NF_IPTABLES_LEGACY help This option adds a `security' table to iptables, for use with Mandatory Access Control (MAC) policy.
@@ -269,8 +270,8 @@ config IP6_NF_NAT tristate "ip6tables NAT support" depends on NF_CONNTRACK depends on NETFILTER_ADVANCED + depends on IP6_NF_IPTABLES_LEGACY select NF_NAT - select IP6_NF_IPTABLES_LEGACY select NETFILTER_XT_NAT help This enables the `nat' table in ip6tables. This allows masquerading,
net/netfilter/x_tables.c +11 -5
@@ -1317,12 +1317,13 @@ void xt_compat_unlock(u_int8_t af)EXPORT_SYMBOL_GPL (xt_compat_unlock);#endif -DEFINE_PER_CPU (seqcount_t, xt_recseq); -EXPORT_PER_CPU_SYMBOL_GPL (xt_recseq); -struct static_key xt_tee_enabled__read_mostly ;EXPORT_SYMBOL_GPL (xt_tee_enabled); +#ifdef CONFIG_NETFILTER_LEGACY +DEFINE_PER_CPU (seqcount_t, xt_recseq); +EXPORT_PER_CPU_SYMBOL_GPL (xt_recseq); +static int xt_jumpstack_alloc (struct xt_table_info *i) {unsigned int size;
@@ -1514,6 +1515,7 @@ void *xt_unregister_table(struct xt_table *table) return private; }EXPORT_SYMBOL_GPL (xt_unregister_table); +#endif #ifdef CONFIG_PROC_FS static void *xt_table_seq_start (struct seq_file *seq,loff_t *pos)
@@ -1897,6 +1899,7 @@ void xt_proto_fini(struct net *net, u_int8_t af) }EXPORT_SYMBOL_GPL (xt_proto_fini); +#ifdef CONFIG_NETFILTER_LEGACY /** * xt_percpu_counter_alloc - allocate x_tables rule counter *
@@ -1951,6 +1954,7 @@ void xt_percpu_counter_free(struct xt_counters *counters) free_percpu((void __percpu *)pcnt); }EXPORT_SYMBOL_GPL (xt_percpu_counter_free); +#endif static int __net_init xt_net_init (struct net *net) {
@@ -1983,8 +1987,10 @@ static int __init xt_init(void)unsigned int i;int rv; -for_each_possible_cpu (i) { -seqcount_init (&per_cpu (xt_recseq, i)); +if (IS_ENABLED (CONFIG_NETFILTER_LEGACY )) { +for_each_possible_cpu (i) { +seqcount_init (&per_cpu (xt_recseq, i)); + } } xt =kcalloc (NFPROTO_NUMPROTO ,sizeof (struct xt_af ),GFP_KERNEL );
net/netfilter/xt_TCPOPTSTRIP.c +2 -2
@@ -91,7 +91,7 @@ tcpoptstrip_tg4(struct sk_buff *skb, const struct xt_action_param *par)return tcpoptstrip_mangle_packet (skb, par,ip_hdrlen (skb)); } -#if IS_ENABLED (CONFIG_IP6_NF_MANGLE ) +#if IS_ENABLED (CONFIG_IP6_NF_IPTABLES )static unsigned int tcpoptstrip_tg6 (struct sk_buff *skb,const struct xt_action_param *par) {
@@ -119,7 +119,7 @@ static struct xt_target tcpoptstrip_tg_reg[] __read_mostly = { .targetsize = sizeof(struct xt_tcpoptstrip_target_info), .me = THIS_MODULE, }, -#if IS_ENABLED (CONFIG_IP6_NF_MANGLE ) +#if IS_ENABLED (CONFIG_IP6_NF_IPTABLES ) { .name = "TCPOPTSTRIP", .family = NFPROTO_IPV6,
net/netfilter/xt_mark.c +1 -1
@@ -48,7 +48,7 @@ static struct xt_target mark_tg_reg[] __read_mostly = { .targetsize = sizeof(struct xt_mark_tginfo2), .me = THIS_MODULE, }, -#if IS_ENABLED (CONFIG_IP_NF_ARPTABLES ) +#if IS_ENABLED (CONFIG_IP_NF_ARPTABLES ) ||IS_ENABLED (CONFIG_NFT_COMPAT_ARP ) { .name = "MARK", .revision = 2,
Signature · 1 line
2.30.2
Jakub Kicinski
maintainerRe: [PATCH net-next 4/7] netfilter: Exclude LEGACY TABLES on PREEMPT_RT.
net/Kconfig menuconfig NETFILTER · line 222
Quoted 9 lines · On Tue, 22 Apr 2025 22:23:24 +0200 Pablo Neira Ayuso wrote:
net/Kconfig +9
-0+config NETFILTER_LEGACY + bool "Netfilter legacy tables support" + depends on NETFILTER && !PREEMPT_RT + help + Say Y here if you still require support for legacy tables. This is + required by the legacy tools (iptables-legacy) and is not needed if + you use iptables over nftables (iptales-nft). + Legacy support is not limited to IP, it also includes EBTABLES and + ARPTABLES.
I think you need to adjust a bunch of existing config files. Or make this somehow default to y when they are selected instead of having them depend on the LEGACY feature.
All these failures are because netdev CI builds based on relevant configs in tools/testing/selftests lost the netfilter modules:
https://netdev.bots.linux.dev/contest.html?branch=net-next-2025-04-23--12-00&pw-n=0&pass=0
Not sure if platform configs include netfilter but they may have similar problem..
Signature · 1 line
pw-bot: cr
Florian Westphal
maintainerRe: [PATCH net-next 4/7] netfilter: Exclude LEGACY TABLES on PREEMPT_RT.
Quoted 7 lines · Jakub Kicinski
I think you need to adjust a bunch of existing config files. Or make this somehow default to y when they are selected instead of having them depend on the LEGACY feature.
All these failures are because netdev CI builds based on relevant configs in
tools/testing/selftestslost the netfilter modules:
https://netdev.bots.linux.dev/contest.html?branch=net-next-2025-04-23--12-00&pw-n=0&pass=0
I can have a look, likely there needs to a a patch before this one that adds a few explicit CONFIG_ entries rather than replying on implicit =y|m.
Florian Westphal
maintainerRe: [PATCH net-next 4/7] netfilter: Exclude LEGACY TABLES on PREEMPT_RT.
Quoted 3 lines · Florian Westphal
I can have a look, likely there needs to a a patch before this one that adds a few explicit
CONFIG_entries rather than replying on implicit =y|m.
Pablo, whats the test suite expectation?
The netfilter tests pass when iptables is iptables-nft, but not when iptables is iptables-legacy.
I can either patch them and replace iptables with iptables-nft everywhere or I an update config so that iptables-legacy works too.
Unless you feel different, I will go with b) and add the needed legacy config options.
net tests are a different issue, they fail regardless of iptables-nft or legacy, looking at that now.
Pablo Neira Ayuso
maintainerRe: [PATCH net-next 4/7] netfilter: Exclude LEGACY TABLES on PREEMPT_RT.
Hi Florian,
Quoted 7 lines · Florian Westphal
Quoted 3 lines · Florian Westphal
I can have a look, likely there needs to a a patch before this one that adds a few explicit
CONFIG_entries rather than replying on implicit =y|m.Pablo, whats the test suite expectation?
Quoted 8 lines
The netfilter tests pass when iptables is iptables-nft, but not when iptables is iptables-legacy.
I can either patch them and replace iptables with iptables-nft everywhere or I an update config so that iptables-legacy works too.
Unless you feel different, I will go with b) and add the needed legacy config options.
b) is fine with me.
Quoted 2 lines
net tests are a different issue, they fail regardless of iptables-nft or legacy, looking at that now.
Thanks.
Pablo Neira Ayuso
maintainerPATCH 5/7 netfilter: conntrack: Remove redundant NFCT_ALIGN call
In reply to Pablo Neira AyusoFrom: Xuanqiang Luo <[email protected]>
The "nf_ct_tmpl_alloc" function had a redundant call to "NFCT_ALIGN" when aligning the pointer "p". Since "NFCT_ALIGN" always gives the same result for the same input.
--- net/netfilter/nf_conntrack_core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/netfilter/nf_conntrack_core.c +1 -3
@@ -531,10 +531,8 @@ struct nf_conn *nf_ct_tmpl_alloc(struct net *net, p = tmpl; tmpl = (struct nf_conn *)NFCT_ALIGN ((unsigned long )p); -if (tmpl != p) { - tmpl = (struct nf_conn *)NFCT_ALIGN ((unsigned long )p); +if (tmpl != p) tmpl->proto.tmpl_padto = (char *)tmpl - (char *)p; - } }else { tmpl =kzalloc (sizeof (*tmpl), flags);if (!tmpl)
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 6/7 docs: tproxy: fix formatting for nft code block
In reply to Pablo Neira AyusoFrom: Chen Linxuan <[email protected]>
The nft command snippet for redirecting traffic isn't formatted in a literal code block like the rest of snippets. Fix the formatting inconsistency.
--- Documentation/networking/tproxy.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/networking/tproxy.rst +2 -2
@@ -69,9 +69,9 @@ add rules like this to the iptables ruleset above:: # iptables -t mangle -A PREROUTING -p tcp --dport 80 -j TPROXY \ --tproxy-mark 0x1/0x1 --on-port 50080 -Or the following rule to nft: +Or the following rule to nft:: -# nft add rule filter divert tcp dport 80 tproxy to :50080 meta mark set 1 accept + # nft add rule filter divert tcp dport 80 tproxy to :50080 meta mark set 1 accept Note that for this to work you'll have to modify the proxy to enable (SOL_IP, IP_TRANSPARENT) for the listening socket.
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 7/7 netfilter: nf_tables: export set count and backend name to userspace
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
nf_tables picks a suitable set backend implementation (bitmap, hash, rbtree..) based on the userspace requirements.
Figuring out the chosen backend requires information about the set flags and the kernel version. Export this to userspace so nft can include this information in '--debug=netlink' output.
--- include/uapi/linux/netfilter/nf_tables.h | 4 ++++ net/netfilter/nf_tables_api.c | 26 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+)
include/uapi/linux/netfilter/nf_tables.h +4 -0
@@ -394,6 +394,8 @@ enum nft_set_field_attributes {* @NFTA_SET_HANDLE: set handle (NLA_U64) * @NFTA_SET_EXPR: set expression (NLA_NESTED: nft_expr_attributes) * @NFTA_SET_EXPRESSIONS: list of expressions (NLA_NESTED: nft_list_attributes) +* @NFTA_SET_TYPE: set backend type (NLA_STRING) +* @NFTA_SET_COUNT: number of set elements (NLA_U32) */ enum nft_set_attributes {NFTA_SET_UNSPEC ,
@@ -415,6 +417,8 @@ enum nft_set_attributes {NFTA_SET_HANDLE ,NFTA_SET_EXPR ,NFTA_SET_EXPRESSIONS , +NFTA_SET_TYPE , +NFTA_SET_COUNT , __NFTA_SET_MAX };#define NFTA_SET_MAX (__NFTA_SET_MAX - 1)
net/netfilter/nf_tables_api.c +26 -0
@@ -4569,6 +4569,8 @@ static const struct nla_policy nft_set_policy[NFTA_SET_MAX + 1] = { [NFTA_SET_HANDLE] = { .type = NLA_U64 }, [NFTA_SET_EXPR] = { .type = NLA_NESTED }, [NFTA_SET_EXPRESSIONS] = NLA_POLICY_NESTED_ARRAY(nft_expr_policy), + [NFTA_SET_TYPE] = { .type = NLA_REJECT }, + [NFTA_SET_COUNT] = { .type = NLA_REJECT }, };static const struct nla_policy nft_concat_policy[NFTA_SET_FIELD_MAX +1 ] = {
@@ -4763,6 +4765,27 @@ static u32 nft_set_userspace_size(const struct nft_set_ops *ops, u32 size)return size; } +static noinline_for_stack int +nf_tables_fill_set_info (struct sk_buff *skb,const struct nft_set *set) +{ +unsigned int nelems; +char str[32 ]; +int ret; + + ret =snprintf (str,sizeof (str),"%ps" , set->ops); + +/* Not expected to happen and harmless: NFTA_SET_TYPE is dumped +* to userspace purely for informational/debug purposes. +*/ +DEBUG_NET_WARN_ON_ONCE (ret >=sizeof (str)); + +if (nla_put_string (skb,NFTA_SET_TYPE , str)) +return -EMSGSIZE ; + + nelems =nft_set_userspace_size (set->ops,atomic_read (&set->nelems)); +return nla_put_be32 (skb,NFTA_SET_COUNT ,htonl (nelems)); +} +static int nf_tables_fill_set (struct sk_buff *skb,const struct nft_ctx *ctx,const struct nft_set *set,u16 event,u16 flags) {
@@ -4843,6 +4866,9 @@ static int nf_tables_fill_set(struct sk_buff *skb, const struct nft_ctx *ctx,nla_nest_end (skb, nest); +if (nf_tables_fill_set_info (skb, set)) + goto nla_put_failure; +if (set->num_exprs ==1 ) { nest =nla_nest_start_noflag (skb,NFTA_SET_EXPR );if (nf_tables_fill_expr_info (skb, set->exprs[0 ], false) <0 )
Signature · 1 line
2.30.2