From patchwork Thu Nov 18 11:24:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Olsa X-Patchwork-Id: 12626703 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 8D9D2C433EF for ; Thu, 18 Nov 2021 11:29:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 71E8F61246 for ; Thu, 18 Nov 2021 11:29:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344129AbhKRLci (ORCPT ); Thu, 18 Nov 2021 06:32:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:29759 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343897AbhKRLaf (ORCPT ); Thu, 18 Nov 2021 06:30:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637234855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rsW/H1X5SXKb3SkfnLF8OThiEczj7whjd6wk1z+2Cn4=; b=QsqO70oPaNhy43N7ntWfsm3CPz3bhEwJrftR4Q1ho4vhNDzSMPItqcKs17bUh0CjGII+sw d2wkRCoY3kAyan/m8Ecs9Ewrg9BfETCH9fiJ1Yr8lKqRSYKYOvyqE/VbYFWYhMdcWmJfYj cUhKZgohp9SvIoG5kOjrBvbyk4sO2Co= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-323-bkoOao0uPEeGzpyEMLkHFQ-1; Thu, 18 Nov 2021 06:27:34 -0500 X-MC-Unique: bkoOao0uPEeGzpyEMLkHFQ-1 Received: by mail-ed1-f69.google.com with SMTP id k7-20020aa7c387000000b003e7ed87fb31so5041347edq.3 for ; Thu, 18 Nov 2021 03:27:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rsW/H1X5SXKb3SkfnLF8OThiEczj7whjd6wk1z+2Cn4=; b=i0O7Pza+2hXagBsNOL7jixB9n7K3Q1ZvWVpx4+e9RU3jnGRQJZCBt2eKvUjHgraJ0X M0541xxvov7zKHmMmrWSKfJKKdEAZzDoJc3QW8pqQm8S+JEIHPK9on+oLKpfn9qS4t62 uP5AI/UIa5t1hLjy4RT7Y99TRH9j9Y9d3LKt5XGoHSa9O9DxTa68R9DqXEAgTtvetcpL /X5hT8B9XiVpEJDsjBfriT0zE6BnnowqWn2KPBPIjRMNY3TKmvaptVIBBf4FjNaMVkXp hYfgp4zHZj53iljwyOjIzfgd1ps84r1y1evXGAP9+I5QmqE7JIo5/eVV70szr0az9ORz n0lA== X-Gm-Message-State: AOAM531X6hmMmVPsaphuJhnRiChezv9KbpHqtV2zscqdU0loykGJKN// 2bGTrNvYbSGRc0BIhYDliu8jz61G1b7WbW8U8V7Ukq4131j5F67pMrvmhq7SkiVBRIKI1K0tA8d IApWFpz4OeO5kJmUz X-Received: by 2002:a17:907:3d94:: with SMTP id he20mr33000604ejc.75.1637234853336; Thu, 18 Nov 2021 03:27:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJzNIOqscLZtBmNLPGLo+AGS5074peYacS+Gr3CSw5E/dwY/58Gho08YE3Vj8B2JynfOt2rC2Q== X-Received: by 2002:a17:907:3d94:: with SMTP id he20mr33000570ejc.75.1637234853179; Thu, 18 Nov 2021 03:27:33 -0800 (PST) Received: from krava.redhat.com (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id l18sm524029ejo.114.2021.11.18.03.27.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Nov 2021 03:27:32 -0800 (PST) From: Jiri Olsa X-Google-Original-From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh Subject: [PATCH bpf-next 26/29] selftests/bpf: Add fentry/fexit multi func test Date: Thu, 18 Nov 2021 12:24:52 +0100 Message-Id: <20211118112455.475349-27-jolsa@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211118112455.475349-1-jolsa@kernel.org> References: <20211118112455.475349-1-jolsa@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Adding selftest for fentry/fexit multi func tests that attaches to bpf_fentry_test* functions and checks argument values based on the processed function. Signed-off-by: Jiri Olsa --- tools/testing/selftests/bpf/Makefile | 4 ++- .../bpf/prog_tests/multi_fentry_fexit_test.c | 32 +++++++++++++++++++ .../selftests/bpf/progs/multi_fentry_fexit.c | 28 ++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/multi_fentry_fexit_test.c create mode 100644 tools/testing/selftests/bpf/progs/multi_fentry_fexit.c diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 42b67834d803..236b6e0a36de 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -323,7 +323,8 @@ SKEL_BLACKLIST := btf__% test_pinning_invalid.c test_sk_assign.c LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h \ linked_vars.skel.h linked_maps.skel.h \ - multi_fentry_test.skel.h multi_fexit_test.skel.h + multi_fentry_test.skel.h multi_fexit_test.skel.h \ + multi_fentry_fexit_test.skel.h LSKELS := kfunc_call_test.c fentry_test.c fexit_test.c fexit_sleep.c \ test_ringbuf.c atomics.c trace_printk.c trace_vprintk.c @@ -337,6 +338,7 @@ linked_vars.skel.h-deps := linked_vars1.o linked_vars2.o linked_maps.skel.h-deps := linked_maps1.o linked_maps2.o multi_fentry_test.skel.h-deps := multi_fentry.o multi_check.o multi_fexit_test.skel.h-deps := multi_fexit.o multi_check.o +multi_fentry_fexit_test.skel.h-deps := multi_fentry_fexit.o multi_check.o LINKED_BPF_SRCS := $(patsubst %.o,%.c,$(foreach skel,$(LINKED_SKELS),$($(skel)-deps))) diff --git a/tools/testing/selftests/bpf/prog_tests/multi_fentry_fexit_test.c b/tools/testing/selftests/bpf/prog_tests/multi_fentry_fexit_test.c new file mode 100644 index 000000000000..d54abf36ab2f --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/multi_fentry_fexit_test.c @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include "multi_fentry_fexit_test.skel.h" + +void test_multi_fentry_fexit_test(void) +{ + DECLARE_LIBBPF_OPTS(bpf_link_update_opts, link_upd_opts); + struct multi_fentry_fexit_test *skel = NULL; + __u32 duration = 0, retval; + int err, prog_fd; + + skel = multi_fentry_fexit_test__open_and_load(); + if (!ASSERT_OK_PTR(skel, "fentry_multi_skel_load")) + goto cleanup; + + err = multi_fentry_fexit_test__attach(skel); + if (!ASSERT_OK(err, "fentry_fexit_attach")) + goto cleanup; + + prog_fd = bpf_program__fd(skel->progs.test2); + err = bpf_prog_test_run(prog_fd, 1, NULL, 0, + NULL, NULL, &retval, &duration); + ASSERT_OK(err, "test_run"); + ASSERT_EQ(retval, 0, "test_run"); + + ASSERT_EQ(skel->bss->test1_arg_result, 8, "test1_arg_result"); + ASSERT_EQ(skel->bss->test2_arg_result, 8, "test2_arg_result"); + ASSERT_EQ(skel->bss->test2_ret_result, 8, "test2_ret_result"); + +cleanup: + multi_fentry_fexit_test__destroy(skel); +} diff --git a/tools/testing/selftests/bpf/progs/multi_fentry_fexit.c b/tools/testing/selftests/bpf/progs/multi_fentry_fexit.c new file mode 100644 index 000000000000..54ee94d060b2 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/multi_fentry_fexit.c @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include + +char _license[] SEC("license") = "GPL"; + +__u64 test1_arg_result = 0; +__u64 test2_arg_result = 0; +__u64 test2_ret_result = 0; + +__hidden extern void multi_arg_check(__u64 *ctx, __u64 *test_result); +__hidden extern void multi_ret_check(void *ctx, __u64 *test_result); + +SEC("fentry.multi/bpf_fentry_test*") +int BPF_PROG(test1, __u64 a, __u64 b, __u64 c, __u64 d, __u64 e, __u64 f) +{ + multi_arg_check(ctx, &test1_arg_result); + return 0; +} + +SEC("fexit.multi/bpf_fentry_test*") +int BPF_PROG(test2, __u64 a, __u64 b, __u64 c, __u64 d, __u64 e, __u64 f, int ret) +{ + multi_arg_check(ctx, &test2_arg_result); + multi_ret_check(ctx, &test2_ret_result); + return 0; +}