From: Roman Gushchin <guro@fb.com>
To: <bpf@vger.kernel.org>
Cc: <netdev@vger.kernel.org>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>, <kernel-team@fb.com>,
<linux-kernel@vger.kernel.org>, Roman Gushchin <guro@fb.com>
Subject: [PATCH bpf-next 08/35] bpf: memcg-based memory accounting for lpm_trie maps
Date: Fri, 24 Jul 2020 17:03:43 -0700 [thread overview]
Message-ID: <20200725000410.3566700-9-guro@fb.com> (raw)
In-Reply-To: <20200725000410.3566700-1-guro@fb.com>
Include lpm trie and lpm trie node objects into the memcg-based memory
accounting.
Signed-off-by: Roman Gushchin <guro@fb.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
next prev parent reply other threads:[~2020-07-25 0:06 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-25 0:03 [PATCH bpf-next 00/35] bpf: switch to memcg-based memory accounting Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 01/35] bpf: memcg-based memory accounting for bpf progs Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 02/35] bpf: memcg-based memory accounting for bpf maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 03/35] bpf: refine memcg-based memory accounting for arraymap maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 04/35] bpf: refine memcg-based memory accounting for cpumap maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 05/35] bpf: memcg-based memory accounting for cgroup storage maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 06/35] bpf: refine memcg-based memory accounting for devmap maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 07/35] bpf: refine memcg-based memory accounting for hashtab maps Roman Gushchin
2020-07-25 0:03 ` Roman Gushchin [this message]
2020-07-25 0:03 ` [PATCH bpf-next 09/35] bpf: memcg-based memory accounting for bpf ringbuffer Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 10/35] bpf: memcg-based memory accounting for socket storage maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 11/35] bpf: refine memcg-based memory accounting for sockmap maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 12/35] bpf: refine memcg-based memory accounting for xskmap maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 13/35] bpf: eliminate rlimit-based memory accounting for arraymap maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 14/35] bpf: eliminate rlimit-based memory accounting for bpf_struct_ops maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 15/35] bpf: eliminate rlimit-based memory accounting for cpumap maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 16/35] bpf: eliminate rlimit-based memory accounting for cgroup storage maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 17/35] bpf: eliminate rlimit-based memory accounting for devmap maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 18/35] bpf: eliminate rlimit-based memory accounting for hashtab maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 19/35] bpf: eliminate rlimit-based memory accounting for lpm_trie maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 20/35] bpf: eliminate rlimit-based memory accounting for queue_stack_maps maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 21/35] bpf: eliminate rlimit-based memory accounting for reuseport_array maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 22/35] bpf: eliminate rlimit-based memory accounting for bpf ringbuffer Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 23/35] bpf: eliminate rlimit-based memory accounting for sock_map maps Roman Gushchin
2020-07-25 0:03 ` [PATCH bpf-next 24/35] bpf: eliminate rlimit-based memory accounting for stackmap maps Roman Gushchin
2020-07-25 0:04 ` [PATCH bpf-next 25/35] bpf: eliminate rlimit-based memory accounting for socket storage maps Roman Gushchin
2020-07-25 0:04 ` [PATCH bpf-next 26/35] bpf: eliminate rlimit-based memory accounting for xskmap maps Roman Gushchin
2020-07-25 0:04 ` [PATCH bpf-next 27/35] bpf: eliminate rlimit-based memory accounting infra for bpf maps Roman Gushchin
2020-07-25 0:04 ` [PATCH bpf-next 28/35] bpf: eliminate rlimit-based memory accounting for bpf progs Roman Gushchin
2020-07-25 0:04 ` [PATCH bpf-next 29/35] bpf: libbpf: cleanup RLIMIT_MEMLOCK usage Roman Gushchin
2020-07-25 0:04 ` [PATCH bpf-next 30/35] bpf: bpftool: do not touch RLIMIT_MEMLOCK Roman Gushchin
2020-07-25 0:04 ` [PATCH bpf-next 31/35] bpf: runqslower: don't " Roman Gushchin
2020-07-25 0:04 ` [PATCH bpf-next 32/35] bpf: selftests: delete bpf_rlimit.h Roman Gushchin
2020-07-25 0:04 ` [PATCH bpf-next 33/35] bpf: selftests: don't touch RLIMIT_MEMLOCK Roman Gushchin
2020-07-25 0:04 ` [PATCH bpf-next 34/35] bpf: samples: do not " Roman Gushchin
2020-07-25 0:04 ` [PATCH bpf-next 35/35] perf: don't " Roman Gushchin
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=20200725000410.3566700-9-guro@fb.com \
--to=guro@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).