support for stateful expressions in set definition
Subsystems (2)
Pablo Neira Ayuso
maintainercover support for stateful expressions in set definition
Hi,
This patchset allows user to specify a stateful expression in the set definition, eg.
table ip x {
set y {
typeof ip saddr
counter
elements = { 192.168.10.35, 192.168.10.101, 192.168.10.135 }
}
chain z {
type filter hook output priority filter; policy accept;
ip daddr @y
}}
The example above turns on counters for each element in the set 'y'.
Pablo Neira Ayuso (3):
netfilter: nf_tables: move nft_expr_clone() to nf_tables_api.c
netfilter: nf_tables: pass context to nft_set_destroy()
netfilter: nf_tables: allow to specify stateful expression in set definition
include/net/netfilter/nf_tables.h | 3 ++ include/uapi/linux/netfilter/nf_tables.h | 2 + net/netfilter/nf_tables_api.c | 88 ++++++++++++++++++++++++++------ net/netfilter/nft_dynset.c | 17 ------ 4 files changed, 76 insertions(+), 34 deletions(-)
--
2.11.0
Pablo Neira Ayuso
maintainerPATCH 1/3 netfilter: nf_tables: move nft_expr_clone() to nf_tables_api.c
Move the nft_expr_clone() helper function to the core.
--- include/net/netfilter/nf_tables.h | 1 + net/netfilter/nf_tables_api.c | 18 ++++++++++++++++++ net/netfilter/nft_dynset.c | 17 ----------------- 3 files changed, 19 insertions(+), 17 deletions(-)
include/net/netfilter/nf_tables.h +1 -0
@@ -846,6 +846,7 @@ static inline void *nft_expr_priv(const struct nft_expr *expr)return (void *)expr->data; } +int nft_expr_clone (struct nft_expr *dst,struct nft_expr *src);void nft_expr_destroy (const struct nft_ctx *ctx,struct nft_expr *expr);int nft_expr_dump (struct sk_buff *skb,unsigned int attr,const struct nft_expr *expr);
net/netfilter/nf_tables_api.c +18 -0
@@ -2557,6 +2557,24 @@ static struct nft_expr *nft_expr_init(const struct nft_ctx *ctx,return ERR_PTR (err); } +int nft_expr_clone (struct nft_expr *dst,struct nft_expr *src) +{ +int err; + +if (src->ops->clone) { + dst->ops = src->ops; + err = src->ops->clone (dst, src); +if (err <0 ) +return err; + }else { +memcpy (dst, src, src->ops->size); + } + +__module_get (src->ops->type->owner); + +return 0 ; +} +void nft_expr_destroy (const struct nft_ctx *ctx,struct nft_expr *expr) {nf_tables_expr_destroy (ctx, expr);
net/netfilter/nft_dynset.c +0 -17
@@ -24,23 +24,6 @@ struct nft_dynset {struct nft_set_binding binding; }; -static int nft_expr_clone (struct nft_expr *dst,struct nft_expr *src) -{ -int err; - -if (src->ops->clone) { - dst->ops = src->ops; - err = src->ops->clone (dst, src); -if (err <0 ) -return err; - }else { -memcpy (dst, src, src->ops->size); - } - -__module_get (src->ops->type->owner); -return 0 ; -} -static void *nft_dynset_new (struct nft_set *set,const struct nft_expr *expr,struct nft_regs *regs) {
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/3 netfilter: nf_tables: pass context to nft_set_destroy()
In reply to Pablo Neira AyusoThe patch that adds support for stateful expressions in set definitions require this.
--- net/netfilter/nf_tables_api.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_api.c +5 -5
@@ -4126,7 +4126,7 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk,return err; } -static void nft_set_destroy (struct nft_set *set) +static void nft_set_destroy (const struct nft_ctx *ctx,struct nft_set *set) {if (WARN_ON (set->use >0 ))return ;
@@ -4271,7 +4271,7 @@ EXPORT_SYMBOL_GPL(nf_tables_deactivate_set);void nf_tables_destroy_set (const struct nft_ctx *ctx,struct nft_set *set) {if (list_empty (&set->bindings) &&nft_set_is_anonymous (set)) -nft_set_destroy (set); +nft_set_destroy (ctx, set); }EXPORT_SYMBOL_GPL (nf_tables_destroy_set);
@@ -7020,7 +7020,7 @@ static void nft_commit_release(struct nft_trans *trans)nf_tables_rule_destroy (&trans->ctx,nft_trans_rule (trans));break ;case NFT_MSG_DELSET : -nft_set_destroy (nft_trans_set (trans)); +nft_set_destroy (&trans->ctx,nft_trans_set (trans));break ;case NFT_MSG_DELSETELEM : nf_tables_set_elem_destroy(&trans->ctx,
@@ -7451,7 +7451,7 @@ static void nf_tables_abort_release(struct nft_trans *trans)nf_tables_rule_destroy (&trans->ctx,nft_trans_rule (trans));break ;case NFT_MSG_NEWSET : -nft_set_destroy (nft_trans_set (trans)); +nft_set_destroy (&trans->ctx,nft_trans_set (trans));break ;case NFT_MSG_NEWSETELEM : nft_set_elem_destroy(nft_trans_elem_set(trans),
@@ -8177,7 +8177,7 @@ static void __nft_release_tables(struct net *net)list_for_each_entry_safe (set, ns, &table->sets, list) {list_del (&set->list); table->use--; -nft_set_destroy (set); +nft_set_destroy (&ctx, set); }list_for_each_entry_safe (obj, ne, &table->objects, list) {nft_obj_del (obj);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/3 netfilter: nf_tables: allow to specify stateful expression in set definition
In reply to Pablo Neira AyusoThis patch allows users to specify the stateful expression for the elements in this set via NFTA_SET_EXPR. This new feature allows you to turn on counters for all of the elements in this set.
--- include/net/netfilter/nf_tables.h | 2 ++ include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/netfilter/nf_tables_api.c | 60 +++++++++++++++++++++++++------- 3 files changed, 52 insertions(+), 12 deletions(-)
include/net/netfilter/nf_tables.h +2 -0
@@ -416,6 +416,7 @@ struct nft_set_type {* @policy: set parameterization (see enum nft_set_policies) * @udlen: user data length * @udata: user data +* @expr: stateful expression * @ops: set ops * @flags: set flags * @genmask: generation mask
@@ -444,6 +445,7 @@ struct nft_set {u16 policy;u16 udlen;unsigned char *udata; +struct nft_expr *expr;/* runtime data below here */ const struct nft_set_ops *ops____cacheline_aligned ; u16 flags:14,
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -342,6 +342,7 @@ enum nft_set_field_attributes {* @NFTA_SET_USERDATA: user data (NLA_BINARY) * @NFTA_SET_OBJ_TYPE: stateful object type (NLA_U32: NFT_OBJECT_*) * @NFTA_SET_HANDLE: set handle (NLA_U64) +* @NFTA_SET_EXPR: set expression (NLA_NESTED: nft_expr_attributes) */ enum nft_set_attributes {NFTA_SET_UNSPEC ,
@@ -361,6 +362,7 @@ enum nft_set_attributes {NFTA_SET_PAD ,NFTA_SET_OBJ_TYPE ,NFTA_SET_HANDLE , +NFTA_SET_EXPR , __NFTA_SET_MAX };#define NFTA_SET_MAX (__NFTA_SET_MAX - 1)
net/netfilter/nf_tables_api.c +48 -12
136 lines not on this page · raw message
Signature · 1 line
2.11.0