Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7530AC31D63 for ; Mon, 21 Jan 2019 07:26:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 38DB12084A for ; Mon, 21 Jan 2019 07:26:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dFtaVa4y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728633AbfAUH0c (ORCPT ); Mon, 21 Jan 2019 02:26:32 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:33165 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728545AbfAUHZf (ORCPT ); Mon, 21 Jan 2019 02:25:35 -0500 Received: by mail-pl1-f194.google.com with SMTP id z23so9397485plo.0 for ; Sun, 20 Jan 2019 23:25:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=SLf/082Y90szKfJuGrb47zkUB75QXpw/dzYMJMPRIL0=; b=dFtaVa4yYjfuLdgWzDnYVfI32PkYXGXHs/fPSbC2B9MBs6LHxnHZ5JTU1gqgL5NWVH 0iTqpemDfLvu4SClTKYJxqhmXV/1hjxmgMFow1AsDcFP4NHZ12GdZE+szw60LF0acm3p PXSSu7R0Crl5H5+cra8iHgOAwuuA2cqrvMr/xXtYgsFcoW/oH49O/MH2NZKMQdmsdfMk 4TV3c1bXQtNpXs3PAe4ANv6/AYBE8HO77P4DpVQ39CYyrjpPfuiyF33vuM06mR5iQtxW 7sdzxFIwej4B/fC9Szrec7hZv5SxNaCqCG5MvzU3jWmv1rvJ8ONIZ3GnPnbtTX3K/XBV qWeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=SLf/082Y90szKfJuGrb47zkUB75QXpw/dzYMJMPRIL0=; b=GpamBSp/Qn09DEV9/v4CBItfoHnPmqW+iK8G1332kxh3656Xy7X0TLnR4jC2u7z8xD 78YSpUMZIFD2715F1n3K0GHVYkiX1DW3XCbSPYXTgk8pMCVQfgU1EW/Y3YX5U1jA5YD0 GMQx1qaOUmOf8JqpOj/cd8X+8V2xflvRlb5JBU6Z56j1XcSBKpubvzc7MqfoQFSHCRkD OixiOwZZCurKOPQEFGSxgwkilgAeOYQaYPVrThbTTqr0RHp3309sj0+KW5pBGzSw11u+ CAhz6812e7dSqJYsRwUyzAyeu1sgCQQNHa4nbrOASTbRw57g/vRQL/XP9N2ptfRJOPdZ qKJg== X-Gm-Message-State: AJcUukclFeJp1HBJLOjToahkX2si8UfWKYvNUArBIgfP5PJV5onAJuLU EQXFvv8M/yAqr9vgiq6JxoY= X-Google-Smtp-Source: ALg8bN4TO4n7NTBFpXsjsKAfCdhAnJMqbwLPoYJUV9MFtodHDRSsDyzq3NfL0pz0URSsLx1XAHmqZQ== X-Received: by 2002:a17:902:d911:: with SMTP id c17mr29877596plz.151.1548055535280; Sun, 20 Jan 2019 23:25:35 -0800 (PST) Received: from localhost.localdomain ([211.196.191.92]) by smtp.gmail.com with ESMTPSA id v12sm12833312pgg.41.2019.01.20.23.25.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Jan 2019 23:25:34 -0800 (PST) From: Taeung Song To: Daniel Borkmann , Alexei Starovoitov Cc: netdev@vger.kernel.org, Jakub Kicinski , Quentin Monnet , Andrey Ignatov Subject: [PATCH RESEND bpf-next v3] libbpf: Show supported ELF section names on when failed to guess a prog/attach type Date: Mon, 21 Jan 2019 16:25:15 +0900 Message-Id: <20190121072515.16522-1-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We need to let users check their wrong ELF section name with proper ELF section names when failed to get a prog/attach type from it. Because users can't realize libbpf guess prog/attach types from given ELF section names. For example, when a 'cgroup' section name of a BPF program is used, show available ELF section names(types). Before: $ bpftool prog load bpf-prog.o /sys/fs/bpf/prog1 Error: failed to guess program type based on ELF section name cgroup After: libbpf: failed to guess program type based on ELF section name 'cgroup' libbpf: supported section(type) names are: socket kprobe/ kretprobe/ classifier action tracepoint/ raw_tracepoint/ xdp perf_event lwt_in lwt_out lwt_xmit lwt_seg6local cgroup_skb/ingress cgroup_skb/egress cgroup/skb cgroup/sock cgroup/post_bind4 cgroup/post_bind6 cgroup/dev sockops sk_skb/stream_parser sk_skb/stream_verdict sk_skb sk_msg lirc_mode2 flow_dissector cgroup/bind4 cgroup/bind6 cgroup/connect4 cgroup/connect6 cgroup/sendmsg4 cgroup/sendmsg6 Reviewed-by: Jakub Kicinski Reviewed-by: Quentin Monnet Cc: Andrey Ignatov Signed-off-by: Taeung Song --- tools/bpf/bpftool/prog.c | 10 ++---- tools/lib/bpf/libbpf.c | 34 +++++++++++++++++-- .../selftests/bpf/test_socket_cookie.c | 4 +-- 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 2d1bb7d6ff51..0640e9bc0ada 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -930,10 +930,9 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) err = libbpf_prog_type_by_name(type, &attr.prog_type, &expected_attach_type); free(type); - if (err < 0) { - p_err("unknown program type '%s'", *argv); + if (err < 0) goto err_free_reuse_maps; - } + NEXT_ARG(); } else if (is_prefix(*argv, "map")) { void *new_map_replace; @@ -1028,11 +1027,8 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) err = libbpf_prog_type_by_name(sec_name, &prog_type, &expected_attach_type); - if (err < 0) { - p_err("failed to guess program type based on section name %s\n", - sec_name); + if (err < 0) goto err_close_obj; - } } bpf_program__set_ifindex(pos, ifindex); diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 169e347c76f6..ea44d7a05149 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -2667,10 +2667,31 @@ static const struct { #undef BPF_EAPROG_SEC #undef BPF_APROG_COMPAT +#define MAX_TYPE_NAME_SIZE 32 + +static char *libbpf_get_type_names(bool attach_type) +{ + int i, len = ARRAY_SIZE(section_names) * MAX_TYPE_NAME_SIZE; + char *buf = malloc(len); + + buf[0] = '\0'; + /* Forge string buf with all available names */ + for (i = 0; i < ARRAY_SIZE(section_names); i++) { + if (attach_type && !section_names[i].is_attachable) + continue; + + strcat(buf, " "); + strcat(buf, section_names[i].sec); + } + + return buf; +} + int libbpf_prog_type_by_name(const char *name, enum bpf_prog_type *prog_type, enum bpf_attach_type *expected_attach_type) { int i; + char *type_names; if (!name) return -EINVAL; @@ -2682,6 +2703,11 @@ int libbpf_prog_type_by_name(const char *name, enum bpf_prog_type *prog_type, *expected_attach_type = section_names[i].expected_attach_type; return 0; } + pr_warning("failed to guess program type based on ELF section name '%s'\n", name); + type_names = libbpf_get_type_names(false); + pr_info("supported section(type) names are:%s\n", type_names); + free(type_names); + return -EINVAL; } @@ -2689,6 +2715,7 @@ int libbpf_attach_type_by_name(const char *name, enum bpf_attach_type *attach_type) { int i; + char *type_names; if (!name) return -EINVAL; @@ -2701,6 +2728,11 @@ int libbpf_attach_type_by_name(const char *name, *attach_type = section_names[i].attach_type; return 0; } + pr_warning("failed to guess attach type based on ELF section name '%s'\n", name); + type_names = libbpf_get_type_names(true); + pr_info("attachable section(type) names are:%s\n", type_names); + free(type_names); + return -EINVAL; } @@ -2907,8 +2939,6 @@ int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr, err = bpf_program__identify_section(prog, &prog_type, &expected_attach_type); if (err < 0) { - pr_warning("failed to guess program type based on section name %s\n", - prog->section_name); bpf_object__close(obj); return -EINVAL; } diff --git a/tools/testing/selftests/bpf/test_socket_cookie.c b/tools/testing/selftests/bpf/test_socket_cookie.c index fc7832ee566b..e51d63786ff8 100644 --- a/tools/testing/selftests/bpf/test_socket_cookie.c +++ b/tools/testing/selftests/bpf/test_socket_cookie.c @@ -158,10 +158,8 @@ static int run_test(int cgfd) bpf_object__for_each_program(prog, pobj) { prog_name = bpf_program__title(prog, /*needs_copy*/ false); - if (libbpf_attach_type_by_name(prog_name, &attach_type)) { - log_err("Unexpected prog: %s", prog_name); + if (libbpf_attach_type_by_name(prog_name, &attach_type)) goto err; - } err = bpf_prog_attach(bpf_program__fd(prog), cgfd, attach_type, BPF_F_ALLOW_OVERRIDE); -- 2.17.1