[bpf-next,v2,27/35] bpf: eliminate rlimit-based memory accounting infra for bpf maps

Message ID	20200727184506.2279656-28-guro@fb.com
State	Changes Requested
Delegated to:	BPF Maintainers
Headers	show Return-Path: <netdev-owner@vger.kernel.org> Smtp-Origin-Hostprefix: devvm From: Roman Gushchin <guro@fb.com> Smtp-Origin-Hostname: devvm1096.prn0.facebook.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> Smtp-Origin-Cluster: prn0c01 Subject: [PATCH bpf-next v2 27/35] bpf: eliminate rlimit-based memory accounting infra for bpf maps Date: Mon, 27 Jul 2020 11:44:58 -0700 Message-ID: <20200727184506.2279656-28-guro@fb.com> In-Reply-To: <20200727184506.2279656-1-guro@fb.com> References: <20200727184506.2279656-1-guro@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	bpf: switch to memcg-based memory accounting \| expand [bpf-next,v2,00/35] bpf: switch to memcg-based memory accounting [bpf-next,v2,01/35] bpf: memcg-based memory accounting for bpf progs [bpf-next,v2,02/35] bpf: memcg-based memory accounting for bpf maps [bpf-next,v2,03/35] bpf: refine memcg-based memory accounting for arraymap maps [bpf-next,v2,04/35] bpf: refine memcg-based memory accounting for cpumap maps [bpf-next,v2,05/35] bpf: memcg-based memory accounting for cgroup storage maps [bpf-next,v2,06/35] bpf: refine memcg-based memory accounting for devmap maps [bpf-next,v2,07/35] bpf: refine memcg-based memory accounting for hashtab maps [bpf-next,v2,08/35] bpf: memcg-based memory accounting for lpm_trie maps [bpf-next,v2,09/35] bpf: memcg-based memory accounting for bpf ringbuffer [bpf-next,v2,10/35] bpf: memcg-based memory accounting for socket storage maps [bpf-next,v2,11/35] bpf: refine memcg-based memory accounting for sockmap and sockhash maps [bpf-next,v2,12/35] bpf: refine memcg-based memory accounting for xskmap maps [bpf-next,v2,13/35] bpf: eliminate rlimit-based memory accounting for arraymap maps [bpf-next,v2,14/35] bpf: eliminate rlimit-based memory accounting for bpf_struct_ops maps [bpf-next,v2,15/35] bpf: eliminate rlimit-based memory accounting for cpumap maps [bpf-next,v2,16/35] bpf: eliminate rlimit-based memory accounting for cgroup storage maps [bpf-next,v2,17/35] bpf: eliminate rlimit-based memory accounting for devmap maps [bpf-next,v2,18/35] bpf: eliminate rlimit-based memory accounting for hashtab maps [bpf-next,v2,19/35] bpf: eliminate rlimit-based memory accounting for lpm_trie maps [bpf-next,v2,20/35] bpf: eliminate rlimit-based memory accounting for queue_stack_maps maps [bpf-next,v2,21/35] bpf: eliminate rlimit-based memory accounting for reuseport_array maps [bpf-next,v2,22/35] bpf: eliminate rlimit-based memory accounting for bpf ringbuffer [bpf-next,v2,23/35] bpf: eliminate rlimit-based memory accounting for sockmap and sockhash maps [bpf-next,v2,24/35] bpf: eliminate rlimit-based memory accounting for stackmap maps [bpf-next,v2,25/35] bpf: eliminate rlimit-based memory accounting for socket storage maps [bpf-next,v2,26/35] bpf: eliminate rlimit-based memory accounting for xskmap maps [bpf-next,v2,27/35] bpf: eliminate rlimit-based memory accounting infra for bpf maps [bpf-next,v2,28/35] bpf: eliminate rlimit-based memory accounting for bpf progs [bpf-next,v2,29/35] bpf: libbpf: cleanup RLIMIT_MEMLOCK usage [bpf-next,v2,30/35] bpf: bpftool: do not touch RLIMIT_MEMLOCK [bpf-next,v2,31/35] bpf: runqslower: don't touch RLIMIT_MEMLOCK [bpf-next,v2,32/35] bpf: selftests: delete bpf_rlimit.h [bpf-next,v2,33/35] bpf: selftests: don't touch RLIMIT_MEMLOCK [bpf-next,v2,34/35] bpf: samples: do not touch RLIMIT_MEMLOCK [bpf-next,v2,35/35] perf: don't touch RLIMIT_MEMLOCK

diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 8357be349133..055c693d9928 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -112,11 +112,6 @@ struct bpf_map_ops { const struct bpf_iter_seq_info *iter_seq_info; }; -struct bpf_map_memory { - u32 pages; - struct user_struct *user; -}; - struct bpf_map { /* The first two cachelines with read-mostly members of which some * are also accessed in fast-path (e.g. ops, max_entries). @@ -137,7 +132,6 @@ struct bpf_map { u32 btf_key_type_id; u32 btf_value_type_id; struct btf *btf; - struct bpf_map_memory memory; char name[BPF_OBJ_NAME_LEN]; u32 btf_vmlinux_value_type_id; bool bypass_spec_v1; @@ -1117,12 +1111,6 @@ void bpf_map_inc_with_uref(struct bpf_map *map); struct bpf_map * __must_check bpf_map_inc_not_zero(struct bpf_map *map); void bpf_map_put_with_uref(struct bpf_map *map); void bpf_map_put(struct bpf_map *map); -int bpf_map_charge_memlock(struct bpf_map *map, u32 pages); -void bpf_map_uncharge_memlock(struct bpf_map *map, u32 pages); -int bpf_map_charge_init(struct bpf_map_memory *mem, u64 size); -void bpf_map_charge_finish(struct bpf_map_memory *mem); -void bpf_map_charge_move(struct bpf_map_memory *dst, - struct bpf_map_memory *src); void *bpf_map_area_alloc(u64 size, int numa_node); void *bpf_map_area_mmapable_alloc(u64 size, int numa_node); void bpf_map_area_free(void *base); diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 501b2c071d7b..ae51e2363cc1 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -354,60 +354,6 @@ static void bpf_uncharge_memlock(struct user_struct *user, u32 pages) atomic_long_sub(pages, &user->locked_vm); } -int bpf_map_charge_init(struct bpf_map_memory *mem, u64 size) -{ - u32 pages = round_up(size, PAGE_SIZE) >> PAGE_SHIFT; - struct user_struct *user; - int ret; - - if (size >= U32_MAX - PAGE_SIZE) - return -E2BIG; - - user = get_current_user(); - ret = bpf_charge_memlock(user, pages); - if (ret) { - free_uid(user); - return ret; - } - - mem->pages = pages; - mem->user = user; - - return 0; -} - -void bpf_map_charge_finish(struct bpf_map_memory *mem) -{ - bpf_uncharge_memlock(mem->user, mem->pages); - free_uid(mem->user); -} - -void bpf_map_charge_move(struct bpf_map_memory *dst, - struct bpf_map_memory *src) -{ - *dst = *src; - - /* Make sure src will not be used for the redundant uncharging. */ - memset(src, 0, sizeof(struct bpf_map_memory)); -} - -int bpf_map_charge_memlock(struct bpf_map *map, u32 pages) -{ - int ret; - - ret = bpf_charge_memlock(map->memory.user, pages); - if (ret) - return ret; - map->memory.pages += pages; - return ret; -} - -void bpf_map_uncharge_memlock(struct bpf_map *map, u32 pages) -{ - bpf_uncharge_memlock(map->memory.user, pages); - map->memory.pages -= pages; -} - static int bpf_map_alloc_id(struct bpf_map *map) { int id; @@ -456,13 +402,10 @@ void bpf_map_free_id(struct bpf_map *map, bool do_idr_lock) static void bpf_map_free_deferred(struct work_struct *work) { struct bpf_map *map = container_of(work, struct bpf_map, work); - struct bpf_map_memory mem; - bpf_map_charge_move(&mem, &map->memory); security_bpf_map_free(map); /* implementation dependent freeing */ map->ops->map_free(map); - bpf_map_charge_finish(&mem); } static void bpf_map_put_uref(struct bpf_map *map) @@ -541,7 +484,7 @@ static void bpf_map_show_fdinfo(struct seq_file *m, struct file *filp) "value_size:\t%u\n" "max_entries:\t%u\n" "map_flags:\t%#x\n" - "memlock:\t%llu\n" + "memlock:\t%llu\n" /* deprecated */ "map_id:\t%u\n" "frozen:\t%u\n", map->map_type, @@ -549,7 +492,7 @@ static void bpf_map_show_fdinfo(struct seq_file *m, struct file *filp) map->value_size, map->max_entries, map->map_flags, - map->memory.pages * 1ULL << PAGE_SHIFT, + 0LLU, map->id, READ_ONCE(map->frozen)); if (type) { @@ -790,7 +733,6 @@ static int map_check_btf(struct bpf_map *map, const struct btf *btf, static int map_create(union bpf_attr *attr) { int numa_node = bpf_map_attr_numa_node(attr); - struct bpf_map_memory mem; struct bpf_map *map; int f_flags; int err; @@ -887,9 +829,7 @@ static int map_create(union bpf_attr *attr) security_bpf_map_free(map); free_map: btf_put(map->btf); - bpf_map_charge_move(&mem, &map->memory); map->ops->map_free(map); - bpf_map_charge_finish(&mem); return err; } diff --git a/tools/testing/selftests/bpf/progs/map_ptr_kern.c b/tools/testing/selftests/bpf/progs/map_ptr_kern.c index 473665cac67e..49d1dcaf7999 100644 --- a/tools/testing/selftests/bpf/progs/map_ptr_kern.c +++ b/tools/testing/selftests/bpf/progs/map_ptr_kern.c @@ -26,17 +26,12 @@ __u32 g_line = 0; return 0; \ }) -struct bpf_map_memory { - __u32 pages; -} __attribute__((preserve_access_index)); - struct bpf_map { enum bpf_map_type map_type; __u32 key_size; __u32 value_size; __u32 max_entries; __u32 id; - struct bpf_map_memory memory; } __attribute__((preserve_access_index)); static inline int check_bpf_map_fields(struct bpf_map *map, __u32 key_size,

[bpf-next,v2,27/35] bpf: eliminate rlimit-based memory accounting infra for bpf maps

Commit Message

Comments

Patch