From: Andrii Nakryiko <andrii@kernel.org>
To: <bpf@vger.kernel.org>, <netdev@vger.kernel.org>, <ast@fb.com>,
<daniel@iogearbox.net>
Cc: <andrii@kernel.org>, <kernel-team@fb.com>
Subject: [PATCH bpf-next 5/7] selftests/bpf: add tp_btf CO-RE reloc test for modules
Date: Fri, 20 Nov 2020 18:46:14 -0800 [thread overview]
Message-ID: <20201121024616.1588175-6-andrii@kernel.org> (raw)
In-Reply-To: <20201121024616.1588175-1-andrii@kernel.org>
Add another CO-RE relocation test for kernel module relocations. This time for
tp_btf with direct memory reads.
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
.../selftests/bpf/prog_tests/core_reloc.c | 3 +-
.../bpf/progs/test_core_reloc_module.c | 32 ++++++++++++++++++-
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/core_reloc.c b/tools/testing/selftests/bpf/prog_tests/core_reloc.c
index b3f14e3d9077..85c9cf8e3994 100644
--- a/tools/testing/selftests/bpf/prog_tests/core_reloc.c
+++ b/tools/testing/selftests/bpf/prog_tests/core_reloc.c
@@ -512,7 +512,8 @@ static struct core_reloc_test_case test_cases[] = {
},
/* validate we can find kernel module BTF types for relocs/attach */
- MODULES_CASE("module", "raw_tp/bpf_sidecar_test_read", "bpf_sidecar_test_read"),
+ MODULES_CASE("module_probed", "raw_tp/bpf_sidecar_test_read", "bpf_sidecar_test_read"),
+ MODULES_CASE("module_direct", "tp_btf/bpf_sidecar_test_read", NULL),
/* validate BPF program can use multiple flavors to match against
* single target BTF type
diff --git a/tools/testing/selftests/bpf/progs/test_core_reloc_module.c b/tools/testing/selftests/bpf/progs/test_core_reloc_module.c
index 4630301de259..f336c0565d47 100644
--- a/tools/testing/selftests/bpf/progs/test_core_reloc_module.c
+++ b/tools/testing/selftests/bpf/progs/test_core_reloc_module.c
@@ -36,7 +36,7 @@ struct core_reloc_module_output {
};
SEC("raw_tp/bpf_sidecar_test_read")
-int BPF_PROG(test_core_module,
+int BPF_PROG(test_core_module_probed,
struct task_struct *task,
struct bpf_sidecar_test_read_ctx *read_ctx)
{
@@ -64,3 +64,33 @@ int BPF_PROG(test_core_module,
return 0;
}
+
+SEC("tp_btf/bpf_sidecar_test_read")
+int BPF_PROG(test_core_module_direct,
+ struct task_struct *task,
+ struct bpf_sidecar_test_read_ctx *read_ctx)
+{
+ struct core_reloc_module_output *out = (void *)&data.out;
+ __u64 pid_tgid = bpf_get_current_pid_tgid();
+ __u32 real_tgid = (__u32)(pid_tgid >> 32);
+ __u32 real_pid = (__u32)pid_tgid;
+
+ if (data.my_pid_tgid != pid_tgid)
+ return 0;
+
+ if (task->pid != real_pid || task->tgid != real_tgid)
+ return 0;
+
+ out->len = read_ctx->len;
+ out->off = read_ctx->off;
+
+ out->read_ctx_sz = bpf_core_type_size(struct bpf_sidecar_test_read_ctx);
+ out->read_ctx_exists = bpf_core_type_exists(struct bpf_sidecar_test_read_ctx);
+ out->buf_exists = bpf_core_field_exists(read_ctx->buf);
+ out->off_exists = bpf_core_field_exists(read_ctx->off);
+ out->len_exists = bpf_core_field_exists(read_ctx->len);
+
+ out->comm_len = BPF_CORE_READ_STR_INTO(&out->comm, task, comm);
+
+ return 0;
+}
--
2.24.1
next prev parent reply other threads:[~2020-11-21 2:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-21 2:46 [PATCH bpf-next 0/7] Add kernel modules support for tracing BPF program attachments Andrii Nakryiko
2020-11-21 2:46 ` [PATCH bpf-next 1/7] bpf: remove hard-coded btf_vmlinux assumption from BPF verifier Andrii Nakryiko
2020-11-29 1:56 ` Alexei Starovoitov
2020-11-30 23:04 ` Andrii Nakryiko
2020-12-01 1:18 ` Alexei Starovoitov
2020-11-21 2:46 ` [PATCH bpf-next 2/7] bpf: allow to specify kernel module BTFs when attaching BPF programs Andrii Nakryiko
2020-11-21 2:46 ` [PATCH bpf-next 3/7] libbpf: factor out low-level BPF program loading helper Andrii Nakryiko
2020-11-21 2:46 ` [PATCH bpf-next 4/7] libbpf: support attachment of BPF tracing programs to kernel modules Andrii Nakryiko
2020-11-21 2:46 ` Andrii Nakryiko [this message]
2020-11-29 1:59 ` [PATCH bpf-next 5/7] selftests/bpf: add tp_btf CO-RE reloc test for modules Alexei Starovoitov
2020-11-30 22:52 ` Andrii Nakryiko
2020-11-30 22:55 ` Alexei Starovoitov
2020-11-21 2:46 ` [PATCH bpf-next 6/7] selftests/bpf: make BPF sidecar traceable function global Andrii Nakryiko
2020-11-21 2:46 ` [PATCH bpf-next 7/7] selftests/bpf: add fentry/fexit/fmod_ret selftest for kernel module Andrii Nakryiko
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=20201121024616.1588175-6-andrii@kernel.org \
--to=andrii@kernel.org \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.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;
as well as URLs for NNTP newsgroup(s).