Netfilter updates for net-next
Subsystems (5)
Pablo Neira Ayuso
maintainercover Netfilter updates for net-next
Hi,
The following patchset contains Netfilter updates for net-next:
1) Fix error path of nf_tables_updobj(), from Dan Carpenter.
2) Move large structure away from stack in the nf_tables offload infrastructure, from Arnd Bergmann.
3) Move indirect flow_block logic to nf_tables_offload.
4) Support for synproxy objects, from Fernando Fernandez Mancera.
5) Support for fwd and dup offload.
6) Add __nft_offload_get_chain() helper, this implicitly fixes missing mutex and check for offload flags in the indirect block support, patch from wenxu.
7) Remove rules on device unregistration, from wenxu. This includes two preparation patches to reuse nft_flow_offload_chain() and nft_flow_offload_rule().
Large batch from Jeremy Sowden to make a second pass to the CONFIG_HEADER_TEST support and a bit of housekeeping:
8) Missing include guard in conntrack label header, from Jeremy Sowden.
9) A few coding style errors: trailing whitespace, incorrect indent in Kconfig, and semicolons at the end of function definitions.
10) Remove unused ipt_init() and ip6t_init() declarations.
11) Inline xt_hashlimit, ebt_802_3 and xt_physdev headers. They are only used once.
12) Update include directive in several netfilter files.
13) Remove unused include/net/netfilter/ipv6/nf_conntrack_icmpv6.h.
14) Move nf_ip6_ext_hdr() to include/linux/netfilter_ipv6.h
15) Move several synproxy structure definitions to nf_synproxy.h
16) Move nf_bridge_frag_data structure to include/linux/netfilter_bridge.h
17) Clean up static inline definitions in nf_conntrack_ecache.h.
18) Replace defined(CONFIG...) || defined(CONFIG...MODULE) with IS_ENABLED(CONFIG...).
19) Missing inline function conditional definitions based on Kconfig preferences in synproxy and nf_conntrack_timeout.
20) Update br_nf_pre_routing_ipv6() definition.
21) Move conntrack code in linux/skbuff.h to nf_conntrack headers.
22) Several patches to remove superfluous CONFIG_NETFILTER and CONFIG_NF_CONNTRACK checks in headers, coming from the initial batch support for CONFIG_HEADER_TEST for netfilter.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
Thanks.
----------------------------------------------------------------
The following changes since commit 6703a605b5ab33502d7a327de880188013d7c377:
Merge branch 'net-tls-small-TX-offload-optimizations' (2019-09-07 18:10:34 +0200)
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 0d32e7048d927418300b9f5415ca546e44621ef1:
netfilter: conntrack: remove two unused functions from nf_conntrack_timestamp.h. (2019-09-13 12:48:09 +0200)
----------------------------------------------------------------
Arnd Bergmann (1):
netfilter: nf_tables_offload: avoid excessive stack usage
Dan Carpenter (1):
netfilter: nf_tables: Fix an Oops in nf_tables_updobj() error handling
Fernando Fernandez Mancera (1):
netfilter: nft_synproxy: add synproxy stateful object support
Jeremy Sowden (18):
netfilter: fix include guards.
netfilter: fix coding-style errors.
netfilter: ip_tables: remove unused function declarations.
netfilter: inline xt_hashlimit, ebt_802_3 and xt_physdev headers
netfilter: update include directives.
netfilter: remove nf_conntrack_icmpv6.h header.
netfilter: move inline nf_ip6_ext_hdr() function to a more appropriate header.
netfilter: synproxy: move code between headers.
netfilter: move nf_bridge_frag_data struct definition to a more appropriate header.
netfilter: conntrack: use consistent style when defining inline functions
netfilter: replace defined(CONFIG...) || defined(CONFIG...MODULE) with IS_ENABLED(CONFIG...).
netfilter: conntrack: wrap two inline functions in config checks.
netfilter: br_netfilter: update stub br_nf_pre_routing_ipv6 parameter to void *priv.
netfilter: conntrack: move code to linux/nf_conntrack_common.h.
netfilter: conntrack: remove CONFIG_NF_CONNTRACK check from nf_conntrack_acct.h.
netfilter: remove CONFIG_NETFILTER checks from headers.
netfilter: conntrack: remove CONFIG_NF_CONNTRACK checks from nf_conntrack_zones.h.
netfilter: conntrack: remove two unused functions from nf_conntrack_timestamp.h.
Pablo Neira Ayuso (2):
netfilter: nf_tables_offload: move indirect flow_block callback logic to core
netfilter: nft_{fwd,dup}_netdev: add offload support
wenxu (4):
netfilter: nf_tables_offload: add __nft_offload_get_chain function
netfilter: nf_tables_offload: refactor the nft_flow_offload_chain function
netfilter: nf_tables_offload: refactor the nft_flow_offload_rule function
netfilter: nf_tables_offload: remove rules when the device unregisters
include/linux/netfilter.h | 4 +- include/linux/netfilter/ipset/ip_set_getport.h | 2 +- include/linux/netfilter/nf_conntrack_common.h | 20 +++ include/linux/netfilter/x_tables.h | 8 +- include/linux/netfilter/xt_hashlimit.h | 11 -- include/linux/netfilter/xt_physdev.h | 8 - include/linux/netfilter_arp/arp_tables.h | 2 - include/linux/netfilter_bridge.h | 7 + include/linux/netfilter_bridge/ebt_802_3.h | 12 -- include/linux/netfilter_bridge/ebtables.h | 3 +- include/linux/netfilter_ipv4/ip_tables.h | 9 +- include/linux/netfilter_ipv6.h | 28 +++- include/linux/netfilter_ipv6/ip6_tables.h | 20 +-- include/linux/skbuff.h | 32 ++-- include/net/netfilter/br_netfilter.h | 4 +- include/net/netfilter/ipv6/nf_conntrack_icmpv6.h | 21 --- include/net/netfilter/nf_conntrack.h | 25 +-- include/net/netfilter/nf_conntrack_acct.h | 4 +- include/net/netfilter/nf_conntrack_bridge.h | 11 +- include/net/netfilter/nf_conntrack_core.h | 8 +- include/net/netfilter/nf_conntrack_ecache.h | 84 ++++++---- include/net/netfilter/nf_conntrack_expect.h | 2 +- include/net/netfilter/nf_conntrack_extend.h | 2 +- include/net/netfilter/nf_conntrack_l4proto.h | 16 +- include/net/netfilter/nf_conntrack_labels.h | 11 +- include/net/netfilter/nf_conntrack_synproxy.h | 41 +---- include/net/netfilter/nf_conntrack_timeout.h | 4 + include/net/netfilter/nf_conntrack_timestamp.h | 16 -- include/net/netfilter/nf_conntrack_tuple.h | 4 +- include/net/netfilter/nf_conntrack_zones.h | 6 +- include/net/netfilter/nf_dup_netdev.h | 6 + include/net/netfilter/nf_flow_table.h | 6 +- include/net/netfilter/nf_nat.h | 21 +-- include/net/netfilter/nf_nat_masquerade.h | 1 + include/net/netfilter/nf_queue.h | 4 - include/net/netfilter/nf_synproxy.h | 44 +++++- include/net/netfilter/nf_tables.h | 8 - include/net/netfilter/nf_tables_offload.h | 10 +- include/uapi/linux/netfilter/nf_tables.h | 3 +- net/bridge/netfilter/ebt_802_3.c | 8 +- net/bridge/netfilter/nf_conntrack_bridge.c | 15 +- net/ipv4/netfilter/Kconfig | 8 +- net/ipv4/netfilter/Makefile | 2 +- net/ipv6/netfilter.c | 4 +- net/ipv6/netfilter/ip6t_ipv6header.c | 4 +- net/ipv6/netfilter/nf_log_ipv6.c | 4 +- net/ipv6/netfilter/nf_socket_ipv6.c | 1 - net/netfilter/Kconfig | 8 +- net/netfilter/Makefile | 2 +- net/netfilter/nf_conntrack_ecache.c | 1 + net/netfilter/nf_conntrack_expect.c | 2 + net/netfilter/nf_conntrack_helper.c | 5 +- net/netfilter/nf_conntrack_proto_icmpv6.c | 1 - net/netfilter/nf_conntrack_standalone.c | 1 - net/netfilter/nf_conntrack_timeout.c | 1 + net/netfilter/nf_dup_netdev.c | 21 +++ net/netfilter/nf_flow_table_core.c | 1 + net/netfilter/nf_nat_core.c | 6 +- net/netfilter/nf_tables_api.c | 25 +-- net/netfilter/nf_tables_offload.c | 186 ++++++++++++++++++----- net/netfilter/nft_dup_netdev.c | 12 ++ net/netfilter/nft_flow_offload.c | 3 +- net/netfilter/nft_fwd_netdev.c | 12 ++ net/netfilter/nft_synproxy.c | 143 ++++++++++++++--- net/netfilter/xt_connlimit.c | 2 + net/netfilter/xt_hashlimit.c | 7 +- net/netfilter/xt_physdev.c | 5 +- net/sched/act_ct.c | 2 +- 68 files changed, 603 insertions(+), 417 deletions(-) delete mode 100644 include/linux/netfilter/xt_hashlimit.h delete mode 100644 include/linux/netfilter/xt_physdev.h delete mode 100644 include/linux/netfilter_bridge/ebt_802_3.h delete mode 100644 include/net/netfilter/ipv6/nf_conntrack_icmpv6.h
Pablo Neira Ayuso
maintainerPATCH 1/27 netfilter: nf_tables: Fix an Oops in nf_tables_updobj() error handling
From: Dan Carpenter <[email protected]>
The "newobj" is an error pointer so we can't pass it to kfree(). It doesn't need to be freed so we can remove that and I also renamed the error label.
--- net/netfilter/nf_tables_api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nf_tables_api.c +3 -3
@@ -5151,7 +5151,7 @@ static int nf_tables_updobj(const struct nft_ctx *ctx, newobj =nft_obj_init (ctx, type, attr);if (IS_ERR (newobj)) { err =PTR_ERR (newobj); - goto err1; + goto err_free_trans; }nft_trans_obj (trans) = obj;
@@ -5160,9 +5160,9 @@ static int nf_tables_updobj(const struct nft_ctx *ctx,list_add_tail (&trans->list, &ctx->net->nft.commit_list);return 0 ; -err1: + +err_free_trans:kfree (trans); -kfree (newobj);return err; }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/27 netfilter: nf_tables_offload: avoid excessive stack usage
In reply to Pablo Neira AyusoFrom: Arnd Bergmann <[email protected]>
The nft_offload_ctx structure is much too large to put on the stack:
net/netfilter/nf_tables_offload.c:31:23: error: stack frame size of 1200 bytes in function 'nft_flow_rule_create' [-Werror,-Wframe-larger-than=]
Use dynamic allocation here, as we do elsewhere in the same function.
--- net/netfilter/nf_tables_offload.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
net/netfilter/nf_tables_offload.c +13 -7
@@ -30,11 +30,7 @@ static struct nft_flow_rule *nft_flow_rule_alloc(int num_actions)struct nft_flow_rule *nft_flow_rule_create (const struct nft_rule *rule) { -struct nft_offload_ctx ctx = { - .dep = { - .type =NFT_OFFLOAD_DEP_UNSPEC , - }, - }; +struct nft_offload_ctx *ctx;struct nft_flow_rule *flow;int num_actions =0 , err;struct nft_expr *expr;
@@ -52,21 +48,31 @@ struct nft_flow_rule *nft_flow_rule_create(const struct nft_rule *rule)return ERR_PTR (-ENOMEM ); expr =nft_expr_first (rule); + + ctx =kzalloc (sizeof (struct nft_offload_ctx ),GFP_KERNEL ); +if (!ctx) { + err = -ENOMEM ; + goto err_out; + } + ctx->dep.type =NFT_OFFLOAD_DEP_UNSPEC ; +while (expr->ops && expr !=nft_expr_last (rule)) {if (!expr->ops->offload) { err = -EOPNOTSUPP ; goto err_out; } - err = expr->ops->offload (&ctx, flow, expr); + err = expr->ops->offload (ctx, flow, expr);if (err <0 ) goto err_out; expr =nft_expr_next (expr); } - flow->proto = ctx.dep.l3num; + flow->proto = ctx->dep.l3num; +kfree (ctx);return flow; err_out: +kfree (ctx);nft_flow_rule_destroy (flow);return ERR_PTR (err);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/27 netfilter: nf_tables_offload: move indirect flow_block callback logic to core
In reply to Pablo Neira AyusoAdd nft_offload_init() and nft_offload_exit() function to deal with the init and the exit path of the offload infrastructure.
Rename nft_indr_block_get_and_ing_cmd() to nft_indr_block_cb().
--- include/net/netfilter/nf_tables_offload.h | 7 +++---- net/netfilter/nf_tables_api.c | 10 +++------- net/netfilter/nf_tables_offload.c | 22 ++++++++++++++++++---- 3 files changed, 24 insertions(+), 15 deletions(-)
include/net/netfilter/nf_tables_offload.h +3 -4
@@ -64,10 +64,6 @@ struct nft_rule;struct nft_flow_rule *nft_flow_rule_create (const struct nft_rule *rule);void nft_flow_rule_destroy (struct nft_flow_rule *flow);int nft_flow_rule_offload_commit (struct net *net); -void nft_indr_block_get_and_ing_cmd (struct net_device *dev, -flow_indr_block_bind_cb_t *cb, -void *cb_priv, -enum flow_block_command command);#define NFT_OFFLOAD_MATCH (__key, __base, __field, __len, __reg) \ (__reg)->base_offset = \
@@ -80,4 +76,7 @@ void nft_indr_block_get_and_ing_cmd(struct net_device *dev,int nft_chain_offload_priority (struct nft_base_chain *basechain); +void nft_offload_init (void ); +void nft_offload_exit (void ); +#endif
net/netfilter/nf_tables_api.c +3 -7
@@ -7669,11 +7669,6 @@ static struct pernet_operations nf_tables_net_ops = { .exit = nf_tables_exit_net, }; -static struct flow_indr_block_ing_entry block_ing_entry = { - .cb = nft_indr_block_get_and_ing_cmd, - .list =LIST_HEAD_INIT (block_ing_entry.list), -}; -static int __init nf_tables_module_init (void ) {int err;
@@ -7705,7 +7700,8 @@ static int __init nf_tables_module_init(void) goto err5;nft_chain_route_init (); -flow_indr_add_block_ing_cb (&block_ing_entry); +nft_offload_init (); +return err; err5:rhltable_destroy (&nft_objname_ht);
@@ -7722,7 +7718,7 @@ static int __init nf_tables_module_init(void) static void __exit nf_tables_module_exit(void) { -flow_indr_del_block_ing_cb (&block_ing_entry); +nft_offload_exit ();nfnetlink_subsys_unregister (&nf_tables_subsys);unregister_netdevice_notifier (&nf_tables_flowtable_notifier);nft_chain_filter_fini ();
net/netfilter/nf_tables_offload.c +18 -4
@@ -354,10 +354,9 @@ int nft_flow_rule_offload_commit(struct net *net)return err; } -void nft_indr_block_get_and_ing_cmd (struct net_device *dev, -flow_indr_block_bind_cb_t *cb, -void *cb_priv, -enum flow_block_command command) +static void nft_indr_block_cb (struct net_device *dev, +flow_indr_block_bind_cb_t *cb,void *cb_priv, +enum flow_block_command command) {struct net *net =dev_net (dev);const struct nft_table *table;
@@ -383,3 +382,18 @@ void nft_indr_block_get_and_ing_cmd(struct net_device *dev, } } } + +static struct flow_indr_block_ing_entry block_ing_entry = { + .cb = nft_indr_block_cb, + .list =LIST_HEAD_INIT (block_ing_entry.list), +}; + +void nft_offload_init (void ) +{ +flow_indr_add_block_ing_cb (&block_ing_entry); +} + +void nft_offload_exit (void ) +{ +flow_indr_del_block_ing_cb (&block_ing_entry); +}
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 4/27 netfilter: nft_synproxy: add synproxy stateful object support
In reply to Pablo Neira AyusoFrom: Fernando Fernandez Mancera <[email protected]>
Register a new synproxy stateful object type into the stateful object infrastructure.
--- include/uapi/linux/netfilter/nf_tables.h | 3 +- net/netfilter/nft_synproxy.c | 143 ++++++++++++++++++++++++++----- 2 files changed, 124 insertions(+), 22 deletions(-)
include/uapi/linux/netfilter/nf_tables.h +2 -1
@@ -1481,7 +1481,8 @@ enum nft_ct_expectation_attributes {#define NFT_OBJECT_CT_TIMEOUT 7#define NFT_OBJECT_SECMARK 8#define NFT_OBJECT_CT_EXPECT 9 -#define __NFT_OBJECT_MAX 10 +#define NFT_OBJECT_SYNPROXY 10 +#define __NFT_OBJECT_MAX 11#define NFT_OBJECT_MAX (__NFT_OBJECT_MAX - 1)/**
net/netfilter/nft_synproxy.c +122 -21
236 lines not on this page · raw message
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 5/27 netfilter: nft_{fwd,dup}_netdev: add offload support
In reply to Pablo Neira AyusoThis patch adds support for packet mirroring and redirection. The nft_fwd_dup_netdev_offload() function configures the flow_action object for the fwd and the dup actions.
Extend nft_flow_rule_destroy() to release the net_device object when the flow_rule object is released, since nft_fwd_dup_netdev_offload() bumps the net_device reference counter.
--- include/net/netfilter/nf_dup_netdev.h | 6 ++++++ include/net/netfilter/nf_tables_offload.h | 3 ++- net/netfilter/nf_dup_netdev.c | 21 +++++++++++++++++++++ net/netfilter/nf_tables_api.c | 2 +- net/netfilter/nf_tables_offload.c | 17 ++++++++++++++++- net/netfilter/nft_dup_netdev.c | 12 ++++++++++++ net/netfilter/nft_fwd_netdev.c | 12 ++++++++++++ 7 files changed, 70 insertions(+), 3 deletions(-)
include/net/netfilter/nf_dup_netdev.h +6 -0
@@ -7,4 +7,10 @@void nf_dup_netdev_egress (const struct nft_pktinfo *pkt,int oif);void nf_fwd_netdev_egress (const struct nft_pktinfo *pkt,int oif); +struct nft_offload_ctx ; +struct nft_flow_rule ; + +int nft_fwd_dup_netdev_offload (struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +enum flow_action_id id,int oif);#endif
include/net/netfilter/nf_tables_offload.h +2 -1
@@ -26,6 +26,7 @@ struct nft_offload_ctx {u8 protonum; } dep;unsigned int num_actions; +struct net *net;struct nft_offload_reg regs[NFT_REG32_15 +1 ]; };
@@ -61,7 +62,7 @@ struct nft_flow_rule {#define NFT_OFFLOAD_F_ACTION (1 << 0)struct nft_rule ; -struct nft_flow_rule *nft_flow_rule_create (const struct nft_rule *rule); +struct nft_flow_rule *nft_flow_rule_create (struct net *net,const struct nft_rule *rule);void nft_flow_rule_destroy (struct nft_flow_rule *flow);int nft_flow_rule_offload_commit (struct net *net);
net/netfilter/nf_dup_netdev.c +21 -0
@@ -10,6 +10,7 @@#include <linux/netfilter.h> #include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h> +#include <net/netfilter/nf_tables_offload.h> #include <net/netfilter/nf_dup_netdev.h> static void nf_do_netdev_egress (struct sk_buff *skb,struct net_device *dev)
@@ -50,5 +51,25 @@ void nf_dup_netdev_egress(const struct nft_pktinfo *pkt, int oif) }EXPORT_SYMBOL_GPL (nf_dup_netdev_egress); +int nft_fwd_dup_netdev_offload (struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +enum flow_action_id id,int oif) +{ +struct flow_action_entry *entry; +struct net_device *dev; + +/* nft_flow_rule_destroy() releases the reference on this device. */ + dev =dev_get_by_index (ctx->net, oif); +if (!dev) +return -EOPNOTSUPP ; + + entry = &flow->rule->action.entries[ctx->num_actions++]; + entry->id = id; + entry->dev = dev; + +return 0 ; +} +EXPORT_SYMBOL_GPL (nft_fwd_dup_netdev_offload); +MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );
net/netfilter/nf_tables_api.c +1 -1
@@ -2853,7 +2853,7 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,return nft_table_validate (net, table);if (chain->flags &NFT_CHAIN_HW_OFFLOAD ) { - flow =nft_flow_rule_create (rule); + flow =nft_flow_rule_create (net, rule);if (IS_ERR (flow))return PTR_ERR (flow);
net/netfilter/nf_tables_offload.c +16 -1
@@ -28,7 +28,8 @@ static struct nft_flow_rule *nft_flow_rule_alloc(int num_actions)return flow; } -struct nft_flow_rule *nft_flow_rule_create (const struct nft_rule *rule) +struct nft_flow_rule *nft_flow_rule_create (struct net *net, +const struct nft_rule *rule) {struct nft_offload_ctx *ctx;struct nft_flow_rule *flow;
@@ -54,6 +55,7 @@ struct nft_flow_rule *nft_flow_rule_create(const struct nft_rule *rule) err = -ENOMEM ; goto err_out; } + ctx->net = net; ctx->dep.type =NFT_OFFLOAD_DEP_UNSPEC ;while (expr->ops && expr !=nft_expr_last (rule)) {
@@ -80,6 +82,19 @@ struct nft_flow_rule *nft_flow_rule_create(const struct nft_rule *rule)void nft_flow_rule_destroy (struct nft_flow_rule *flow) { +struct flow_action_entry *entry; +int i; + +flow_action_for_each (i, entry, &flow->rule->action) { +switch (entry->id) { +case FLOW_ACTION_REDIRECT : +case FLOW_ACTION_MIRRED : +dev_put (entry->dev); +break ; +default : +break ; + } + }kfree (flow->rule);kfree (flow); }
net/netfilter/nft_dup_netdev.c +12 -0
@@ -10,6 +10,7 @@#include <linux/netfilter.h> #include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h> +#include <net/netfilter/nf_tables_offload.h> #include <net/netfilter/nf_dup_netdev.h> struct nft_dup_netdev {
@@ -56,6 +57,16 @@ static int nft_dup_netdev_dump(struct sk_buff *skb, const struct nft_expr *expr)return -1 ; } +static int nft_dup_netdev_offload (struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +const struct nft_expr *expr) +{ +const struct nft_dup_netdev *priv =nft_expr_priv (expr); +int oif = ctx->regs[priv->sreg_dev].data.data[0 ]; + +return nft_fwd_dup_netdev_offload (ctx, flow,FLOW_ACTION_MIRRED , oif); +} +static struct nft_expr_type nft_dup_netdev_type;static const struct nft_expr_ops nft_dup_netdev_ops = { .type = &nft_dup_netdev_type,
@@ -63,6 +74,7 @@ static const struct nft_expr_ops nft_dup_netdev_ops = { .eval = nft_dup_netdev_eval, .init = nft_dup_netdev_init, .dump = nft_dup_netdev_dump, + .offload = nft_dup_netdev_offload, };static struct nft_expr_type nft_dup_netdev_type__read_mostly = {
net/netfilter/nft_fwd_netdev.c +12 -0
@@ -12,6 +12,7 @@#include <linux/ip.h> #include <linux/ipv6.h> #include <net/netfilter/nf_tables.h> +#include <net/netfilter/nf_tables_offload.h> #include <net/netfilter/nf_dup_netdev.h> #include <net/neighbour.h> #include <net/ip.h>
@@ -63,6 +64,16 @@ static int nft_fwd_netdev_dump(struct sk_buff *skb, const struct nft_expr *expr)return -1 ; } +static int nft_fwd_netdev_offload (struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +const struct nft_expr *expr) +{ +const struct nft_fwd_netdev *priv =nft_expr_priv (expr); +int oif = ctx->regs[priv->sreg_dev].data.data[0 ]; + +return nft_fwd_dup_netdev_offload (ctx, flow,FLOW_ACTION_REDIRECT , oif); +} +struct nft_fwd_neigh {enum nft_registers sreg_dev:8 ;enum nft_registers sreg_addr:8 ;
@@ -194,6 +205,7 @@ static const struct nft_expr_ops nft_fwd_netdev_ops = { .eval = nft_fwd_netdev_eval, .init = nft_fwd_netdev_init, .dump = nft_fwd_netdev_dump, + .offload = nft_fwd_netdev_offload, }; static const struct nft_expr_ops *
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 6/27 netfilter: nf_tables_offload: add __nft_offload_get_chain function
In reply to Pablo Neira AyusoFrom: wenxu <[email protected]>
Add __nft_offload_get_chain function to get basechain from device. This function requires that caller holds the per-netns nftables mutex. This patch implicitly fixes missing offload flags check and proper mutex from nft_indr_block_cb().
--- net/netfilter/nf_tables_offload.c | 52 +++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 18 deletions(-)
net/netfilter/nf_tables_offload.c +34 -18
@@ -369,33 +369,49 @@ int nft_flow_rule_offload_commit(struct net *net)return err; } -static void nft_indr_block_cb (struct net_device *dev, -flow_indr_block_bind_cb_t *cb,void *cb_priv, -enum flow_block_command command) +static struct nft_chain *__nft_offload_get_chain (struct net_device *dev) { +struct nft_base_chain *basechain;struct net *net =dev_net (dev);const struct nft_table *table; -const struct nft_chain *chain; +struct nft_chain *chain; -list_for_each_entry_rcu (table, &net->nft.tables, list) { +list_for_each_entry (table, &net->nft.tables, list) {if (table->family !=NFPROTO_NETDEV )continue ; -list_for_each_entry_rcu (chain, &table->chains, list) { -if (nft_is_base_chain (chain)) { -struct nft_base_chain *basechain; - - basechain =nft_base_chain (chain); -if (!strncmp (basechain->dev_name, dev->name, -IFNAMSIZ )) { -nft_indr_block_ing_cmd (dev, basechain, - cb, cb_priv, - command); -return ; - } - } +list_for_each_entry (chain, &table->chains, list) { +if (!nft_is_base_chain (chain) || + !(chain->flags &NFT_CHAIN_HW_OFFLOAD )) +continue ; + + basechain =nft_base_chain (chain); +if (strncmp (basechain->dev_name, dev->name,IFNAMSIZ )) +continue ; + +return chain; } } + +return NULL ; +} + +static void nft_indr_block_cb (struct net_device *dev, +flow_indr_block_bind_cb_t *cb,void *cb_priv, +enum flow_block_command cmd) +{ +struct net *net =dev_net (dev); +struct nft_chain *chain; + +mutex_lock (&net->nft.commit_mutex); + chain =__nft_offload_get_chain (dev); +if (chain) { +struct nft_base_chain *basechain; + + basechain =nft_base_chain (chain); +nft_indr_block_ing_cmd (dev, basechain, cb, cb_priv, cmd); + } +mutex_unlock (&net->nft.commit_mutex); }static struct flow_indr_block_ing_entry block_ing_entry = {
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 7/27 netfilter: nf_tables_offload: refactor the nft_flow_offload_chain function
In reply to Pablo Neira AyusoFrom: wenxu <[email protected]>
Pass chain and policy parameters to nft_flow_offload_chain to reuse it.
--- net/netfilter/nf_tables_offload.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
net/netfilter/nf_tables_offload.c +13 -7
@@ -294,12 +294,13 @@ static int nft_indr_block_offload_cmd(struct nft_base_chain *chain,#define FLOW_SETUP_BLOCK TC_SETUP_BLOCK -static int nft_flow_offload_chain (struct nft_trans *trans, +static int nft_flow_offload_chain (struct nft_chain *chain, +u8 *ppolicy,enum flow_block_command cmd) { -struct nft_chain *chain = trans->ctx.chain;struct nft_base_chain *basechain;struct net_device *dev; +u8 policy;if (!nft_is_base_chain (chain))return -EOPNOTSUPP ;
@@ -309,10 +310,10 @@ static int nft_flow_offload_chain(struct nft_trans *trans,if (!dev)return -EOPNOTSUPP ; + policy = ppolicy ? *ppolicy : basechain->policy; +/* Only default policy to accept is supported for now. */ -if (cmd ==FLOW_BLOCK_BIND && -nft_trans_chain_policy (trans) !=-1 && -nft_trans_chain_policy (trans) !=NF_ACCEPT ) +if (cmd ==FLOW_BLOCK_BIND && policy !=-1 && policy !=NF_ACCEPT )return -EOPNOTSUPP ;if (dev->netdev_ops->ndo_setup_tc)
@@ -325,6 +326,7 @@ int nft_flow_rule_offload_commit(struct net *net) {struct nft_trans *trans;int err =0 ; +u8 policy;list_for_each_entry (trans, &net->nft.commit_list, list) {if (trans->ctx.family !=NFPROTO_NETDEV )
@@ -335,13 +337,17 @@ int nft_flow_rule_offload_commit(struct net *net)if (!(trans->ctx.chain->flags &NFT_CHAIN_HW_OFFLOAD ))continue ; - err =nft_flow_offload_chain (trans,FLOW_BLOCK_BIND ); + policy =nft_trans_chain_policy (trans); + err =nft_flow_offload_chain (trans->ctx.chain, &policy, +FLOW_BLOCK_BIND );break ;case NFT_MSG_DELCHAIN :if (!(trans->ctx.chain->flags &NFT_CHAIN_HW_OFFLOAD ))continue ; - err =nft_flow_offload_chain (trans,FLOW_BLOCK_UNBIND ); + policy =nft_trans_chain_policy (trans); + err =nft_flow_offload_chain (trans->ctx.chain, &policy, +FLOW_BLOCK_BIND );break ;case NFT_MSG_NEWRULE :if (!(trans->ctx.chain->flags &NFT_CHAIN_HW_OFFLOAD ))
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 8/27 netfilter: nf_tables_offload: refactor the nft_flow_offload_rule function
In reply to Pablo Neira AyusoFrom: wenxu <[email protected]>
Pass rule, chain and flow_rule object parameters to nft_flow_offload_rule to reuse it.
--- net/netfilter/nf_tables_offload.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
net/netfilter/nf_tables_offload.c +13 -7
@@ -155,20 +155,20 @@ int nft_chain_offload_priority(struct nft_base_chain *basechain)return 0 ; } -static int nft_flow_offload_rule (struct nft_trans *trans, +static int nft_flow_offload_rule (struct nft_chain *chain, +struct nft_rule *rule, +struct nft_flow_rule *flow,enum flow_cls_command command) { -struct nft_flow_rule *flow =nft_trans_flow_rule (trans); -struct nft_rule *rule =nft_trans_rule (trans);struct flow_cls_offload cls_flow = {};struct nft_base_chain *basechain;struct netlink_ext_ack extack;__be16 proto =ETH_P_ALL ; -if (!nft_is_base_chain (trans->ctx.chain)) +if (!nft_is_base_chain (chain))return -EOPNOTSUPP ; - basechain =nft_base_chain (trans->ctx.chain); + basechain =nft_base_chain (chain);if (flow) proto = flow->proto;
@@ -357,14 +357,20 @@ int nft_flow_rule_offload_commit(struct net *net) !(trans->ctx.flags & NLM_F_APPEND))return -EOPNOTSUPP ; - err =nft_flow_offload_rule (trans,FLOW_CLS_REPLACE ); + err =nft_flow_offload_rule (trans->ctx.chain, +nft_trans_rule (trans), +nft_trans_flow_rule (trans), +FLOW_CLS_REPLACE );nft_flow_rule_destroy (nft_trans_flow_rule (trans));break ;case NFT_MSG_DELRULE :if (!(trans->ctx.chain->flags &NFT_CHAIN_HW_OFFLOAD ))continue ; - err =nft_flow_offload_rule (trans,FLOW_CLS_DESTROY ); + err =nft_flow_offload_rule (trans->ctx.chain, +nft_trans_rule (trans), +nft_trans_flow_rule (trans), +FLOW_CLS_DESTROY );break ; }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 9/27 netfilter: nf_tables_offload: remove rules when the device unregisters
In reply to Pablo Neira AyusoFrom: wenxu <[email protected]>
If the net_device unregisters, clean up the offload rules before the chain is destroy.
--- include/net/netfilter/nf_tables_offload.h | 2 +- net/netfilter/nf_tables_api.c | 11 +++++--- net/netfilter/nf_tables_offload.c | 43 ++++++++++++++++++++++++++++++- 3 files changed, 51 insertions(+), 5 deletions(-)
include/net/netfilter/nf_tables_offload.h +1 -1
@@ -77,7 +77,7 @@ int nft_flow_rule_offload_commit(struct net *net);int nft_chain_offload_priority (struct nft_base_chain *basechain); -void nft_offload_init (void ); +int nft_offload_init (void );void nft_offload_exit (void );#endif
net/netfilter/nf_tables_api.c +8 -3
@@ -7694,15 +7694,20 @@ static int __init nf_tables_module_init(void)if (err <0 ) goto err4; + err =nft_offload_init (); +if (err <0 ) + goto err5; +/* must be last */ err =nfnetlink_subsys_register (&nf_tables_subsys);if (err <0 ) - goto err5; + goto err6;nft_chain_route_init (); -nft_offload_init ();return err; +err6: +nft_offload_exit (); err5:rhltable_destroy (&nft_objname_ht); err4:
@@ -7718,8 +7723,8 @@ static int __init nf_tables_module_init(void) static void __exit nf_tables_module_exit(void) { -nft_offload_exit ();nfnetlink_subsys_unregister (&nf_tables_subsys); +nft_offload_exit ();unregister_netdevice_notifier (&nf_tables_flowtable_notifier);nft_chain_filter_fini ();nft_chain_route_fini ();
net/netfilter/nf_tables_offload.c +42 -1
59 lines not on this page · raw message
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 10/27 netfilter: fix include guards.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
nf_conntrack_labels.h has no include guard. Add it.
The comment following the #endif in the nf_flow_table.h include guard referred to the wrong macro. Fix it.
--- include/net/netfilter/nf_conntrack_labels.h | 11 ++++++++--- include/net/netfilter/nf_flow_table.h | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-)
include/net/netfilter/nf_conntrack_labels.h +8 -3
@@ -1,11 +1,14 @@/* SPDX-License-Identifier: GPL-2.0 */ -#include <linux/types.h> -#include <net/net_namespace.h> + +#ifndef _NF_CONNTRACK_LABELS_H +#define _NF_CONNTRACK_LABELS_H +#include <linux/netfilter/nf_conntrack_common.h> #include <linux/netfilter/nf_conntrack_tuple_common.h> +#include <linux/types.h> +#include <net/net_namespace.h> #include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_extend.h> -#include <uapi/linux/netfilter/xt_connlabel.h> #define NF_CT_LABELS_MAX_SIZE ((XT_CONNLABEL_MAXBIT + 1) / BITS_PER_BYTE)
@@ -51,3 +54,5 @@ static inline void nf_conntrack_labels_fini(void) {}static inline int nf_connlabels_get (struct net *net,unsigned int bit) {return 0 ; }static inline void nf_connlabels_put (struct net *net) {}#endif + +#endif /* _NF_CONNTRACK_LABELS_H */
include/net/netfilter/nf_flow_table.h +1 -1
@@ -127,4 +127,4 @@ unsigned int nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,#define MODULE_ALIAS_NF_FLOWTABLE (family) \ MODULE_ALIAS("nf-flowtable-" __stringify(family)) -#endif /* _FLOW_OFFLOAD_H */ +#endif /* _NF_FLOW_TABLE_H */
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 11/27 netfilter: fix coding-style errors.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
Several header-files, Kconfig files and Makefiles have trailing white-space. Remove it.
In netfilter/Kconfig, indent the type of CONFIG_NETFILTER_NETLINK_ACCT correctly.
There are semicolons at the end of two function definitions in include/net/netfilter/nf_conntrack_acct.h and include/net/netfilter/nf_conntrack_ecache.h. Remove them.
Fix indentation in nf_conntrack_l4proto.h.
--- include/linux/netfilter/x_tables.h | 2 +- include/linux/netfilter_ipv6.h | 2 +- include/net/netfilter/nf_conntrack_acct.h | 2 +- include/net/netfilter/nf_conntrack_ecache.h | 2 +- include/net/netfilter/nf_conntrack_expect.h | 2 +- include/net/netfilter/nf_conntrack_l4proto.h | 14 +++++++------- include/net/netfilter/nf_conntrack_tuple.h | 2 +- net/ipv4/netfilter/Kconfig | 8 ++++---- net/ipv4/netfilter/Makefile | 2 +- net/netfilter/Kconfig | 8 ++++---- net/netfilter/Makefile | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-)
include/linux/netfilter/x_tables.h +1 -1
@@ -340,7 +340,7 @@ void xt_free_table_info(struct xt_table_info *info);/** * xt_recseq - recursive seqcount for netfilter use -* +* * Packet processing changes the seqcount only if no recursion happened * get_counters() can use read_seqcount_begin()/read_seqcount_retry(), * because we use the normal seqcount convention :
include/linux/netfilter_ipv6.h +1 -1
@@ -1,7 +1,7 @@/* IPv6-specific defines for netfilter. * (C)1998 Rusty Russell -- This code is GPL. * (C)1999 David Jeffery -* this header was blatantly ripped from netfilter_ipv4.h +* this header was blatantly ripped from netfilter_ipv4.h * it's amazing what adding a bunch of 6s can do =8^) */ #ifndef __LINUX_IP6_NETFILTER_H
include/net/netfilter/nf_conntrack_acct.h +1 -1
@@ -45,7 +45,7 @@ struct nf_conn_acct *nf_ct_acct_ext_add(struct nf_conn *ct, gfp_t gfp)#else return NULL ;#endif -}; +}/* Check if connection tracking accounting is enabled */ static inline bool nf_ct_acct_enabled (struct net *net)
include/net/netfilter/nf_conntrack_ecache.h +1 -1
@@ -61,7 +61,7 @@ nf_ct_ecache_ext_add(struct nf_conn *ct, u16 ctmask, u16 expmask, gfp_t gfp)#else return NULL ;#endif -}; +}#ifdef CONFIG_NF_CONNTRACK_EVENTS /* This structure is passed to event handler */
include/net/netfilter/nf_conntrack_expect.h +1 -1
@@ -126,7 +126,7 @@ void nf_ct_expect_init(struct nf_conntrack_expect *, unsigned int, u_int8_t, const union nf_inet_addr *, u_int8_t, const __be16 *, const __be16 *);void nf_ct_expect_put (struct nf_conntrack_expect *exp); -int nf_ct_expect_related_report (struct nf_conntrack_expect *expect, +int nf_ct_expect_related_report (struct nf_conntrack_expect *expect,u32 portid,int report,unsigned int flags);static inline int nf_ct_expect_related (struct nf_conntrack_expect *expect,unsigned int flags)
include/net/netfilter/nf_conntrack_l4proto.h +7 -7
@@ -181,41 +181,41 @@ void nf_ct_l4proto_log_invalid(const struct sk_buff *skb,#if IS_ENABLED (CONFIG_NF_CONNTRACK )static inline struct nf_generic_net *nf_generic_pernet (struct net *net) { -return &net->ct.nf_ct_proto.generic; +return &net->ct.nf_ct_proto.generic; }static inline struct nf_tcp_net *nf_tcp_pernet (struct net *net) { -return &net->ct.nf_ct_proto.tcp; +return &net->ct.nf_ct_proto.tcp; }static inline struct nf_udp_net *nf_udp_pernet (struct net *net) { -return &net->ct.nf_ct_proto.udp; +return &net->ct.nf_ct_proto.udp; }static inline struct nf_icmp_net *nf_icmp_pernet (struct net *net) { -return &net->ct.nf_ct_proto.icmp; +return &net->ct.nf_ct_proto.icmp; }static inline struct nf_icmp_net *nf_icmpv6_pernet (struct net *net) { -return &net->ct.nf_ct_proto.icmpv6; +return &net->ct.nf_ct_proto.icmpv6; }#endif #ifdef CONFIG_NF_CT_PROTO_DCCP static inline struct nf_dccp_net *nf_dccp_pernet (struct net *net) { -return &net->ct.nf_ct_proto.dccp; +return &net->ct.nf_ct_proto.dccp; }#endif #ifdef CONFIG_NF_CT_PROTO_SCTP static inline struct nf_sctp_net *nf_sctp_pernet (struct net *net) { -return &net->ct.nf_ct_proto.sctp; +return &net->ct.nf_ct_proto.sctp; }#endif
include/net/netfilter/nf_conntrack_tuple.h +1 -1
@@ -124,7 +124,7 @@ struct nf_conntrack_tuple_hash {#if IS_ENABLED (CONFIG_NETFILTER )static inline bool __nf_ct_tuple_src_equal (const struct nf_conntrack_tuple *t1,const struct nf_conntrack_tuple *t2) -{ +{return (nf_inet_addr_cmp (&t1->src.u3, &t2->src.u3) && t1->src.u.all == t2->src.u.all && t1->src.l3num == t2->src.l3num);
net/ipv4/netfilter/Kconfig +4 -4
@@ -272,7 +272,7 @@ config IP_NF_TARGET_CLUSTERIP The CLUSTERIP target allows you to build load-balancing clusters of network servers without having a dedicated load-balancing router/server/switch. - + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_ECN
@@ -281,7 +281,7 @@ config IP_NF_TARGET_ECN depends on NETFILTER_ADVANCED ---help--- This option adds a `ECN' target, which can be used in the iptables mangle - table. + table. You can use this target to remove the ECN bits from the IPv4 header of an IP packet. This is particularly useful, if you need to work around
@@ -306,7 +306,7 @@ config IP_NF_RAW This option adds a `raw' table to iptables. This table is the very first in the netfilter framework and hooks in at the PREROUTING and OUTPUT chains. - + If you want to compile it as a module, say M here and read <file:Documentation/kbuild/modules.rst>. If unsure, say `N'.
@@ -318,7 +318,7 @@ config IP_NF_SECURITY help This option adds a `security' table to iptables, for use with Mandatory Access Control (MAC) policy. - + If unsure, say N. endif # IP_NF_IPTABLES
net/ipv4/netfilter/Makefile +1 -1
@@ -31,7 +31,7 @@ obj-$(CONFIG_NFT_DUP_IPV4) += nft_dup_ipv4.o # flow table support obj-$(CONFIG_NF_FLOW_TABLE_IPV4) += nf_flow_table_ipv4.o -# generic IP tables +# generic IP tables obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o # the three instances of ip_tables
net/netfilter/Kconfig +4 -4
@@ -20,7 +20,7 @@ config NETFILTER_FAMILY_ARP bool config NETFILTER_NETLINK_ACCT -tristate "Netfilter NFACCT over NFNETLINK interface" + tristate "Netfilter NFACCT over NFNETLINK interface" depends on NETFILTER_ADVANCED select NETFILTER_NETLINK help
@@ -34,7 +34,7 @@ config NETFILTER_NETLINK_QUEUE help If this option is enabled, the kernel will include support for queueing packets via NFNETLINK. - + config NETFILTER_NETLINK_LOG tristate "Netfilter LOG over NFNETLINK interface" default m if NETFILTER_ADVANCED=n
@@ -1502,7 +1502,7 @@ config NETFILTER_XT_MATCH_REALM This option adds a `realm' match, which allows you to use the realm key from the routing subsystem inside iptables. - This match pretty much resembles the CONFIG_NET_CLS_ROUTE4 option + This match pretty much resembles the CONFIG_NET_CLS_ROUTE4 option in tc world. If you want to compile it as a module, say M here and read
@@ -1523,7 +1523,7 @@ config NETFILTER_XT_MATCH_SCTP depends on NETFILTER_ADVANCED default IP_SCTP help - With this option enabled, you will be able to use the + With this option enabled, you will be able to use the `sctp' match in order to match on SCTP source/destination ports and SCTP chunk types.
net/netfilter/Makefile +1 -1
@@ -124,7 +124,7 @@ nf_flow_table-objs := nf_flow_table_core.o nf_flow_table_ip.o obj-$(CONFIG_NF_FLOW_TABLE_INET) += nf_flow_table_inet.o -# generic X tables +# generic X tables obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o # combos
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 12/27 netfilter: ip_tables: remove unused function declarations.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
Two headers include declarations of functions which are never defined. Remove them.
--- include/linux/netfilter_ipv4/ip_tables.h | 2 -- include/linux/netfilter_ipv6/ip6_tables.h | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-)
include/linux/netfilter_ipv4/ip_tables.h +0 -2
@@ -23,8 +23,6 @@#include <linux/init.h> #include <uapi/linux/netfilter_ipv4/ip_tables.h> -extern void ipt_init (void )__init ; -#if IS_ENABLED (CONFIG_NETFILTER ) int ipt_register_table(struct net *net, const struct xt_table *table, const struct ipt_replace *repl,
include/linux/netfilter_ipv6/ip6_tables.h +1 -2
@@ -23,9 +23,8 @@#include <linux/init.h> #include <uapi/linux/netfilter_ipv6/ip6_tables.h> -extern void ip6t_init (void )__init ; -extern void *ip6t_alloc_initial_table (const struct xt_table *); +#if IS_ENABLED (CONFIG_NETFILTER ) int ip6t_register_table(struct net *net, const struct xt_table *table, const struct ip6t_replace *repl,
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 13/27 netfilter: inline xt_hashlimit, ebt_802_3 and xt_physdev headers
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
Three netfilter headers are only included once. Inline their contents at those sites and remove them.
--- include/linux/netfilter/xt_hashlimit.h | 11 ----------- include/linux/netfilter/xt_physdev.h | 8 -------- include/linux/netfilter_bridge/ebt_802_3.h | 12 ------------ net/bridge/netfilter/ebt_802_3.c | 8 +++++++- net/netfilter/xt_hashlimit.c | 7 ++++++- net/netfilter/xt_physdev.c | 5 +++-- 6 files changed, 16 insertions(+), 35 deletions(-) delete mode 100644 include/linux/netfilter/xt_hashlimit.h delete mode 100644 include/linux/netfilter/xt_physdev.h delete mode 100644 include/linux/netfilter_bridge/ebt_802_3.h
include/linux/netfilter/xt_hashlimit.h deleted +0 -11
@@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _XT_HASHLIMIT_H -#define _XT_HASHLIMIT_H - -#include <uapi/linux/netfilter/xt_hashlimit.h> - -#define XT_HASHLIMIT_ALL (XT_HASHLIMIT_HASH_DIP | XT_HASHLIMIT_HASH_DPT | \ - XT_HASHLIMIT_HASH_SIP | XT_HASHLIMIT_HASH_SPT | \ - XT_HASHLIMIT_INVERT | XT_HASHLIMIT_BYTES |\ - XT_HASHLIMIT_RATE_MATCH) -#endif /*_XT_HASHLIMIT_H*/
include/linux/netfilter/xt_physdev.h deleted +0 -8
@@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _XT_PHYSDEV_H -#define _XT_PHYSDEV_H - -#include <linux/if.h> -#include <uapi/linux/netfilter/xt_physdev.h> - -#endif /*_XT_PHYSDEV_H*/
include/linux/netfilter_bridge/ebt_802_3.h deleted +0 -12
@@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __LINUX_BRIDGE_EBT_802_3_H -#define __LINUX_BRIDGE_EBT_802_3_H - -#include <linux/skbuff.h> -#include <uapi/linux/netfilter_bridge/ebt_802_3.h> - -static inline struct ebt_802_3_hdr *ebt_802_3_hdr (const struct sk_buff *skb) -{ -return (struct ebt_802_3_hdr *)skb_mac_header (skb); -} -#endif
net/bridge/netfilter/ebt_802_3.c +7 -1
@@ -11,7 +11,13 @@#include <linux/module.h> #include <linux/netfilter/x_tables.h> #include <linux/netfilter_bridge/ebtables.h> -#include <linux/netfilter_bridge/ebt_802_3.h> +#include <linux/skbuff.h> +#include <uapi/linux/netfilter_bridge/ebt_802_3.h> + +static struct ebt_802_3_hdr *ebt_802_3_hdr (const struct sk_buff *skb) +{ +return (struct ebt_802_3_hdr *)skb_mac_header (skb); +}static bool ebt_802_3_mt (const struct sk_buff *skb,struct xt_action_param *par)
net/netfilter/xt_hashlimit.c +6 -1
@@ -34,9 +34,14 @@#include <linux/netfilter/x_tables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv6/ip6_tables.h> -#include <linux/netfilter/xt_hashlimit.h> #include <linux/mutex.h> #include <linux/kernel.h> +#include <uapi/linux/netfilter/xt_hashlimit.h> + +#define XT_HASHLIMIT_ALL (XT_HASHLIMIT_HASH_DIP | XT_HASHLIMIT_HASH_DPT | \ + XT_HASHLIMIT_HASH_SIP | XT_HASHLIMIT_HASH_SPT | \ + XT_HASHLIMIT_INVERT | XT_HASHLIMIT_BYTES |\ + XT_HASHLIMIT_RATE_MATCH)MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Harald Welte <[email protected]>" );
net/netfilter/xt_physdev.c +3 -2
@@ -5,12 +5,13 @@/* (C) 2001-2003 Bart De Schuymer <[email protected]> */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt + +#include <linux/if.h> #include <linux/module.h> #include <linux/skbuff.h> #include <linux/netfilter_bridge.h> -#include <linux/netfilter/xt_physdev.h> #include <linux/netfilter/x_tables.h> -#include <net/netfilter/br_netfilter.h> +#include <uapi/linux/netfilter/xt_physdev.h> MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Bart De Schuymer <[email protected]>" );
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 14/27 netfilter: update include directives.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
Include some headers in files which require them, and remove others which are not required.
--- include/net/netfilter/nf_conntrack_core.h | 3 ++- include/net/netfilter/nf_conntrack_zones.h | 3 ++- include/net/netfilter/nf_nat.h | 13 ++++++------- include/net/netfilter/nf_nat_masquerade.h | 1 + net/bridge/netfilter/nf_conntrack_bridge.c | 1 - net/ipv6/netfilter/nf_socket_ipv6.c | 1 - net/netfilter/nf_conntrack_ecache.c | 1 + net/netfilter/nf_conntrack_expect.c | 2 ++ net/netfilter/nf_conntrack_helper.c | 5 +++-- net/netfilter/nf_conntrack_timeout.c | 1 + net/netfilter/nf_flow_table_core.c | 1 + net/netfilter/nf_nat_core.c | 6 +++--- net/netfilter/nft_flow_offload.c | 3 ++- net/netfilter/xt_connlimit.c | 2 ++ net/sched/act_ct.c | 2 +- 15 files changed, 27 insertions(+), 18 deletions(-)
include/net/netfilter/nf_conntrack_core.h +2 -1
@@ -14,8 +14,9 @@#define _NF_CONNTRACK_CORE_H#include <linux/netfilter.h> -#include <net/netfilter/nf_conntrack_l4proto.h> +#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_ecache.h> +#include <net/netfilter/nf_conntrack_l4proto.h> /* This header is used to share core functionality between the standalone connection tracking module, and the compatibility layer's use
include/net/netfilter/nf_conntrack_zones.h +2 -1
@@ -5,7 +5,8 @@#include <linux/netfilter/nf_conntrack_zones_common.h> #if IS_ENABLED (CONFIG_NF_CONNTRACK ) -#include <net/netfilter/nf_conntrack_extend.h> + +#include <net/netfilter/nf_conntrack.h> static inline const struct nf_conntrack_zone *nf_ct_zone (const struct nf_conn *ct)
include/net/netfilter/nf_nat.h +6 -7
@@ -1,9 +1,14 @@/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _NF_NAT_H#define _NF_NAT_H + +#include <linux/list.h> #include <linux/netfilter_ipv4.h> -#include <linux/netfilter/nf_nat.h> +#include <linux/netfilter/nf_conntrack_pptp.h> +#include <net/netfilter/nf_conntrack.h> +#include <net/netfilter/nf_conntrack_extend.h> #include <net/netfilter/nf_conntrack_tuple.h> +#include <uapi/linux/netfilter/nf_nat.h> enum nf_nat_manip_type { NF_NAT_MANIP_SRC,
@@ -14,10 +19,6 @@ enum nf_nat_manip_type {#define HOOK2MANIP (hooknum) ((hooknum) != NF_INET_POST_ROUTING && \ (hooknum) != NF_INET_LOCAL_IN) -#include <linux/list.h> -#include <linux/netfilter/nf_conntrack_pptp.h> -#include <net/netfilter/nf_conntrack_extend.h> -/* per conntrack: nat application helper private data */ union nf_conntrack_nat_help {/* insert nat helper private data here */
@@ -26,8 +27,6 @@ union nf_conntrack_nat_help {#endif }; -struct nf_conn ; -/* The structure embedded in the conntrack structure. */ struct nf_conn_nat {union nf_conntrack_nat_help help;
include/net/netfilter/nf_nat_masquerade.h +1 -0
@@ -2,6 +2,7 @@#ifndef _NF_NAT_MASQUERADE_H_#define _NF_NAT_MASQUERADE_H_ +#include <linux/skbuff.h> #include <net/netfilter/nf_nat.h> unsigned int
net/bridge/netfilter/nf_conntrack_bridge.c +0 -1
@@ -17,7 +17,6 @@#include <net/netfilter/nf_conntrack_bridge.h> #include <linux/netfilter/nf_tables.h> -#include <net/netfilter/ipv6/nf_defrag_ipv6.h> #include <net/netfilter/nf_tables.h> #include "../br_private.h"
net/ipv6/netfilter/nf_socket_ipv6.c +0 -1
@@ -12,7 +12,6 @@#include <net/sock.h> #include <net/inet_sock.h> #include <net/inet6_hashtables.h> -#include <net/netfilter/ipv6/nf_defrag_ipv6.h> #include <net/netfilter/nf_socket.h> #if IS_ENABLED (CONFIG_NF_CONNTRACK )#include <net/netfilter/nf_conntrack.h>
net/netfilter/nf_conntrack_ecache.c +1 -0
@@ -24,6 +24,7 @@#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_core.h> +#include <net/netfilter/nf_conntrack_ecache.h> #include <net/netfilter/nf_conntrack_extend.h> static DEFINE_MUTEX (nf_ct_ecache_mutex);
net/netfilter/nf_conntrack_expect.c +2 -0
@@ -25,8 +25,10 @@#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_core.h> +#include <net/netfilter/nf_conntrack_ecache.h> #include <net/netfilter/nf_conntrack_expect.h> #include <net/netfilter/nf_conntrack_helper.h> +#include <net/netfilter/nf_conntrack_l4proto.h> #include <net/netfilter/nf_conntrack_tuple.h> #include <net/netfilter/nf_conntrack_zones.h>
net/netfilter/nf_conntrack_helper.c +3 -2
@@ -21,10 +21,11 @@#include <linux/rtnetlink.h> #include <net/netfilter/nf_conntrack.h> -#include <net/netfilter/nf_conntrack_l4proto.h> -#include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_core.h> +#include <net/netfilter/nf_conntrack_ecache.h> #include <net/netfilter/nf_conntrack_extend.h> +#include <net/netfilter/nf_conntrack_helper.h> +#include <net/netfilter/nf_conntrack_l4proto.h> #include <net/netfilter/nf_log.h> static DEFINE_MUTEX (nf_ct_helper_mutex);
net/netfilter/nf_conntrack_timeout.c +1 -0
@@ -19,6 +19,7 @@#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_extend.h> +#include <net/netfilter/nf_conntrack_l4proto.h> #include <net/netfilter/nf_conntrack_timeout.h> struct nf_ct_timeout *
net/netfilter/nf_flow_table_core.c +1 -0
@@ -11,6 +11,7 @@#include <net/netfilter/nf_flow_table.h> #include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_core.h> +#include <net/netfilter/nf_conntrack_l4proto.h> #include <net/netfilter/nf_conntrack_tuple.h> struct flow_offload_entry {
net/netfilter/nf_nat_core.c +3 -3
@@ -18,12 +18,12 @@#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_core.h> -#include <net/netfilter/nf_nat.h> -#include <net/netfilter/nf_nat_helper.h> #include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_seqadj.h> #include <net/netfilter/nf_conntrack_zones.h> -#include <linux/netfilter/nf_nat.h> +#include <net/netfilter/nf_nat.h> +#include <net/netfilter/nf_nat_helper.h> +#include <uapi/linux/netfilter/nf_nat.h> #include "nf_internals.h"
net/netfilter/nft_flow_offload.c +2 -1
@@ -6,12 +6,13 @@#include <linux/netfilter.h> #include <linux/workqueue.h> #include <linux/spinlock.h> +#include <linux/netfilter/nf_conntrack_common.h> #include <linux/netfilter/nf_tables.h> #include <net/ip.h> /* for ipv4 options. */ #include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_tables_core.h> #include <net/netfilter/nf_conntrack_core.h> -#include <linux/netfilter/nf_conntrack_common.h> +#include <net/netfilter/nf_conntrack_extend.h> #include <net/netfilter/nf_flow_table.h> struct nft_flow_offload {
net/netfilter/xt_connlimit.c +2 -0
@@ -13,6 +13,8 @@*/ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/ip.h> +#include <linux/ipv6.h> #include <linux/module.h> #include <linux/skbuff.h> #include <linux/netfilter/x_tables.h>
net/sched/act_ct.c +1 -1
@@ -24,12 +24,12 @@#include <uapi/linux/tc_act/tc_ct.h> #include <net/tc_act/tc_ct.h> -#include <linux/netfilter/nf_nat.h> #include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_zones.h> #include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/ipv6/nf_defrag_ipv6.h> +#include <uapi/linux/netfilter/nf_nat.h> static struct tc_action_ops act_ct_ops;static unsigned int ct_net_id;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 15/27 netfilter: remove nf_conntrack_icmpv6.h header.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
nf_conntrack_icmpv6.h contains two object macros which duplicate macros in linux/icmpv6.h. The latter definitions are also visible wherever it is included, so remove it.
--- include/net/netfilter/ipv6/nf_conntrack_icmpv6.h | 21 --------------------- include/net/netfilter/nf_conntrack.h | 1 - net/netfilter/nf_conntrack_proto_icmpv6.c | 1 - 3 files changed, 23 deletions(-) delete mode 100644 include/net/netfilter/ipv6/nf_conntrack_icmpv6.h
include/net/netfilter/ipv6/nf_conntrack_icmpv6.h deleted +0 -21
@@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* ICMPv6 tracking. -* -* 21 Apl 2004: Yasuyuki Kozakai @USAGI <[email protected]> -* - separated from nf_conntrack_icmp.h -* -* Derived from include/linux/netfiter_ipv4/ip_conntrack_icmp.h -*/ - -#ifndef _NF_CONNTRACK_ICMPV6_H -#define _NF_CONNTRACK_ICMPV6_H - -#ifndef ICMPV6_NI_QUERY -#define ICMPV6_NI_QUERY 139 -#endif -#ifndef ICMPV6_NI_REPLY -#define ICMPV6_NI_REPLY 140 -#endif - -#endif /* _NF_CONNTRACK_ICMPV6_H */
include/net/netfilter/nf_conntrack.h +0 -1
@@ -23,7 +23,6 @@#include <linux/netfilter/nf_conntrack_dccp.h> #include <linux/netfilter/nf_conntrack_sctp.h> #include <linux/netfilter/nf_conntrack_proto_gre.h> -#include <net/netfilter/ipv6/nf_conntrack_icmpv6.h> #include <net/netfilter/nf_conntrack_tuple.h>
net/netfilter/nf_conntrack_proto_icmpv6.c +0 -1
@@ -22,7 +22,6 @@#include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_timeout.h> #include <net/netfilter/nf_conntrack_zones.h> -#include <net/netfilter/ipv6/nf_conntrack_icmpv6.h> #include <net/netfilter/nf_log.h> static const unsigned int nf_ct_icmpv6_timeout =30 *HZ ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 16/27 netfilter: move inline nf_ip6_ext_hdr() function to a more appropriate header.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
There is an inline function in ip6_tables.h which is not specific to ip6tables and is used elswhere in netfilter. Move it into netfilter_ipv6.h and update the callers.
--- include/linux/netfilter_ipv6.h | 12 ++++++++++++ include/linux/netfilter_ipv6/ip6_tables.h | 12 ------------ net/ipv6/netfilter/ip6t_ipv6header.c | 4 ++-- net/ipv6/netfilter/nf_log_ipv6.c | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-)
include/linux/netfilter_ipv6.h +12 -0
@@ -10,6 +10,18 @@#include <uapi/linux/netfilter_ipv6.h> #include <net/tcp.h> +/* Check for an extension */ +static inline int +nf_ip6_ext_hdr (u8 nexthdr) +{return (nexthdr ==IPPROTO_HOPOPTS ) || + (nexthdr ==IPPROTO_ROUTING ) || + (nexthdr ==IPPROTO_FRAGMENT ) || + (nexthdr ==IPPROTO_ESP ) || + (nexthdr ==IPPROTO_AH ) || + (nexthdr ==IPPROTO_NONE ) || + (nexthdr ==IPPROTO_DSTOPTS ); +} +/* Extra routing may needed on local out, as the QUEUE target never returns * control to the table. */
include/linux/netfilter_ipv6/ip6_tables.h +0 -12
@@ -36,18 +36,6 @@ extern unsigned int ip6t_do_table(struct sk_buff *skb, struct xt_table *table);#endif -/* Check for an extension */ -static inline int -ip6t_ext_hdr (u8 nexthdr) -{return (nexthdr ==IPPROTO_HOPOPTS ) || - (nexthdr ==IPPROTO_ROUTING ) || - (nexthdr ==IPPROTO_FRAGMENT ) || - (nexthdr ==IPPROTO_ESP ) || - (nexthdr ==IPPROTO_AH ) || - (nexthdr ==IPPROTO_NONE ) || - (nexthdr ==IPPROTO_DSTOPTS ); -} -#ifdef CONFIG_COMPAT #include <net/compat.h>
net/ipv6/netfilter/ip6t_ipv6header.c +2 -2
@@ -16,7 +16,7 @@#include <net/ipv6.h> #include <linux/netfilter/x_tables.h> -#include <linux/netfilter_ipv6/ip6_tables.h> +#include <linux/netfilter_ipv6.h> #include <linux/netfilter_ipv6/ip6t_ipv6header.h> MODULE_LICENSE ("GPL" );
@@ -42,7 +42,7 @@ ipv6header_mt6(const struct sk_buff *skb, struct xt_action_param *par) len = skb->len - ptr; temp =0 ; -while (ip6t_ext_hdr (nexthdr)) { +while (nf_ip6_ext_hdr (nexthdr)) {const struct ipv6_opt_hdr *hp;struct ipv6_opt_hdr _hdr;int hdrlen;
net/ipv6/netfilter/nf_log_ipv6.c +2 -2
@@ -18,7 +18,7 @@#include <net/route.h> #include <linux/netfilter.h> -#include <linux/netfilter_ipv6/ip6_tables.h> +#include <linux/netfilter_ipv6.h> #include <linux/netfilter/xt_LOG.h> #include <net/netfilter/nf_log.h>
@@ -70,7 +70,7 @@ static void dump_ipv6_packet(struct net *net, struct nf_log_buf *m, fragment =0 ; ptr = ip6hoff +sizeof (struct ipv6hdr ); currenthdr = ih->nexthdr; -while (currenthdr !=NEXTHDR_NONE &&ip6t_ext_hdr (currenthdr)) { +while (currenthdr !=NEXTHDR_NONE &&nf_ip6_ext_hdr (currenthdr)) {struct ipv6_opt_hdr _hdr;const struct ipv6_opt_hdr *hp;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 17/27 netfilter: synproxy: move code between headers.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
There is some non-conntrack code in the nf_conntrack_synproxy.h header. Move it to the nf_synproxy.h header.
--- include/net/netfilter/nf_conntrack_synproxy.h | 39 --------------------------- include/net/netfilter/nf_synproxy.h | 38 ++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 39 deletions(-)
include/net/netfilter/nf_conntrack_synproxy.h +0 -39
@@ -43,43 +43,4 @@ static inline bool nf_ct_add_synproxy(struct nf_conn *ct, return true; } -struct synproxy_stats { -unsigned int syn_received; -unsigned int cookie_invalid; -unsigned int cookie_valid; -unsigned int cookie_retrans; -unsigned int conn_reopened; -}; - -struct synproxy_net { -struct nf_conn *tmpl; -struct synproxy_stats __percpu *stats; -unsigned int hook_ref4; -unsigned int hook_ref6; -}; - -extern unsigned int synproxy_net_id; -static inline struct synproxy_net *synproxy_pernet (struct net *net) -{ -return net_generic (net, synproxy_net_id); -} - -struct synproxy_options { -u8 options; -u8 wscale; -u16 mss_option; -u16 mss_encode; -u32 tsval; -u32 tsecr; -}; - -struct tcphdr ; -struct nf_synproxy_info ; -bool synproxy_parse_options (const struct sk_buff *skb,unsigned int doff, -const struct tcphdr *th, -struct synproxy_options *opts); - -void synproxy_init_timestamp_cookie (const struct nf_synproxy_info *info, -struct synproxy_options *opts); -#endif /* _NF_CONNTRACK_SYNPROXY_H */
include/net/netfilter/nf_synproxy.h +38 -0
@@ -11,6 +11,44 @@#include <net/netfilter/nf_conntrack_seqadj.h> #include <net/netfilter/nf_conntrack_synproxy.h> +struct synproxy_stats { +unsigned int syn_received; +unsigned int cookie_invalid; +unsigned int cookie_valid; +unsigned int cookie_retrans; +unsigned int conn_reopened; +}; + +struct synproxy_net { +struct nf_conn *tmpl; +struct synproxy_stats __percpu *stats; +unsigned int hook_ref4; +unsigned int hook_ref6; +}; + +extern unsigned int synproxy_net_id; +static inline struct synproxy_net *synproxy_pernet (struct net *net) +{ +return net_generic (net, synproxy_net_id); +} + +struct synproxy_options { +u8 options; +u8 wscale; +u16 mss_option; +u16 mss_encode; +u32 tsval; +u32 tsecr; +}; + +struct nf_synproxy_info ; +bool synproxy_parse_options (const struct sk_buff *skb,unsigned int doff, +const struct tcphdr *th, +struct synproxy_options *opts); + +void synproxy_init_timestamp_cookie (const struct nf_synproxy_info *info, +struct synproxy_options *opts); +void synproxy_send_client_synack (struct net *net,const struct sk_buff *skb,const struct tcphdr *th,const struct synproxy_options *opts);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 18/27 netfilter: move nf_bridge_frag_data struct definition to a more appropriate header.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
There is a struct definition function in nf_conntrack_bridge.h which is not specific to conntrack and is used elswhere in netfilter. Move it into netfilter_bridge.h.
--- include/linux/netfilter_bridge.h | 7 +++++++ include/linux/netfilter_ipv6.h | 14 +++++++------- include/net/netfilter/nf_conntrack_bridge.h | 7 ------- net/bridge/netfilter/nf_conntrack_bridge.c | 14 +++++++------- net/ipv6/netfilter.c | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-)
include/linux/netfilter_bridge.h +7 -0
@@ -5,6 +5,13 @@#include <uapi/linux/netfilter_bridge.h> #include <linux/skbuff.h> +struct nf_bridge_frag_data { +char mac[ETH_HLEN ]; +bool vlan_present; +u16 vlan_tci; +__be16 vlan_proto; +}; +#if IS_ENABLED (CONFIG_BRIDGE_NETFILTER )int br_handle_frame_finish (struct net *net,struct sock *sk,struct sk_buff *skb);
include/linux/netfilter_ipv6.h +7 -7
@@ -32,7 +32,7 @@ struct ip6_rt_info { };struct nf_queue_entry ; -struct nf_ct_bridge_frag_data ; +struct nf_bridge_frag_data ;/* * Hook functions for ipv6 to allow xt_* modules to be built-in even
@@ -61,9 +61,9 @@ struct nf_ipv6_ops {int (*br_defrag)(struct net *net,struct sk_buff *skb,u32 user);int (*br_fragment)(struct net *net,struct sock *sk,struct sk_buff *skb, -struct nf_ct_bridge_frag_data *data, +struct nf_bridge_frag_data *data,int (*output)(struct net *,struct sock *sk, -const struct nf_ct_bridge_frag_data *data, +const struct nf_bridge_frag_data *data,struct sk_buff *));#endif };
@@ -135,16 +135,16 @@ static inline int nf_ipv6_br_defrag(struct net *net, struct sk_buff *skb, }int br_ip6_fragment (struct net *net,struct sock *sk,struct sk_buff *skb, -struct nf_ct_bridge_frag_data *data, +struct nf_bridge_frag_data *data,int (*output)(struct net *,struct sock *sk, -const struct nf_ct_bridge_frag_data *data, +const struct nf_bridge_frag_data *data,struct sk_buff *));static inline int nf_br_ip6_fragment (struct net *net,struct sock *sk,struct sk_buff *skb, -struct nf_ct_bridge_frag_data *data, +struct nf_bridge_frag_data *data,int (*output)(struct net *,struct sock *sk, -const struct nf_ct_bridge_frag_data *data, +const struct nf_bridge_frag_data *data,struct sk_buff *)) {#if IS_MODULE (CONFIG_IPV6 )
include/net/netfilter/nf_conntrack_bridge.h +0 -7
@@ -16,11 +16,4 @@ struct nf_ct_bridge_info {void nf_ct_bridge_register (struct nf_ct_bridge_info *info);void nf_ct_bridge_unregister (struct nf_ct_bridge_info *info); -struct nf_ct_bridge_frag_data { -char mac[ETH_HLEN ]; -bool vlan_present; -u16 vlan_tci; -__be16 vlan_proto; -}; -#endif
net/bridge/netfilter/nf_conntrack_bridge.c +7 -7
@@ -26,9 +26,9 @@*/ static int nf_br_ip_fragment (struct net *net,struct sock *sk,struct sk_buff *skb, -struct nf_ct_bridge_frag_data *data, +struct nf_bridge_frag_data *data,int (*output)(struct net *,struct sock *sk, -const struct nf_ct_bridge_frag_data *data, +const struct nf_bridge_frag_data *data,struct sk_buff *)) {int frag_max_size =BR_INPUT_SKB_CB (skb)->frag_max_size;
@@ -278,7 +278,7 @@ static unsigned int nf_ct_bridge_pre(void *priv, struct sk_buff *skb, }static void nf_ct_bridge_frag_save (struct sk_buff *skb, -struct nf_ct_bridge_frag_data *data) +struct nf_bridge_frag_data *data) {if (skb_vlan_tag_present (skb)) { data->vlan_present = true;
@@ -293,10 +293,10 @@ static void nf_ct_bridge_frag_save(struct sk_buff *skb,static unsigned int nf_ct_bridge_refrag (struct sk_buff *skb,const struct nf_hook_state *state,int (*output)(struct net *,struct sock *sk, -const struct nf_ct_bridge_frag_data *data, +const struct nf_bridge_frag_data *data,struct sk_buff *)) { -struct nf_ct_bridge_frag_data data; +struct nf_bridge_frag_data data;if (!BR_INPUT_SKB_CB (skb)->frag_max_size)return NF_ACCEPT ;
@@ -319,7 +319,7 @@ nf_ct_bridge_refrag(struct sk_buff *skb, const struct nf_hook_state *state,/* Actually only slow path refragmentation needs this. */ static int nf_ct_bridge_frag_restore (struct sk_buff *skb, -const struct nf_ct_bridge_frag_data *data) +const struct nf_bridge_frag_data *data) {int err;
@@ -340,7 +340,7 @@ static int nf_ct_bridge_frag_restore(struct sk_buff *skb, }static int nf_ct_bridge_refrag_post (struct net *net,struct sock *sk, -const struct nf_ct_bridge_frag_data *data, +const struct nf_bridge_frag_data *data,struct sk_buff *skb) {int err;
net/ipv6/netfilter.c +2 -2
@@ -113,9 +113,9 @@ int __nf_ip6_route(struct net *net, struct dst_entry **dst,EXPORT_SYMBOL_GPL (__nf_ip6_route);int br_ip6_fragment (struct net *net,struct sock *sk,struct sk_buff *skb, -struct nf_ct_bridge_frag_data *data, +struct nf_bridge_frag_data *data,int (*output)(struct net *,struct sock *sk, -const struct nf_ct_bridge_frag_data *data, +const struct nf_bridge_frag_data *data,struct sk_buff *)) {int frag_max_size =BR_INPUT_SKB_CB (skb)->frag_max_size;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 19/27 netfilter: conntrack: use consistent style when defining inline functions
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
The header contains some inline functions defined as:
static inline f (...)
{
#ifdef CONFIG_NF_CONNTRACK_EVENTS
...
#else
...
#endif
}and a few others as:
#ifdef CONFIG_NF_CONNTRACK_EVENTS
static inline f (...)
{
...
}
#else
static inline f (...)
{
...
}
#endifPrefer the former style, which is more numerous.
--- include/net/netfilter/nf_conntrack_ecache.h | 82 ++++++++++++++++++----------- 1 file changed, 50 insertions(+), 32 deletions(-)
include/net/netfilter/nf_conntrack_ecache.h +50 -32
@@ -64,6 +64,7 @@ nf_ct_ecache_ext_add(struct nf_conn *ct, u16 ctmask, u16 expmask, gfp_t gfp) } #ifdef CONFIG_NF_CONNTRACK_EVENTS + /* This structure is passed to event handler */ struct nf_ct_event { struct nf_conn *ct;
@@ -84,9 +85,26 @@ void nf_ct_deliver_cached_events(struct nf_conn *ct);int nf_conntrack_eventmask_report (unsigned int eventmask,struct nf_conn *ct,u32 portid,int report); +#else + +static inline void nf_ct_deliver_cached_events (const struct nf_conn *ct) +{ +} + +static inline int nf_conntrack_eventmask_report (unsigned int eventmask, +struct nf_conn *ct, +u32 portid, +int report) +{ +return 0 ; +} + +#endif +static inline void nf_conntrack_event_cache (enum ip_conntrack_events event,struct nf_conn *ct) { +#ifdef CONFIG_NF_CONNTRACK_EVENTS struct net *net =nf_ct_net (ct);struct nf_conntrack_ecache *e;
@@ -98,31 +116,42 @@ nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct)return ;set_bit (event, &e->cache); +#endif }static inline int nf_conntrack_event_report (enum ip_conntrack_events event,struct nf_conn *ct,u32 portid,int report) { +#ifdef CONFIG_NF_CONNTRACK_EVENTS const struct net *net =nf_ct_net (ct);if (!rcu_access_pointer (net->ct.nf_conntrack_event_cb))return 0 ;return nf_conntrack_eventmask_report (1 << event, ct, portid, report); +#else +return 0 ; +#endif }static inline int nf_conntrack_event (enum ip_conntrack_events event,struct nf_conn *ct) { +#ifdef CONFIG_NF_CONNTRACK_EVENTS const struct net *net =nf_ct_net (ct);if (!rcu_access_pointer (net->ct.nf_conntrack_event_cb))return 0 ;return nf_conntrack_eventmask_report (1 << event, ct,0 ,0 ); +#else +return 0 ; +#endif } +#ifdef CONFIG_NF_CONNTRACK_EVENTS + struct nf_exp_event { struct nf_conntrack_expect *exp; u32 portid;
@@ -148,41 +177,18 @@ void nf_conntrack_ecache_pernet_fini(struct net *net);int nf_conntrack_ecache_init (void );void nf_conntrack_ecache_fini (void ); -static inline void nf_conntrack_ecache_delayed_work (struct net *net) +#else /* CONFIG_NF_CONNTRACK_EVENTS */ + +static inline void nf_ct_expect_event_report (enum ip_conntrack_expect_events e, +struct nf_conntrack_expect *exp, +u32 portid, +int report) { -if (!delayed_work_pending (&net->ct.ecache_dwork)) { -schedule_delayed_work (&net->ct.ecache_dwork,HZ ); - net->ct.ecache_dwork_pending = true; - } } -static inline void nf_conntrack_ecache_work (struct net *net) +static inline void nf_conntrack_ecache_pernet_init (struct net *net) { -if (net->ct.ecache_dwork_pending) { - net->ct.ecache_dwork_pending = false; -mod_delayed_work (system_wq, &net->ct.ecache_dwork,0 ); - } } -#else /* CONFIG_NF_CONNTRACK_EVENTS */ -static inline void nf_conntrack_event_cache (enum ip_conntrack_events event, -struct nf_conn *ct) {} -static inline int nf_conntrack_eventmask_report (unsigned int eventmask, -struct nf_conn *ct, -u32 portid, -int report) {return 0 ; } -static inline int nf_conntrack_event (enum ip_conntrack_events event, -struct nf_conn *ct) {return 0 ; } -static inline int nf_conntrack_event_report (enum ip_conntrack_events event, -struct nf_conn *ct, -u32 portid, -int report) {return 0 ; } -static inline void nf_ct_deliver_cached_events (const struct nf_conn *ct) {} -static inline void nf_ct_expect_event_report (enum ip_conntrack_expect_events e, -struct nf_conntrack_expect *exp, -u32 portid, -int report) {} - -static inline void nf_conntrack_ecache_pernet_init (struct net *net) {}static inline void nf_conntrack_ecache_pernet_fini (struct net *net) {
@@ -197,14 +203,26 @@ static inline void nf_conntrack_ecache_fini(void) { } +#endif /* CONFIG_NF_CONNTRACK_EVENTS */ +static inline void nf_conntrack_ecache_delayed_work (struct net *net) { +#ifdef CONFIG_NF_CONNTRACK_EVENTS +if (!delayed_work_pending (&net->ct.ecache_dwork)) { +schedule_delayed_work (&net->ct.ecache_dwork,HZ ); + net->ct.ecache_dwork_pending = true; + } +#endif }static inline void nf_conntrack_ecache_work (struct net *net) { +#ifdef CONFIG_NF_CONNTRACK_EVENTS +if (net->ct.ecache_dwork_pending) { + net->ct.ecache_dwork_pending = false; +mod_delayed_work (system_wq, &net->ct.ecache_dwork,0 ); + } +#endif } -#endif /* CONFIG_NF_CONNTRACK_EVENTS */ #endif /*_NF_CONNTRACK_ECACHE_H*/ -
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 20/27 netfilter: replace defined(CONFIG...) || defined(CONFIG...MODULE) with IS_ENABLED(CONFIG...).
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
A few headers contain instances of:
#if defined(CONFIG_XXX) or defined(CONFIG_XXX_MODULE)
Replace them with:
#if IS_ENABLED(CONFIG_XXX)
--- include/linux/netfilter.h | 2 +- include/linux/netfilter/ipset/ip_set_getport.h | 2 +- include/net/netfilter/nf_conntrack_extend.h | 2 +- include/net/netfilter/nf_nat.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
include/linux/netfilter.h +1 -1
@@ -422,7 +422,7 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family) }#endif /*CONFIG_NETFILTER*/ -#if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE ) +#if IS_ENABLED (CONFIG_NF_CONNTRACK )#include <linux/netfilter/nf_conntrack_zones_common.h> extern void (*ip_ct_attach)(struct sk_buff *,const struct sk_buff *)__rcu ;
include/linux/netfilter/ipset/ip_set_getport.h +1 -1
@@ -9,7 +9,7 @@extern bool ip_set_get_ip4_port (const struct sk_buff *skb,bool src,__be16 *port,u8 *proto); -#if defined(CONFIG_IP6_NF_IPTABLES ) || defined(CONFIG_IP6_NF_IPTABLES_MODULE ) +#if IS_ENABLED (CONFIG_IP6_NF_IPTABLES )extern bool ip_set_get_ip6_port (const struct sk_buff *skb,bool src,__be16 *port,u8 *proto);#else
include/net/netfilter/nf_conntrack_extend.h +1 -1
@@ -8,7 +8,7 @@enum nf_ct_ext_id {NF_CT_EXT_HELPER , -#if defined(CONFIG_NF_NAT ) || defined(CONFIG_NF_NAT_MODULE ) +#if IS_ENABLED (CONFIG_NF_NAT )NF_CT_EXT_NAT ,#endif NF_CT_EXT_SEQADJ ,
include/net/netfilter/nf_nat.h +2 -2
@@ -22,7 +22,7 @@ enum nf_nat_manip_type {/* per conntrack: nat application helper private data */ union nf_conntrack_nat_help {/* insert nat helper private data here */ -#if defined(CONFIG_NF_NAT_PPTP ) || defined(CONFIG_NF_NAT_PPTP_MODULE ) +#if IS_ENABLED (CONFIG_NF_NAT_PPTP )struct nf_nat_pptp nat_pptp_info;#endif };
@@ -47,7 +47,7 @@ struct nf_conn_nat *nf_ct_nat_ext_add(struct nf_conn *ct);static inline struct nf_conn_nat *nfct_nat (const struct nf_conn *ct) { -#if defined(CONFIG_NF_NAT ) || defined(CONFIG_NF_NAT_MODULE ) +#if IS_ENABLED (CONFIG_NF_NAT )return nf_ct_ext_find (ct,NF_CT_EXT_NAT );#else return NULL ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 21/27 netfilter: conntrack: wrap two inline functions in config checks.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
nf_conntrack_synproxy.h contains three inline functions. The contents of two of them are wrapped in CONFIG_NETFILTER_SYNPROXY checks and just return NULL if it is not enabled. The third does nothing if they return NULL, so wrap its contents as well.
nf_ct_timeout_data is only called if CONFIG_NETFILTER_TIMEOUT is enabled. Wrap its contents in a CONFIG_NETFILTER_TIMEOUT check like the other inline functions in nf_conntrack_timeout.h.
--- include/net/netfilter/nf_conntrack_synproxy.h | 2 ++ include/net/netfilter/nf_conntrack_timeout.h | 4 ++++ 2 files changed, 6 insertions(+)
include/net/netfilter/nf_conntrack_synproxy.h +2 -0
@@ -32,6 +32,7 @@ static inline struct nf_conn_synproxy *nfct_synproxy_ext_add(struct nf_conn *ct)static inline bool nf_ct_add_synproxy (struct nf_conn *ct,const struct nf_conn *tmpl) { +#if IS_ENABLED (CONFIG_NETFILTER_SYNPROXY )if (tmpl &&nfct_synproxy (tmpl)) {if (!nfct_seqadj_ext_add (ct))return false;
@@ -39,6 +40,7 @@ static inline bool nf_ct_add_synproxy(struct nf_conn *ct,if (!nfct_synproxy_ext_add (ct)) return false; } +#endif return true; }
include/net/netfilter/nf_conntrack_timeout.h +4 -0
@@ -32,6 +32,7 @@ struct nf_conn_timeout {static inline unsigned int *nf_ct_timeout_data (const struct nf_conn_timeout *t) { +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT struct nf_ct_timeout *timeout; timeout =rcu_dereference (t->timeout);
@@ -39,6 +40,9 @@ nf_ct_timeout_data(const struct nf_conn_timeout *t)return NULL ;return (unsigned int *)timeout->data; +#else +return NULL ; +#endif } static inline
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 22/27 netfilter: br_netfilter: update stub br_nf_pre_routing_ipv6 parameter to `void *priv`.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
The real br_nf_pre_routing_ipv6 function, defined when CONFIG_IPV6 is enabled, expects void *priv, not const struct nf_hook_ops *ops. Update the stub br_nf_pre_routing_ipv6, defined when CONFIG_IPV6 is disabled, to match.
--- include/net/netfilter/br_netfilter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/netfilter/br_netfilter.h +1 -1
@@ -68,7 +68,7 @@ static inline int br_validate_ipv6(struct net *net, struct sk_buff *skb) }static inline unsigned int -br_nf_pre_routing_ipv6 (const struct nf_hook_ops *ops,struct sk_buff *skb, +br_nf_pre_routing_ipv6 (void *priv,struct sk_buff *skb,const struct nf_hook_state *state) {return NF_ACCEPT ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 23/27 netfilter: conntrack: move code to linux/nf_conntrack_common.h.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
Move some struct nf_conntrack code from linux/skbuff.h to linux/nf_conntrack_common.h. Together with a couple of helpers for getting and setting skb->_nfct, it allows us to remove CONFIG_NF_CONNTRACK checks from net/netfilter/nf_conntrack.h.
--- include/linux/netfilter/nf_conntrack_common.h | 20 +++++++++++++++++ include/linux/skbuff.h | 32 +++++++++++++-------------- include/net/netfilter/nf_conntrack.h | 24 +++++--------------- net/netfilter/nf_conntrack_standalone.c | 1 - 4 files changed, 40 insertions(+), 37 deletions(-)
include/linux/netfilter/nf_conntrack_common.h +20 -0
@@ -2,6 +2,7 @@#ifndef _NF_CONNTRACK_COMMON_H#define _NF_CONNTRACK_COMMON_H +#include <linux/atomic.h> #include <uapi/linux/netfilter/nf_conntrack_common.h> struct ip_conntrack_stat {
@@ -19,4 +20,23 @@ struct ip_conntrack_stat { unsigned int search_restart; }; +#define NFCT_INFOMASK 7UL +#define NFCT_PTRMASK ~(NFCT_INFOMASK) + +struct nf_conntrack { +atomic_t use; +}; + +void nf_conntrack_destroy (struct nf_conntrack *nfct); +static inline void nf_conntrack_put (struct nf_conntrack *nfct) +{ +if (nfct &&atomic_dec_and_test (&nfct->use)) +nf_conntrack_destroy (nfct); +} +static inline void nf_conntrack_get (struct nf_conntrack *nfct) +{ +if (nfct) +atomic_inc (&nfct->use); +} +#endif /* _NF_CONNTRACK_COMMON_H */
include/linux/skbuff.h +15 -17
@@ -37,6 +37,9 @@#include <linux/in6.h> #include <linux/if_packet.h> #include <net/flow.h> +#if IS_ENABLED (CONFIG_NF_CONNTRACK ) +#include <linux/netfilter/nf_conntrack_common.h> +#endif /* The interface for checksum offload between the stack and networking drivers * is as follows...
@@ -244,12 +247,6 @@ struct bpf_prog;union bpf_attr ;struct skb_ext ; -#if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE ) -struct nf_conntrack { -atomic_t use; -}; -#endif - #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) struct nf_bridge_info { enum {
@@ -914,7 +911,6 @@ static inline bool skb_pfmemalloc(const struct sk_buff *skb)#define SKB_DST_NOREF 1UL#define SKB_DST_PTRMASK ~(SKB_DST_NOREF) -#define SKB_NFCT_PTRMASK ~(7UL)/** * skb_dst - returns skb dst_entry * @skb: buffer
@@ -4040,25 +4036,27 @@ static inline void skb_remcsum_process(struct sk_buff *skb, void *ptr,static inline struct nf_conntrack *skb_nfct (const struct sk_buff *skb) {#if IS_ENABLED (CONFIG_NF_CONNTRACK ) -return (void *)(skb->_nfct &SKB_NFCT_PTRMASK ); +return (void *)(skb->_nfct &NFCT_PTRMASK );#else return NULL ;#endif } -#if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE ) -void nf_conntrack_destroy (struct nf_conntrack *nfct); -static inline void nf_conntrack_put (struct nf_conntrack *nfct) +static inline unsigned long skb_get_nfct (const struct sk_buff *skb) { -if (nfct &&atomic_dec_and_test (&nfct->use)) -nf_conntrack_destroy (nfct); +#if IS_ENABLED (CONFIG_NF_CONNTRACK ) +return skb->_nfct; +#else +return 0UL ; +#endif } -static inline void nf_conntrack_get (struct nf_conntrack *nfct) + +static inline void skb_set_nfct (struct sk_buff *skb,unsigned long nfct) { -if (nfct) -atomic_inc (&nfct->use); -} +#if IS_ENABLED (CONFIG_NF_CONNTRACK ) + skb->_nfct = nfct;#endif +}#ifdef CONFIG_SKB_EXTENSIONS enum skb_ext_id {
include/net/netfilter/nf_conntrack.h +5 -19
@@ -13,12 +13,10 @@#ifndef _NF_CONNTRACK_H#define _NF_CONNTRACK_H -#include <linux/netfilter/nf_conntrack_common.h> -#include <linux/bitops.h> #include <linux/compiler.h> -#include <linux/atomic.h> +#include <linux/netfilter/nf_conntrack_common.h> #include <linux/netfilter/nf_conntrack_tcp.h> #include <linux/netfilter/nf_conntrack_dccp.h> #include <linux/netfilter/nf_conntrack_sctp.h>
@@ -58,7 +56,6 @@ struct nf_conntrack_net {#include <net/netfilter/ipv6/nf_conntrack_ipv6.h> struct nf_conn { -#if IS_ENABLED (CONFIG_NF_CONNTRACK )/* Usage count in here is 1 for hash table, 1 per skb, * plus 1 for any connection(s) we are `master' for *
@@ -68,7 +65,6 @@ struct nf_conn {* beware nf_ct_get() is different and don't inc refcnt. */ struct nf_conntrack ct_general; -#endif spinlock_t lock;/* jiffies32 when this ct is considered dead */
@@ -149,18 +145,14 @@ void nf_conntrack_alter_reply(struct nf_conn *ct,int nf_conntrack_tuple_taken (const struct nf_conntrack_tuple *tuple,const struct nf_conn *ignored_conntrack); -#if IS_ENABLED (CONFIG_NF_CONNTRACK ) - -#define NFCT_INFOMASK 7UL -#define NFCT_PTRMASK ~(NFCT_INFOMASK) -/* Return conntrack_info and tuple hash for given skb. */ static inline struct nf_conn *nf_ct_get (const struct sk_buff *skb,enum ip_conntrack_info *ctinfo) { - *ctinfo = skb->_nfct &NFCT_INFOMASK ; +unsigned long nfct =skb_get_nfct (skb); -return (struct nf_conn *)(skb->_nfct &NFCT_PTRMASK ); + *ctinfo = nfct &NFCT_INFOMASK ; +return (struct nf_conn *)(nfct &NFCT_PTRMASK ); }/* decrement reference count on a conntrack */
@@ -170,8 +162,6 @@ static inline void nf_ct_put(struct nf_conn *ct)nf_conntrack_put (&ct->ct_general); } -#endif -/* Protocol module loading */ int nf_ct_l3proto_try_module_get (unsigned short l3proto);void nf_ct_l3proto_module_put (unsigned short l3proto);
@@ -323,16 +313,12 @@ void nf_ct_tmpl_free(struct nf_conn *tmpl);u32 nf_ct_get_id (const struct nf_conn *ct); -#if IS_ENABLED (CONFIG_NF_CONNTRACK ) -static inline void nf_ct_set (struct sk_buff *skb,struct nf_conn *ct,enum ip_conntrack_info info) { - skb->_nfct = (unsigned long )ct | info; +skb_set_nfct (skb, (unsigned long )ct | info); } -#endif -#define NF_CT_STAT_INC (net, count) __this_cpu_inc((net)->ct.stat->count)#define NF_CT_STAT_INC_ATOMIC (net, count) this_cpu_inc((net)->ct.stat->count)#define NF_CT_STAT_ADD_ATOMIC (net, count, v) this_cpu_add((net)->ct.stat->count, (v))
net/netfilter/nf_conntrack_standalone.c +0 -1
@@ -1167,7 +1167,6 @@ static int __init nf_conntrack_standalone_init(void)if (ret <0 ) goto out_start; -BUILD_BUG_ON (SKB_NFCT_PTRMASK !=NFCT_PTRMASK );BUILD_BUG_ON (NFCT_INFOMASK <=IP_CT_NUMBER );#ifdef CONFIG_SYSCTL
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 24/27 netfilter: conntrack: remove CONFIG_NF_CONNTRACK check from nf_conntrack_acct.h.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
There is a superfluous #if IS_ENABLED(CONFIG_NF_CONNTRACK) check wrapping some function declarations. Remove it.
--- include/net/netfilter/nf_conntrack_acct.h | 2 -- 1 file changed, 2 deletions(-)
include/net/netfilter/nf_conntrack_acct.h +0 -2
@@ -65,11 +65,9 @@ static inline void nf_ct_set_acct(struct net *net, bool enable) #endif } -#if IS_ENABLED (CONFIG_NF_CONNTRACK )void nf_conntrack_acct_pernet_init (struct net *net);int nf_conntrack_acct_init (void );void nf_conntrack_acct_fini (void ); -#endif /* IS_ENABLED(CONFIG_NF_CONNTRACK) */ #endif /* _NF_CONNTRACK_ACCT_H */
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 25/27 netfilter: remove CONFIG_NETFILTER checks from headers.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
struct nf_hook_ops, struct nf_hook_state and the nf_hookfn function typedef appear in function and struct declarations and definitions in a number of netfilter headers. The structs and typedef themselves are defined by linux/netfilter.h but only when CONFIG_NETFILTER is enabled. Define them unconditionally and add forward declarations in order to remove CONFIG_NETFILTER conditionals from the other headers.
--- include/linux/netfilter.h | 2 +- include/linux/netfilter/x_tables.h | 6 ------ include/linux/netfilter_arp/arp_tables.h | 2 -- include/linux/netfilter_bridge/ebtables.h | 3 +-- include/linux/netfilter_ipv4/ip_tables.h | 7 +------ include/linux/netfilter_ipv6/ip6_tables.h | 5 +---- include/net/netfilter/br_netfilter.h | 2 -- include/net/netfilter/nf_conntrack_bridge.h | 4 ++-- include/net/netfilter/nf_conntrack_core.h | 5 ++--- include/net/netfilter/nf_conntrack_l4proto.h | 2 -- include/net/netfilter/nf_conntrack_tuple.h | 2 -- include/net/netfilter/nf_flow_table.h | 4 ---- include/net/netfilter/nf_nat.h | 4 ---- include/net/netfilter/nf_queue.h | 4 ---- include/net/netfilter/nf_synproxy.h | 6 ++---- include/net/netfilter/nf_tables.h | 8 -------- 16 files changed, 10 insertions(+), 56 deletions(-)
include/linux/netfilter.h +1 -1
@@ -15,7 +15,6 @@#include <linux/netdevice.h> #include <net/net_namespace.h> -#ifdef CONFIG_NETFILTER static inline int NF_DROP_GETERR (int verdict) {return -(verdict >>NF_VERDICT_QBITS );
@@ -118,6 +117,7 @@ struct nf_hook_entries {*/ }; +#ifdef CONFIG_NETFILTER static inline struct nf_hook_ops **nf_hook_entries_get_hook_ops (const struct nf_hook_entries *e) {unsigned int n = e->num_hook_entries;
include/linux/netfilter/x_tables.h +0 -6
@@ -35,15 +35,12 @@ struct xt_action_param {union {const void *matchinfo, *targinfo; }; -#if IS_ENABLED (CONFIG_NETFILTER )const struct nf_hook_state *state; -#endif int fragoff;unsigned int thoff;bool hotdrop; }; -#if IS_ENABLED (CONFIG_NETFILTER )static inline struct net *xt_net (const struct xt_action_param *par) {return par->state->net;
@@ -78,7 +75,6 @@ static inline u_int8_t xt_family(const struct xt_action_param *par) {return par->state->pf; } -#endif /** * struct xt_mtchk_param - parameters for match extensions'
@@ -450,9 +446,7 @@ xt_get_per_cpu_counter(struct xt_counters *cnt, unsigned int cpu)return cnt; } -#if IS_ENABLED (CONFIG_NETFILTER )struct nf_hook_ops *xt_hook_ops_alloc (const struct xt_table *,nf_hookfn *); -#endif #ifdef CONFIG_COMPAT #include <net/compat.h>
include/linux/netfilter_arp/arp_tables.h +0 -2
@@ -49,7 +49,6 @@ struct arpt_error { }extern void *arpt_alloc_initial_table (const struct xt_table *); -#if IS_ENABLED (CONFIG_NETFILTER )int arpt_register_table (struct net *net,const struct xt_table *table,const struct arpt_replace *repl,const struct nf_hook_ops *ops,struct xt_table **res);
@@ -58,7 +57,6 @@ void arpt_unregister_table(struct net *net, struct xt_table *table,extern unsigned int arpt_do_table (struct sk_buff *skb,const struct nf_hook_state *state,struct xt_table *table); -#endif #ifdef CONFIG_COMPAT #include <net/compat.h>
include/linux/netfilter_bridge/ebtables.h +1 -2
@@ -105,7 +105,7 @@ struct ebt_table {#define EBT_ALIGN (s) (((s) + (__alignof__(struct _xt_align)-1)) & \ ~(__alignof__(struct _xt_align)-1)) -#if IS_ENABLED (CONFIG_NETFILTER ) + extern int ebt_register_table(struct net *net, const struct ebt_table *table, const struct nf_hook_ops *ops,
@@ -115,7 +115,6 @@ extern void ebt_unregister_table(struct net *net, struct ebt_table *table,extern unsigned int ebt_do_table (struct sk_buff *skb,const struct nf_hook_state *state,struct ebt_table *table); -#endif /* True if the hook mask denotes that the rule is in a base chain, * used in the check() functions */
include/linux/netfilter_ipv4/ip_tables.h +1 -6
@@ -17,19 +17,16 @@#include <linux/if.h> #include <linux/in.h> +#include <linux/init.h> #include <linux/ip.h> #include <linux/skbuff.h> - -#include <linux/init.h> #include <uapi/linux/netfilter_ipv4/ip_tables.h> -#if IS_ENABLED (CONFIG_NETFILTER )int ipt_register_table (struct net *net,const struct xt_table *table,const struct ipt_replace *repl,const struct nf_hook_ops *ops,struct xt_table **res);void ipt_unregister_table (struct net *net,struct xt_table *table,const struct nf_hook_ops *ops); -#endif /* Standard entry. */ struct ipt_standard {
@@ -65,11 +62,9 @@ struct ipt_error { }extern void *ipt_alloc_initial_table (const struct xt_table *); -#if IS_ENABLED (CONFIG_NETFILTER )extern unsigned int ipt_do_table (struct sk_buff *skb,const struct nf_hook_state *state,struct xt_table *table); -#endif #ifdef CONFIG_COMPAT #include <net/compat.h>
include/linux/netfilter_ipv6/ip6_tables.h +1 -4
@@ -17,15 +17,13 @@#include <linux/if.h> #include <linux/in6.h> +#include <linux/init.h> #include <linux/ipv6.h> #include <linux/skbuff.h> - -#include <linux/init.h> #include <uapi/linux/netfilter_ipv6/ip6_tables.h> extern void *ip6t_alloc_initial_table (const struct xt_table *); -#if IS_ENABLED (CONFIG_NETFILTER )int ip6t_register_table (struct net *net,const struct xt_table *table,const struct ip6t_replace *repl,const struct nf_hook_ops *ops,struct xt_table **res);
@@ -34,7 +32,6 @@ void ip6t_unregister_table(struct net *net, struct xt_table *table,extern unsigned int ip6t_do_table (struct sk_buff *skb,const struct nf_hook_state *state,struct xt_table *table); -#endif #ifdef CONFIG_COMPAT #include <net/compat.h>
include/net/netfilter/br_netfilter.h +0 -2
@@ -55,7 +55,6 @@ static inline struct rtable *bridge_parent_rtable(const struct net_device *dev)struct net_device *setup_pre_routing (struct sk_buff *skb,const struct net *net); -#if IS_ENABLED (CONFIG_NETFILTER )#if IS_ENABLED (CONFIG_IPV6 )int br_validate_ipv6 (struct net *net,struct sk_buff *skb); unsigned int br_nf_pre_routing_ipv6(void *priv,
@@ -74,6 +73,5 @@ br_nf_pre_routing_ipv6(void *priv, struct sk_buff *skb,return NF_ACCEPT ; }#endif -#endif #endif /* _BR_NETFILTER_H_ */
include/net/netfilter/nf_conntrack_bridge.h +2 -2
@@ -5,10 +5,10 @@#include <linux/types.h> #include <uapi/linux/if_ether.h> +struct nf_hook_ops ; +struct nf_ct_bridge_info { -#if IS_ENABLED (CONFIG_NETFILTER )struct nf_hook_ops *ops; -#endif unsigned int ops_size;struct module *me; };
include/net/netfilter/nf_conntrack_core.h +2 -3
@@ -22,9 +22,8 @@standalone connection tracking module, and the compatibility layer's use of connection tracking. */ -#if IS_ENABLED (CONFIG_NETFILTER ) -unsigned int nf_conntrack_in (struct sk_buff *skb,const struct nf_hook_state *state); -#endif +unsigned int nf_conntrack_in (struct sk_buff *skb, +const struct nf_hook_state *state);int nf_conntrack_init_net (struct net *net);void nf_conntrack_cleanup_net (struct net *net);
include/net/netfilter/nf_conntrack_l4proto.h +0 -2
@@ -75,7 +75,6 @@ bool nf_conntrack_invert_icmp_tuple(struct nf_conntrack_tuple *tuple,bool nf_conntrack_invert_icmpv6_tuple (struct nf_conntrack_tuple *tuple,const struct nf_conntrack_tuple *orig); -#if IS_ENABLED (CONFIG_NETFILTER ) int nf_conntrack_inet_error(struct nf_conn *tmpl, struct sk_buff *skb, unsigned int dataoff, const struct nf_hook_state *state,
@@ -132,7 +131,6 @@ int nf_conntrack_gre_packet(struct nf_conn *ct,unsigned int dataoff, enum ip_conntrack_info ctinfo, const struct nf_hook_state *state); -#endif void nf_conntrack_generic_init_net (struct net *net);void nf_conntrack_tcp_init_net (struct net *net);
include/net/netfilter/nf_conntrack_tuple.h +0 -2
@@ -121,7 +121,6 @@ struct nf_conntrack_tuple_hash {struct nf_conntrack_tuple tuple; }; -#if IS_ENABLED (CONFIG_NETFILTER )static inline bool __nf_ct_tuple_src_equal (const struct nf_conntrack_tuple *t1,const struct nf_conntrack_tuple *t2) {
@@ -184,6 +183,5 @@ nf_ct_tuple_mask_cmp(const struct nf_conntrack_tuple *t,return nf_ct_tuple_src_mask_cmp (t, tuple, mask) && __nf_ct_tuple_dst_equal(t, tuple); } -#endif #endif /* _NF_CONNTRACK_TUPLE_H */
include/net/netfilter/nf_flow_table.h +0 -4
@@ -17,9 +17,7 @@ struct nf_flowtable_type {int family;int (*init)(struct nf_flowtable *ft);void (*free)(struct nf_flowtable *ft); -#if IS_ENABLED (CONFIG_NETFILTER )nf_hookfn *hook; -#endif struct module *owner; };
@@ -117,12 +115,10 @@ struct flow_ports {__be16 source, dest; }; -#if IS_ENABLED (CONFIG_NETFILTER )unsigned int nf_flow_offload_ip_hook (void *priv,struct sk_buff *skb,const struct nf_hook_state *state);unsigned int nf_flow_offload_ipv6_hook (void *priv,struct sk_buff *skb,const struct nf_hook_state *state); -#endif #define MODULE_ALIAS_NF_FLOWTABLE (family) \ MODULE_ALIAS("nf-flowtable-" __stringify(family))
include/net/netfilter/nf_nat.h +0 -4
@@ -68,12 +68,10 @@ static inline bool nf_nat_oif_changed(unsigned int hooknum,#endif } -#if IS_ENABLED (CONFIG_NETFILTER )int nf_nat_register_fn (struct net *net,u8 pf,const struct nf_hook_ops *ops,const struct nf_hook_ops *nat_ops,unsigned int ops_count);void nf_nat_unregister_fn (struct net *net,u8 pf,const struct nf_hook_ops *ops,unsigned int ops_count); -#endif unsigned int nf_nat_packet (struct nf_conn *ct,enum ip_conntrack_info ctinfo,unsigned int hooknum,struct sk_buff *skb);
@@ -93,7 +91,6 @@ int nf_nat_icmpv6_reply_translation(struct sk_buff *skb, struct nf_conn *ct,enum ip_conntrack_info ctinfo, unsigned int hooknum, unsigned int hdrlen); -#if IS_ENABLED (CONFIG_NETFILTER )int nf_nat_ipv4_register_fn (struct net *net,const struct nf_hook_ops *ops);void nf_nat_ipv4_unregister_fn (struct net *net,const struct nf_hook_ops *ops);
@@ -106,7 +103,6 @@ void nf_nat_inet_unregister_fn(struct net *net, const struct nf_hook_ops *ops);unsigned int nf_nat_inet_fn (void *priv,struct sk_buff *skb,const struct nf_hook_state *state); -#endif int nf_xfrm_me_harder (struct net *n,struct sk_buff *s,unsigned int family);
include/net/netfilter/nf_queue.h +0 -4
@@ -15,9 +15,7 @@ struct nf_queue_entry {unsigned int id;unsigned int hook_index;/* index in hook_entries->hook[] */ -#if IS_ENABLED (CONFIG_NETFILTER )struct nf_hook_state state; -#endif u16 size;/* sizeof(entry) + saved route keys */ /* extra space to store route keys */
@@ -123,9 +121,7 @@ nfqueue_hash(const struct sk_buff *skb, u16 queue, u16 queues_total, u8 family, return queue; } -#if IS_ENABLED (CONFIG_NETFILTER )int nf_queue (struct sk_buff *skb,struct nf_hook_state *state,unsigned int index,unsigned int verdict); -#endif #endif /* _NF_QUEUE_H */
include/net/netfilter/nf_synproxy.h +2 -4
@@ -58,10 +58,10 @@ bool synproxy_recv_client_ack(struct net *net,const struct tcphdr *th, struct synproxy_options *opts, u32 recv_seq); -#if IS_ENABLED (CONFIG_NETFILTER ) +struct nf_hook_state ; +unsigned int ipv4_synproxy_hook (void *priv,struct sk_buff *skb,const struct nf_hook_state *nhs); -#endif int nf_synproxy_ipv4_init (struct synproxy_net *snet,struct net *net);void nf_synproxy_ipv4_fini (struct synproxy_net *snet,struct net *net);
@@ -75,10 +75,8 @@ bool synproxy_recv_client_ack_ipv6(struct net *net, const struct sk_buff *skb,const struct tcphdr *th, struct synproxy_options *opts, u32 recv_seq); -#if IS_ENABLED (CONFIG_NETFILTER )unsigned int ipv6_synproxy_hook (void *priv,struct sk_buff *skb,const struct nf_hook_state *nhs); -#endif int nf_synproxy_ipv6_init (struct synproxy_net *snet,struct net *net);void nf_synproxy_ipv6_fini (struct synproxy_net *snet,struct net *net);#else
include/net/netfilter/nf_tables.h +0 -8
@@ -26,7 +26,6 @@ struct nft_pktinfo {struct xt_action_param xt; }; -#if IS_ENABLED (CONFIG_NETFILTER )static inline struct net *nft_net (const struct nft_pktinfo *pkt) {return pkt->xt.state->net;
@@ -59,7 +58,6 @@ static inline void nft_set_pktinfo(struct nft_pktinfo *pkt, pkt->skb = skb; pkt->xt.state = state; } -#endif static inline void nft_set_pktinfo_unspec (struct nft_pktinfo *pkt,struct sk_buff *skb)
@@ -947,11 +945,9 @@ struct nft_chain_type {int family;struct module *owner;unsigned int hook_mask; -#if IS_ENABLED (CONFIG_NETFILTER )nf_hookfn *hooks[NF_MAX_HOOKS ];int (*ops_register)(struct net *net,const struct nf_hook_ops *ops);void (*ops_unregister)(struct net *net,const struct nf_hook_ops *ops); -#endif }; int nft_chain_validate_dependency(const struct nft_chain *chain,
@@ -977,9 +973,7 @@ struct nft_stats {* @flow_block: flow block (for hardware offload) */ struct nft_base_chain { -#if IS_ENABLED (CONFIG_NETFILTER )struct nf_hook_ops ops; -#endif const struct nft_chain_type *type;u8 policy;u8 flags;
@@ -1179,9 +1173,7 @@ struct nft_flowtable { use:30 ;u64 handle;/* runtime data below here */ -#if IS_ENABLED (CONFIG_NETFILTER )struct nf_hook_ops *ops____cacheline_aligned ; -#endif struct nf_flowtable data; };
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 26/27 netfilter: conntrack: remove CONFIG_NF_CONNTRACK checks from nf_conntrack_zones.h.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
nf_conntrack_zones.h was wrapped in a CONFIG_NF_CONNTRACK check in order to fix compilation failures:
37ee3d5b3e97 ("netfilter: nf_defrag_ipv4: fix compilation error with NF_CONNTRACK=n")
Subsequent changes mean that these failures will no longer occur and the check is unnecessary. Remove it.
--- include/net/netfilter/nf_conntrack_zones.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
include/net/netfilter/nf_conntrack_zones.h +1 -4
@@ -3,9 +3,6 @@#define _NF_CONNTRACK_ZONES_H#include <linux/netfilter/nf_conntrack_zones_common.h> - -#if IS_ENABLED (CONFIG_NF_CONNTRACK ) -#include <net/netfilter/nf_conntrack.h> static inline const struct nf_conntrack_zone *
@@ -88,5 +85,5 @@ static inline bool nf_ct_zone_equal_any(const struct nf_conn *a,return true; #endif } -#endif /* IS_ENABLED(CONFIG_NF_CONNTRACK) */ +#endif /* _NF_CONNTRACK_ZONES_H */
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 27/27 netfilter: conntrack: remove two unused functions from nf_conntrack_timestamp.h.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
Two inline functions defined in nf_conntrack_timestamp.h, nf_ct_tstamp_enabled and nf_ct_set_tstamp, are not called anywhere. Remove them.
--- include/net/netfilter/nf_conntrack_timestamp.h | 16 ---------------- 1 file changed, 16 deletions(-)
include/net/netfilter/nf_conntrack_timestamp.h +0 -16
@@ -38,22 +38,6 @@ struct nf_conn_tstamp *nf_ct_tstamp_ext_add(struct nf_conn *ct, gfp_t gfp)#endif }; -static inline bool nf_ct_tstamp_enabled (struct net *net) -{ -#if IS_ENABLED (CONFIG_NF_CONNTRACK ) -return net->ct.sysctl_tstamp !=0 ; -#else -return false; -#endif -} - -static inline void nf_ct_set_tstamp (struct net *net,bool enable) -{ -#if IS_ENABLED (CONFIG_NF_CONNTRACK ) - net->ct.sysctl_tstamp = enable; -#endif -} -#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP void nf_conntrack_tstamp_pernet_init (struct net *net);
Signature · 1 line
2.11.0
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Fri, 13 Sep 2019 13:30:35 +0200
Quoted 1 line
The following patchset contains Netfilter updates for net-next:
...
Quoted 3 lines
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
Looks good, pulled.