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 05/34] bpf: memcg-based memory accounting for bpf progs
Date: Thu, 19 Nov 2020 09:37:25 -0800 [thread overview]
Message-ID: <20201119173754.4125257-6-guro@fb.com> (raw)
In-Reply-To: <20201119173754.4125257-1-guro@fb.com>
Include memory used by bpf programs into the memcg-based accounting.
This includes the memory used by programs itself, auxiliary data,
statistics and bpf line info. A memory cgroup containing the
process which loads the program is getting charged.
Signed-off-by: Roman Gushchin <guro@fb.com>
Acked-by: Song Liu <songliubraving@fb.com>
---
kernel/bpf/core.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index ff55cbcfbab4..2921f58c03a8 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -77,7 +77,7 @@ void *bpf_internal_load_pointer_neg_helper(const struct sk_buff *skb, int k, uns
struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flags)
{
- gfp_t gfp_flags = GFP_KERNEL | __GFP_ZERO | gfp_extra_flags;
+ gfp_t gfp_flags = GFP_KERNEL_ACCOUNT | __GFP_ZERO | gfp_extra_flags;
struct bpf_prog_aux *aux;
struct bpf_prog *fp;
@@ -86,7 +86,7 @@ struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flag
if (fp == NULL)
return NULL;
- aux = kzalloc(sizeof(*aux), GFP_KERNEL | gfp_extra_flags);
+ aux = kzalloc(sizeof(*aux), GFP_KERNEL_ACCOUNT | gfp_extra_flags);
if (aux == NULL) {
vfree(fp);
return NULL;
@@ -106,7 +106,7 @@ struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flag
struct bpf_prog *bpf_prog_alloc(unsigned int size, gfp_t gfp_extra_flags)
{
- gfp_t gfp_flags = GFP_KERNEL | __GFP_ZERO | gfp_extra_flags;
+ gfp_t gfp_flags = GFP_KERNEL_ACCOUNT | __GFP_ZERO | gfp_extra_flags;
struct bpf_prog *prog;
int cpu;
@@ -138,7 +138,7 @@ int bpf_prog_alloc_jited_linfo(struct bpf_prog *prog)
prog->aux->jited_linfo = kcalloc(prog->aux->nr_linfo,
sizeof(*prog->aux->jited_linfo),
- GFP_KERNEL | __GFP_NOWARN);
+ GFP_KERNEL_ACCOUNT | __GFP_NOWARN);
if (!prog->aux->jited_linfo)
return -ENOMEM;
@@ -219,7 +219,7 @@ void bpf_prog_free_linfo(struct bpf_prog *prog)
struct bpf_prog *bpf_prog_realloc(struct bpf_prog *fp_old, unsigned int size,
gfp_t gfp_extra_flags)
{
- gfp_t gfp_flags = GFP_KERNEL | __GFP_ZERO | gfp_extra_flags;
+ gfp_t gfp_flags = GFP_KERNEL_ACCOUNT | __GFP_ZERO | gfp_extra_flags;
struct bpf_prog *fp;
u32 pages, delta;
int ret;
--
2.26.2
next prev parent reply other threads:[~2020-11-19 17:38 UTC|newest]
Thread overview: 47+ 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 ` Roman Gushchin [this message]
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 ` [PATCH bpf-next v7 14/34] bpf: memcg-based memory accounting for bpf ringbuffer Roman Gushchin
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
[not found] ` <9134a408-e26c-a7f2-23a7-5fc221bafdde@iogearbox.net>
2020-11-24 0:05 ` [PATCH bpf-next v7 00/34] bpf: switch to memcg-based memory accounting 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-6-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox