| Message ID | 20200727184506.2279656-31-guro@fb.com |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | bpf: switch to memcg-based memory accounting | expand |
On Mon, Jul 27, 2020 at 12:21 PM Roman Gushchin <guro@fb.com> wrote: > > Since bpf stopped using memlock rlimit to limit the memory usage, > there is no more reason for bpftool to alter its own limits. > > Signed-off-by: Roman Gushchin <guro@fb.com> I think we will need feature check for memcg based accounting. Thanks, Song
On Mon, Jul 27, 2020 at 12:21 PM Roman Gushchin <guro@fb.com> wrote: > > Since bpf stopped using memlock rlimit to limit the memory usage, > there is no more reason for bpftool to alter its own limits. > > Signed-off-by: Roman Gushchin <guro@fb.com> > --- This can't be removed either, due to old kernel support. We probably should have a helper function to probe RLIMIT_MEMLOCK use by BPF subsystem, though, and not call set_max_rlimit() is not necessary. > tools/bpf/bpftool/common.c | 7 ------- > tools/bpf/bpftool/feature.c | 2 -- > tools/bpf/bpftool/main.h | 2 -- > tools/bpf/bpftool/map.c | 2 -- > tools/bpf/bpftool/pids.c | 1 - > tools/bpf/bpftool/prog.c | 3 --- > tools/bpf/bpftool/struct_ops.c | 2 -- > 7 files changed, 19 deletions(-) > [...]
diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c index 65303664417e..01b87e8c3040 100644 --- a/tools/bpf/bpftool/common.c +++ b/tools/bpf/bpftool/common.c @@ -109,13 +109,6 @@ static bool is_bpffs(char *path) return (unsigned long)st_fs.f_type == BPF_FS_MAGIC; } -void set_max_rlimit(void) -{ - struct rlimit rinf = { RLIM_INFINITY, RLIM_INFINITY }; - - setrlimit(RLIMIT_MEMLOCK, &rinf); -} - static int mnt_fs(const char *target, const char *type, char *buff, size_t bufflen) { diff --git a/tools/bpf/bpftool/feature.c b/tools/bpf/bpftool/feature.c index 1cd75807673e..2d6c6bff934e 100644 --- a/tools/bpf/bpftool/feature.c +++ b/tools/bpf/bpftool/feature.c @@ -885,8 +885,6 @@ static int do_probe(int argc, char **argv) __u32 ifindex = 0; char *ifname; - set_max_rlimit(); - while (argc) { if (is_prefix(*argv, "kernel")) { if (target != COMPONENT_UNSPEC) { diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h index e3a79b5a9960..0a3bd1ff14da 100644 --- a/tools/bpf/bpftool/main.h +++ b/tools/bpf/bpftool/main.h @@ -95,8 +95,6 @@ int detect_common_prefix(const char *arg, ...); void fprint_hex(FILE *f, void *arg, unsigned int n, const char *sep); void usage(void) __noreturn; -void set_max_rlimit(void); - int mount_tracefs(const char *target); struct pinned_obj_table { diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c index 3a27d31a1856..f08b9e707511 100644 --- a/tools/bpf/bpftool/map.c +++ b/tools/bpf/bpftool/map.c @@ -1315,8 +1315,6 @@ static int do_create(int argc, char **argv) return -1; } - set_max_rlimit(); - fd = bpf_create_map_xattr(&attr); if (fd < 0) { p_err("map create failed: %s", strerror(errno)); diff --git a/tools/bpf/bpftool/pids.c b/tools/bpf/bpftool/pids.c index e3b116325403..4c559a8ae4e8 100644 --- a/tools/bpf/bpftool/pids.c +++ b/tools/bpf/bpftool/pids.c @@ -96,7 +96,6 @@ int build_obj_refs_table(struct obj_refs_table *table, enum bpf_obj_type type) libbpf_print_fn_t default_print; hash_init(table->table); - set_max_rlimit(); skel = pid_iter_bpf__open(); if (!skel) { diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 3e6ecc6332e2..40e50db60332 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -1291,8 +1291,6 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) } } - set_max_rlimit(); - obj = bpf_object__open_file(file, &open_opts); if (IS_ERR_OR_NULL(obj)) { p_err("failed to open object file"); @@ -1833,7 +1831,6 @@ static int do_profile(int argc, char **argv) } } - set_max_rlimit(); err = profiler_bpf__load(profile_obj); if (err) { p_err("failed to load profile_obj"); diff --git a/tools/bpf/bpftool/struct_ops.c b/tools/bpf/bpftool/struct_ops.c index b58b91f62ffb..0915e1e9b7c0 100644 --- a/tools/bpf/bpftool/struct_ops.c +++ b/tools/bpf/bpftool/struct_ops.c @@ -498,8 +498,6 @@ static int do_register(int argc, char **argv) if (IS_ERR_OR_NULL(obj)) return -1; - set_max_rlimit(); - load_attr.obj = obj; if (verifier_logs) /* log_level1 + log_level2 + stats, but not stable UAPI */
Since bpf stopped using memlock rlimit to limit the memory usage, there is no more reason for bpftool to alter its own limits. Signed-off-by: Roman Gushchin <guro@fb.com> --- tools/bpf/bpftool/common.c | 7 ------- tools/bpf/bpftool/feature.c | 2 -- tools/bpf/bpftool/main.h | 2 -- tools/bpf/bpftool/map.c | 2 -- tools/bpf/bpftool/pids.c | 1 - tools/bpf/bpftool/prog.c | 3 --- tools/bpf/bpftool/struct_ops.c | 2 -- 7 files changed, 19 deletions(-)