From patchwork Wed Jul 19 12:52:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Hwang X-Patchwork-Id: 13318953 X-Patchwork-Delegate: bpf@iogearbox.net Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E471614AA3; Wed, 19 Jul 2023 12:53:06 +0000 (UTC) Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9ECC91711; Wed, 19 Jul 2023 05:53:05 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-66869feb7d1so4636518b3a.3; Wed, 19 Jul 2023 05:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689771184; x=1690375984; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k/fyEQro42W9/vnF1W1U2M036ZnpKcRcNmVYZzD6x00=; b=PhxY4OnfjVmITv5WDZL1Jno7Qo60HvLZgFzy43D8wjBzKE3m/ajiJ/daixNL8+QZ5V Nr35Rcs/DQ0w9KEMTLh0NF14M4F3LBJxRdjidpVk2kVe2VYDcVNbTNzxj5HtjguyrV14 LrGti1UuY7fGlGP9bXQY9VnxdZHctyF7UjlIrZq12BzOuJ1Sd+7fRZOcTuaSgyYlnek2 Sq927Nmo7SUpuNiCIVDe1230ALkleCcDs45f5mOjE981tOL4r4X1njrERVzJUWwMpsvD cOh0emZ5UnHO3H+5Vv/+alUU6ta4LWEDJdRjuoefwCu4L97gspNZx9V5KrhbYXIEwwNR 3LRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689771184; x=1690375984; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k/fyEQro42W9/vnF1W1U2M036ZnpKcRcNmVYZzD6x00=; b=diW9TgO0cfoRYSNjw0k37uHm8tRNFdW2x0M4iWoIPU+3cDUlQC3ymbVU55+rJe1sKG az7xXXnS5f481JvTPaWxSjfyYVX0mWxX1vCs2b0zk73PnqPtlmLGArP2LIMhgfqyOk6/ Y4wtIvKdBk8eidVz60/6i75LK3bkuihLAm6A4RMc92tqjmB5bMWCBdyPRNvWg4tmPboH XZWh2bIK4nlBXk4pCV6XtUCYmoMt6QZsCYJID//UYJN5n0T1baTQucJeC146Walx+unv PFFTp+War9/yVpR+OWuq8kNK3sy2Ts16p2Yih1z9pHbNJn1t0MfCuUKVmLlpp1puKnpz EmjA== X-Gm-Message-State: ABy/qLYUoxnfbDdUoFYm5HZfFEVi+LPaPL+4JcnUUOVj7y7GChkD6Jbg 6Va05EKcjba3ybp8kamL0gk= X-Google-Smtp-Source: APBJJlHxfRi7rH7QakBWvMMMSxzspOsiUYbuqZMpQZ+0eqUhb721X/KThVbk6weyzPIxX+8qGeP8bQ== X-Received: by 2002:a17:90a:6548:b0:259:3e2a:b6d8 with SMTP id f8-20020a17090a654800b002593e2ab6d8mr15545272pjs.17.1689771184605; Wed, 19 Jul 2023 05:53:04 -0700 (PDT) Received: from localhost.localdomain (bb219-74-209-211.singnet.com.sg. [219.74.209.211]) by smtp.gmail.com with ESMTPSA id lc14-20020a17090b158e00b002612150d958sm1146191pjb.16.2023.07.19.05.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 05:53:04 -0700 (PDT) From: Leon Hwang To: ast@kernel.org Cc: daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yhs@fb.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, hawk@kernel.org, hffilwlqm@gmail.com, tangyeechou@gmail.com, kernel-patches-bot@fb.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH bpf-next v3 1/2] bpf, xdp: Add tracepoint to xdp attaching failure Date: Wed, 19 Jul 2023 20:52:31 +0800 Message-ID: <20230719125232.92607-2-hffilwlqm@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719125232.92607-1-hffilwlqm@gmail.com> References: <20230719125232.92607-1-hffilwlqm@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,HK_RANDOM_ENVFROM, HK_RANDOM_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: bpf@iogearbox.net When error happens in dev_xdp_attach(), it should have a way to tell users the error message like the netlink approach. To avoid breaking uapi, adding a tracepoint in bpf_xdp_link_attach() is an appropriate way to notify users the error message. Hence, bpf libraries are able to retrieve the error message by this tracepoint, and then report the error message to users. Signed-off-by: Leon Hwang --- include/trace/events/xdp.h | 17 +++++++++++++++++ net/core/dev.c | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h index c40fc97f94171..35712ecfe9203 100644 --- a/include/trace/events/xdp.h +++ b/include/trace/events/xdp.h @@ -404,6 +404,23 @@ TRACE_EVENT(mem_return_failed, ) ); +TRACE_EVENT(bpf_xdp_link_attach_failed, + + TP_PROTO(const char *msg), + + TP_ARGS(msg), + + TP_STRUCT__entry( + __string(msg, msg) + ), + + TP_fast_assign( + __assign_str(msg, msg); + ), + + TP_printk("errmsg=%s", __get_str(msg)) +); + #endif /* _TRACE_XDP_H */ #include diff --git a/net/core/dev.c b/net/core/dev.c index d6e1b786c5c52..062bbbb736f80 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -132,6 +132,7 @@ #include #include #include +#include #include #include #include @@ -9411,6 +9412,7 @@ int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog) struct bpf_link_primer link_primer; struct bpf_xdp_link *link; struct net_device *dev; + struct netlink_ext_ack extack; int err, fd; rtnl_lock(); @@ -9436,12 +9438,13 @@ int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog) goto unlock; } - err = dev_xdp_attach_link(dev, NULL, link); + err = dev_xdp_attach_link(dev, &extack, link); rtnl_unlock(); if (err) { link->dev = NULL; bpf_link_cleanup(&link_primer); + trace_bpf_xdp_link_attach_failed(extack._msg); goto out_put_dev; } From patchwork Wed Jul 19 12:52:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Hwang X-Patchwork-Id: 13318954 X-Patchwork-Delegate: bpf@iogearbox.net Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D8D4E12B88; Wed, 19 Jul 2023 12:53:12 +0000 (UTC) Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41A081719; Wed, 19 Jul 2023 05:53:11 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1b89b75dc1cso5277015ad.1; Wed, 19 Jul 2023 05:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689771191; x=1690375991; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eZEc1m9bRrutzRiHcrkT5tCiyj18axUv2cav0ilgCkI=; b=ZHZfxTnnwbEaOht+uP3JCF6eIY1dxKPFo3Z/TDQauEJ8mO1lxhIa96nvA8OheLIB7E M2InhdGdkoZpQoh1GhL9+ca4ckILbyvfm+lyqLnuWCd1Dy5B+xd1hA/WSBFFPneLD76t vEAvOU79Ga3Ebh3bvZLHa3i3p9UvCU1Fke4q20zACt4GutsBFdYkmL8fbfegaAHFjDop wslebTR1J05b9kITr3nqkD44Qilzp9bBSmzQJaMsArImOarhGu7MTXNO1t/i+DEXn1U9 2zyradUQUZawn2dNYYv7tIiBgxZU+OD4nfGLRflw8JovypIsWPsqE1juXi8bjW2ecTEj mmvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689771191; x=1690375991; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eZEc1m9bRrutzRiHcrkT5tCiyj18axUv2cav0ilgCkI=; b=ZqMB1riqT5c/oxiEypQLwuaEsv0/snYB5jaXiNFsnTXQ3icy80+shlXDy9kIi3Aiti ddgngg9TKDaN+ztn41qJqLdIRN/pMJOIzsGe6TM0suF7VmrEPSx6l4dvWYWaKZXC4a2w U3AwlIRspBsNZraOkudf9BzEgsMt60KY8ozVNc7IHbkS69AsQJDMUzaGX3eEnmdABrhR mKkncTvVTXHIXMD1anNYEjSTNiHohZRIYNgFb6AnhKXOYL/kzR7vimmwqACxnSQ0qHiI JmcnmC5Ki+GZriHo4aW8GLDqARqbICCL2s14shrjylsUphKIAPoHOXiN7rPRI2D5lvC2 smYw== X-Gm-Message-State: ABy/qLaIT+XXPYQ3yA+cwJFimhsAOJfBbGfu/GZyD4TdIfNCEDljhB91 IV6eaIiX5yIzmyJAWkIufq4= X-Google-Smtp-Source: APBJJlHwLXwtaeOlnIc52QYsqsgbFEJYr6VcRF/nfeZ0tSFhcgqsVvDrh22xdSoZ12XNNcERxIbAMQ== X-Received: by 2002:a17:90a:98c:b0:263:f674:490e with SMTP id 12-20020a17090a098c00b00263f674490emr2682197pjo.3.1689771190668; Wed, 19 Jul 2023 05:53:10 -0700 (PDT) Received: from localhost.localdomain (bb219-74-209-211.singnet.com.sg. [219.74.209.211]) by smtp.gmail.com with ESMTPSA id lc14-20020a17090b158e00b002612150d958sm1146191pjb.16.2023.07.19.05.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 05:53:10 -0700 (PDT) From: Leon Hwang To: ast@kernel.org Cc: daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yhs@fb.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, hawk@kernel.org, hffilwlqm@gmail.com, tangyeechou@gmail.com, kernel-patches-bot@fb.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH bpf-next v3 2/2] selftests/bpf: Add testcase for xdp attaching failure tracepoint Date: Wed, 19 Jul 2023 20:52:32 +0800 Message-ID: <20230719125232.92607-3-hffilwlqm@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719125232.92607-1-hffilwlqm@gmail.com> References: <20230719125232.92607-1-hffilwlqm@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,HK_RANDOM_ENVFROM, HK_RANDOM_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: bpf@iogearbox.net Add a test case for the tracepoint of xdp attaching failure by bpf tracepoint when attach XDP to a device with invalid flags option. The bpf tracepoint retrieves error message from the tracepoint, and then put the error message to a perf buffer. The testing code receives error message from perf buffer, and then ASSERT "Invalid XDP flags for BPF link attachment". Signed-off-by: Leon Hwang --- .../selftests/bpf/prog_tests/xdp_attach.c | 63 +++++++++++++++++++ .../bpf/progs/test_xdp_attach_fail.c | 51 +++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_attach_fail.c +char LICENSE[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_attach.c index fa3cac5488f5d..265dba875f16b 100644 --- a/tools/testing/selftests/bpf/prog_tests/xdp_attach.c +++ b/tools/testing/selftests/bpf/prog_tests/xdp_attach.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include "test_xdp_attach_fail.skel.h" #define IFINDEX_LO 1 #define XDP_FLAGS_REPLACE (1U << 4) @@ -85,10 +87,74 @@ static void test_xdp_attach(const char *file) bpf_object__close(obj1); } +struct xdp_errmsg { + char msg[64]; +}; + +static void on_xdp_errmsg(void *ctx, int cpu, void *data, __u32 size) +{ + struct xdp_errmsg *ctx_errmg = ctx, *tp_errmsg = data; + + memcpy(&ctx_errmg->msg, &tp_errmsg->msg, size); +} + +static const char tgt_errmsg[] = "Invalid XDP flags for BPF link attachment"; + +static void test_xdp_attach_fail(const char *file) +{ + __u32 duration = 0; + int err, fd_xdp, fd_link_xdp; + struct bpf_object *obj = NULL; + struct test_xdp_attach_fail *skel = NULL; + struct bpf_link *link = NULL; + struct perf_buffer *pb = NULL; + struct xdp_errmsg errmsg = {}; + + LIBBPF_OPTS(bpf_link_create_opts, opts); + + skel = test_xdp_attach_fail__open_and_load(); + if (!ASSERT_OK_PTR(skel, "test_xdp_attach_fail_skel")) + goto out_close; + + link = bpf_program__attach_tracepoint(skel->progs.tp__xdp__bpf_xdp_link_attach_failed, + "xdp", "bpf_xdp_link_attach_failed"); + if (!ASSERT_OK_PTR(link, "attach_tp")) + goto out_close; + + /* set up perf buffer */ + pb = perf_buffer__new(bpf_map__fd(skel->maps.xdp_errmsg_pb), 1, + on_xdp_errmsg, NULL, &errmsg, NULL); + + err = bpf_prog_test_load(file, BPF_PROG_TYPE_XDP, &obj, &fd_xdp); + if (CHECK_FAIL(err)) + goto out_close; + + opts.flags = 0xFF; // invalid flags to fail to attach XDP prog + fd_link_xdp = bpf_link_create(fd_xdp, IFINDEX_LO, BPF_XDP, &opts); + if (CHECK(fd_link_xdp != -22, "bpf_link_create_failed", + "created link fd: %d\n", fd_link_xdp)) + goto out_close; + + /* read perf buffer */ + err = perf_buffer__poll(pb, 100); + if (CHECK(err < 0, "perf_buffer__poll", "err %d\n", err)) + goto out_close; + + ASSERT_STRNEQ((const char *) errmsg.msg, tgt_errmsg, + 42 /* strlen(tgt_errmsg) */, "check error message"); + +out_close: + perf_buffer__free(pb); + bpf_object__close(obj); + test_xdp_attach_fail__destroy(skel); +} + void serial_test_xdp_attach(void) { if (test__start_subtest("xdp_attach")) test_xdp_attach("./test_xdp.bpf.o"); if (test__start_subtest("xdp_attach_dynptr")) test_xdp_attach("./test_xdp_dynptr.bpf.o"); + if (test__start_subtest("xdp_attach_failed")) + test_xdp_attach_fail("./xdp_dummy.bpf.o"); } diff --git a/tools/testing/selftests/bpf/progs/test_xdp_attach_fail.c b/tools/testing/selftests/bpf/progs/test_xdp_attach_fail.c new file mode 100644 index 0000000000000..ad8d536775d9d --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_xdp_attach_fail.c @@ -0,0 +2,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright Leon Hwang */ + +#include +#include + +struct xdp_errmsg { + char msg[64]; +}; + +struct { + __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY); + __uint(key_size, sizeof(__u32)); + __uint(value_size, sizeof(__u32)); +} xdp_errmsg_pb SEC(".maps"); + +struct xdp_attach_error_ctx { + unsigned long unused; + + /* + * bpf does not support tracepoint __data_loc directly. + * + * Actually, this field is a 32 bit integer whose value encodes + * information on where to find the actual data. The first 2 bytes is + * the size of the data. The last 2 bytes is the offset from the start + * of the tracepoint struct where the data begins. + * -- https://github.com/iovisor/bpftrace/pull/1542 + */ + __u32 msg; // __data_loc char[] msg; +}; + +/* + * Catch the error message at the tracepoint. + */ + +SEC("tp/xdp/bpf_xdp_link_attach_failed") +int tp__xdp__bpf_xdp_link_attach_failed(struct xdp_attach_error_ctx *ctx) +{ + struct xdp_errmsg errmsg; + char *msg = (void *)(__u64) ((void *) ctx + (__u16) ctx->msg); + + bpf_probe_read_kernel_str(&errmsg.msg, sizeof(errmsg.msg), msg); + bpf_perf_event_output(ctx, &xdp_errmsg_pb, BPF_F_CURRENT_CPU, &errmsg, + sizeof(errmsg)); + return 0; +} + +/* + * Reuse the XDP program in xdp_dummy.c. + */ +