[v6,05/34] bpf: memcg-based memory accounting for bpf progs

Message ID	20201117025529.1034387-6-guro@fb.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=Ztci=EX=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 16D9C206E3 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 v6 05/34] bpf: memcg-based memory accounting for bpf progs Date: Mon, 16 Nov 2020 18:55:00 -0800 Message-ID: <20201117025529.1034387-6-guro@fb.com> In-Reply-To: <20201117025529.1034387-1-guro@fb.com> References: <20201117025529.1034387-1-guro@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	bpf: switch to memcg-based memory accounting \| expand [v6,00/34] bpf: switch to memcg-based memory accounting [v6,01/34] mm: memcontrol: use helpers to read page's memcg data [v6,02/34] mm: memcontrol/slab: use helpers to access slab page's memcg_data [v6,03/34] mm: introduce page memcg flags [v6,04/34] mm: convert page kmemcg type to a page memcg flag [v6,05/34] bpf: memcg-based memory accounting for bpf progs [v6,06/34] bpf: prepare for memcg-based memory accounting for bpf maps [v6,07/34] bpf: memcg-based memory accounting for bpf maps [v6,08/34] bpf: refine memcg-based memory accounting for arraymap maps [v6,09/34] bpf: refine memcg-based memory accounting for cpumap maps [v6,10/34] bpf: memcg-based memory accounting for cgroup storage maps [v6,11/34] bpf: refine memcg-based memory accounting for devmap maps [v6,12/34] bpf: refine memcg-based memory accounting for hashtab maps [v6,13/34] bpf: memcg-based memory accounting for lpm_trie maps [v6,14/34] bpf: memcg-based memory accounting for bpf ringbuffer [v6,15/34] bpf: memcg-based memory accounting for bpf local storage maps [v6,16/34] bpf: refine memcg-based memory accounting for sockmap and sockhash maps [v6,17/34] bpf: refine memcg-based memory accounting for xskmap maps [v6,18/34] bpf: eliminate rlimit-based memory accounting for arraymap maps [v6,19/34] bpf: eliminate rlimit-based memory accounting for bpf_struct_ops maps [v6,20/34] bpf: eliminate rlimit-based memory accounting for cpumap maps [v6,21/34] bpf: eliminate rlimit-based memory accounting for cgroup storage maps [v6,22/34] bpf: eliminate rlimit-based memory accounting for devmap maps [v6,23/34] bpf: eliminate rlimit-based memory accounting for hashtab maps [v6,24/34] bpf: eliminate rlimit-based memory accounting for lpm_trie maps [v6,25/34] bpf: eliminate rlimit-based memory accounting for queue_stack_maps maps [v6,26/34] bpf: eliminate rlimit-based memory accounting for reuseport_array maps [v6,27/34] bpf: eliminate rlimit-based memory accounting for bpf ringbuffer [v6,28/34] bpf: eliminate rlimit-based memory accounting for sockmap and sockhash maps [v6,29/34] bpf: eliminate rlimit-based memory accounting for stackmap maps [v6,30/34] bpf: eliminate rlimit-based memory accounting for xskmap maps [v6,31/34] bpf: eliminate rlimit-based memory accounting for bpf local storage maps [v6,32/34] bpf: eliminate rlimit-based memory accounting infra for bpf maps [v6,33/34] bpf: eliminate rlimit-based memory accounting for bpf progs [v6,34/34] bpf: samples: do not touch RLIMIT_MEMLOCK

Message ID

20201117025529.1034387-6-guro@fb.com (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 16D9C206E3
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 v6 05/34] bpf: memcg-based memory accounting for bpf progs
Date: Mon, 16 Nov 2020 18:55:00 -0800
Message-ID: <20201117025529.1034387-6-guro@fb.com>
In-Reply-To: <20201117025529.1034387-1-guro@fb.com>
References: <20201117025529.1034387-1-guro@fb.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

bpf: switch to memcg-based memory accounting | expand

Commit Message

Roman Gushchin Nov. 17, 2020, 2:55 a.m. UTC

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 55454d2278b1..fd83e5c65d15 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;

[v6,05/34] bpf: memcg-based memory accounting for bpf progs

Commit Message

Patch