[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAPhsuW4jUcPD6KPYiFoSRcVucGqry4FdEXs2re0qR00VWL6vug@mail.gmail.com>
Date: Mon, 27 Jul 2020 16:55:15 -0700
From: Song Liu <song@...nel.org>
To: Roman Gushchin <guro@...com>
Cc: bpf <bpf@...r.kernel.org>, Networking <netdev@...r.kernel.org>,
Alexei Starovoitov <ast@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>,
Kernel Team <kernel-team@...com>,
open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH bpf-next v2 08/35] bpf: memcg-based memory accounting for
lpm_trie maps
On Mon, Jul 27, 2020 at 12:22 PM Roman Gushchin <guro@...com> wrote:
>
> Include lpm trie and lpm trie node objects into the memcg-based memory
> accounting.
>
> Signed-off-by: Roman Gushchin <guro@...com>
Acked-by: Song Liu <songliubraving@...com>
> ---
> kernel/bpf/lpm_trie.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/bpf/lpm_trie.c b/kernel/bpf/lpm_trie.c
> index 44474bf3ab7a..d85e0fc2cafc 100644
> --- a/kernel/bpf/lpm_trie.c
> +++ b/kernel/bpf/lpm_trie.c
> @@ -282,7 +282,7 @@ static struct lpm_trie_node *lpm_trie_node_alloc(const struct lpm_trie *trie,
> if (value)
> size += trie->map.value_size;
>
> - node = kmalloc_node(size, GFP_ATOMIC | __GFP_NOWARN,
> + node = kmalloc_node(size, GFP_ATOMIC | __GFP_NOWARN | __GFP_ACCOUNT,
> trie->map.numa_node);
> if (!node)
> return NULL;
> @@ -557,7 +557,7 @@ static struct bpf_map *trie_alloc(union bpf_attr *attr)
> attr->value_size > LPM_VAL_SIZE_MAX)
> return ERR_PTR(-EINVAL);
>
> - trie = kzalloc(sizeof(*trie), GFP_USER | __GFP_NOWARN);
> + trie = kzalloc(sizeof(*trie), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT);
> if (!trie)
> return ERR_PTR(-ENOMEM);
>
> --
> 2.26.2
>
Powered by blists - more mailing lists