From: Benjamin Tissoires <bentiss@kernel.org>
To: Shuah Khan <shuah@kernel.org>, Jiri Kosina <jikos@kernel.org>,
Jonathan Corbet <corbet@lwn.net>,
Alexei Starovoitov <ast@kernel.org>
Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
bpf@vger.kernel.org, linux-input@vger.kernel.org,
linux-doc@vger.kernel.org,
Benjamin Tissoires <bentiss@kernel.org>
Subject: [PATCH HID v3 09/16] selftests/hid: add subprog call test
Date: Sat, 08 Jun 2024 11:01:21 +0200 [thread overview]
Message-ID: <20240608-hid_bpf_struct_ops-v3-9-6ac6ade58329@kernel.org> (raw)
In-Reply-To: <20240608-hid_bpf_struct_ops-v3-0-6ac6ade58329@kernel.org>
I got a weird verifier error with a subprog once, so let's have a test
for it.
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
---
no changes in v3
no changes in v2
---
tools/testing/selftests/hid/hid_bpf.c | 41 +++++++++++++++++++++++++++++++++
tools/testing/selftests/hid/progs/hid.c | 24 +++++++++++++++++++
2 files changed, 65 insertions(+)
diff --git a/tools/testing/selftests/hid/hid_bpf.c b/tools/testing/selftests/hid/hid_bpf.c
index 967dfe6b58cb..45e173db35bd 100644
--- a/tools/testing/selftests/hid/hid_bpf.c
+++ b/tools/testing/selftests/hid/hid_bpf.c
@@ -638,6 +638,47 @@ TEST_F(hid_bpf, raw_event)
ASSERT_EQ(buf[2], 52);
}
+/*
+ * Attach hid_first_event to the given uhid device,
+ * retrieve and open the matching hidraw node,
+ * inject one event in the uhid device,
+ * check that the program sees it and can change the data
+ */
+TEST_F(hid_bpf, subprog_raw_event)
+{
+ const struct test_program progs[] = {
+ { .name = "hid_subprog_first_event" },
+ };
+ __u8 buf[10] = {0};
+ int err;
+
+ LOAD_PROGRAMS(progs);
+
+ /* inject one event */
+ buf[0] = 1;
+ buf[1] = 42;
+ uhid_send_event(_metadata, self->uhid_fd, buf, 6);
+
+ /* read the data from hidraw */
+ memset(buf, 0, sizeof(buf));
+ err = read(self->hidraw_fd, buf, sizeof(buf));
+ ASSERT_EQ(err, 6) TH_LOG("read_hidraw");
+ ASSERT_EQ(buf[0], 1);
+ ASSERT_EQ(buf[2], 47);
+
+ /* inject another event */
+ memset(buf, 0, sizeof(buf));
+ buf[0] = 1;
+ buf[1] = 47;
+ uhid_send_event(_metadata, self->uhid_fd, buf, 6);
+
+ /* read the data from hidraw */
+ memset(buf, 0, sizeof(buf));
+ err = read(self->hidraw_fd, buf, sizeof(buf));
+ ASSERT_EQ(err, 6) TH_LOG("read_hidraw");
+ ASSERT_EQ(buf[2], 52);
+}
+
/*
* Ensures that we can attach/detach programs
*/
diff --git a/tools/testing/selftests/hid/progs/hid.c b/tools/testing/selftests/hid/progs/hid.c
index 614f1aa32649..2e7e5a736dc6 100644
--- a/tools/testing/selftests/hid/progs/hid.c
+++ b/tools/testing/selftests/hid/progs/hid.c
@@ -35,6 +35,30 @@ struct hid_bpf_ops first_event = {
.hid_id = 2,
};
+int __hid_subprog_first_event(struct hid_bpf_ctx *hid_ctx, enum hid_report_type type)
+{
+ __u8 *rw_data = hid_bpf_get_data(hid_ctx, 0 /* offset */, 3 /* size */);
+
+ if (!rw_data)
+ return 0; /* EPERM check */
+
+ rw_data[2] = rw_data[1] + 5;
+
+ return hid_ctx->size;
+}
+
+SEC("?struct_ops/hid_device_event")
+int BPF_PROG(hid_subprog_first_event, struct hid_bpf_ctx *hid_ctx, enum hid_report_type type)
+{
+ return __hid_subprog_first_event(hid_ctx, type);
+}
+
+SEC(".struct_ops.link")
+struct hid_bpf_ops subprog_first_event = {
+ .hid_device_event = (void *)hid_subprog_first_event,
+ .hid_id = 2,
+};
+
SEC("?struct_ops/hid_device_event")
int BPF_PROG(hid_second_event, struct hid_bpf_ctx *hid_ctx, enum hid_report_type type)
{
--
2.44.0
next prev parent reply other threads:[~2024-06-08 9:01 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-08 9:01 [PATCH HID v3 00/16] HID: convert HID-BPF into using bpf_struct_ops Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 01/16] HID: rename struct hid_bpf_ops into hid_ops Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 02/16] HID: bpf: add hid_get/put_device() helpers Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 03/16] HID: bpf: implement HID-BPF through bpf_struct_ops Benjamin Tissoires
2024-06-10 18:34 ` Alexei Starovoitov
2024-06-14 9:25 ` Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 04/16] selftests/hid: convert the hid_bpf selftests with struct_ops Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 05/16] HID: samples: convert the 2 HID-BPF samples into struct_ops Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 06/16] HID: bpf: add defines for HID-BPF SEC in in-tree bpf fixes Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 07/16] HID: bpf: convert in-tree fixes into struct_ops Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 08/16] HID: bpf: remove tracing HID-BPF capability Benjamin Tissoires
2024-06-08 9:01 ` Benjamin Tissoires [this message]
2024-06-08 9:01 ` [PATCH HID v3 10/16] Documentation: HID: amend HID-BPF for struct_ops Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 11/16] Documentation: HID: add a small blurb on udev-hid-bpf Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 12/16] HID: bpf: Artist24: remove unused variable Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 13/16] HID: bpf: error on warnings when compiling bpf objects Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 14/16] bpf: allow bpf helpers to be used into HID-BPF struct_ops Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 15/16] HID: bpf: rework hid_bpf_ops_btf_struct_access Benjamin Tissoires
2024-06-10 18:39 ` Alexei Starovoitov
2024-06-11 16:57 ` Benjamin Tissoires
2024-06-08 9:01 ` [PATCH HID v3 16/16] HID: bpf: make part of struct hid_device writable Benjamin Tissoires
2024-06-14 9:26 ` [PATCH HID v3 00/16] HID: convert HID-BPF into using bpf_struct_ops Benjamin Tissoires
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=20240608-hid_bpf_struct_ops-v3-9-6ac6ade58329@kernel.org \
--to=bentiss@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=corbet@lwn.net \
--cc=jikos@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=shuah@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).