netfilter: nf_tables: add hardware offload support
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH v5 12/12 netfilter: nf_tables: add hardware offload support
This patch adds hardware offload support for nftables through the existing netdev_ops->ndo_setup_tc() interface, the TC_SETUP_CLSFLOWER classifier and the flow rule API. This hardware offload support is available for the NFPROTO_NETDEV family and the ingress hook.
Each nftables expression has a new ->offload interface, that is used to populate the flow rule object that is attached to the transaction object.
There is a new per-table NFT_TABLE_F_HW flag, that is set on to offload an entire table, including all of its chains.
This patch supports for basic metadata (layer 3 and 4 protocol numbers), 5-tuple payload matching and the accept/drop actions; this also includes basechain hardware offload only.
---
v5: fix minor conflict with net-next, git am will complain when applying this.
include/net/netfilter/nf_tables.h | 14 ++ include/net/netfilter/nf_tables_offload.h | 76 +++++++++ include/uapi/linux/netfilter/nf_tables.h | 2 + net/netfilter/Makefile | 2 +- net/netfilter/nf_tables_api.c | 39 ++++- net/netfilter/nf_tables_offload.c | 267 ++++++++++++++++++++++++++++++ net/netfilter/nft_cmp.c | 53 ++++++ net/netfilter/nft_immediate.c | 31 ++++ net/netfilter/nft_meta.c | 27 +++ net/netfilter/nft_payload.c | 187 +++++++++++++++++++++ 10 files changed, 691 insertions(+), 7 deletions(-) create mode 100644 include/net/netfilter/nf_tables_offload.h create mode 100644 net/netfilter/nf_tables_offload.c
include/net/netfilter/nf_tables.h +14 -0
@@ -161,6 +161,7 @@ struct nft_ctx {const struct nlattr *const *nla;u32 portid;u32 seq; +u16 flags;u8 family;u8 level;bool report;
@@ -735,6 +736,9 @@ enum nft_trans_phase { NFT_TRANS_RELEASE }; +struct nft_flow_rule ; +struct nft_offload_ctx ; +/** * struct nft_expr_ops - nf_tables expression operations *
@@ -777,6 +781,10 @@ struct nft_expr_ops { const struct nft_data **data);bool (*gc)(struct net *net,const struct nft_expr *expr); +int (*offload)(struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +const struct nft_expr *expr); +u32 offload_flags;const struct nft_expr_type *type;void *data; };
@@ -859,6 +867,7 @@ static inline struct nft_userdata *nft_userdata(const struct nft_rule *rule)enum nft_chain_flags {NFT_BASE_CHAIN =0x1 , +NFT_CHAIN_HW_OFFLOAD =0x2 , };/**
@@ -942,6 +951,7 @@ struct nft_stats {* @stats: per-cpu chain stats * @chain: the chain * @dev_name: device name that this base chain is attached to (if any) +* @cb_list: list of flow block callbacks (for hardware offload) */ struct nft_base_chain {struct nf_hook_ops ops;
@@ -951,6 +961,7 @@ struct nft_base_chain {struct nft_stats __percpu *stats;struct nft_chain chain;char dev_name[IFNAMSIZ ]; +struct list_head cb_list; };static inline struct nft_base_chain *nft_base_chain (const struct nft_chain *chain)
@@ -1322,11 +1333,14 @@ struct nft_trans {struct nft_trans_rule {struct nft_rule *rule; +struct nft_flow_rule *flow;u32 rule_id; };#define nft_trans_rule (trans) \ (((struct nft_trans_rule *)trans->data)->rule) +#define nft_trans_flow_rule (trans) \ + (((struct nft_trans_rule *)trans->data)->flow)#define nft_trans_rule_id (trans) \ (((struct nft_trans_rule *)trans->data)->rule_id)
include/net/netfilter/nf_tables_offload.h new file +76 -0
76 lines not on this page · raw message
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -192,6 +192,7 @@ enum nft_table_attributes {* @NFTA_CHAIN_USE: number of references to this chain (NLA_U32) * @NFTA_CHAIN_TYPE: type name of the string (NLA_NUL_STRING) * @NFTA_CHAIN_COUNTERS: counter specification of the chain (NLA_NESTED: nft_counter_attributes) +* @NFTA_CHAIN_FLAGS: chain flags */ enum nft_chain_attributes {NFTA_CHAIN_UNSPEC ,
@@ -204,6 +205,7 @@ enum nft_chain_attributes {NFTA_CHAIN_TYPE ,NFTA_CHAIN_COUNTERS ,NFTA_CHAIN_PAD , +NFTA_CHAIN_FLAGS , __NFTA_CHAIN_MAX };#define NFTA_CHAIN_MAX (__NFTA_CHAIN_MAX - 1)
net/netfilter/Makefile +1 -1
@@ -78,7 +78,7 @@ nf_tables-objs := nf_tables_core.o nf_tables_api.o nft_chain_filter.o \ nf_tables_trace.o nft_immediate.o nft_cmp.o nft_range.o \ nft_bitwise.o nft_byteorder.o nft_payload.o nft_lookup.o \ nft_dynset.o nft_meta.o nft_rt.o nft_exthdr.o \ - nft_chain_route.o + nft_chain_route.o nf_tables_offload.o nf_tables_set-objs := nf_tables_set_core.o \ nft_set_hash.o nft_set_bitmap.o nft_set_rbtree.o
net/netfilter/nf_tables_api.c +33 -6
@@ -18,6 +18,7 @@#include <net/netfilter/nf_flow_table.h> #include <net/netfilter/nf_tables_core.h> #include <net/netfilter/nf_tables.h> +#include <net/netfilter/nf_tables_offload.h> #include <net/net_namespace.h> #include <net/sock.h>
@@ -97,6 +98,7 @@ static void nft_ctx_init(struct nft_ctx *ctx, ctx->nla = nla; ctx->portid =NETLINK_CB (skb).portid; ctx->report =nlmsg_report (nlh); + ctx->flags = nlh->nlmsg_flags; ctx->seq = nlh->nlmsg_seq; }
@@ -1169,6 +1171,7 @@ static const struct nla_policy nft_chain_policy[NFTA_CHAIN_MAX + 1] = { [NFTA_CHAIN_POLICY] = { .type = NLA_U32 }, [NFTA_CHAIN_TYPE] = { .type = NLA_STRING }, [NFTA_CHAIN_COUNTERS] = { .type = NLA_NESTED }, + [NFTA_CHAIN_FLAGS] = { .type = NLA_U32 }, };static const struct nla_policy nft_hook_policy[NFTA_HOOK_MAX +1 ] = {
@@ -1603,7 +1606,7 @@ static struct nft_rule **nf_tables_chain_alloc_rules(const struct nft_chain *cha }static int nf_tables_addchain (struct nft_ctx *ctx,u8 family,u8 genmask, -u8 policy) +u8 policy,u32 flags) {const struct nlattr *const *nla = ctx->nla;struct nft_table *table = ctx->table;
@@ -1657,8 +1660,9 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask, ops->hook = hook.type->hooks[ops->hooknum]; ops->dev = hook.dev; - chain->flags |=NFT_BASE_CHAIN ; + chain->flags |=NFT_BASE_CHAIN | flags; basechain->policy =NF_ACCEPT ; +INIT_LIST_HEAD (&basechain->cb_list); }else { chain =kzalloc (sizeof (*chain),GFP_KERNEL );if (chain ==NULL )
@@ -1718,7 +1722,8 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,return err; } -static int nf_tables_updchain (struct nft_ctx *ctx,u8 genmask,u8 policy) +static int nf_tables_updchain (struct nft_ctx *ctx,u8 genmask,u8 policy, +u32 flags) {const struct nlattr *const *nla = ctx->nla;struct nft_table *table = ctx->table;
@@ -1730,6 +1735,9 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy)struct nft_trans *trans;int err; +if (chain->flags ^ flags) +return -EOPNOTSUPP ; +if (nla[NFTA_CHAIN_HOOK ]) {if (!nft_is_base_chain (chain))return -EBUSY ;
@@ -1835,6 +1843,7 @@ static int nf_tables_newchain(struct net *net, struct sock *nlsk,u8 policy =NF_ACCEPT ;struct nft_ctx ctx;u64 handle =0 ; +u32 flags =0 ;lockdep_assert_held (&net->nft.commit_mutex);
@@ -1889,6 +1898,9 @@ static int nf_tables_newchain(struct net *net, struct sock *nlsk, } } +if (nla[NFTA_CHAIN_FLAGS ]) + flags =ntohl (nla_get_be32 (nla[NFTA_CHAIN_FLAGS ])); +nft_ctx_init (&ctx, net, skb, nlh, family, table, chain, nla);if (chain !=NULL ) {
@@ -1899,10 +1911,10 @@ static int nf_tables_newchain(struct net *net, struct sock *nlsk,if (nlh->nlmsg_flags &NLM_F_REPLACE )return -EOPNOTSUPP ; -return nf_tables_updchain (&ctx, genmask, policy); +return nf_tables_updchain (&ctx, genmask, policy, flags); } -return nf_tables_addchain (&ctx, family, genmask, policy); +return nf_tables_addchain (&ctx, family, genmask, policy, flags); } static int nf_tables_delchain(struct net *net, struct sock *nlsk,
@@ -2658,6 +2670,7 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,u8 genmask =nft_genmask_next (net);struct nft_expr_info *info =NULL ;int family = nfmsg->nfgen_family; +struct nft_flow_rule *flow;struct nft_table *table;struct nft_chain *chain;struct nft_rule *rule, *old_rule =NULL ;
@@ -2804,7 +2817,8 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,list_add_tail_rcu (&rule->list, &old_rule->list); }else { -if (nft_trans_rule_add (&ctx,NFT_MSG_NEWRULE , rule) ==NULL ) { + trans =nft_trans_rule_add (&ctx,NFT_MSG_NEWRULE , rule); +if (!trans) { err = -ENOMEM ; goto err2; }
@@ -2827,6 +2841,14 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,if (net->nft.validate_state ==NFT_VALIDATE_DO )return nft_table_validate (net, table); +if (chain->flags &NFT_CHAIN_HW_OFFLOAD ) { + flow =nft_flow_rule_create (rule); +if (IS_ERR (flow)) +return PTR_ERR (flow); + +nft_trans_flow_rule (trans) = flow; + } +return 0 ; err2:nf_tables_rule_release (&ctx, rule);
@@ -6624,6 +6646,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)struct nft_trans_elem *te;struct nft_chain *chain;struct nft_table *table; +int err;if (list_empty (&net->nft.commit_list)) {mutex_unlock (&net->nft.commit_mutex);
@@ -6634,6 +6657,10 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)if (nf_tables_validate (net) <0 )return -EAGAIN ; + err =nft_flow_rule_offload_commit (net); +if (err <0 ) +return err; +/* 1. Allocate space for next generation rules_gen_X[] */ list_for_each_entry_safe (trans, next, &net->nft.commit_list, list) {int ret;
net/netfilter/nf_tables_offload.c new file +267 -0
267 lines not on this page · raw message
net/netfilter/nft_cmp.c +53 -0
83 lines not on this page · raw message
net/netfilter/nft_immediate.c +31 -0
@@ -13,6 +13,7 @@#include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables_core.h> #include <net/netfilter/nf_tables.h> +#include <net/netfilter/nf_tables_offload.h> void nft_immediate_eval(const struct nft_expr *expr, struct nft_regs *regs,
@@ -124,6 +125,34 @@ static int nft_immediate_validate(const struct nft_ctx *ctx,return 0 ; } +static int nft_immediate_offload (struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +const struct nft_expr *expr) +{ +const struct nft_immediate_expr *priv =nft_expr_priv (expr); +struct flow_action_entry *entry; +const struct nft_data *data; + +if (priv->dreg !=NFT_REG_VERDICT ) +return -EOPNOTSUPP ; + + entry = &flow->rule->action.entries[ctx->num_actions++]; + + data = &priv->data; +switch (data->verdict.code) { +case NF_ACCEPT : + entry->id =FLOW_ACTION_ACCEPT ; +break ; +case NF_DROP : + entry->id =FLOW_ACTION_DROP ; +break ; +default : +return -EOPNOTSUPP ; + } + +return 0 ; +} +static const struct nft_expr_ops nft_imm_ops = { .type = &nft_imm_type, .size =NFT_EXPR_SIZE (sizeof (struct nft_immediate_expr )),
@@ -133,6 +162,8 @@ static const struct nft_expr_ops nft_imm_ops = { .deactivate = nft_immediate_deactivate, .dump = nft_immediate_dump, .validate = nft_immediate_validate, + .offload = nft_immediate_offload, + .offload_flags = NFT_OFFLOAD_F_ACTION, };struct nft_expr_type nft_imm_type__read_mostly = {
net/netfilter/nft_meta.c +27 -0
@@ -22,6 +22,7 @@#include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_tables_core.h> #include <net/netfilter/nft_meta.h> +#include <net/netfilter/nf_tables_offload.h> #include <uapi/linux/netfilter_bridge.h> /* NF_BR_PRE_ROUTING */
@@ -490,6 +491,31 @@ void nft_meta_set_destroy(const struct nft_ctx *ctx, }EXPORT_SYMBOL_GPL (nft_meta_set_destroy); +static int nft_meta_get_offload (struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +const struct nft_expr *expr) +{ +const struct nft_meta *priv =nft_expr_priv (expr); +struct nft_offload_reg *reg = &ctx->regs[priv->dreg]; + +switch (priv->key) { +case NFT_META_PROTOCOL : +NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_BASIC , basic, n_proto, +sizeof (__u16), reg); +nft_offload_set_dependency (ctx,NFT_OFFLOAD_DEP_NETWORK ); +break ; +case NFT_META_L4PROTO : +NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_BASIC , basic, ip_proto, +sizeof (__u8), reg); +nft_offload_set_dependency (ctx,NFT_OFFLOAD_DEP_TRANSPORT ); +break ; +default : +return -EOPNOTSUPP ; + } + +return 0 ; +} +static const struct nft_expr_ops nft_meta_get_ops = { .type = &nft_meta_type, .size =NFT_EXPR_SIZE (sizeof (struct nft_meta )),
@@ -497,6 +523,7 @@ static const struct nft_expr_ops nft_meta_get_ops = { .init = nft_meta_get_init, .dump = nft_meta_get_dump, .validate = nft_meta_get_validate, + .offload = nft_meta_get_offload, };static const struct nft_expr_ops nft_meta_set_ops = {
net/netfilter/nft_payload.c +187 -0
215 lines not on this page · raw message
Signature · 1 line
2.11.0