The commit is pushed to "branch-rh9-5.14.vz9.1.x-ovz" and will appear at
https://src.openvz.org/scm/ovz/vzkernel.git
after ark-5.14
------>
commit 5fbbaed47d4cf9c08974c58fd0966cee9f721668
Author: Vasily Averin <v...@virtuozzo.com>
Date: Tue Sep 28 14:16:26 2021 +0300
memcg: Enable accounting for nft objects
Patch enables memcg accounting for nft objects.
https://jira.sw.ru/browse/PSBM-128719
Signed-off-by: Vasily Averin <v...@virtuozzo.com>
(cherry picked from commit b6d838ad6519bac8fc003a3fdfe2ca8623492674)
VvS: ported to rh9
https://jira.sw.ru/browse/PSBM-133990
Signed-off-by: Vasily Averin <v...@virtuozzo.com>
---
net/netfilter/nf_tables_api.c | 51 ++++++++++++++++++++++++-------------------
1 file changed, 28 insertions(+), 23 deletions(-)
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 081437dd75b7..96117340b266 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -149,7 +149,7 @@ static struct nft_trans *nft_trans_alloc_gfp(const struct
nft_ctx *ctx,
{
struct nft_trans *trans;
- trans = kzalloc(sizeof(struct nft_trans) + size, gfp);
+ trans = kzalloc(sizeof(struct nft_trans) + size, gfp | __GFP_ACCOUNT);
if (trans == NULL)
return NULL;
@@ -1080,6 +1080,7 @@ static int nf_tables_newtable(struct sk_buff *skb, const
struct nfnl_info *info,
struct nft_table *table;
struct nft_ctx ctx;
u32 flags = 0;
+ gfp_t gfp = GFP_KERNEL_ACCOUNT;
int err;
lockdep_assert_held(&nft_net->commit_mutex);
@@ -1109,16 +1110,16 @@ static int nf_tables_newtable(struct sk_buff *skb,
const struct nfnl_info *info,
}
err = -ENOMEM;
- table = kzalloc(sizeof(*table), GFP_KERNEL);
+ table = kzalloc(sizeof(*table), gfp);
if (table == NULL)
goto err_kzalloc;
- table->name = nla_strdup(attr, GFP_KERNEL);
+ table->name = nla_strdup(attr, gfp);
if (table->name == NULL)
goto err_strdup;
if (nla[NFTA_TABLE_USERDATA]) {
- table->udata = nla_memdup(nla[NFTA_TABLE_USERDATA], GFP_KERNEL);
+ table->udata = nla_memdup(nla[NFTA_TABLE_USERDATA], gfp);
if (table->udata == NULL)
goto err_table_udata;
@@ -1795,7 +1796,7 @@ static struct nft_hook *nft_netdev_hook_alloc(struct net
*net,
struct nft_hook *hook;
int err;
- hook = kmalloc(sizeof(struct nft_hook), GFP_KERNEL);
+ hook = kmalloc(sizeof(struct nft_hook), GFP_KERNEL_ACCOUNT);
if (!hook) {
err = -ENOMEM;
goto err_hook_alloc;
@@ -2010,7 +2011,7 @@ static struct nft_rule
**nf_tables_chain_alloc_rules(const struct nft_chain *cha
alloc *= sizeof(struct nft_rule *);
alloc += sizeof(struct nft_rules_old);
- return kvmalloc(alloc, GFP_KERNEL);
+ return kvmalloc(alloc, GFP_KERNEL_ACCOUNT);
}
static void nft_basechain_hook_init(struct nf_hook_ops *ops, u8 family,
@@ -2086,6 +2087,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8
family, u8 genmask,
struct nft_trans *trans;
struct nft_chain *chain;
struct nft_rule **rules;
+ gfp_t gfp = GFP_KERNEL_ACCOUNT;
int err;
if (table->use == UINT_MAX)
@@ -2102,7 +2104,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8
family, u8 genmask,
if (err < 0)
return err;
- basechain = kzalloc(sizeof(*basechain), GFP_KERNEL);
+ basechain = kzalloc(sizeof(*basechain), gfp);
if (basechain == NULL) {
nft_chain_release_hook(&hook);
return -ENOMEM;
@@ -2132,7 +2134,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8
family, u8 genmask,
if (flags & NFT_CHAIN_HW_OFFLOAD)
return -EOPNOTSUPP;
- chain = kzalloc(sizeof(*chain), GFP_KERNEL);
+ chain = kzalloc(sizeof(*chain), gfp);
if (chain == NULL)
return -ENOMEM;
@@ -2145,7 +2147,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8
family, u8 genmask,
chain->table = table;
if (nla[NFTA_CHAIN_NAME]) {
- chain->name = nla_strdup(nla[NFTA_CHAIN_NAME], GFP_KERNEL);
+ chain->name = nla_strdup(nla[NFTA_CHAIN_NAME], gfp);
} else {
if (!(flags & NFT_CHAIN_BINDING)) {
err = -EINVAL;
@@ -2153,7 +2155,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8
family, u8 genmask,
}
snprintf(name, sizeof(name), "__chain%llu", ++chain_id);
- chain->name = kstrdup(name, GFP_KERNEL);
+ chain->name = kstrdup(name, gfp);
}
if (!chain->name) {
@@ -2162,7 +2164,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8
family, u8 genmask,
}
if (nla[NFTA_CHAIN_USERDATA]) {
- chain->udata = nla_memdup(nla[NFTA_CHAIN_USERDATA], GFP_KERNEL);
+ chain->udata = nla_memdup(nla[NFTA_CHAIN_USERDATA], gfp);
if (chain->udata == NULL) {
err = -ENOMEM;
goto err_destroy_chain;
@@ -2325,7 +2327,7 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8
genmask, u8 policy,
char *name;
err = -ENOMEM;
- name = nla_strdup(nla[NFTA_CHAIN_NAME], GFP_KERNEL);
+ name = nla_strdup(nla[NFTA_CHAIN_NAME], GFP_KERNEL_ACCOUNT);
if (!name)
goto err;
@@ -2773,7 +2775,7 @@ static struct nft_expr *nft_expr_init(const struct
nft_ctx *ctx,
goto err1;
err = -ENOMEM;
- expr = kzalloc(expr_info.ops->size, GFP_KERNEL);
+ expr = kzalloc(expr_info.ops->size, GFP_KERNEL_ACCOUNT);
if (expr == NULL)
goto err2;
@@ -3363,7 +3365,7 @@ static int nf_tables_newrule(struct sk_buff *skb, const
struct nfnl_info *info,
}
err = -ENOMEM;
- rule = kzalloc(sizeof(*rule) + size + usize, GFP_KERNEL);
+ rule = kzalloc(sizeof(*rule) + size + usize, GFP_KERNEL_ACCOUNT);
if (rule == NULL)
goto err_release_expr;
@@ -3778,7 +3780,7 @@ static int nf_tables_set_alloc_name(struct nft_ctx *ctx,
struct nft_set *set,
free_page((unsigned long)inuse);
}
- set->name = kasprintf(GFP_KERNEL, name, min + n);
+ set->name = kasprintf(GFP_KERNEL_ACCOUNT, name, min + n);
if (!set->name)
return -ENOMEM;
@@ -4195,6 +4197,7 @@ static int nf_tables_newset(struct sk_buff *skb, const
struct nfnl_info *info,
int err, i;
u16 udlen;
u64 size;
+ gfp_t gfp = GFP_KERNEL_ACCOUNT;
if (nla[NFTA_SET_TABLE] == NULL ||
nla[NFTA_SET_NAME] == NULL ||
@@ -4338,11 +4341,12 @@ static int nf_tables_newset(struct sk_buff *skb, const
struct nfnl_info *info,
alloc_size = sizeof(*set) + size + udlen;
if (alloc_size < size)
return -ENOMEM;
- set = kvzalloc(alloc_size, GFP_KERNEL);
+
+ set = kvzalloc(alloc_size, gfp);
if (!set)
return -ENOMEM;
- name = nla_strdup(nla[NFTA_SET_NAME], GFP_KERNEL);
+ name = nla_strdup(nla[NFTA_SET_NAME], gfp);
if (!name) {
err = -ENOMEM;
goto err_set_name;
@@ -5873,7 +5877,7 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct
nft_set *set,
err = -ENOMEM;
elem.priv = nft_set_elem_init(set, &tmpl, elem.key.val.data,
elem.key_end.val.data, elem.data.val.data,
- timeout, expiration, GFP_KERNEL);
+ timeout, expiration, GFP_KERNEL_ACCOUNT);
if (elem.priv == NULL)
goto err_parse_data;
@@ -6117,7 +6121,7 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct
nft_set *set,
err = -ENOMEM;
elem.priv = nft_set_elem_init(set, &tmpl, elem.key.val.data,
elem.key_end.val.data, NULL, 0, 0,
- GFP_KERNEL);
+ GFP_KERNEL_ACCOUNT);
if (elem.priv == NULL)
goto fail_elem;
@@ -6429,7 +6433,7 @@ static struct nft_object *nft_obj_init(const struct
nft_ctx *ctx,
}
err = -ENOMEM;
- obj = kzalloc(sizeof(*obj) + ops->size, GFP_KERNEL);
+ obj = kzalloc(sizeof(*obj) + ops->size, GFP_KERNEL_ACCOUNT);
if (!obj)
goto err2;
@@ -6590,7 +6594,7 @@ static int nf_tables_newobj(struct sk_buff *skb, const
struct nfnl_info *info,
obj->key.table = table;
obj->handle = nf_tables_alloc_handle(table);
- obj->key.name = nla_strdup(nla[NFTA_OBJ_NAME], GFP_KERNEL);
+ obj->key.name = nla_strdup(nla[NFTA_OBJ_NAME], GFP_KERNEL_ACCOUNT);
if (!obj->key.name) {
err = -ENOMEM;
goto err_strdup;
@@ -7315,6 +7319,7 @@ static int nf_tables_newflowtable(struct sk_buff *skb,
struct net *net = info->net;
struct nft_table *table;
struct nft_ctx ctx;
+ gfp_t gfp = GFP_KERNEL_ACCOUNT;
int err;
if (!nla[NFTA_FLOWTABLE_TABLE] ||
@@ -7350,7 +7355,7 @@ static int nf_tables_newflowtable(struct sk_buff *skb,
nft_ctx_init(&ctx, net, skb, info->nlh, family, table, NULL, nla);
- flowtable = kzalloc(sizeof(*flowtable), GFP_KERNEL);
+ flowtable = kzalloc(sizeof(*flowtable), gfp);
if (!flowtable)
return -ENOMEM;
@@ -7358,7 +7363,7 @@ static int nf_tables_newflowtable(struct sk_buff *skb,
flowtable->handle = nf_tables_alloc_handle(table);
INIT_LIST_HEAD(&flowtable->hook_list);
- flowtable->name = nla_strdup(nla[NFTA_FLOWTABLE_NAME], GFP_KERNEL);
+ flowtable->name = nla_strdup(nla[NFTA_FLOWTABLE_NAME], gfp);
if (!flowtable->name) {
err = -ENOMEM;
goto err1;
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
