From patchwork Tue Oct 12 16:15:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 12553023 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D3BEC433F5 for ; Tue, 12 Oct 2021 16:15:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 70CC860F23 for ; Tue, 12 Oct 2021 16:15:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230096AbhJLQRy (ORCPT ); Tue, 12 Oct 2021 12:17:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229892AbhJLQRx (ORCPT ); Tue, 12 Oct 2021 12:17:53 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D7CCC061745 for ; Tue, 12 Oct 2021 09:15:50 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id b126-20020a251b84000000b005bd8aca71a2so8046969ybb.4 for ; Tue, 12 Oct 2021 09:15:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=hQDefVqBcVtNj8blFbQ05wqXANbAMPXIhYV5cVjAGI8=; b=dw1Y7/G6iqMUO5jCfpgBW+6BPyR8dTn7LtDDAz4nFL4/h3UPbCCccWyiaR9yz3EsvG bIMgUPV8objgiIXcSw0pLSXHL7zVje4wBXoLTaYhlEagXNGx1nUTyVmbzKjr7YLuW3so JMUyUe4AFK+Gl2iOMOCLeZ/LfoKvo+vozIRu3xB+VKPV+lmVzgXGlwrxfQTNxGnsGXzO RazhKrSnaqz+7uEvHWeAibPLW1A3uweg7SqgBBpw7OaaCd381IWfmt7oj3uKQenZuqbG RiMKxDslpNDMP5lXbV/t+BoA9C29GsD1E7+mj6cMhgBBy7x1amHswLlue1GC9uXWzX6Z sOvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=hQDefVqBcVtNj8blFbQ05wqXANbAMPXIhYV5cVjAGI8=; b=3dXVEOkcvdiYMVaoz12B2dqfEMuUBFuKvct5X7jrSRcHpyRqjYA20avGG9PBdIUsZo WCYIW0NWSPQWjbTm2J0jcjCLg7TVyyHYob63E61BsrE6D0Yhrr5kb9HM7W866elUKE66 Nc9h2/1ImTJxRDsX41q7Z8D0bBVOK4N2QX+2sw5iDf9m/Q3z/AWZZp8xSlwdMRqrnT6Z CY/38DAc1KvYsY9fWx+mYnzLxcs0vL88HQ24S6B1B6rfmDdfVqchtn3gJBnmLkN0wKH+ DjTvyrawUwNzd68eXTCSJFIWLQ3IXhuQsXpovqHp1PvwrgR1wKUmVf07AmuICqWoV3WM jmOQ== X-Gm-Message-State: AOAM5318ny2KRMc1nhOWn7RdMIVl+EVfj/5975YIEKN4Ozsjeww0ewhA fb4IQTROrZaoQR3GWKYBEI9IxJkjb0yqc+wPM0na+kpVjzCjB1TcJ7ocqdoDKXhCdOzOROzIyJx cUAlVnJcKTXEmUdugKIt8sgCkXqglP6iHkWq7BdHhxaCx+u15V4sNrA== X-Google-Smtp-Source: ABdhPJxCaH5ifIWNNqql/POAJ7f7k3GjlWfho4J6GvY5rSlR8PwIZiswsX4q4spEYzprA/1FBnRHPAs= X-Received: from sdf2.svl.corp.google.com ([2620:15c:2c4:201:4060:335c:dc47:9fc2]) (user=sdf job=sendgmr) by 2002:a25:e4c7:: with SMTP id b190mr30179861ybh.302.1634055349558; Tue, 12 Oct 2021 09:15:49 -0700 (PDT) Date: Tue, 12 Oct 2021 09:15:42 -0700 In-Reply-To: <20211012161544.660286-1-sdf@google.com> Message-Id: <20211012161544.660286-2-sdf@google.com> Mime-Version: 1.0 References: <20211012161544.660286-1-sdf@google.com> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH bpf-next v2 1/3] libbpf: use func name when pinning programs with LIBBPF_STRICT_SEC_NAME From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, Stanislav Fomichev Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net We can't use section name anymore because they are not unique and pinning objects with multiple programs with the same progtype/secname will fail. Closes: https://github.com/libbpf/libbpf/issues/273 Signed-off-by: Stanislav Fomichev --- tools/lib/bpf/libbpf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index ae0889bebe32..d1646b32188f 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -285,7 +285,7 @@ struct bpf_program { size_t sub_insn_off; char *name; - /* sec_name with / replaced by _; makes recursive pinning + /* name with / replaced by _; makes recursive pinning * in bpf_object__pin_programs easier */ char *pin_name; @@ -614,7 +614,13 @@ static char *__bpf_program__pin_name(struct bpf_program *prog) { char *name, *p; - name = p = strdup(prog->sec_name); + if (libbpf_mode & LIBBPF_STRICT_SEC_NAME) + name = strdup(prog->name); + else + name = strdup(prog->sec_name); + + p = name; + while ((p = strchr(p, '/'))) *p = '_'; From patchwork Tue Oct 12 16:15:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 12553025 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FAD9C4332F for ; Tue, 12 Oct 2021 16:15:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25FCF6103D for ; Tue, 12 Oct 2021 16:15:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230123AbhJLQRz (ORCPT ); Tue, 12 Oct 2021 12:17:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229495AbhJLQRy (ORCPT ); Tue, 12 Oct 2021 12:17:54 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3849C061745 for ; Tue, 12 Oct 2021 09:15:52 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id z130-20020a256588000000b005b6b4594129so27852100ybb.15 for ; Tue, 12 Oct 2021 09:15:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=jlfiTEUka2/blqQcciOdP3p7gXV+iiMGA7a+lcQ/zbM=; b=IANQUCztSu0fD1+kqjILQ95Vw6oZpZ/P1o9fs7kkGN6BJ0XfDwEDavy1ZWWvmoi693 WmVP4/OWpChEvhl0vdDGQyrXeLSYxL8hHT+Kczo90VOpvZURzPA3nxz9uoNGOnSVxAdO 1xDN0ziNkW/lueu6N79FvKwds3f8AVOTZdNpwRebmb3YW4Mk68UdpFRen2ym9gjwEfSt YP7vKordN6q3/F0Qdu9OgYja6TFfUJY0UoEb8RotlpMTNLZlVOZ/mfWmKdQET2wUc3iL zA4lMPI31lalrDwYNjST/XdoHpqKsPcSay9Xk6y71FCu/zrPgrh3M6vI/CDwbzv07vXq iDDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=jlfiTEUka2/blqQcciOdP3p7gXV+iiMGA7a+lcQ/zbM=; b=zR2aCfxK9cuNUG2ob4oFeUvKfq48ocQnBdsNnTzOBtSceTwyoymNHFU/nNSDzgknPL ZEbiah70Or3a3pyWOdBQ2tQOl+gfcx9vwkF9DvbV47JdV7p/7I+eAEcpxwByZZplXWvt NZdFVdaugG0YPEHMgpmChcFCT41zngiUfCqNE1oyEP4eMMPVCyHtnQ36PJr+S37hwtoj OHn1KKz3Ir8KiBmU9rL4AtKVcRyssXnR/Y8r+WbMC5ZKv/t1QoqWI8hW4MYCqmNwqryZ Oh9vsCDTJ5/v1tOna5zCsGJx3HywwvdEm/2MIfrGltAXlhVJ09iY7SSQQPGwgNXHMw3y Eomw== X-Gm-Message-State: AOAM532pbg+7dFw4hRqfa4rflDij+zLbdYaxJM6ZB9b9trB6YRkMmf6A 1xuAso32Kgr5dqEQJKLPLda5pUhH67WyxjIW+6Jm3S9Q4aIfJa4EWH+DNrhBUwxxq2oxq0jzIng 22DG4LOPFwyXkVO1wtmv1Eyh1/e7FZcNc6+OkaZ7xQW+/nBM+A3emkA== X-Google-Smtp-Source: ABdhPJz+kjT7uSEq8SgR2Cvdpyd8woeyUs/fZknba1ewWywixRh3FyHAJ2oUsGXYuY3TlofzwSxAd0s= X-Received: from sdf2.svl.corp.google.com ([2620:15c:2c4:201:4060:335c:dc47:9fc2]) (user=sdf job=sendgmr) by 2002:a25:b309:: with SMTP id l9mr28165653ybj.188.1634055351928; Tue, 12 Oct 2021 09:15:51 -0700 (PDT) Date: Tue, 12 Oct 2021 09:15:43 -0700 In-Reply-To: <20211012161544.660286-1-sdf@google.com> Message-Id: <20211012161544.660286-3-sdf@google.com> Mime-Version: 1.0 References: <20211012161544.660286-1-sdf@google.com> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH bpf-next v2 2/3] bpftool: don't append / to the progtype From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, Stanislav Fomichev Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Otherwise, attaching with bpftool doesn't work with strict section names. Also, switch to libbpf strict mode to use the latest conventions (note, I don't think we have any cli api guarantees?). Signed-off-by: Stanislav Fomichev --- tools/bpf/bpftool/main.c | 4 ++++ tools/bpf/bpftool/prog.c | 15 +-------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c index 02eaaf065f65..8223bac1e401 100644 --- a/tools/bpf/bpftool/main.c +++ b/tools/bpf/bpftool/main.c @@ -409,6 +409,10 @@ int main(int argc, char **argv) block_mount = false; bin_name = argv[0]; + ret = libbpf_set_strict_mode(LIBBPF_STRICT_ALL); + if (ret) + p_err("failed to enable libbpf strict mode: %d", ret); + hash_init(prog_table.table); hash_init(map_table.table); hash_init(link_table.table); diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 277d51c4c5d9..17505dc1243e 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -1396,8 +1396,6 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) while (argc) { if (is_prefix(*argv, "type")) { - char *type; - NEXT_ARG(); if (common_prog_type != BPF_PROG_TYPE_UNSPEC) { @@ -1407,19 +1405,8 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) if (!REQ_ARGS(1)) goto err_free_reuse_maps; - /* Put a '/' at the end of type to appease libbpf */ - type = malloc(strlen(*argv) + 2); - if (!type) { - p_err("mem alloc failed"); - goto err_free_reuse_maps; - } - *type = 0; - strcat(type, *argv); - strcat(type, "/"); - - err = get_prog_type_by_name(type, &common_prog_type, + err = get_prog_type_by_name(*argv, &common_prog_type, &expected_attach_type); - free(type); if (err < 0) goto err_free_reuse_maps; From patchwork Tue Oct 12 16:15:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 12553027 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EE46C433F5 for ; Tue, 12 Oct 2021 16:15:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 844D36103D for ; Tue, 12 Oct 2021 16:15:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230141AbhJLQR7 (ORCPT ); Tue, 12 Oct 2021 12:17:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229495AbhJLQR4 (ORCPT ); Tue, 12 Oct 2021 12:17:56 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4502C061745 for ; Tue, 12 Oct 2021 09:15:54 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id q193-20020a252aca000000b005ba63482993so19261792ybq.0 for ; Tue, 12 Oct 2021 09:15:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=1fprwygtfcbW4YsIOZabVxvRcnD8jzC8e3Grk+JtWJM=; b=eIJzWdq4FqJxjYSYrWTzyPf4aRvaZ4BUXVxKKqyI0/9L/UZsNlnIRt4wg+e/raLxE2 TU0SpC6qcKDauHj0119LFPg/QRAWb00seCJZi2uiIfv50LTtHtfmpL8NnnJDEVmJ4Ler h6+ev/h7tf6yW0a8neMPjNPdokA8jiENwR7OoIiBxTNv7uDYhSHPlolIvsmrB6pKeJWU tgG/Cb6oFLRXCjcQ1SIqUhHeLnLXON09vlhgRfkIJlCrusYh64MTCNbOCXga0tbomaPI 7tyCG6+BEQpSwjX2Ka75FzwgA0kwkX0TpHvwAghB+elyo3cELjDqEtnrK+4LaAZn/0Ga ASJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=1fprwygtfcbW4YsIOZabVxvRcnD8jzC8e3Grk+JtWJM=; b=hKcOJLAYjFYLETOOLKuxdw4/yOqecqTJ//7NX+sp7OiUTyLzCUycMaIESU2z0O/qjU WgLUoAexVbdnbcMRK6/+emOGDYVFyPLTCvxBj70vPjE/inNc6mxlzI7E/wPzKtnCOQtk h9tQPA1HUVaSlMWWxwbL+eBkojS2EX7RAoScEgJ0M7bpfm8+/s8CHPEderlBIh0zlaGn BaqoJjgfj7jOOgWYrrHGXw/mXkXX89IzpvQxsQnRdw80xTh/0ilOcpFd7n34OtxSGKQw 8LNIvxKtHHnUnB5L1Afbr9G2gTR82dJRFK/bSPuYCPEUFvXcNSYx2goqe/IH8UUmf3tO /AvA== X-Gm-Message-State: AOAM531KR8D62TwuHxLtKn6edrY+xZ3ZtUFcLmDjFTozfDvnZMMMYoht rH38az1hn4KO8u+lFJCN8Ea95JrQ+uvomIf+PZltDEGDXtQklPbhg62jpugKJ/8Q6cCKnpkr39a fv/fq8efB/mLRDxeVNH1gTeerYJ2w1WlczSuX45wN1U+8FHOOZhtvFQ== X-Google-Smtp-Source: ABdhPJwofZ85WPvbeKvSYlN0n5Fu8ww/Y1Q/yrh2BMwd8ds19k5TfOmnVwYrLMbnfcP3rZ6zDZqLGvs= X-Received: from sdf2.svl.corp.google.com ([2620:15c:2c4:201:4060:335c:dc47:9fc2]) (user=sdf job=sendgmr) by 2002:a25:ccd1:: with SMTP id l200mr29997924ybf.140.1634055354057; Tue, 12 Oct 2021 09:15:54 -0700 (PDT) Date: Tue, 12 Oct 2021 09:15:44 -0700 In-Reply-To: <20211012161544.660286-1-sdf@google.com> Message-Id: <20211012161544.660286-4-sdf@google.com> Mime-Version: 1.0 References: <20211012161544.660286-1-sdf@google.com> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH bpf-next v2 3/3] selftests/bpf: fix flow dissector tests From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, Stanislav Fomichev Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net - update custom loader to search by name, not section name - update bpftool commands to use proper pin path Signed-off-by: Stanislav Fomichev --- .../selftests/bpf/flow_dissector_load.c | 18 +++++++++++------- .../selftests/bpf/flow_dissector_load.h | 10 ++-------- .../selftests/bpf/test_flow_dissector.sh | 10 +++++----- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/tools/testing/selftests/bpf/flow_dissector_load.c b/tools/testing/selftests/bpf/flow_dissector_load.c index 3fd83b9dc1bf..87fd1aa323a9 100644 --- a/tools/testing/selftests/bpf/flow_dissector_load.c +++ b/tools/testing/selftests/bpf/flow_dissector_load.c @@ -17,7 +17,7 @@ const char *cfg_pin_path = "/sys/fs/bpf/flow_dissector"; const char *cfg_map_name = "jmp_table"; bool cfg_attach = true; -char *cfg_section_name; +char *cfg_prog_name; char *cfg_path_name; static void load_and_attach_program(void) @@ -25,7 +25,11 @@ static void load_and_attach_program(void) int prog_fd, ret; struct bpf_object *obj; - ret = bpf_flow_load(&obj, cfg_path_name, cfg_section_name, + ret = libbpf_set_strict_mode(LIBBPF_STRICT_ALL); + if (ret) + error(1, 0, "failed to enable libbpf strict mode: %d", ret); + + ret = bpf_flow_load(&obj, cfg_path_name, cfg_prog_name, cfg_map_name, NULL, &prog_fd, NULL); if (ret) error(1, 0, "bpf_flow_load %s", cfg_path_name); @@ -75,15 +79,15 @@ static void parse_opts(int argc, char **argv) break; case 'p': if (cfg_path_name) - error(1, 0, "only one prog name can be given"); + error(1, 0, "only one path can be given"); cfg_path_name = optarg; break; case 's': - if (cfg_section_name) - error(1, 0, "only one section can be given"); + if (cfg_prog_name) + error(1, 0, "only one prog can be given"); - cfg_section_name = optarg; + cfg_prog_name = optarg; break; } } @@ -94,7 +98,7 @@ static void parse_opts(int argc, char **argv) if (cfg_attach && !cfg_path_name) error(1, 0, "must provide a path to the BPF program"); - if (cfg_attach && !cfg_section_name) + if (cfg_attach && !cfg_prog_name) error(1, 0, "must provide a section name"); } diff --git a/tools/testing/selftests/bpf/flow_dissector_load.h b/tools/testing/selftests/bpf/flow_dissector_load.h index 7290401ec172..9d0acc2fc6cc 100644 --- a/tools/testing/selftests/bpf/flow_dissector_load.h +++ b/tools/testing/selftests/bpf/flow_dissector_load.h @@ -7,7 +7,7 @@ static inline int bpf_flow_load(struct bpf_object **obj, const char *path, - const char *section_name, + const char *prog_name, const char *map_name, const char *keys_map_name, int *prog_fd, @@ -23,13 +23,7 @@ static inline int bpf_flow_load(struct bpf_object **obj, if (ret) return ret; - main_prog = NULL; - bpf_object__for_each_program(prog, *obj) { - if (strcmp(section_name, bpf_program__section_name(prog)) == 0) { - main_prog = prog; - break; - } - } + main_prog = bpf_object__find_program_by_name(*obj, prog_name); if (!main_prog) return -1; diff --git a/tools/testing/selftests/bpf/test_flow_dissector.sh b/tools/testing/selftests/bpf/test_flow_dissector.sh index 174b72a64a4c..dbd91221727d 100755 --- a/tools/testing/selftests/bpf/test_flow_dissector.sh +++ b/tools/testing/selftests/bpf/test_flow_dissector.sh @@ -26,22 +26,22 @@ if [[ -z $(ip netns identify $$) ]]; then type flow_dissector if ! unshare --net $bpftool prog attach pinned \ - /sys/fs/bpf/flow/flow_dissector flow_dissector; then + /sys/fs/bpf/flow/_dissect flow_dissector; then echo "Unexpected unsuccessful attach in namespace" >&2 err=1 fi - $bpftool prog attach pinned /sys/fs/bpf/flow/flow_dissector \ + $bpftool prog attach pinned /sys/fs/bpf/flow/_dissect \ flow_dissector if unshare --net $bpftool prog attach pinned \ - /sys/fs/bpf/flow/flow_dissector flow_dissector; then + /sys/fs/bpf/flow/_dissect flow_dissector; then echo "Unexpected successful attach in namespace" >&2 err=1 fi if ! $bpftool prog detach pinned \ - /sys/fs/bpf/flow/flow_dissector flow_dissector; then + /sys/fs/bpf/flow/_dissect flow_dissector; then echo "Failed to detach flow dissector" >&2 err=1 fi @@ -95,7 +95,7 @@ else fi # Attach BPF program -./flow_dissector_load -p bpf_flow.o -s flow_dissector +./flow_dissector_load -p bpf_flow.o -s _dissect # Setup tc qdisc add dev lo ingress