From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Greg KH <gregkh@linuxfoundation.org>,
Jiri Kosina <jikos@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>, Shuah Khan <shuah@kernel.org>,
Dave Marchevsky <davemarchevsky@fb.com>,
Joe Stringer <joe@cilium.io>
Cc: Tero Kristo <tero.kristo@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
netdev@vger.kernel.org, bpf@vger.kernel.org,
linux-kselftest@vger.kernel.org,
Benjamin Tissoires <benjamin.tissoires@redhat.com>
Subject: [PATCH bpf-next v2 27/28] selftests/bpf: Add a test for BPF_F_INSERT_HEAD
Date: Fri, 4 Mar 2022 18:28:51 +0100 [thread overview]
Message-ID: <20220304172852.274126-28-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <20220304172852.274126-1-benjamin.tissoires@redhat.com>
Insert 3 programs to check that we are doing the correct thing:
'2', '1', '3' are inserted, but '1' is supposed to be executed first.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
new in v2
---
tools/testing/selftests/bpf/prog_tests/hid.c | 90 ++++++++++++++++++--
tools/testing/selftests/bpf/progs/hid.c | 36 ++++++++
2 files changed, 121 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/hid.c b/tools/testing/selftests/bpf/prog_tests/hid.c
index a2bab6a799a1..f7fec748a0b9 100644
--- a/tools/testing/selftests/bpf/prog_tests/hid.c
+++ b/tools/testing/selftests/bpf/prog_tests/hid.c
@@ -353,7 +353,7 @@ static int test_hid_raw_event(struct hid *hid_skel, int uhid_fd, int sysfs_fd)
/* attach the first program */
hid_skel->links.hid_first_event =
- bpf_program__attach_hid(hid_skel->progs.hid_first_event, sysfs_fd);
+ bpf_program__attach_hid(hid_skel->progs.hid_first_event, sysfs_fd, 0);
if (!ASSERT_OK_PTR(hid_skel->links.hid_first_event,
"attach_hid(hid_first_event)"))
return PTR_ERR(hid_skel->links.hid_first_event);
@@ -429,7 +429,7 @@ static int test_hid_set_get_data(struct hid *hid_skel, int uhid_fd, int sysfs_fd
/* attach hid_set_get_data program */
hid_skel->links.hid_set_get_data =
- bpf_program__attach_hid(hid_skel->progs.hid_set_get_data, sysfs_fd);
+ bpf_program__attach_hid(hid_skel->progs.hid_set_get_data, sysfs_fd, 0);
if (!ASSERT_OK_PTR(hid_skel->links.hid_set_get_data,
"attach_hid(hid_set_get_data)"))
return PTR_ERR(hid_skel->links.hid_set_get_data);
@@ -498,7 +498,7 @@ static int test_hid_user_call(struct hid *hid_skel, int uhid_fd, int sysfs_fd)
);
/* attach hid_user program */
- hid_skel->links.hid_user = bpf_program__attach_hid(hid_skel->progs.hid_user, sysfs_fd);
+ hid_skel->links.hid_user = bpf_program__attach_hid(hid_skel->progs.hid_user, sysfs_fd, 0);
if (!ASSERT_OK_PTR(hid_skel->links.hid_user,
"attach_hid(hid_user)"))
return PTR_ERR(hid_skel->links.hid_user);
@@ -552,7 +552,7 @@ static int test_hid_user_raw_request_call(struct hid *hid_skel, int uhid_fd, int
/* attach hid_user_raw_request program */
hid_skel->links.hid_user_raw_request =
- bpf_program__attach_hid(hid_skel->progs.hid_user_raw_request, sysfs_fd);
+ bpf_program__attach_hid(hid_skel->progs.hid_user_raw_request, sysfs_fd, 0);
if (!ASSERT_OK_PTR(hid_skel->links.hid_user_raw_request,
"attach_hid(hid_user_raw_request)"))
return PTR_ERR(hid_skel->links.hid_user_raw_request);
@@ -582,6 +582,83 @@ static int test_hid_user_raw_request_call(struct hid *hid_skel, int uhid_fd, int
return ret;
}
+/*
+ * Attach hid_insert{0,1,2} to the given uhid device,
+ * retrieve and open the matching hidraw node,
+ * inject one event in the uhid device,
+ * check that the programs have been inserted in the correct order.
+ */
+static int test_hid_attach_flags(struct hid *hid_skel, int uhid_fd, int sysfs_fd)
+{
+ int err, hidraw_ino, hidraw_fd = -1;
+ char hidraw_path[64] = {0};
+ u8 buf[10] = {0};
+ int ret = -1;
+
+ /* attach hid_test_insert2 program */
+ hid_skel->links.hid_test_insert2 =
+ bpf_program__attach_hid(hid_skel->progs.hid_test_insert2, sysfs_fd, 0);
+ if (!ASSERT_OK_PTR(hid_skel->links.hid_test_insert2,
+ "attach_hid(hid_test_insert2)"))
+ return PTR_ERR(hid_skel->links.hid_test_insert2);
+
+ /* then attach hid_test_insert1 program before the previous*/
+ hid_skel->links.hid_test_insert1 =
+ bpf_program__attach_hid(hid_skel->progs.hid_test_insert1,
+ sysfs_fd,
+ BPF_F_INSERT_HEAD);
+ if (!ASSERT_OK_PTR(hid_skel->links.hid_test_insert1,
+ "attach_hid(hid_test_insert1)"))
+ return PTR_ERR(hid_skel->links.hid_test_insert1);
+
+ /* finally attach hid_test_insert3 at the end */
+ hid_skel->links.hid_test_insert3 =
+ bpf_program__attach_hid(hid_skel->progs.hid_test_insert3, sysfs_fd, 0);
+ if (!ASSERT_OK_PTR(hid_skel->links.hid_test_insert3,
+ "attach_hid(hid_test_insert3)"))
+ return PTR_ERR(hid_skel->links.hid_test_insert3);
+
+ hidraw_ino = get_hidraw(hid_skel->links.hid_test_insert1);
+ if (!ASSERT_GE(hidraw_ino, 0, "get_hidraw"))
+ goto cleanup;
+
+ /* open hidraw node to check the other side of the pipe */
+ sprintf(hidraw_path, "/dev/hidraw%d", hidraw_ino);
+ hidraw_fd = open(hidraw_path, O_RDWR | O_NONBLOCK);
+
+ if (!ASSERT_GE(hidraw_fd, 0, "open_hidraw"))
+ goto cleanup;
+
+ /* inject one event */
+ buf[0] = 1;
+ send_event(uhid_fd, buf, 6);
+
+ /* read the data from hidraw */
+ memset(buf, 0, sizeof(buf));
+ err = read(hidraw_fd, buf, sizeof(buf));
+ if (!ASSERT_EQ(err, 6, "read_hidraw"))
+ goto cleanup;
+
+ if (!ASSERT_EQ(buf[1], 1, "hid_test_insert1"))
+ goto cleanup;
+
+ if (!ASSERT_EQ(buf[2], 2, "hid_test_insert2"))
+ goto cleanup;
+
+ if (!ASSERT_EQ(buf[3], 3, "hid_test_insert3"))
+ goto cleanup;
+
+ ret = 0;
+
+cleanup:
+ if (hidraw_fd >= 0)
+ close(hidraw_fd);
+
+ hid__detach(hid_skel);
+
+ return ret;
+}
+
/*
* Attach hid_rdesc_fixup to the given uhid device,
* retrieve and open the matching hidraw node,
@@ -598,7 +675,7 @@ static int test_rdesc_fixup(struct hid *hid_skel, int uhid_fd, int sysfs_fd)
/* attach the program */
hid_skel->links.hid_rdesc_fixup =
- bpf_program__attach_hid(hid_skel->progs.hid_rdesc_fixup, sysfs_fd);
+ bpf_program__attach_hid(hid_skel->progs.hid_rdesc_fixup, sysfs_fd, 0);
if (!ASSERT_OK_PTR(hid_skel->links.hid_rdesc_fixup,
"attach_hid(hid_rdesc_fixup)"))
return PTR_ERR(hid_skel->links.hid_rdesc_fixup);
@@ -695,6 +772,9 @@ void serial_test_hid_bpf(void)
err = test_hid_user_raw_request_call(hid_skel, uhid_fd, sysfs_fd);
ASSERT_OK(err, "hid_user_raw_request");
+ err = test_hid_attach_flags(hid_skel, uhid_fd, sysfs_fd);
+ ASSERT_OK(err, "hid_user_raw_request");
+
err = test_rdesc_fixup(hid_skel, uhid_fd, sysfs_fd);
ASSERT_OK(err, "hid_rdesc_fixup");
diff --git a/tools/testing/selftests/bpf/progs/hid.c b/tools/testing/selftests/bpf/progs/hid.c
index ea011ff9e752..40161aa8cb6e 100644
--- a/tools/testing/selftests/bpf/progs/hid.c
+++ b/tools/testing/selftests/bpf/progs/hid.c
@@ -178,3 +178,39 @@ int hid_user_raw_request(struct hid_bpf_ctx *ctx)
return ret;
}
+
+SEC("hid/device_event")
+int hid_test_insert1(struct hid_bpf_ctx *ctx)
+{
+ /* we need to be run first */
+ if (ctx->data[2] || ctx->data[3])
+ return -1;
+
+ ctx->data[1] = 1;
+
+ return 0;
+}
+
+SEC("hid/device_event")
+int hid_test_insert2(struct hid_bpf_ctx *ctx)
+{
+ /* after insert0 and before insert2 */
+ if (!ctx->data[1] || ctx->data[3])
+ return -1;
+
+ ctx->data[2] = 2;
+
+ return 0;
+}
+
+SEC("hid/device_event")
+int hid_test_insert3(struct hid_bpf_ctx *ctx)
+{
+ /* at the end */
+ if (!ctx->data[1] || !ctx->data[2])
+ return -1;
+
+ ctx->data[3] = 3;
+
+ return 0;
+}
--
2.35.1
next prev parent reply other threads:[~2022-03-04 17:36 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-04 17:28 [PATCH bpf-next v2 00/28] Introduce eBPF support for HID devices Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 01/28] bpf: add new is_sys_admin_prog_type() helper Benjamin Tissoires
2022-03-04 23:12 ` Song Liu
2022-03-05 10:07 ` Benjamin Tissoires
2022-03-05 16:58 ` Sean Young
2022-03-07 18:26 ` Song Liu
2022-03-07 18:23 ` Song Liu
2022-03-09 8:27 ` Sean Young
2022-03-04 17:28 ` [PATCH bpf-next v2 02/28] bpf: introduce hid program type Benjamin Tissoires
2022-03-04 18:21 ` Greg KH
2022-03-07 17:57 ` Benjamin Tissoires
2022-03-05 0:02 ` Song Liu
2022-03-07 18:39 ` Benjamin Tissoires
2022-03-08 0:56 ` Song Liu
2022-03-08 9:20 ` Benjamin Tissoires
2022-03-11 17:16 ` Benjamin Tissoires
2022-03-05 0:20 ` Song Liu
2022-03-04 17:28 ` [PATCH bpf-next v2 03/28] HID: hook up with bpf Benjamin Tissoires
2022-03-04 18:24 ` Greg KH
2022-03-05 0:23 ` Song Liu
2022-03-15 16:29 ` Tero Kristo
2022-03-04 17:28 ` [PATCH bpf-next v2 04/28] libbpf: add HID program type and API Benjamin Tissoires
2022-03-05 0:31 ` Song Liu
2022-03-08 1:30 ` Andrii Nakryiko
2022-03-08 1:38 ` Song Liu
2022-03-08 5:52 ` Andrii Nakryiko
2022-03-04 17:28 ` [PATCH bpf-next v2 05/28] selftests/bpf: add tests for the HID-bpf initial implementation Benjamin Tissoires
2022-03-05 0:41 ` Song Liu
2022-03-05 10:10 ` Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 06/28] samples/bpf: add new hid_mouse example Benjamin Tissoires
2022-03-04 18:26 ` Greg KH
2022-03-04 17:28 ` [PATCH bpf-next v2 07/28] bpf/hid: add a new attach type to change the report descriptor Benjamin Tissoires
2022-03-04 18:32 ` Greg KH
2022-03-04 17:28 ` [PATCH bpf-next v2 08/28] HID: allow to change the report descriptor from an eBPF program Benjamin Tissoires
2022-03-04 18:32 ` Greg KH
2022-03-04 17:28 ` [PATCH bpf-next v2 09/28] libbpf: add new attach type BPF_HID_RDESC_FIXUP Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 10/28] selftests/bpf: add report descriptor fixup tests Benjamin Tissoires
2022-03-04 18:34 ` Greg KH
2022-03-04 17:28 ` [PATCH bpf-next v2 11/28] samples/bpf: add a report descriptor fixup Benjamin Tissoires
2022-03-04 18:36 ` Greg KH
2022-03-04 17:28 ` [PATCH bpf-next v2 12/28] bpf/hid: add hid_{get|set}_data helpers Benjamin Tissoires
2022-03-04 18:37 ` Greg KH
2022-03-04 18:41 ` Greg KH
2022-03-05 10:33 ` Benjamin Tissoires
2022-03-05 10:47 ` Greg KH
2022-03-11 0:40 ` Song Liu
2022-03-11 15:08 ` Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 13/28] HID: bpf: implement hid_bpf_get|set_data Benjamin Tissoires
2022-03-04 18:39 ` Greg KH
2022-03-04 17:28 ` [PATCH bpf-next v2 14/28] selftests/bpf: add tests for hid_{get|set}_data helpers Benjamin Tissoires
2022-03-15 16:49 ` Tero Kristo
2022-03-15 17:02 ` Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 15/28] bpf/hid: add new BPF type to trigger commands from userspace Benjamin Tissoires
2022-03-11 0:46 ` Song Liu
2022-03-04 17:28 ` [PATCH bpf-next v2 16/28] libbpf: add new attach type BPF_HID_USER_EVENT Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 17/28] selftests/bpf: add test for user call of HID bpf programs Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 18/28] selftests/bpf: hid: rely on uhid event to know if a test device is ready Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 19/28] bpf/hid: add bpf_hid_raw_request helper function Benjamin Tissoires
2022-03-11 0:50 ` Song Liu
2022-03-04 17:28 ` [PATCH bpf-next v2 20/28] HID: add implementation of bpf_hid_raw_request Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 21/28] selftests/bpf: add tests for bpf_hid_hw_request Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 22/28] bpf/verifier: prevent non GPL programs to be loaded against HID Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 23/28] HID: bpf: compute only the required buffer size for the device Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 24/28] HID: bpf: only call hid_bpf_raw_event() if a ctx is available Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 25/28] bpf/hid: Add a flag to add the program at the beginning of the list Benjamin Tissoires
2022-03-04 17:28 ` [PATCH bpf-next v2 26/28] libbpf: add handling for BPF_F_INSERT_HEAD in HID programs Benjamin Tissoires
2022-03-04 17:28 ` Benjamin Tissoires [this message]
2022-03-04 17:28 ` [PATCH bpf-next v2 28/28] samples/bpf: fix bpf_program__attach_hid() api change Benjamin Tissoires
2022-03-05 1:13 ` [PATCH bpf-next v2 00/28] Introduce eBPF support for HID devices Song Liu
2022-03-05 10:23 ` Benjamin Tissoires
2022-03-07 18:11 ` Song Liu
2022-03-08 13:37 ` Benjamin Tissoires
2022-03-15 17:04 ` Tero Kristo
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=20220304172852.274126-28-benjamin.tissoires@redhat.com \
--to=benjamin.tissoires@redhat.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davemarchevsky@fb.com \
--cc=gregkh@linuxfoundation.org \
--cc=jikos@kernel.org \
--cc=joe@cilium.io \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=songliubraving@fb.com \
--cc=tero.kristo@linux.intel.com \
--cc=yhs@fb.com \
/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).