Skip to content

Commit

Permalink
netfilter: nf_tables: memcg accounting for dynamically allocated objects
Browse files Browse the repository at this point in the history
nft_*.c files whose NFT_EXPR_STATEFUL flag is set on need to
use __GFP_ACCOUNT flag for objects that are dynamically
allocated from the packet path.

Such objects are allocated inside nft_expr_ops->init() callbacks
executed in task context while processing netlink messages.

In addition, this patch adds accounting to nft_set_elem_expr_clone()
used for the same purposes.

Signed-off-by: Vasily Averin <vvs@openvz.org>
Acked-by: Roman Gushchin <roman.gushchin@linux.dev>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Vasily Averin authored and ummakynes committed Apr 5, 2022
1 parent 3181821 commit 42193ff
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion net/netfilter/nf_tables_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -5526,7 +5526,7 @@ int nft_set_elem_expr_clone(const struct nft_ctx *ctx, struct nft_set *set,
int err, i, k;

for (i = 0; i < set->num_exprs; i++) {
expr = kzalloc(set->exprs[i]->ops->size, GFP_KERNEL);
expr = kzalloc(set->exprs[i]->ops->size, GFP_KERNEL_ACCOUNT);
if (!expr)
goto err_expr;

Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_connlimit.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ static int nft_connlimit_do_init(const struct nft_ctx *ctx,
invert = true;
}

priv->list = kmalloc(sizeof(*priv->list), GFP_KERNEL);
priv->list = kmalloc(sizeof(*priv->list), GFP_KERNEL_ACCOUNT);
if (!priv->list)
return -ENOMEM;

Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static int nft_counter_do_init(const struct nlattr * const tb[],
struct nft_counter __percpu *cpu_stats;
struct nft_counter *this_cpu;

cpu_stats = alloc_percpu(struct nft_counter);
cpu_stats = alloc_percpu_gfp(struct nft_counter, GFP_KERNEL_ACCOUNT);
if (cpu_stats == NULL)
return -ENOMEM;

Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_last.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static int nft_last_init(const struct nft_ctx *ctx, const struct nft_expr *expr,
u64 last_jiffies;
int err;

last = kzalloc(sizeof(*last), GFP_KERNEL);
last = kzalloc(sizeof(*last), GFP_KERNEL_ACCOUNT);
if (!last)
return -ENOMEM;

Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_limit.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static int nft_limit_init(struct nft_limit_priv *priv,
priv->rate);
}

priv->limit = kmalloc(sizeof(*priv->limit), GFP_KERNEL);
priv->limit = kmalloc(sizeof(*priv->limit), GFP_KERNEL_ACCOUNT);
if (!priv->limit)
return -ENOMEM;

Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_quota.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static int nft_quota_do_init(const struct nlattr * const tb[],
return -EOPNOTSUPP;
}

priv->consumed = kmalloc(sizeof(*priv->consumed), GFP_KERNEL);
priv->consumed = kmalloc(sizeof(*priv->consumed), GFP_KERNEL_ACCOUNT);
if (!priv->consumed)
return -ENOMEM;

Expand Down

0 comments on commit 42193ff

Please sign in to comment.