From: Roman Gushchin <guro@fb.com>
To: <bpf@vger.kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>, <netdev@vger.kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Shakeel Butt <shakeelb@google.com>, <linux-mm@kvack.org>,
<linux-kernel@vger.kernel.org>, <kernel-team@fb.com>,
Roman Gushchin <guro@fb.com>, Song Liu <songliubraving@fb.com>
Subject: [PATCH bpf-next v5 22/34] bpf: eliminate rlimit-based memory accounting for devmap maps
Date: Thu, 12 Nov 2020 14:15:31 -0800 [thread overview]
Message-ID: <20201112221543.3621014-23-guro@fb.com> (raw)
In-Reply-To: <20201112221543.3621014-1-guro@fb.com>
Do not use rlimit-based memory accounting for devmap maps.
It has been replaced with the memcg-based memory accounting.
Signed-off-by: Roman Gushchin <guro@fb.com>
Acked-by: Song Liu <songliubraving@fb.com>
---
kernel/bpf/devmap.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
index e75e12ae624e..b2e98c1049e1 100644
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -109,8 +109,6 @@ static inline struct hlist_head *dev_map_index_hash(struct bpf_dtab *dtab,
static int dev_map_init_map(struct bpf_dtab *dtab, union bpf_attr *attr)
{
u32 valsize = attr->value_size;
- u64 cost = 0;
- int err;
/* check sanity of attributes. 2 value sizes supported:
* 4 bytes: ifindex
@@ -135,21 +133,13 @@ static int dev_map_init_map(struct bpf_dtab *dtab, union bpf_attr *attr)
if (!dtab->n_buckets) /* Overflow check */
return -EINVAL;
- cost += (u64) sizeof(struct hlist_head) * dtab->n_buckets;
- } else {
- cost += (u64) dtab->map.max_entries * sizeof(struct bpf_dtab_netdev *);
}
- /* if map size is larger than memlock limit, reject it */
- err = bpf_map_charge_init(&dtab->map.memory, cost);
- if (err)
- return -EINVAL;
-
if (attr->map_type == BPF_MAP_TYPE_DEVMAP_HASH) {
dtab->dev_index_head = dev_map_create_hash(dtab->n_buckets,
dtab->map.numa_node);
if (!dtab->dev_index_head)
- goto free_charge;
+ return -ENOMEM;
spin_lock_init(&dtab->index_lock);
} else {
@@ -157,14 +147,10 @@ static int dev_map_init_map(struct bpf_dtab *dtab, union bpf_attr *attr)
sizeof(struct bpf_dtab_netdev *),
dtab->map.numa_node);
if (!dtab->netdev_map)
- goto free_charge;
+ return -ENOMEM;
}
return 0;
-
-free_charge:
- bpf_map_charge_finish(&dtab->map.memory);
- return -ENOMEM;
}
static struct bpf_map *dev_map_alloc(union bpf_attr *attr)
--
2.26.2
next prev parent reply other threads:[~2020-11-12 22:36 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 22:15 [PATCH bpf-next v5 00/34] bpf: switch to memcg-based memory accounting Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 01/34] mm: memcontrol: use helpers to read page's memcg data Roman Gushchin
2020-11-12 22:56 ` Stephen Rothwell
2020-11-13 0:26 ` Roman Gushchin
2020-11-13 3:04 ` Alexei Starovoitov
2020-11-13 3:18 ` Andrew Morton
2020-11-13 3:25 ` Alexei Starovoitov
2020-11-13 3:40 ` Andrew Morton
2020-11-13 4:08 ` Alexei Starovoitov
2020-11-13 4:01 ` Roman Gushchin
2020-11-13 14:25 ` Shakeel Butt
2020-11-13 17:18 ` Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 02/34] mm: memcontrol/slab: use helpers to access slab page's memcg_data Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 03/34] mm: introduce page memcg flags Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 04/34] mm: convert page kmemcg type to a page memcg flag Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 05/34] bpf: memcg-based memory accounting for bpf progs Roman Gushchin
2020-11-13 17:31 ` Song Liu
2020-11-12 22:15 ` [PATCH bpf-next v5 06/34] bpf: prepare for memcg-based memory accounting for bpf maps Roman Gushchin
2020-11-13 17:46 ` Song Liu
2020-11-13 19:40 ` Roman Gushchin
2020-11-13 20:48 ` Song Liu
2020-11-12 22:15 ` [PATCH bpf-next v5 07/34] bpf: " Roman Gushchin
2020-11-13 18:04 ` Song Liu
2020-11-12 22:15 ` [PATCH bpf-next v5 08/34] bpf: refine memcg-based memory accounting for arraymap maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 09/34] bpf: refine memcg-based memory accounting for cpumap maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 10/34] bpf: memcg-based memory accounting for cgroup storage maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 11/34] bpf: refine memcg-based memory accounting for devmap maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 12/34] bpf: refine memcg-based memory accounting for hashtab maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 13/34] bpf: memcg-based memory accounting for lpm_trie maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 14/34] bpf: memcg-based memory accounting for bpf ringbuffer Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 15/34] bpf: memcg-based memory accounting for bpf local storage maps Roman Gushchin
2020-11-13 18:07 ` Song Liu
2020-11-12 22:15 ` [PATCH bpf-next v5 16/34] bpf: refine memcg-based memory accounting for sockmap and sockhash maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 17/34] bpf: refine memcg-based memory accounting for xskmap maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 18/34] bpf: eliminate rlimit-based memory accounting for arraymap maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 19/34] bpf: eliminate rlimit-based memory accounting for bpf_struct_ops maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 20/34] bpf: eliminate rlimit-based memory accounting for cpumap maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 21/34] bpf: eliminate rlimit-based memory accounting for cgroup storage maps Roman Gushchin
2020-11-12 22:15 ` Roman Gushchin [this message]
2020-11-12 22:15 ` [PATCH bpf-next v5 23/34] bpf: eliminate rlimit-based memory accounting for hashtab maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 24/34] bpf: eliminate rlimit-based memory accounting for lpm_trie maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 25/34] bpf: eliminate rlimit-based memory accounting for queue_stack_maps maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 26/34] bpf: eliminate rlimit-based memory accounting for reuseport_array maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 27/34] bpf: eliminate rlimit-based memory accounting for bpf ringbuffer Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 28/34] bpf: eliminate rlimit-based memory accounting for sockmap and sockhash maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 29/34] bpf: eliminate rlimit-based memory accounting for stackmap maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 30/34] bpf: eliminate rlimit-based memory accounting for xskmap maps Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 31/34] bpf: eliminate rlimit-based memory accounting for bpf local storage maps Roman Gushchin
2020-11-13 18:14 ` Song Liu
2020-11-13 19:33 ` Roman Gushchin
2020-11-13 20:53 ` Song Liu
2020-11-12 22:15 ` [PATCH bpf-next v5 32/34] bpf: eliminate rlimit-based memory accounting infra for bpf maps Roman Gushchin
2020-11-13 18:17 ` Song Liu
2020-11-12 22:15 ` [PATCH bpf-next v5 33/34] bpf: eliminate rlimit-based memory accounting for bpf progs Roman Gushchin
2020-11-12 22:15 ` [PATCH bpf-next v5 34/34] bpf: samples: do not touch RLIMIT_MEMLOCK 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=20201112221543.3621014-23-guro@fb.com \
--to=guro@fb.com \
--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 \
--cc=shakeelb@google.com \
--cc=songliubraving@fb.com \
/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;
as well as URLs for NNTP newsgroup(s).