lkml.org 
[lkml]   [2021]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 37/96] libbpf: Fix probe for BPF_PROG_TYPE_CGROUP_SOCKOPT
    Date
    From: Robin Gögge <r.goegge@googlemail.com>

    [ Upstream commit 78d14bda861dd2729f15bb438fe355b48514bfe0 ]

    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>
    Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Reviewed-by: Quentin Monnet <quentin@isovalent.com>
    Link: https://lore.kernel.org/bpf/20210728225825.2357586-1-r.goegge@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/lib/bpf/libbpf_probes.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/tools/lib/bpf/libbpf_probes.c b/tools/lib/bpf/libbpf_probes.c
    index 5482a9b7ae2d..d38284a3aaf0 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:
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-08-16 15:13    [W:5.586 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site