add multiple program checks to bpf_object__probe_loading
PATCH 1/1 add multiple program checks to bpf_object__probe_loading
eBPF has been backported for RHEL 7 w/ kernel 3.10-940+ (https://www.redhat.com/en/blog/introduction-ebpf-red-hat-enterprise-linux-7).
However only the following program types are supported (https://access.redhat.com/articles/3550581)
BPF_PROG_TYPE_KPROBEBPF_PROG_TYPE_TRACEPOINTBPF_PROG_TYPE_PERF_EVENT
Source is here: https://access.redhat.com/labs/rhcb/RHEL-7.9/kernel-3.10.0-1160.25.1.el7/sources/raw/kernel/bpf/syscall.c#_code.1177
For libbpf 0.4.0 (db9614b6bd69746809d506c2786f914b0f812c37) this causes an EINVAL return during the bpf_object__probe_loading call which only checks to see if programs of type BPF_PROG_TYPE_SOCKET_FILTER can load as a test.
Quick discussion with anakryiko (https://github.com/libbpf/libbpf/issues/320) indicated a preference for trying to load multiple program types before failing (e.g SOCKET_FILTER, then KPROBE). On older kernels KPROBE requires attr.kern_version == LINUX_VERSION_CODE, which may not always be available (out of tree builds). TRACEPOINT will work without needing to know the version. We can use multiple tests.
The following suggestion will try multiple program types and return successfully if one passes. TRACEPOINT works for the ebpf backport for RHEL 7, KPROBE on newer kernels (e.g 5+)
--- src/libbpf.c | 6 ++++++ 1 file changed, 6 insertions(+)
src/libbpf.c +6 -0
@@ -4002,6 +4002,12 @@ bpf_object__probe_loading(struct bpf_object *obj) attr.license ="GPL" ; ret =bpf_load_program_xattr (&attr,NULL ,0 ); + + attr.prog_type =BPF_PROG_TYPE_KPROBE ; + ret = (ret <0 ) ?bpf_load_program_xattr (&attr,NULL ,0 ) : ret; + attr.prog_type =BPF_PROG_TYPE_TRACEPOINT ; + ret = (ret <0 ) ?bpf_load_program_xattr (&attr,NULL ,0 ) : ret; +if (ret <0 ) { ret = errno; cp =libbpf_strerror_r (ret, errmsg,sizeof (errmsg));
Signature · 1 line
2.17.1
Quoted 9 lines · Jonathan Edwards
eBPF has been backported for RHEL 7 w/ kernel 3.10-940+ (https://www.redhat.com/en/blog/introduction-ebpf-red-hat-enterprise-linux-7).
However only the following program types are supported (https://access.redhat.com/articles/3550581)
BPF_PROG_TYPE_KPROBEBPF_PROG_TYPE_TRACEPOINTBPF_PROG_TYPE_PERF_EVENT
Quoted 8 lines
Source is here: https://access.redhat.com/labs/rhcb/RHEL-7.9/kernel-3.10.0-1160.25.1.el7/sources/raw/kernel/bpf/syscall.c#_code.1177
For libbpf 0.4.0 (
db9614b6bd69746809d506c2786f914b0f812c37) this causes an EINVAL return during thebpf_object__probe_loadingcall which only checks to see if programs of typeBPF_PROG_TYPE_SOCKET_FILTERcan load as a test.Quick discussion with anakryiko (https://github.com/libbpf/libbpf/issues/320) indicated a preference for trying to load multiple program types before failing (e.g
SOCKET_FILTER, then KPROBE). On older kernels KPROBE requires attr.kern_version ==LINUX_VERSION_CODE, which may not always be available (out of tree builds). TRACEPOINT will work without needing to know the version. We can use multiple tests.The following suggestion will try multiple program types and return successfully if one passes. TRACEPOINT works for the ebpf backport for RHEL 7, KPROBE on newer kernels (e.g 5+)
So few high-level points about formatting the patch itself:
- please use [PATCH bpf-next] subject prefix when submitting patches
against bpf-next tree;
- please wrap all the lines at 80 and please look through general
kernel patch submission guidelines ([0])
- note how I didn't include URL directly and used [0] (and [1], [2],
etc, if necessary). Please do the same, that keeps text more readable and shorter.
[0] https://www.kernel.org/doc/html/latest/process/submitting-patches.html
Quoted 9 lines
--- src/libbpf.c | 6 ++++++ 1 file changed, 6 insertions(+)src/libbpf.c +0
-0
src/libbpf.c bpf_object__probe_loading(struct bpf_object *obj) · line 4009
Quoted 8 lines
src/libbpf.c +5
-0@@ -4002,6 +4002,12 @@ bpf_object__probe_loading(struct bpf_object *obj) attr.license ="GPL" ; ret =bpf_load_program_xattr (&attr,NULL ,0 ); + + attr.prog_type =BPF_PROG_TYPE_KPROBE ; + ret = (ret <0 ) ?bpf_load_program_xattr (&attr,NULL ,0 ) : ret; + attr.prog_type =BPF_PROG_TYPE_TRACEPOINT ; + ret = (ret <0 ) ?bpf_load_program_xattr (&attr,NULL ,0 ) : ret;
As for this logic, I think let's drop KPROBE altogether. Ubuntu has problems with LINUX_VERSION_CODE. Let's try SOCKET_FILTER and fallback to TRACEPOINT before giving up. Very old upstream kernels allow SOCKET_FILTER, so that is covered. And then backported RHEL will know about TRACEPOINT. That should be good enough.
Also, explicit if in this case is more appropriate:
if (ret < 0) {
attr.prog_type = BPF_PROG_TYPE_TRACEPOINT;
ret = bpf_load_program_xattr(...);
}if (ret < 0) { /* warn and error out */ }
Quoted 6 lines
src/libbpf.c +1
-1+if (ret <0 ) { ret = errno; cp =libbpf_strerror_r (ret, errmsg,sizeof (errmsg)); --2.17.1
PATCH 1/1 libbpf: add extra BPF_PROG_TYPE check to bpf_object__probe_loading
eBPF has been backported for RHEL 7 w/ kernel 3.10-940+ [0]. However only the following program types are supported [1]
BPF_PROG_TYPE_KPROBEBPF_PROG_TYPE_TRACEPOINTBPF_PROG_TYPE_PERF_EVENT
For libbpf this causes an EINVAL return during the bpf_object__probe_loading call which only checks to see if programs of type BPF_PROG_TYPE_SOCKET_FILTER can load.
The following will try BPF_PROG_TYPE_TRACEPOINT as a fallback attempt before erroring out. BPF_PROG_TYPE_KPROBE was not a good candidate because on some kernels it requires knowledge of the LINUX_VERSION_CODE.
[0] https://www.redhat.com/en/blog/introduction-ebpf-red-hat-enterprise-linux-7
[1] https://access.redhat.com/articles/3550581
--- tools/lib/bpf/libbpf.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/lib/bpf/libbpf.c +4 -0
@@ -4000,6 +4000,10 @@ bpf_object__probe_loading(struct bpf_object *obj) attr.license ="GPL" ; ret =bpf_load_program_xattr (&attr,NULL ,0 ); +if (ret <0 ) { + attr.prog_type =BPF_PROG_TYPE_TRACEPOINT ; + ret =bpf_load_program_xattr (&attr,NULL ,0 ); + }if (ret <0 ) { ret = errno; cp =libbpf_strerror_r (ret, errmsg,sizeof (errmsg));
Signature · 1 line
2.17.1
Re: [PATCH bpf-next] libbpf: add extra BPF_PROG_TYPE check to bpf_object__probe_loading
Quoted 16 lines · On Fri, Jun 18, 2021 at 4:13 PM jjedwa165…
eBPF has been backported for RHEL 7 w/ kernel 3.10-940+ [0]. However only the following program types are supported [1]
BPF_PROG_TYPE_KPROBEBPF_PROG_TYPE_TRACEPOINTBPF_PROG_TYPE_PERF_EVENTFor libbpf this causes an EINVAL return during the
bpf_object__probe_loadingcall which only checks to see if programs of typeBPF_PROG_TYPE_SOCKET_FILTERcan load.The following will try
BPF_PROG_TYPE_TRACEPOINTas a fallback attempt before erroring out.BPF_PROG_TYPE_KPROBEwas not a good candidate because on some kernels it requires knowledge of theLINUX_VERSION_CODE.
Quoted 5 lines
[0] https://www.redhat.com/en/blog/introduction-ebpf-red-hat-enterprise-linux-7
[1] https://access.redhat.com/articles/3550581Signed-off-by jjedwa165 <[email protected]>---
LGTM, but please re-submit with your real first and last name in Signed-off-by. Also add my ack:
Quoted 21 lines
tools/lib/bpf/libbpf.c | 4 ++++ 1 file changed, 4 insertions(+)tools/lib/bpf/libbpf.c +4
-1@@ -4000,6 +4000,10 @@ bpf_object__probe_loading(struct bpf_object *obj) attr.license ="GPL" ; ret =bpf_load_program_xattr (&attr,NULL ,0 ); +if (ret <0 ) { + attr.prog_type =BPF_PROG_TYPE_TRACEPOINT ; + ret =bpf_load_program_xattr (&attr,NULL ,0 ); + }if (ret <0 ) { ret = errno; cp =libbpf_strerror_r (ret, errmsg,sizeof (errmsg)); --2.17.1
PATCH 1/1 libbpf: add extra BPF_PROG_TYPE check to bpf_object__probe_loading
eBPF has been backported for RHEL 7 w/ kernel 3.10-940+ [0]. However only the following program types are supported [1]
BPF_PROG_TYPE_KPROBEBPF_PROG_TYPE_TRACEPOINTBPF_PROG_TYPE_PERF_EVENT
For libbpf this causes an EINVAL return during the bpf_object__probe_loading call which only checks to see if programs of type BPF_PROG_TYPE_SOCKET_FILTER can load.
The following will try BPF_PROG_TYPE_TRACEPOINT as a fallback attempt before erroring out. BPF_PROG_TYPE_KPROBE was not a good candidate because on some kernels it requires knowledge of the LINUX_VERSION_CODE.
[0] https://www.redhat.com/en/blog/introduction-ebpf-red-hat-enterprise-linux-7
[1] https://access.redhat.com/articles/3550581
--- tools/lib/bpf/libbpf.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/lib/bpf/libbpf.c +4 -0
@@ -4000,6 +4000,10 @@ bpf_object__probe_loading(struct bpf_object *obj) attr.license ="GPL" ; ret =bpf_load_program_xattr (&attr,NULL ,0 ); +if (ret <0 ) { + attr.prog_type =BPF_PROG_TYPE_TRACEPOINT ; + ret =bpf_load_program_xattr (&attr,NULL ,0 ); + }if (ret <0 ) { ret = errno; cp =libbpf_strerror_r (ret, errmsg,sizeof (errmsg));
Signature · 1 line
2.17.1
Re: [PATCH bpf-next] libbpf: add extra BPF_PROG_TYPE check to bpf_object__probe_loading
This patch was applied to bpf/bpf-next.git (refs/heads/master):
Hello:
This patch was applied to bpf/bpf-next.git (refs/heads/master):
Quoted 8 lines · On Sat, 19 Jun 2021 11:10:07 -0400 you wrote:
eBPF has been backported for RHEL 7 w/ kernel 3.10-940+ [0]. However only the following program types are supported [1]
BPF_PROG_TYPE_KPROBEBPF_PROG_TYPE_TRACEPOINTBPF_PROG_TYPE_PERF_EVENT[...]
Here is the summary with links:
- [bpf-next] libbpf: add extra BPF_PROG_TYPE check to bpf_object__probe_loading
https://git.kernel.org/bpf/bpf-next/c/5c10a3dbe922
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html