Commit 451b5fbc authored by Yafang Shao's avatar Yafang Shao Committed by Andrii Nakryiko

tools/runqslower: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK

Explicitly set libbpf 1.0 API mode, then we can avoid using the deprecated
RLIMIT_MEMLOCK.
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-5-laoar.shao@gmail.com
parent a777e18f
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/resource.h>
#include <time.h> #include <time.h>
#include <bpf/libbpf.h> #include <bpf/libbpf.h>
#include <bpf/bpf.h> #include <bpf/bpf.h>
...@@ -88,16 +87,6 @@ int libbpf_print_fn(enum libbpf_print_level level, ...@@ -88,16 +87,6 @@ int libbpf_print_fn(enum libbpf_print_level level,
return vfprintf(stderr, format, args); 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 handle_event(void *ctx, int cpu, void *data, __u32 data_sz) void handle_event(void *ctx, int cpu, void *data, __u32 data_sz)
{ {
const struct runq_event *e = data; const struct runq_event *e = data;
...@@ -133,11 +122,8 @@ int main(int argc, char **argv) ...@@ -133,11 +122,8 @@ int main(int argc, char **argv)
libbpf_set_print(libbpf_print_fn); libbpf_set_print(libbpf_print_fn);
err = bump_memlock_rlimit(); /* Use libbpf 1.0 API mode */
if (err) { libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
fprintf(stderr, "failed to increase rlimit: %d", err);
return 1;
}
obj = runqslower_bpf__open(); obj = runqslower_bpf__open();
if (!obj) { if (!obj) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment