All of lore.kernel.org
 help / color / mirror / Atom feed
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 14/35] bpf: eliminate rlimit-based memory accounting for bpf_struct_ops maps
Date: Fri, 24 Jul 2020 17:03:49 -0700	[thread overview]
Message-ID: <20200725000410.3566700-15-guro@fb.com> (raw)
In-Reply-To: <20200725000410.3566700-1-guro@fb.com>

Do not use rlimit-based memory accounting for bpf_struct_ops maps.
It has been replaced with the memcg-based memory accounting.

Signed-off-by: Roman Gushchin <guro@fb.com>
---
 kernel/bpf/bpf_struct_ops.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c
index 969c5d47f81f..22bfa236683b 100644
--- a/kernel/bpf/bpf_struct_ops.c
+++ b/kernel/bpf/bpf_struct_ops.c
@@ -550,12 +550,10 @@ static int bpf_struct_ops_map_alloc_check(union bpf_attr *attr)
 static struct bpf_map *bpf_struct_ops_map_alloc(union bpf_attr *attr)
 {
 	const struct bpf_struct_ops *st_ops;
-	size_t map_total_size, st_map_size;
+	size_t st_map_size;
 	struct bpf_struct_ops_map *st_map;
 	const struct btf_type *t, *vt;
-	struct bpf_map_memory mem;
 	struct bpf_map *map;
-	int err;
 
 	if (!bpf_capable())
 		return ERR_PTR(-EPERM);
@@ -575,20 +573,11 @@ static struct bpf_map *bpf_struct_ops_map_alloc(union bpf_attr *attr)
 		 * struct bpf_struct_ops_tcp_congestions_ops
 		 */
 		(vt->size - sizeof(struct bpf_struct_ops_value));
-	map_total_size = st_map_size +
-		/* uvalue */
-		sizeof(vt->size) +
-		/* struct bpf_progs **progs */
-		 btf_type_vlen(t) * sizeof(struct bpf_prog *);
-	err = bpf_map_charge_init(&mem, map_total_size);
-	if (err < 0)
-		return ERR_PTR(err);
 
 	st_map = bpf_map_area_alloc(st_map_size, NUMA_NO_NODE);
-	if (!st_map) {
-		bpf_map_charge_finish(&mem);
+	if (!st_map)
 		return ERR_PTR(-ENOMEM);
-	}
+
 	st_map->st_ops = st_ops;
 	map = &st_map->map;
 
@@ -599,14 +588,12 @@ static struct bpf_map *bpf_struct_ops_map_alloc(union bpf_attr *attr)
 	st_map->image = bpf_jit_alloc_exec(PAGE_SIZE);
 	if (!st_map->uvalue || !st_map->progs || !st_map->image) {
 		bpf_struct_ops_map_free(map);
-		bpf_map_charge_finish(&mem);
 		return ERR_PTR(-ENOMEM);
 	}
 
 	mutex_init(&st_map->lock);
 	set_vm_flush_reset_perms(st_map->image);
 	bpf_map_init_from_attr(map, attr);
-	bpf_map_charge_move(&map->memory, &mem);
 
 	return map;
 }
-- 
2.26.2


  parent reply	other threads:[~2020-07-25  0:06 UTC|newest]

Thread overview: 37+ 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 ` [PATCH bpf-next 08/35] bpf: memcg-based memory accounting for lpm_trie maps Roman Gushchin
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 ` Roman Gushchin [this message]
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  4:10   ` kernel test robot
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-15-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 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.