From: Manu Bretelle <chantr4@gmail.com>
To: bpf@vger.kernel.org, quentin@isovalent.com, andrii@kernel.org,
daniel@iogearbox.net, ast@kernel.org, martin.lau@linux.dev,
song@kernel.org, john.fastabend@gmail.com, kpsingh@kernel.org,
sdf@google.com, haoluo@google.com, jolsa@kernel.org
Subject: [PATCH v1 bpf-next 5/9] bpftool: add test for bpftool prog
Date: Thu, 16 Nov 2023 11:42:32 -0800 [thread overview]
Message-ID: <20231116194236.1345035-6-chantr4@gmail.com> (raw)
In-Reply-To: <20231116194236.1345035-1-chantr4@gmail.com>
Add tests that validate `bpftool prog list` functions, that we can
associate pids with them, and that we can show a prog by id.
$ BPFTOOL_PATH=../bpftool
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="sudo -E" cargo test --
--nocapture
Finished test [unoptimized + debuginfo] target(s) in 0.05s
Running unittests src/main.rs
(target/debug/deps/bpftool_tests-afa5a7eef3cdeafb)
running 6 tests
Running command "../bpftool" "version"
test bpftool_tests::run_bpftool ... ok
Running command "../bpftool" "map" "list" "--json"
Running command "../bpftool" "prog" "list" "--json"
Running command "../bpftool" "prog" "list" "--json"
Running command "../bpftool" "map" "list" "--json"
Running command "../bpftool" "prog" "show" "id" "3160417" "--json"
test bpftool_tests::run_bpftool_prog_show_id ... ok
test bpftool_tests::run_bpftool_map_pids ... ok
test bpftool_tests::run_bpftool_map_list ... ok
test bpftool_tests::run_bpftool_prog_pids ... ok
test bpftool_tests::run_bpftool_prog_list ... ok
test result: ok. 6 passed; 0 failed; 0 ignored; 0 measured; 0 filtered
out; finished in 0.20s
Signed-off-by: Manu Bretelle <chantr4@gmail.com>
---
.../bpftool_tests/src/bpf/bpftool_tests.bpf.c | 2 +-
.../bpf/bpftool_tests/src/bpftool_tests.rs | 79 ++++++++++++++++++-
2 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/bpf/bpftool_tests/src/bpf/bpftool_tests.bpf.c b/tools/testing/selftests/bpf/bpftool_tests/src/bpf/bpftool_tests.bpf.c
index dbd4e2aad277..e2b18dd36207 100644
--- a/tools/testing/selftests/bpf/bpftool_tests/src/bpf/bpftool_tests.bpf.c
+++ b/tools/testing/selftests/bpf/bpftool_tests/src/bpf/bpftool_tests.bpf.c
@@ -14,7 +14,7 @@ struct {
int my_pid = 0;
SEC("tp/syscalls/sys_enter_write")
-int handle_tp(void *ctx)
+int handle_tp_sys_enter_write(void *ctx)
{
int pid = bpf_get_current_pid_tgid() >> 32;
diff --git a/tools/testing/selftests/bpf/bpftool_tests/src/bpftool_tests.rs b/tools/testing/selftests/bpf/bpftool_tests/src/bpftool_tests.rs
index a832b255e988..695a1cbc5be8 100644
--- a/tools/testing/selftests/bpf/bpftool_tests/src/bpftool_tests.rs
+++ b/tools/testing/selftests/bpf/bpftool_tests/src/bpftool_tests.rs
@@ -8,9 +8,10 @@ mod bpftool_tests_skel {
use bpftool_tests_skel::BpftoolTestsSkelBuilder;
use libbpf_rs::skel::OpenSkel;
use libbpf_rs::skel::SkelBuilder;
+use libbpf_rs::Program;
use serde::Deserialize;
use serde::Serialize;
-
+use std::os::fd::AsFd;
use std::process::Command;
const BPFTOOL_PATH_ENV: &str = "BPFTOOL_PATH";
@@ -23,6 +24,17 @@ struct Pid {
pid: u64,
}
+/// A struct representing a prog entry from `bpftool prog list -j`
+#[derive(Serialize, Deserialize, Debug)]
+struct Prog {
+ name: Option<String>,
+ id: u32,
+ r#type: String,
+ tag: String,
+ #[serde(default)]
+ pids: Vec<Pid>,
+}
+
/// A struct representing a map entry from `bpftool map list -j`
#[derive(Serialize, Deserialize, Debug)]
struct Map {
@@ -101,3 +113,68 @@ fn run_bpftool_map_pids() {
map.pids
);
}
+
+/// A test to validate that we can list programs using bpftool
+#[test]
+fn run_bpftool_prog_list() {
+ let _skel = setup().expect("Failed to set up BPF program");
+ let output = run_bpftool_command(&["prog", "list", "--json"]);
+
+ let progs = serde_json::from_slice::<Vec<Prog>>(&output.stdout).expect("Failed to parse JSON");
+
+ assert!(output.status.success());
+ assert!(!progs.is_empty(), "No programs were listed");
+}
+
+/// A test to validate that we can find PIDs associated with a program
+#[test]
+fn run_bpftool_prog_pids() {
+ let hook_name = "handle_tp_sys_enter_write";
+
+ let _skel = setup().expect("Failed to set up BPF program");
+ let output = run_bpftool_command(&["prog", "list", "--json"]);
+
+ let progs = serde_json::from_slice::<Vec<Prog>>(&output.stdout).expect("Failed to parse JSON");
+ assert!(output.status.success(), "bpftool returned an error.");
+
+ // `handle_tp_sys_enter_write` is a hook our bpftool_tests.bpf.c attaches
+ // to (tp/syscalls/sys_enter_write).
+ // It should have at least one entry for our current process.
+ let prog = progs
+ .iter()
+ .find(|m| m.name.is_some() && m.name.as_ref().unwrap() == hook_name)
+ .unwrap_or_else(|| panic!("Did not find {} prog", hook_name));
+
+ let mypid = std::process::id() as u64;
+ assert!(
+ prog.pids.iter().any(|p| p.pid == mypid),
+ "Did not find test runner pid ({}) in pids list associated with prog *{}*: {:?}",
+ mypid,
+ hook_name,
+ prog.pids
+ );
+}
+
+/// A test to validate that we can run `bpftool prog show <id>`
+/// an extract the expected information.
+#[test]
+fn run_bpftool_prog_show_id() {
+ let skel = setup().expect("Failed to set up BPF program");
+ let binding = skel.progs();
+ let handle_tp_sys_enter_write = binding.handle_tp_sys_enter_write();
+ let prog_id =
+ Program::get_id_by_fd(handle_tp_sys_enter_write.as_fd()).expect("Failed to get prog ID");
+
+ let output = run_bpftool_command(&["prog", "show", "id", &prog_id.to_string(), "--json"]);
+ assert!(output.status.success(), "bpftool returned an error.");
+
+ let prog = serde_json::from_slice::<Prog>(&output.stdout).expect("Failed to parse JSON");
+
+ assert_eq!(prog_id, prog.id);
+ assert_eq!(
+ handle_tp_sys_enter_write.name(),
+ prog.name
+ .expect("Program handle_tp_sys_enter_write has no name")
+ );
+ assert_eq!("tracepoint", prog.r#type);
+}
--
2.39.3
next prev parent reply other threads:[~2023-11-16 19:43 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-16 19:42 [PATCH v1 bpf-next 0/9] bpftool: Add end-to-end testing Manu Bretelle
2023-11-16 19:42 ` [PATCH v1 bpf-next 1/9] bpftool: add testing skeleton Manu Bretelle
2023-11-21 1:37 ` Alexei Starovoitov
2023-11-21 16:26 ` Quentin Monnet
2023-11-21 16:42 ` Alexei Starovoitov
2023-11-21 19:50 ` Andrii Nakryiko
2023-11-27 17:07 ` Quentin Monnet
2023-11-27 18:39 ` Andrii Nakryiko
2023-12-15 6:26 ` Manu Bretelle
2023-11-27 17:07 ` Quentin Monnet
2023-12-15 6:37 ` Manu Bretelle
2023-11-21 16:26 ` Quentin Monnet
2023-11-16 19:42 ` [PATCH v1 bpf-next 2/9] bpftool: add libbpf-rs dependency and minimal bpf program Manu Bretelle
2023-11-16 19:42 ` [PATCH v1 bpf-next 3/9] bpftool: open and load bpf object Manu Bretelle
2023-11-16 19:42 ` [PATCH v1 bpf-next 4/9] bpftool: Add test to verify that pids are associated to maps Manu Bretelle
2023-11-21 16:26 ` Quentin Monnet
2023-11-16 19:42 ` Manu Bretelle [this message]
2023-11-21 16:26 ` [PATCH v1 bpf-next 5/9] bpftool: add test for bpftool prog Quentin Monnet
2023-11-16 19:42 ` [PATCH v1 bpf-next 6/9] bpftool: test that we can dump and read the content of a map Manu Bretelle
2023-11-21 16:26 ` Quentin Monnet
2023-11-16 19:42 ` [PATCH v1 bpf-next 7/9] bpftool: Add struct_ops tests Manu Bretelle
2023-11-16 19:42 ` [PATCH v1 bpf-next 8/9] bpftool: Add bpftool_tests README.md Manu Bretelle
2023-11-21 16:26 ` Quentin Monnet
2023-11-16 19:42 ` [PATCH v1 bpf-next 9/9] bpftool: Add Makefile to facilitate bpftool_tests usage Manu Bretelle
2023-11-21 16:26 ` Quentin Monnet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231116194236.1345035-6-chantr4@gmail.com \
--to=chantr4@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=martin.lau@linux.dev \
--cc=quentin@isovalent.com \
--cc=sdf@google.com \
--cc=song@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox