Commit d6d418bd authored Dec 02, 2020 by Stanislav Fomichev Committed by Andrii Nakryiko Dec 03, 2020

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

parent 9cf309c5

tools/lib/bpf/bpf.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message