[bpf-next,29/35] bpf: libbpf: cleanup RLIMIT_MEMLOCK usage

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

Message ID

20200725000410.3566700-30-guro@fb.com

State

Changes Requested

Delegated to:

BPF Maintainers

Headers

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 29/35] bpf: libbpf: cleanup RLIMIT_MEMLOCK usage
Date: Fri, 24 Jul 2020 17:04:04 -0700
Message-ID: <20200725000410.3566700-30-guro@fb.com>
In-Reply-To: <20200725000410.3566700-1-guro@fb.com>
References: <20200725000410.3566700-1-guro@fb.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain
Sender: bpf-owner@vger.kernel.org
Precedence: bulk

Series

bpf: switch to memcg-based memory accounting | expand

Commit Message

Roman Gushchin July 25, 2020, 12:04 a.m. UTC

As bpf is not using memlock rlimit for memory accounting anymore,
let's remove the related code from libbpf.

Bpf operations can't fail because of exceeding the limit anymore.

Signed-off-by: Roman Gushchin <guro@fb.com>
---
 tools/lib/bpf/libbpf.c | 31 +------------------------------
 tools/lib/bpf/libbpf.h |  5 -----
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index e51479d60285..841060f5cee3 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -112,32 +112,6 @@  void libbpf_print(enum libbpf_print_level level, const char *format, ...)
 	va_end(args);
 }
 
-static void pr_perm_msg(int err)
-{
-	struct rlimit limit;
-	char buf[100];
-
-	if (err != -EPERM || geteuid() != 0)
-		return;
-
-	err = getrlimit(RLIMIT_MEMLOCK, &limit);
-	if (err)
-		return;
-
-	if (limit.rlim_cur == RLIM_INFINITY)
-		return;
-
-	if (limit.rlim_cur < 1024)
-		snprintf(buf, sizeof(buf), "%zu bytes", (size_t)limit.rlim_cur);
-	else if (limit.rlim_cur < 1024*1024)
-		snprintf(buf, sizeof(buf), "%.1f KiB", (double)limit.rlim_cur / 1024);
-	else
-		snprintf(buf, sizeof(buf), "%.1f MiB", (double)limit.rlim_cur / (1024*1024));
-
-	pr_warn("permission error while running as root; try raising 'ulimit -l'? current value: %s\n",
-		buf);
-}
-
 #define STRERR_BUFSIZE  128
 
 /* Copied from tools/perf/util/util.h */
@@ -3420,8 +3394,7 @@  bpf_object__probe_loading(struct bpf_object *obj)
 		cp = libbpf_strerror_r(ret, errmsg, sizeof(errmsg));
 		pr_warn("Error in %s():%s(%d). Couldn't load trivial BPF "
 			"program. Make sure your kernel supports BPF "
-			"(CONFIG_BPF_SYSCALL=y) and/or that RLIMIT_MEMLOCK is "
-			"set to big enough value.\n", __func__, cp, ret);
+			"(CONFIG_BPF_SYSCALL=y)", __func__, cp, ret);
 		return -ret;
 	}
 	close(ret);
@@ -3918,7 +3891,6 @@  bpf_object__create_maps(struct bpf_object *obj)
 err_out:
 	cp = libbpf_strerror_r(err, errmsg, sizeof(errmsg));
 	pr_warn("map '%s': failed to create: %s(%d)\n", map->name, cp, err);
-	pr_perm_msg(err);
 	for (j = 0; j < i; j++)
 		zclose(obj->maps[j].fd);
 	return err;
@@ -5419,7 +5391,6 @@  load_program(struct bpf_program *prog, struct bpf_insn *insns, int insns_cnt,
 	ret = -errno;
 	cp = libbpf_strerror_r(errno, errmsg, sizeof(errmsg));
 	pr_warn("load bpf program failed: %s\n", cp);
-	pr_perm_msg(ret);
 
 	if (log_buf && log_buf[0] != '\0') {
 		ret = -LIBBPF_ERRNO__VERIFY;
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index c6813791fa7e..8d2f1194cb02 100644
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -610,11 +610,6 @@  bpf_prog_linfo__lfind(const struct bpf_prog_linfo *prog_linfo,
 
 /*
  * Probe for supported system features
- *
- * Note that running many of these probes in a short amount of time can cause
- * the kernel to reach the maximal size of lockable memory allowed for the
- * user, causing subsequent probes to fail. In this case, the caller may want
- * to adjust that limit with setrlimit().
  */
 LIBBPF_API bool bpf_probe_prog_type(enum bpf_prog_type prog_type,
 				    __u32 ifindex);

[bpf-next,29/35] bpf: libbpf: cleanup RLIMIT_MEMLOCK usage

Commit Message

Patch