From: Roman Gushchin <guro@fb.com>
To: <bpf@vger.kernel.org>
Cc: <ast@kernel.org>, <daniel@iogearbox.net>,
<netdev@vger.kernel.org>, <andrii@kernel.org>,
<akpm@linux-foundation.org>, <linux-mm@kvack.org>,
<linux-kernel@vger.kernel.org>, <kernel-team@fb.com>
Subject: [PATCH bpf-next v7 14/34] bpf: memcg-based memory accounting for bpf ringbuffer
Date: Thu, 19 Nov 2020 09:37:34 -0800 [thread overview]
Message-ID: <20201119173754.4125257-15-guro@fb.com> (raw)
In-Reply-To: <20201119173754.4125257-1-guro@fb.com>
Enable the memcg-based memory accounting for the memory used by
the bpf ringbuffer.
Signed-off-by: Roman Gushchin <guro@fb.com>
Acked-by: Song Liu <songliubraving@fb.com>
---
kernel/bpf/ringbuf.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/kernel/bpf/ringbuf.c b/kernel/bpf/ringbuf.c
index 31cb04a4dd2d..ee5f55d9276e 100644
--- a/kernel/bpf/ringbuf.c
+++ b/kernel/bpf/ringbuf.c
@@ -60,8 +60,8 @@ struct bpf_ringbuf_hdr {
static struct bpf_ringbuf *bpf_ringbuf_area_alloc(size_t data_sz, int numa_node)
{
- const gfp_t flags = GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN |
- __GFP_ZERO;
+ const gfp_t flags = GFP_KERNEL_ACCOUNT | __GFP_RETRY_MAYFAIL |
+ __GFP_NOWARN | __GFP_ZERO;
int nr_meta_pages = RINGBUF_PGOFF + RINGBUF_POS_PAGES;
int nr_data_pages = data_sz >> PAGE_SHIFT;
int nr_pages = nr_meta_pages + nr_data_pages;
@@ -89,7 +89,8 @@ static struct bpf_ringbuf *bpf_ringbuf_area_alloc(size_t data_sz, int numa_node)
*/
array_size = (nr_meta_pages + 2 * nr_data_pages) * sizeof(*pages);
if (array_size > PAGE_SIZE)
- pages = vmalloc_node(array_size, numa_node);
+ pages = __vmalloc_node(array_size, 1, GFP_KERNEL_ACCOUNT,
+ numa_node, __builtin_return_address(0));
else
pages = kmalloc_node(array_size, flags, numa_node);
if (!pages)
@@ -167,7 +168,7 @@ static struct bpf_map *ringbuf_map_alloc(union bpf_attr *attr)
return ERR_PTR(-E2BIG);
#endif
- rb_map = kzalloc(sizeof(*rb_map), GFP_USER);
+ rb_map = kzalloc(sizeof(*rb_map), GFP_USER | __GFP_ACCOUNT);
if (!rb_map)
return ERR_PTR(-ENOMEM);
--
2.26.2
next prev parent reply other threads:[~2020-11-19 17:38 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-19 17:37 [PATCH bpf-next v7 00/34] bpf: switch to memcg-based memory accounting Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 01/34] mm: memcontrol: use helpers to read page's memcg data Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 02/34] mm: memcontrol/slab: use helpers to access slab page's memcg_data Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 03/34] mm: introduce page memcg flags Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 04/34] mm: convert page kmemcg type to a page memcg flag Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 05/34] bpf: memcg-based memory accounting for bpf progs Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 06/34] bpf: prepare for memcg-based memory accounting for bpf maps Roman Gushchin
2020-11-20 1:05 ` Song Liu
2020-11-19 17:37 ` [PATCH bpf-next v7 07/34] bpf: " Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 08/34] bpf: refine memcg-based memory accounting for arraymap maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 09/34] bpf: refine memcg-based memory accounting for cpumap maps Roman Gushchin
2020-11-20 1:33 ` Song Liu
2020-11-19 17:37 ` [PATCH bpf-next v7 10/34] bpf: memcg-based memory accounting for cgroup storage maps Roman Gushchin
2020-11-20 1:37 ` Song Liu
2020-11-19 17:37 ` [PATCH bpf-next v7 11/34] bpf: refine memcg-based memory accounting for devmap maps Roman Gushchin
2020-11-20 1:38 ` Song Liu
2020-11-19 17:37 ` [PATCH bpf-next v7 12/34] bpf: refine memcg-based memory accounting for hashtab maps Roman Gushchin
2020-11-20 1:39 ` Song Liu
2020-11-19 17:37 ` [PATCH bpf-next v7 13/34] bpf: memcg-based memory accounting for lpm_trie maps Roman Gushchin
2020-11-20 1:39 ` Song Liu
2020-11-19 17:37 ` Roman Gushchin [this message]
2020-11-19 17:37 ` [PATCH bpf-next v7 15/34] bpf: memcg-based memory accounting for bpf local storage maps Roman Gushchin
2020-11-20 1:44 ` Song Liu
2020-11-19 17:37 ` [PATCH bpf-next v7 16/34] bpf: refine memcg-based memory accounting for sockmap and sockhash maps Roman Gushchin
2020-11-20 1:45 ` Song Liu
2020-11-19 17:37 ` [PATCH bpf-next v7 17/34] bpf: refine memcg-based memory accounting for xskmap maps Roman Gushchin
2020-11-20 1:45 ` Song Liu
2020-11-19 17:37 ` [PATCH bpf-next v7 18/34] bpf: eliminate rlimit-based memory accounting for arraymap maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 19/34] bpf: eliminate rlimit-based memory accounting for bpf_struct_ops maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 20/34] bpf: eliminate rlimit-based memory accounting for cpumap maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 21/34] bpf: eliminate rlimit-based memory accounting for cgroup storage maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 22/34] bpf: eliminate rlimit-based memory accounting for devmap maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 23/34] bpf: eliminate rlimit-based memory accounting for hashtab maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 24/34] bpf: eliminate rlimit-based memory accounting for lpm_trie maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 25/34] bpf: eliminate rlimit-based memory accounting for queue_stack_maps maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 26/34] bpf: eliminate rlimit-based memory accounting for reuseport_array maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 27/34] bpf: eliminate rlimit-based memory accounting for bpf ringbuffer Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 28/34] bpf: eliminate rlimit-based memory accounting for sockmap and sockhash maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 29/34] bpf: eliminate rlimit-based memory accounting for stackmap maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 30/34] bpf: eliminate rlimit-based memory accounting for xskmap maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 31/34] bpf: eliminate rlimit-based memory accounting for bpf local storage maps Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 32/34] bpf: eliminate rlimit-based memory accounting infra for bpf maps Roman Gushchin
2020-11-21 2:52 ` Alexei Starovoitov
2020-11-21 2:59 ` Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 33/34] bpf: eliminate rlimit-based memory accounting for bpf progs Roman Gushchin
2020-11-19 17:37 ` [PATCH bpf-next v7 34/34] bpf: samples: do not touch RLIMIT_MEMLOCK Roman Gushchin
2020-11-23 13:30 ` [PATCH bpf-next v7 00/34] bpf: switch to memcg-based memory accounting Daniel Borkmann
2020-11-24 0:05 ` 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=20201119173754.4125257-15-guro@fb.com \
--to=guro@fb.com \
--cc=akpm@linux-foundation.org \
--cc=andrii@kernel.org \
--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=linux-mm@kvack.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 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.