From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Vasily Averin <vasily.averin@linux.dev>
Cc: Florian Westphal <fw@strlen.de>,
Jozsef Kadlecsik <kadlec@netfilter.org>,
linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org,
kernel@openvz.org
Subject: Re: [PATCH v2] memcg: enable accounting for nft objects
Date: Thu, 24 Mar 2022 15:19:19 +0100 [thread overview]
Message-ID: <Yjx95+4qTtcYFYrv@salvia> (raw)
In-Reply-To: <f359be78-c95d-555a-67ec-f665f90e93b8@linux.dev>
Hm. Patch does not apply for some reason. git am complains. And
manually applying this also fails.
patch -p1 < vasily.averin.txt
patching file net/netfilter/core.c
Hunk #1 FAILED at 58.
1 out of 1 hunk FAILED -- saving rejects to file net/netfilter/core.c.rej
patching file net/netfilter/nf_tables_api.c
Hunk #1 FAILED at 1113.
Hunk #2 FAILED at 1803.
Hunk #3 FAILED at 2026.
Hunk #4 FAILED at 2126.
Hunk #5 FAILED at 2156.
Hunk #6 FAILED at 2169.
Hunk #7 FAILED at 2177.
Hunk #8 FAILED at 2186.
Hunk #9 FAILED at 2349.
Hunk #10 FAILED at 2797.
Hunk #11 FAILED at 3405.
Hunk #12 FAILED at 3818.
Hunk #13 FAILED at 4382.
Hunk #14 FAILED at 5921.
Hunk #15 FAILED at 6165.
Hunk #16 FAILED at 6477.
Hunk #17 FAILED at 6643.
Hunk #18 FAILED at 7404.
Hunk #19 FAILED at 7412.
19 out of 19 hunks FAILED -- saving rejects to file net/netfilter/nf_tables_api.c.rej
On Mon, Mar 21, 2022 at 08:02:22AM +0300, Vasily Averin wrote:
> nftables replaces iptables, but it lacks memcg accounting.
>
> This patch account most of the memory allocation associated with nft
> and should protect the host from misusing nft inside a memcg restricted
> container.
>
> Signed-off-by: Vasily Averin <vvs@openvz.org>
> ---
> net/netfilter/core.c | 2 +-
> net/netfilter/nf_tables_api.c | 44 +++++++++++++++++------------------
> 2 files changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/net/netfilter/core.c b/net/netfilter/core.c
> index 8a77a3fd69bc..77ae3e8d344c 100644
> --- a/net/netfilter/core.c
> +++ b/net/netfilter/core.c
> @@ -58,7 +58,7 @@ static struct nf_hook_entries *allocate_hook_entries_size(u16 num)
> if (num == 0)
> return NULL;
> - e = kvzalloc(alloc, GFP_KERNEL);
> + e = kvzalloc(alloc, GFP_KERNEL_ACCOUNT);
> if (e)
> e->num_hook_entries = num;
> return e;
> diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
> index d71a33ae39b3..04be94236a34 100644
> --- a/net/netfilter/nf_tables_api.c
> +++ b/net/netfilter/nf_tables_api.c
> @@ -1113,16 +1113,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_KERNEL_ACCOUNT);
> if (table == NULL)
> goto err_kzalloc;
> - table->name = nla_strdup(attr, GFP_KERNEL);
> + table->name = nla_strdup(attr, GFP_KERNEL_ACCOUNT);
> 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_KERNEL_ACCOUNT);
> if (table->udata == NULL)
> goto err_table_udata;
> @@ -1803,7 +1803,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;
> @@ -2026,7 +2026,7 @@ static struct nft_rule_blob *nf_tables_chain_alloc_rules(unsigned int size)
> if (size > INT_MAX)
> return NULL;
> - blob = kvmalloc(size, GFP_KERNEL);
> + blob = kvmalloc(size, GFP_KERNEL_ACCOUNT);
> if (!blob)
> return NULL;
> @@ -2126,7 +2126,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_KERNEL_ACCOUNT);
> if (basechain == NULL) {
> nft_chain_release_hook(&hook);
> return -ENOMEM;
> @@ -2156,7 +2156,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_KERNEL_ACCOUNT);
> if (chain == NULL)
> return -ENOMEM;
> @@ -2169,7 +2169,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_KERNEL_ACCOUNT);
> } else {
> if (!(flags & NFT_CHAIN_BINDING)) {
> err = -EINVAL;
> @@ -2177,7 +2177,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_KERNEL_ACCOUNT);
> }
> if (!chain->name) {
> @@ -2186,7 +2186,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_KERNEL_ACCOUNT);
> if (chain->udata == NULL) {
> err = -ENOMEM;
> goto err_destroy_chain;
> @@ -2349,7 +2349,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;
> @@ -2797,7 +2797,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;
> @@ -3405,7 +3405,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;
> @@ -3818,7 +3818,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;
> @@ -4382,11 +4382,11 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info,
> alloc_size = sizeof(*set) + size + udlen;
> if (alloc_size < size || alloc_size > INT_MAX)
> return -ENOMEM;
> - set = kvzalloc(alloc_size, GFP_KERNEL);
> + set = kvzalloc(alloc_size, GFP_KERNEL_ACCOUNT);
> if (!set)
> return -ENOMEM;
> - name = nla_strdup(nla[NFTA_SET_NAME], GFP_KERNEL);
> + name = nla_strdup(nla[NFTA_SET_NAME], GFP_KERNEL_ACCOUNT);
> if (!name) {
> err = -ENOMEM;
> goto err_set_name;
> @@ -5921,7 +5921,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;
> @@ -6165,7 +6165,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;
> @@ -6477,7 +6477,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;
> @@ -6643,7 +6643,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;
> @@ -7404,7 +7404,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_KERNEL_ACCOUNT);
> if (!flowtable)
> return -ENOMEM;
> @@ -7412,7 +7412,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_KERNEL_ACCOUNT);
> if (!flowtable->name) {
> err = -ENOMEM;
> goto err1;
> --
> 2.25.1
>
next prev parent reply other threads:[~2022-03-24 14:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 6:39 [PATCH RFC] memcg: Enable accounting for nft objects Vasily Averin
2022-02-28 12:24 ` Florian Westphal
2022-03-21 5:02 ` [PATCH v2] memcg: enable " Vasily Averin
2022-03-22 10:25 ` Florian Westphal
2022-03-24 14:19 ` Pablo Neira Ayuso [this message]
2022-03-24 17:23 ` Vasily Averin
2022-03-21 5:12 ` [PATCH RFC] memcg: Enable " Vasily Averin
2022-03-24 18:05 ` [PATCH v2 RESEND] memcg: enable " Vasily Averin
2022-03-28 8:15 ` Pablo Neira Ayuso
2022-03-28 9:23 ` Vasily Averin
2022-03-31 8:40 ` [PATCH nft] nft: memcg accounting for dynamically allocated objects Vasily Averin
2022-03-31 18:45 ` Roman Gushchin
2022-04-01 12:03 ` Florian Westphal
2022-04-01 18:56 ` Vasily Averin
2022-04-01 19:31 ` Florian Westphal
2022-04-01 21:14 ` Roman Gushchin
2022-04-01 23:01 ` Florian Westphal
2022-04-02 8:55 ` Vasily Averin
2022-04-02 9:50 ` [PATCH v2] " Vasily Averin
2022-04-05 9:58 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yjx95+4qTtcYFYrv@salvia \
--to=pablo@netfilter.org \
--cc=fw@strlen.de \
--cc=kadlec@netfilter.org \
--cc=kernel@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=vasily.averin@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.