Commit b25acdaf authored by Yafang Shao's avatar Yafang Shao Committed by Andrii Nakryiko
Browse files

samples/bpf: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK 



We have switched to memcg-based memory accouting and thus the rlimit is
not needed any more. LIBBPF_STRICT_AUTO_RLIMIT_MEMLOCK was introduced in
libbpf for backward compatibility, so we can use it instead now.

This patch also removes the useless header sys/resource.h from many files
in samples/bpf.

Signed-off-by: default avatarYafang Shao <laoar.shao@gmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220409125958.92629-2-laoar.shao@gmail.com
parent d252a4a4

samples/bpf/cpustat_user.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <sys/types.h>

#include <sys/stat.h>

#include <sys/time.h>

#include <sys/resource.h>

#include <sys/wait.h>



#include <bpf/bpf.h>

samples/bpf/hbm.c

+3 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <assert.h>

#include <sys/resource.h>

#include <sys/time.h>

#include <unistd.h>

#include <errno.h>
@@ -46,7 +45,6 @@ 
#include <bpf/bpf.h>

#include <getopt.h>



#include "bpf_rlimit.h"

#include "cgroup_helpers.h"

#include "hbm.h"

#include "bpf_util.h"
@@ -510,5 +508,8 @@ int main(int argc, char **argv) 
		prog = argv[optind];

	printf("HBM prog: %s\n", prog != NULL ? prog : "NULL");



	/* Use libbpf 1.0 API mode */

	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);



	return run_bpf_prog(prog, cg_id);

}

samples/bpf/ibumad_user.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <sys/types.h>

#include <limits.h>



#include <sys/resource.h>

#include <getopt.h>

#include <net/if.h>

samples/bpf/map_perf_test_user.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <signal.h>

#include <string.h>

#include <time.h>

#include <sys/resource.h>

#include <arpa/inet.h>

#include <errno.h>

samples/bpf/offwaketime_user.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/perf_event.h>

#include <errno.h>

#include <stdbool.h>

#include <sys/resource.h>

#include <bpf/libbpf.h>

#include <bpf/bpf.h>

#include "trace_helpers.h"