diff mbox series

[bpf-next,04/17] selftests: xsk: set rlimit per thread

Message ID 20210727131753.10924-5-magnus.karlsson@gmail.com
State New
Headers show
Series selftests: xsk: various simplifications | expand

Commit Message

Magnus Karlsson July 27, 2021, 1:17 p.m. UTC 
From: Magnus Karlsson <magnus.karlsson@intel.com>

Set rlimit per thread instead of on the main thread. The main thread
does not register any umem area so do not need this.

Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
---
 tools/testing/selftests/bpf/xdpxceiver.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/xdpxceiver.c b/tools/testing/selftests/bpf/xdpxceiver.c
index 4d8ee636fc24..2100ab4e58b7 100644
--- a/tools/testing/selftests/bpf/xdpxceiver.c
+++ b/tools/testing/selftests/bpf/xdpxceiver.c
@@ -252,6 +252,7 @@  static void gen_eth_frame(struct xsk_umem_info *umem, u64 addr)
 
 static void xsk_configure_umem(struct ifobject *data, void *buffer, int idx)
 {
+	const struct rlimit _rlim = { RLIM_INFINITY, RLIM_INFINITY };
 	struct xsk_umem_config cfg = {
 		.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,
 		.comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS,
@@ -263,6 +264,10 @@  static void xsk_configure_umem(struct ifobject *data, void *buffer, int idx)
 	struct xsk_umem_info *umem;
 	int ret;
 
+	ret = XSK_UMEM__DEFAULT_FRAME_SIZE;
+	if (setrlimit(RLIMIT_MEMLOCK, &_rlim))
+		exit_with_error(errno);
+
 	umem = calloc(1, sizeof(struct xsk_umem_info));
 	if (!umem)
 		exit_with_error(errno);
@@ -1088,13 +1093,9 @@  static void run_pkt_test(int mode, int type)
 
 int main(int argc, char **argv)
 {
-	struct rlimit _rlim = { RLIM_INFINITY, RLIM_INFINITY };
 	bool failure = false;
 	int i, j;
 
-	if (setrlimit(RLIMIT_MEMLOCK, &_rlim))
-		exit_with_error(errno);
-
 	for (int i = 0; i < MAX_INTERFACES; i++) {
 		ifdict[i] = malloc(sizeof(struct ifobject));
 		if (!ifdict[i])