leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: nf_tables: memcg accounting for dynamically allocated objects

Browse Source 
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>
This commit is contained in:
Vasily Averin 2022-04-02 12:50:37 +03:00 committed by Pablo Neira Ayuso
parent 3181821317
commit 42193ffd79
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/netfilter/nf_tables_api.c
View File

@ -5526,7 +5526,7 @@ int nft_set_elem_expr_clone(const struct nft_ctx *ctx, struct nft_set *set,
int err, i, k; int err, i, k;
for (i = 0; i < set->num_exprs; i++) { 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) if (!expr)
goto err_expr; goto err_expr;

2
net/netfilter/nft_connlimit.c
View File

@ -77,7 +77,7 @@ static int nft_connlimit_do_init(const struct nft_ctx *ctx,
invert = true; invert = true;
} }
priv->list = kmalloc(sizeof(*priv->list), GFP_KERNEL); priv->list = kmalloc(sizeof(*priv->list), GFP_KERNEL_ACCOUNT);
if (!priv->list) if (!priv->list)
return -ENOMEM; return -ENOMEM;

2
net/netfilter/nft_counter.c
View File

@ -62,7 +62,7 @@ static int nft_counter_do_init(const struct nlattr * const tb[],
struct nft_counter __percpu *cpu_stats; struct nft_counter __percpu *cpu_stats;
struct nft_counter *this_cpu; 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) if (cpu_stats == NULL)
return -ENOMEM; return -ENOMEM;

2
net/netfilter/nft_last.c
View File

@ -30,7 +30,7 @@ static int nft_last_init(const struct nft_ctx *ctx, const struct nft_expr *expr,
u64 last_jiffies; u64 last_jiffies;
int err; int err;
last = kzalloc(sizeof(*last), GFP_KERNEL); last = kzalloc(sizeof(*last), GFP_KERNEL_ACCOUNT);
if (!last) if (!last)
return -ENOMEM; return -ENOMEM;

2
net/netfilter/nft_limit.c
View File

@ -90,7 +90,7 @@ static int nft_limit_init(struct nft_limit_priv *priv,
priv->rate); priv->rate);
} }
priv->limit = kmalloc(sizeof(*priv->limit), GFP_KERNEL); priv->limit = kmalloc(sizeof(*priv->limit), GFP_KERNEL_ACCOUNT);
if (!priv->limit) if (!priv->limit)
return -ENOMEM; return -ENOMEM;

2
net/netfilter/nft_quota.c
View File

@ -90,7 +90,7 @@ static int nft_quota_do_init(const struct nlattr * const tb[],
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
priv->consumed = kmalloc(sizeof(*priv->consumed), GFP_KERNEL); priv->consumed = kmalloc(sizeof(*priv->consumed), GFP_KERNEL_ACCOUNT);
if (!priv->consumed) if (!priv->consumed)
return -ENOMEM; return -ENOMEM;