diff mbox series

[v6,07/34] bpf: memcg-based memory accounting for bpf maps

Message ID	20201117025529.1034387-8-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 74C2420867 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 07/34] bpf: memcg-based memory accounting for bpf maps Date: Mon, 16 Nov 2020 18:55:02 -0800 Message-ID: <20201117025529.1034387-8-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

Commit Message

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

This patch enables memcg-based memory accounting for memory allocated
by __bpf_map_area_alloc(), which is used by many types of bpf maps for
large memory allocations.

Following patches in the series will refine the accounting for
some of the map types.

Signed-off-by: Roman Gushchin <guro@fb.com>
Acked-by: Song Liu <songliubraving@fb.com>
---
 kernel/bpf/syscall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 2d77fc2496da..fcadf953989f 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -280,7 +280,7 @@  static void *__bpf_map_area_alloc(u64 size, int numa_node, bool mmapable)
 	 * __GFP_RETRY_MAYFAIL to avoid such situations.
 	 */
 
-	const gfp_t gfp = __GFP_NOWARN | __GFP_ZERO;
+	const gfp_t gfp = __GFP_NOWARN | __GFP_ZERO | __GFP_ACCOUNT;
 	unsigned int flags = 0;
 	unsigned long align = 1;
 	void *area;