nftables: operational limit match
Subsystems (2)
PATCH 1/1 nftables: operational limit match
The nft limit match currently does not work at all. Below patches to nftables, libnftables, and kernel address the issue. A few notes on the implementation:
- Removed support for nano/micro/milli second limits. These seem pointless, given we are using jiffies in the limit match, not a hpet. And who really needs to limit items down to sub-second level??
- 'depth' member is removed as unnecessary. All we need in the kernel is the rate and the unit.
- 'stamp' member becomes the time we need to next refresh the token bucket, instead of being updated on every packet which goes through the match.
This closes netfilter bugzilla #827, reported by Eric Leblond.
include/uapi/linux/netfilter/nf_tables.h +2 -2
@@ -538,12 +538,12 @@ enum nft_ct_attributes {* enum nft_limit_attributes - nf_tables limit expression netlink attributes * * @NFTA_LIMIT_RATE: refill rate (NLA_U64) -* @NFTA_LIMIT_DEPTH: bucket depth (NLA_U64) +* @NFTA_LIMIT_UNIT: refill unit (NLA_U64) */ enum nft_limit_attributes {NFTA_LIMIT_UNSPEC ,NFTA_LIMIT_RATE , -NFTA_LIMIT_DEPTH , +NFTA_LIMIT_UNIT , __NFTA_LIMIT_MAX };#define NFTA_LIMIT_MAX (__NFTA_LIMIT_MAX - 1)
net/netfilter/nft_limit.c +10 -11
@@ -21,8 +21,8 @@ static DEFINE_SPINLOCK(limit_lock);struct nft_limit {u64 tokens; -u64 depth;u64 rate; +u64 unit;unsigned long stamp; };
@@ -33,11 +33,9 @@ static void nft_limit_eval(const struct nft_expr *expr,struct nft_limit *priv =nft_expr_priv (expr);spin_lock_bh (&limit_lock); -if (priv->stamp != jiffies) { - priv->tokens += priv->rate * (jiffies - priv->stamp); -if (priv->tokens > priv->depth) - priv->tokens = priv->depth; - priv->stamp = jiffies; +if (time_after_eq (jiffies, priv->stamp)) { + priv->tokens = priv->rate; + priv->stamp = jiffies + priv->unit *HZ ; }if (priv->tokens >=1 ) {
@@ -52,7 +50,7 @@ static void nft_limit_eval(const struct nft_expr *expr,static const struct nla_policy nft_limit_policy[NFTA_LIMIT_MAX +1 ] = { [NFTA_LIMIT_RATE ] = { .type =NLA_U64 }, - [NFTA_LIMIT_DEPTH ] = { .type =NLA_U64 }, + [NFTA_LIMIT_UNIT ] = { .type =NLA_U64 }, }; static int nft_limit_init(const struct nft_ctx *ctx,
@@ -62,12 +60,13 @@ static int nft_limit_init(const struct nft_ctx *ctx,struct nft_limit *priv =nft_expr_priv (expr);if (tb[NFTA_LIMIT_RATE ] ==NULL || - tb[NFTA_LIMIT_DEPTH ] ==NULL ) + tb[NFTA_LIMIT_UNIT ] ==NULL )return -EINVAL ; priv->rate =be64_to_cpu (nla_get_be64 (tb[NFTA_LIMIT_RATE ])); - priv->depth =be64_to_cpu (nla_get_be64 (tb[NFTA_LIMIT_DEPTH ])); - priv->tokens = priv->depth; + priv->unit =be64_to_cpu (nla_get_be64 (tb[NFTA_LIMIT_UNIT ])); + priv->stamp = jiffies + priv->unit *HZ ; + priv->tokens = priv->rate;return 0 ; }
@@ -77,7 +76,7 @@ static int nft_limit_dump(struct sk_buff *skb, const struct nft_expr *expr)if (nla_put_be64 (skb,NFTA_LIMIT_RATE ,cpu_to_be64 (priv->rate))) goto nla_put_failure; -if (nla_put_be64 (skb,NFTA_LIMIT_DEPTH ,cpu_to_be64 (priv->depth))) +if (nla_put_be64 (skb,NFTA_LIMIT_UNIT ,cpu_to_be64 (priv->unit))) goto nla_put_failure;return 0 ;
include/libnftables/expr.h +1 -1
@@ -134,7 +134,7 @@ enum {enum {NFT_EXPR_LIMIT_RATE =NFT_RULE_EXPR_ATTR_BASE , -NFT_EXPR_LIMIT_DEPTH , +NFT_EXPR_LIMIT_UNIT , };#ifdef __cplusplus
include/linux/netfilter/nf_tables.h +2 -2
@@ -537,12 +537,12 @@ enum nft_ct_attributes {* enum nft_limit_attributes - nf_tables limit expression netlink attributes * * @NFTA_LIMIT_RATE: refill rate (NLA_U64) -* @NFTA_LIMIT_DEPTH: bucket depth (NLA_U64) +* @NFTA_LIMIT_UNIT: refill unit (NLA_U64) */ enum nft_limit_attributes {NFTA_LIMIT_UNSPEC ,NFTA_LIMIT_RATE , -NFTA_LIMIT_DEPTH , +NFTA_LIMIT_UNIT , __NFTA_LIMIT_MAX };#define NFTA_LIMIT_MAX (__NFTA_LIMIT_MAX - 1)
src/expr/limit.c +29 -22
117 lines not on this page · raw message
include/linux/netfilter/nf_tables.h +2 -2
@@ -544,12 +544,12 @@ enum nft_ct_attributes {* enum nft_limit_attributes - nf_tables limit expression netlink attributes * * @NFTA_LIMIT_RATE: refill rate (NLA_U64) -* @NFTA_LIMIT_DEPTH: bucket depth (NLA_U64) +* @NFTA_LIMIT_UNIT: refill unit (NLA_U64) */ enum nft_limit_attributes {NFTA_LIMIT_UNSPEC ,NFTA_LIMIT_RATE , -NFTA_LIMIT_DEPTH , +NFTA_LIMIT_UNIT , __NFTA_LIMIT_MAX };#define NFTA_LIMIT_MAX (__NFTA_LIMIT_MAX - 1)
include/statement.h +0 -1
@@ -41,7 +41,6 @@ extern struct stmt *log_stmt_alloc(const struct location *loc);struct limit_stmt {uint64_t rate;uint64_t unit; -uint64_t depth; };extern struct stmt *limit_stmt_alloc (const struct location *loc);
src/netlink_delinearize.c +2 -2
@@ -385,8 +385,8 @@ static void netlink_parse_limit(struct netlink_parse_ctx *ctx,struct stmt *stmt; stmt =limit_stmt_alloc (loc); - stmt->limit.rate =nft_rule_expr_get_u32 (nle,NFT_EXPR_LIMIT_RATE ); - stmt->limit.depth =nft_rule_expr_get_u32 (nle,NFT_EXPR_LIMIT_DEPTH ); + stmt->limit.rate =nft_rule_expr_get_u64 (nle,NFT_EXPR_LIMIT_RATE ); + stmt->limit.unit =nft_rule_expr_get_u64 (nle,NFT_EXPR_LIMIT_UNIT );list_add_tail (&stmt->list, &ctx->rule->stmts); }
src/netlink_linearize.c +2 -2
@@ -551,8 +551,8 @@ static void netlink_gen_limit_stmt(struct netlink_linearize_ctx *ctx,struct nft_rule_expr *nle; nle =alloc_nft_expr ("limit" ); -nft_rule_expr_set_u32 (nle,NFT_EXPR_LIMIT_RATE , stmt->limit.rate); -nft_rule_expr_set_u32 (nle,NFT_EXPR_LIMIT_DEPTH , stmt->limit.depth); +nft_rule_expr_set_u64 (nle,NFT_EXPR_LIMIT_RATE , stmt->limit.rate); +nft_rule_expr_set_u64 (nle,NFT_EXPR_LIMIT_UNIT , stmt->limit.unit);nft_rule_add_expr (ctx->nlr, nle); }
src/parser.y +5 -8
@@ -1003,14 +1003,11 @@ limit_stmt : LIMIT RATE NUM SLASH time_unit } ; -time_unit : NANOSECOND { $$ = 1ULL; } - | MICROSECOND { $$ = 1ULL * 1000; } - | MILLISECOND { $$ = 1ULL * 1000 * 1000; } - | SECOND { $$ = 1ULL * 1000 * 1000 * 1000; } - | MINUTE { $$ = 1ULL * 1000 * 1000 * 1000 * 60; } - | HOUR { $$ = 1ULL * 1000 * 1000 * 1000 * 60 * 60; } - | DAY { $$ = 1ULL * 1000 * 1000 * 1000 * 60 * 60 * 24; } - | WEEK { $$ = 1ULL * 1000 * 1000 * 1000 * 60 * 60 * 24 * 7; } +time_unit : SECOND { $$ = 1ULL; } + | MINUTE { $$ = 1ULL * 60; } + | HOUR { $$ = 1ULL * 60 * 60; } + | DAY { $$ = 1ULL * 60 * 60 * 24; } + | WEEK { $$ = 1ULL * 60 * 60 * 24 * 7; } ; reject_stmt : _REJECT
src/statement.c +10 -2
@@ -144,8 +144,16 @@ struct stmt *log_stmt_alloc(const struct location *loc)static void limit_stmt_print (const struct stmt *stmt) { -printf ("limit rate %" PRIu64" depth %" PRIu64, - stmt->limit.rate, stmt->limit.depth); +static const char *units[] = { + [1 ] ="second" , + [1 *60 ] ="minute" , + [1 *60 *60 ] ="hour" , + [1 *60 *60 *24 ] ="day" , + [1 *60 *60 *24 *7 ] ="week" , + }; + +printf ("limit rate %" PRIu64"/%s" , + stmt->limit.rate, units[stmt->limit.unit]); }static const struct stmt_ops limit_stmt_ops = {
Pablo Neira Ayuso
maintainerQuoted 7 lines · Phil Oester
The nft limit match currently does not work at all. Below patches to nftables, libnftables, and kernel address the issue. A few notes on the implementation:
- Removed support for nano/micro/milli second limits. These seem pointless, given we are using jiffies in the limit match, not a hpet. And who really needs to limit items down to sub-second level??
Quoted 7 lines
- 'depth' member is removed as unnecessary. All we need in the kernel is the rate and the unit.
- 'stamp' member becomes the time we need to next refresh the token bucket, instead of being updated on every packet which goes through the match.
This closes netfilter bugzilla #827, reported by Eric Leblond.
Applied the userspace chunks to libnftables and nftables, please split this in three patches next time. The kernel chunk was merged into the nftables pull request.
Thanks.