From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6A1FA1D690 for ; Fri, 19 Jan 2024 11:06:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705662387; cv=none; b=VgObOB4pZ2Bq+Dyw0z2dn1KOgMB+QM/pTRf/Ks/Kk3Sxir3pb6BwkaWPO+7dAd1jzqHFY9Zj0VDfPlNbEZMOokV1GjYspAegynMZRHdHuamsZN9ZiXZUdYr8s7aya7VvF+YXdcQD/HHF5BdDaflXTPjPMBPuKxPoyoteQoZni1M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705662387; c=relaxed/simple; bh=NW5rzKFuCFZy1w810jndYtklE+L66BXOFRZlUSIkjhg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rxJswi67a2r4LTx7DBmvRsgmItfrzEGAG4vM79VyfpBoEnVEdfUjhLarZKu/7gFstzgJj0MFBoKoA+mtlP/6jVWtyuDalD+Ee1yBjA1qTyXxeqdFFCvT0/5L+aYsssnW00DZ3lv2xuTWTYz1f+1XBYi7ZobrIGi4XxVjV78aQNo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UC6ryY1k; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UC6ryY1k" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB2F9C433C7; Fri, 19 Jan 2024 11:06:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705662387; bh=NW5rzKFuCFZy1w810jndYtklE+L66BXOFRZlUSIkjhg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UC6ryY1kiWI75FAslAH8v+RnqC0Kham/6cjElMHxb4mOYfTwCaoXcZswpawGGGuOI 7enz8/ReuoojPemFwklWTgijahbuwkKWjwE+Kv8RDd5ooOQuIyTYU8f8QKv47qJTMJ UHZHJuSR/GtDmngHyOoa2jLTbWMsG8qpW1w0aYCtw24Yc1bbtQ5sIqineR7g1P9Fyn mii8B5Z5Uw/DWuske5ZFgUAH4kjNbXvOlYkvnPo3/HU1ULUCX2lrj9+QD5G++/s1VM Pl7Pr0q2JTCRtBNrnvKkHlXdDVEzzQkB5evCorIMPydY2ss9fdmM9voT9PUWev7efU 3HGeWVtYSwaFw== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Yafang Shao , Quentin Monnet Subject: [PATCHv2 bpf-next 6/8] selftests/bpf: Add fill_link_info test for perf event Date: Fri, 19 Jan 2024 12:05:03 +0100 Message-ID: <20240119110505.400573-7-jolsa@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240119110505.400573-1-jolsa@kernel.org> References: <20240119110505.400573-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Adding fill_link_info test for perf event and testing we get its values back through the bpf_link_info interface. Signed-off-by: Jiri Olsa --- .../selftests/bpf/prog_tests/fill_link_info.c | 40 +++++++++++++++++++ .../selftests/bpf/progs/test_fill_link_info.c | 6 +++ 2 files changed, 46 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c index 20e105001bc3..f3932941bbaa 100644 --- a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c +++ b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c @@ -109,6 +109,11 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add strlen(UPROBE_FILE)); ASSERT_EQ(err, 0, "cmp_file_name"); break; + case BPF_PERF_EVENT_EVENT: + ASSERT_EQ(info.perf_event.event.type, PERF_TYPE_SOFTWARE, "event_type"); + ASSERT_EQ(info.perf_event.event.config, PERF_COUNT_SW_PAGE_FAULTS, "event_config"); + ASSERT_EQ(info.perf_event.event.cookie, PERF_EVENT_COOKIE, "event_cookie"); + break; default: err = -1; break; @@ -189,6 +194,39 @@ static void test_tp_fill_link_info(struct test_fill_link_info *skel) bpf_link__destroy(link); } +static void test_event_fill_link_info(struct test_fill_link_info *skel) +{ + DECLARE_LIBBPF_OPTS(bpf_perf_event_opts, opts, + .bpf_cookie = PERF_EVENT_COOKIE, + ); + struct bpf_link *link; + int link_fd, err, pfd; + struct perf_event_attr attr = { + .type = PERF_TYPE_SOFTWARE, + .config = PERF_COUNT_SW_PAGE_FAULTS, + .freq = 1, + .sample_freq = 1, + .size = sizeof(struct perf_event_attr), + }; + + pfd = syscall(__NR_perf_event_open, &attr, -1 /* pid */, 0 /* cpu 0 */, + -1 /* group id */, 0 /* flags */); + if (!ASSERT_GE(pfd, 0, "perf_event_open")) + return; + + link = bpf_program__attach_perf_event_opts(skel->progs.event_run, pfd, &opts); + if (!ASSERT_OK_PTR(link, "attach_event")) + goto error; + + link_fd = bpf_link__fd(link); + err = verify_perf_link_info(link_fd, BPF_PERF_EVENT_EVENT, 0, 0, 0); + ASSERT_OK(err, "verify_perf_link_info"); + bpf_link__destroy(link); + +error: + close(pfd); +} + static void test_uprobe_fill_link_info(struct test_fill_link_info *skel, enum bpf_perf_event_type type) { @@ -549,6 +587,8 @@ void test_fill_link_info(void) test_kprobe_fill_link_info(skel, BPF_PERF_EVENT_KPROBE, true); if (test__start_subtest("tracepoint_link_info")) test_tp_fill_link_info(skel); + if (test__start_subtest("event_link_info")) + test_event_fill_link_info(skel); uprobe_offset = get_uprobe_offset(&uprobe_func); if (test__start_subtest("uprobe_link_info")) diff --git a/tools/testing/selftests/bpf/progs/test_fill_link_info.c b/tools/testing/selftests/bpf/progs/test_fill_link_info.c index 69509f8bb680..6afa834756e9 100644 --- a/tools/testing/selftests/bpf/progs/test_fill_link_info.c +++ b/tools/testing/selftests/bpf/progs/test_fill_link_info.c @@ -33,6 +33,12 @@ int BPF_PROG(tp_run) return 0; } +SEC("perf_event") +int event_run(void *ctx) +{ + return 0; +} + SEC("kprobe.multi") int BPF_PROG(kmulti_run) { -- 2.43.0