[bpf-next,33/35] bpf: selftests: don't touch RLIMIT_MEMLOCK

Message ID	20200725000410.3566700-34-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 33/35] bpf: selftests: don't touch RLIMIT_MEMLOCK Date: Fri, 24 Jul 2020 17:04:08 -0700 Message-ID: <20200725000410.3566700-34-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-34-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 33/35] bpf: selftests: don't touch RLIMIT_MEMLOCK
Date: Fri, 24 Jul 2020 17:04:08 -0700
Message-ID: <20200725000410.3566700-34-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

Since bpf is not using memlock rlimit for memory accounting,
there are no more reasons to bump the limit.

Signed-off-by: Roman Gushchin <guro@fb.com>
---
 tools/testing/selftests/bpf/bench.c           | 16 ---------------
 .../selftests/bpf/progs/bpf_iter_bpf_map.c    |  5 ++---
 tools/testing/selftests/bpf/xdping.c          |  6 ------
 tools/testing/selftests/net/reuseport_bpf.c   | 20 -------------------
 4 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/tools/testing/selftests/bpf/bench.c b/tools/testing/selftests/bpf/bench.c
index 944ad4721c83..f66610541c8a 100644
--- a/tools/testing/selftests/bpf/bench.c
+++ b/tools/testing/selftests/bpf/bench.c
@@ -29,25 +29,9 @@  static int libbpf_print_fn(enum libbpf_print_level level,
 	return vfprintf(stderr, format, args);
 }
 
-static int bump_memlock_rlimit(void)
-{
-	struct rlimit rlim_new = {
-		.rlim_cur	= RLIM_INFINITY,
-		.rlim_max	= RLIM_INFINITY,
-	};
-
-	return setrlimit(RLIMIT_MEMLOCK, &rlim_new);
-}
-
 void setup_libbpf()
 {
-	int err;
-
 	libbpf_set_print(libbpf_print_fn);
-
-	err = bump_memlock_rlimit();
-	if (err)
-		fprintf(stderr, "failed to increase RLIMIT_MEMLOCK: %d", err);
 }
 
 void hits_drops_report_progress(int iter, struct bench_res *res, long delta_ns)
diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_bpf_map.c b/tools/testing/selftests/bpf/progs/bpf_iter_bpf_map.c
index 08651b23edba..5fe76df58dd4 100644
--- a/tools/testing/selftests/bpf/progs/bpf_iter_bpf_map.c
+++ b/tools/testing/selftests/bpf/progs/bpf_iter_bpf_map.c
@@ -19,10 +19,9 @@  int dump_bpf_map(struct bpf_iter__bpf_map *ctx)
 	}
 
 	if (seq_num == 0)
-		BPF_SEQ_PRINTF(seq, "      id   refcnt  usercnt  locked_vm\n");
+		BPF_SEQ_PRINTF(seq, "      id   refcnt  usercnt\n");
 
 	BPF_SEQ_PRINTF(seq, "%8u %8ld %8ld %10lu\n", map->id, map->refcnt.counter,
-		       map->usercnt.counter,
-		       map->memory.user->locked_vm.counter);
+		       map->usercnt.counter);
 	return 0;
 }
diff --git a/tools/testing/selftests/bpf/xdping.c b/tools/testing/selftests/bpf/xdping.c
index 842d9155d36c..488021169171 100644
--- a/tools/testing/selftests/bpf/xdping.c
+++ b/tools/testing/selftests/bpf/xdping.c
@@ -88,7 +88,6 @@  int main(int argc, char **argv)
 {
 	__u32 mode_flags = XDP_FLAGS_DRV_MODE | XDP_FLAGS_SKB_MODE;
 	struct addrinfo *a, hints = { .ai_family = AF_INET };
-	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
 	__u16 count = XDPING_DEFAULT_COUNT;
 	struct pinginfo pinginfo = { 0 };
 	const char *optstr = "c:I:NsS";
@@ -166,11 +165,6 @@  int main(int argc, char **argv)
 		freeaddrinfo(a);
 	}
 
-	if (setrlimit(RLIMIT_MEMLOCK, &r)) {
-		perror("setrlimit(RLIMIT_MEMLOCK)");
-		return 1;
-	}
-
 	snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
 
 	if (bpf_prog_load(filename, BPF_PROG_TYPE_XDP, &obj, &prog_fd)) {
diff --git a/tools/testing/selftests/net/reuseport_bpf.c b/tools/testing/selftests/net/reuseport_bpf.c
index b5277106df1f..88709898bae5 100644
--- a/tools/testing/selftests/net/reuseport_bpf.c
+++ b/tools/testing/selftests/net/reuseport_bpf.c
@@ -437,26 +437,6 @@  void enable_fastopen(void)
 	}
 }
 
-static struct rlimit rlim_old;
-
-static  __attribute__((constructor)) void main_ctor(void)
-{
-	getrlimit(RLIMIT_MEMLOCK, &rlim_old);
-
-	if (rlim_old.rlim_cur != RLIM_INFINITY) {
-		struct rlimit rlim_new;
-
-		rlim_new.rlim_cur = rlim_old.rlim_cur + (1UL << 20);
-		rlim_new.rlim_max = rlim_old.rlim_max + (1UL << 20);
-		setrlimit(RLIMIT_MEMLOCK, &rlim_new);
-	}
-}
-
-static __attribute__((destructor)) void main_dtor(void)
-{
-	setrlimit(RLIMIT_MEMLOCK, &rlim_old);
-}
-
 int main(void)
 {
 	fprintf(stderr, "---- IPv4 UDP ----\n");

[bpf-next,33/35] bpf: selftests: don't touch RLIMIT_MEMLOCK

Commit Message

Patch