Hook multiple netdevices to basechain
Subsystems (2)
Pablo Neira Ayuso
maintainercover Hook multiple netdevices to basechain
Hi,
This patchset extends the netdev family to allow for hooking multiple devices to basechains, eg.
nft add table netdev x
nft add chain netdev x y { \
type filter hook ingress devices = { eth0, eth1 } priority 0\; }Hence you can apply the same policy to packet coming in from eth0 and eth1 netdevices.
1) Add nft_flow_block_chain() helper function.
2) Pass callback list to nft_setup_cb_call().
3) Add nft_flow_cls_offload_setup() helper function.
4) Iterate over list of callbacks that belongs to the netdevices that is being unregister to remove the rules from the netdevice.
This patches comes in preparation for:
5) Allow for hooking multiple devices to the same netdev basechain.
Pablo Neira Ayuso (5):
netfilter: nf_tables_offload: add nft_flow_block_chain()
netfilter: nf_tables_offload: Pass callback list to nft_setup_cb_call()
netfilter: nf_tables_offload: add nft_flow_cls_offload_setup()
netfilter: nf_tables_offload: remove rules on unregistered device only
netfilter: nf_tables: support for multiple devices per netdev hook
include/net/netfilter/nf_tables.h | 4 +- include/uapi/linux/netfilter/nf_tables.h | 2 + net/netfilter/nf_tables_api.c | 296 ++++++++++++++++++++++++------- net/netfilter/nf_tables_offload.c | 98 ++++++---- net/netfilter/nft_chain_filter.c | 45 +++-- 5 files changed, 325 insertions(+), 120 deletions(-)
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 1/5 netfilter: nf_tables_offload: add nft_flow_block_chain()
Add nft_flow_block_chain() helper function.
--- net/netfilter/nf_tables_offload.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_offload.c +11 -4
@@ -294,6 +294,16 @@ static int nft_indr_block_offload_cmd(struct nft_base_chain *chain,#define FLOW_SETUP_BLOCK TC_SETUP_BLOCK +static int nft_flow_block_chain (struct nft_base_chain *basechain, +struct net_device *dev, +enum flow_block_command cmd) +{ +if (dev->netdev_ops->ndo_setup_tc) +return nft_block_offload_cmd (basechain, dev, cmd); + +return nft_indr_block_offload_cmd (basechain, dev, cmd); +} +static int nft_flow_offload_chain (struct nft_chain *chain,u8 *ppolicy,enum flow_block_command cmd)
@@ -316,10 +326,7 @@ static int nft_flow_offload_chain(struct nft_chain *chain,if (cmd ==FLOW_BLOCK_BIND && policy ==NF_DROP )return -EOPNOTSUPP ; -if (dev->netdev_ops->ndo_setup_tc) -return nft_block_offload_cmd (basechain, dev, cmd); -else -return nft_indr_block_offload_cmd (basechain, dev, cmd); +return nft_flow_block_chain (basechain, dev, cmd); }int nft_flow_rule_offload_commit (struct net *net)
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/5 netfilter: nf_tables_offload: Pass callback list to nft_setup_cb_call()
In reply to Pablo Neira AyusoThis allows to reuse nft_setup_cb_call() from callback unbind path.
--- net/netfilter/nf_tables_offload.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_offload.c +5 -4
@@ -132,13 +132,13 @@ static void nft_flow_offload_common_init(struct flow_cls_common_offload *common, common->extack = extack; } -static int nft_setup_cb_call (struct nft_base_chain *basechain, -enum tc_setup_type type,void *type_data) +static int nft_setup_cb_call (enum tc_setup_type type,void *type_data, +struct list_head *cb_list) {struct flow_block_cb *block_cb;int err; -list_for_each_entry (block_cb, &basechain->flow_block.cb_list, list) { +list_for_each_entry (block_cb, cb_list, list) { err = block_cb->cb (type, type_data, block_cb->cb_priv);if (err <0 )return err;
@@ -180,7 +180,8 @@ static int nft_flow_offload_rule(struct nft_chain *chain,if (flow) cls_flow.rule = flow->rule; -return nft_setup_cb_call (basechain,TC_SETUP_CLSFLOWER , &cls_flow); +return nft_setup_cb_call (TC_SETUP_CLSFLOWER , &cls_flow, + &basechain->flow_block.cb_list); } static int nft_flow_offload_bind(struct flow_block_offload *bo,
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/5 netfilter: nf_tables_offload: add nft_flow_cls_offload_setup()
In reply to Pablo Neira AyusoAdd helper function to set up the flow_cls_offload object.
--- net/netfilter/nf_tables_offload.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-)
net/netfilter/nf_tables_offload.c +24 -13
@@ -155,30 +155,41 @@ int nft_chain_offload_priority(struct nft_base_chain *basechain)return 0 ; } +static void nft_flow_cls_offload_setup (struct flow_cls_offload *cls_flow, +const struct nft_base_chain *basechain, +const struct nft_rule *rule, +const struct nft_flow_rule *flow, +enum flow_cls_command command) +{ +struct netlink_ext_ack extack; +__be16 proto =ETH_P_ALL ; + +memset (cls_flow,0 ,sizeof (*cls_flow)); + +if (flow) + proto = flow->proto; + +nft_flow_offload_common_init (&cls_flow->common, proto, + basechain->ops.priority, &extack); + cls_flow->command = command; + cls_flow->cookie = (unsigned long ) rule; +if (flow) + cls_flow->rule = flow->rule; +} +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 flow_cls_offload cls_flow = {}; +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 (chain))return -EOPNOTSUPP ; basechain =nft_base_chain (chain); - -if (flow) - proto = flow->proto; - -nft_flow_offload_common_init (&cls_flow.common, proto, - basechain->ops.priority, &extack); - cls_flow.command = command; - cls_flow.cookie = (unsigned long ) rule; -if (flow) - cls_flow.rule = flow->rule; +nft_flow_cls_offload_setup (&cls_flow, basechain, rule, flow, command);return nft_setup_cb_call (TC_SETUP_CLSFLOWER , &cls_flow, &basechain->flow_block.cb_list);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 4/5 netfilter: nf_tables_offload: remove rules on unregistered device only
In reply to Pablo Neira AyusoAfter unbinding the list of flow_block callbacks, iterate over it to remove the existing rules in the netdevice that has just been unregistered.
--- net/netfilter/nf_tables_offload.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
net/netfilter/nf_tables_offload.c +13 -13
@@ -206,6 +206,16 @@ static int nft_flow_offload_unbind(struct flow_block_offload *bo, struct nft_base_chain *basechain) {struct flow_block_cb *block_cb, *next; +struct flow_cls_offload cls_flow; +struct nft_chain *chain; +struct nft_rule *rule; + + chain = &basechain->chain; +list_for_each_entry (rule, &chain->rules, list) { +nft_flow_cls_offload_setup (&cls_flow, basechain, rule,NULL , +FLOW_CLS_DESTROY ); +nft_setup_cb_call (TC_SETUP_CLSFLOWER , &cls_flow, &bo->cb_list); + }list_for_each_entry_safe (block_cb, next, &bo->cb_list, list) {list_del (&block_cb->list);
@@ -445,18 +455,6 @@ static void nft_indr_block_cb(struct net_device *dev,mutex_unlock (&net->nft.commit_mutex); } -static void nft_offload_chain_clean (struct nft_chain *chain) -{ -struct nft_rule *rule; - -list_for_each_entry (rule, &chain->rules, list) { -nft_flow_offload_rule (chain, rule, -NULL ,FLOW_CLS_DESTROY ); - } - -nft_flow_offload_chain (chain,NULL ,FLOW_BLOCK_UNBIND ); -} -static int nft_offload_netdev_event (struct notifier_block *this,unsigned long event,void *ptr) {
@@ -467,7 +465,9 @@ static int nft_offload_netdev_event(struct notifier_block *this,mutex_lock (&net->nft.commit_mutex); chain =__nft_offload_get_chain (dev);if (chain) -nft_offload_chain_clean (chain); +nft_flow_block_chain (nft_base_chain (chain), dev, +FLOW_BLOCK_UNBIND ); +mutex_unlock (&net->nft.commit_mutex);return NOTIFY_DONE ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 5/5 netfilter: nf_tables: support for multiple devices per netdev hook
In reply to Pablo Neira AyusoThis patch allows you to register one netdev basechain to multiple devices. This adds a new NFTA_HOOK_DEVS netlink attribute to specify the list of netdevices. Basechains store a list of hooks.
--- include/net/netfilter/nf_tables.h | 4 +- include/uapi/linux/netfilter/nf_tables.h | 2 + net/netfilter/nf_tables_api.c | 296 ++++++++++++++++++++++++------- net/netfilter/nf_tables_offload.c | 11 +- net/netfilter/nft_chain_filter.c | 45 +++-- 5 files changed, 272 insertions(+), 86 deletions(-)
include/net/netfilter/nf_tables.h +2 -2
@@ -973,21 +973,21 @@ struct nft_hook {* struct nft_base_chain - nf_tables base chain * * @ops: netfilter hook ops +* @hook_list: list of netfilter hooks (for NFPROTO_NETDEV family) * @type: chain type * @policy: default policy * @stats: per-cpu chain stats * @chain: the chain -* @dev_name: device name that this base chain is attached to (if any) * @flow_block: flow block (for hardware offload) */ struct nft_base_chain {struct nf_hook_ops ops; +struct list_head hook_list;const struct nft_chain_type *type;u8 policy;u8 flags;struct nft_stats __percpu *stats;struct nft_chain chain; -char dev_name[IFNAMSIZ ];struct flow_block flow_block; };
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -144,12 +144,14 @@ enum nft_list_attributes {* @NFTA_HOOK_HOOKNUM: netfilter hook number (NLA_U32) * @NFTA_HOOK_PRIORITY: netfilter hook priority (NLA_U32) * @NFTA_HOOK_DEV: netdevice name (NLA_STRING) +* @NFTA_HOOK_DEVS: list of netdevices (NLA_NESTED) */ enum nft_hook_attributes {NFTA_HOOK_UNSPEC ,NFTA_HOOK_HOOKNUM ,NFTA_HOOK_PRIORITY ,NFTA_HOOK_DEV , +NFTA_HOOK_DEVS , __NFTA_HOOK_MAX };#define NFTA_HOOK_MAX (__NFTA_HOOK_MAX - 1)
net/netfilter/nf_tables_api.c +232 -64
433 lines not on this page · raw message
net/netfilter/nf_tables_offload.c +10 -1
@@ -414,6 +414,7 @@ static struct nft_chain *__nft_offload_get_chain(struct net_device *dev) {struct nft_base_chain *basechain;struct net *net =dev_net (dev); +struct nft_hook *hook, *found;const struct nft_table *table;struct nft_chain *chain;
@@ -426,8 +427,16 @@ static struct nft_chain *__nft_offload_get_chain(struct net_device *dev) !(chain->flags & NFT_CHAIN_HW_OFFLOAD))continue ; + found =NULL ; basechain =nft_base_chain (chain); -if (strncmp (basechain->dev_name, dev->name,IFNAMSIZ )) +list_for_each_entry (hook, &basechain->hook_list, list) { +if (hook->ops.dev != dev) +continue ; + + found = hook; +break ; + } +if (!found)continue ;return chain;
net/netfilter/nft_chain_filter.c +26 -19
54 lines not on this page · raw message
Signature · 1 line
2.11.0