Merge branch 'map-charge-cleanup'

Roman Gushchin says: ==================== During my work on memcg-based memory accounting for bpf maps I've done some cleanups and refactorings of the existing memlock rlimit-based code. It makes it more robust, unifies size to pages conversion, size checks and corresponding error codes. Also it adds coverage for cgroup local storage and socket local storage maps. It looks like some preliminary work on the mm side might be required to start working on the memcg-based accounting, so I'm sending these patches as a separate patchset. ==================== Signed-off-by: Alexei Starovoitov <ast@kernel.org>
2026-10-14 05:55:17 +00:00 · 2019-05-31 16:52:56 -07:00 · 2019-05-31 16:52:56 -07:00 · d168286d77
commit d168286d77
parent 576240cfaf c85d69135a
14 changed files with 132 additions and 135 deletions
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
--- a/kernel/bpf/cpumap.c
+++ b/kernel/bpf/cpumap.c
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
--- a/kernel/bpf/hashtab.c
+++ b/kernel/bpf/hashtab.c
--- a/kernel/bpf/local_storage.c
+++ b/kernel/bpf/local_storage.c
--- a/kernel/bpf/lpm_trie.c
+++ b/kernel/bpf/lpm_trie.c
--- a/kernel/bpf/queue_stack_maps.c
+++ b/kernel/bpf/queue_stack_maps.c
--- a/kernel/bpf/reuseport_array.c
+++ b/kernel/bpf/reuseport_array.c
--- a/kernel/bpf/stackmap.c
+++ b/kernel/bpf/stackmap.c
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
--- a/kernel/bpf/xskmap.c
+++ b/kernel/bpf/xskmap.c
--- a/net/core/bpf_sk_storage.c
+++ b/net/core/bpf_sk_storage.c
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c