| Message ID | 20210728225825.2357586-1-r.goegge@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [RESEND,bpf] libbpf: fix probe for BPF_PROG_TYPE_CGROUP_SOCKOPT | expand |
Hello: This patch was applied to bpf/bpf.git (refs/heads/master): On Thu, 29 Jul 2021 00:58:25 +0200 you wrote: > This patch fixes the probe for BPF_PROG_TYPE_CGROUP_SOCKOPT, > so the probe reports accurate results when used by e.g. > bpftool. > > Fixes: 4cdbfb59c44a ("libbpf: support sockopt hooks") > > Signed-off-by: Robin Gögge <r.goegge@gmail.com> > Reviewed-by: Quentin Monnet <quentin@isovalent.com> > > [...] Here is the summary with links: - [RESEND,bpf] libbpf: fix probe for BPF_PROG_TYPE_CGROUP_SOCKOPT https://git.kernel.org/bpf/bpf/c/19f6fb5956fc You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/tools/lib/bpf/libbpf_probes.c b/tools/lib/bpf/libbpf_probes.c index ecaae2927ab8..cd8c703dde71 100644 --- a/tools/lib/bpf/libbpf_probes.c +++ b/tools/lib/bpf/libbpf_probes.c @@ -75,6 +75,9 @@ probe_load(enum bpf_prog_type prog_type, const struct bpf_insn *insns, case BPF_PROG_TYPE_CGROUP_SOCK_ADDR: xattr.expected_attach_type = BPF_CGROUP_INET4_CONNECT; break; + case BPF_PROG_TYPE_CGROUP_SOCKOPT: + xattr.expected_attach_type = BPF_CGROUP_GETSOCKOPT; + break; case BPF_PROG_TYPE_SK_LOOKUP: xattr.expected_attach_type = BPF_SK_LOOKUP; break; @@ -104,7 +107,6 @@ probe_load(enum bpf_prog_type prog_type, const struct bpf_insn *insns, case BPF_PROG_TYPE_SK_REUSEPORT: case BPF_PROG_TYPE_FLOW_DISSECTOR: case BPF_PROG_TYPE_CGROUP_SYSCTL: - case BPF_PROG_TYPE_CGROUP_SOCKOPT: case BPF_PROG_TYPE_TRACING: case BPF_PROG_TYPE_STRUCT_OPS: case BPF_PROG_TYPE_EXT:
This patch fixes the probe for BPF_PROG_TYPE_CGROUP_SOCKOPT, so the probe reports accurate results when used by e.g. bpftool. Fixes: 4cdbfb59c44a ("libbpf: support sockopt hooks") Signed-off-by: Robin Gögge <r.goegge@gmail.com> Reviewed-by: Quentin Monnet <quentin@isovalent.com> --- tools/lib/bpf/libbpf_probes.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)