summaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorStanislav Fomichev <sdf@google.com>2020-12-03 00:13:32 +0100
committerAndrii Nakryiko <andrii@kernel.org>2020-12-03 21:01:18 +0100
commitd6d418bd8f92aaa4c7c26d606188147c2ee0dae9 (patch)
treeed992bd637cd557b9fa76b204ef4a9ac01a6e7b6 /tools/lib
parentlibbpf: Sanitise map names before pinning (diff)
downloadlinux-d6d418bd8f92aaa4c7c26d606188147c2ee0dae9.tar.xz
linux-d6d418bd8f92aaa4c7c26d606188147c2ee0dae9.zip
libbpf: Cap retries in sys_bpf_prog_load
I've seen a situation, where a process that's under pprof constantly generates SIGPROF which prevents program loading indefinitely. The right thing to do probably is to disable signals in the upper layers while loading, but it still would be nice to get some error from libbpf instead of an endless loop. Let's add some small retry limit to the program loading: try loading the program 5 (arbitrary) times and give up. v2: * 10 -> 5 retires (Andrii Nakryiko) Signed-off-by: Stanislav Fomichev <sdf@google.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20201202231332.3923644-1-sdf@google.com
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/bpf/bpf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index d27e34133973..4025266d0fb0 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -67,11 +67,12 @@ static inline int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,
static inline int sys_bpf_prog_load(union bpf_attr *attr, unsigned int size)
{
+ int retries = 5;
int fd;
do {
fd = sys_bpf(BPF_PROG_LOAD, attr, size);
- } while (fd < 0 && errno == EAGAIN);
+ } while (fd < 0 && errno == EAGAIN && retries-- > 0);
return fd;
}