From: Benjamin Tissoires <bentiss@kernel.org>
To: Jiri Kosina <jikos@kernel.org>,
Peter Hutterer <peter.hutterer@who-t.net>,
Vicki Pfau <vi@endrift.com>, Shuah Khan <shuah@kernel.org>
Cc: linux-input@vger.kernel.org, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org, bpf@vger.kernel.org,
Benjamin Tissoires <bentiss@kernel.org>
Subject: [PATCH HID v2 11/11] selftests/hid: add test to disable hid-input
Date: Tue, 10 Sep 2024 23:43:47 +0900 [thread overview]
Message-ID: <20240910-hid-bpf-hid-generic-v2-11-083dfc189e97@kernel.org> (raw)
In-Reply-To: <20240910-hid-bpf-hid-generic-v2-0-083dfc189e97@kernel.org>
Add a test for the newly enabled feature to control the connect_mask
of hid-generic.
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
---
changes in v2:
- amended for the new API
---
tools/testing/selftests/hid/hid_bpf.c | 60 +++++++++++++++++++++-
tools/testing/selftests/hid/progs/hid.c | 1 +
.../testing/selftests/hid/progs/hid_bpf_helpers.h | 1 +
3 files changed, 61 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/hid/hid_bpf.c b/tools/testing/selftests/hid/hid_bpf.c
index edc061b38528..41cacc30ef8b 100644
--- a/tools/testing/selftests/hid/hid_bpf.c
+++ b/tools/testing/selftests/hid/hid_bpf.c
@@ -4,6 +4,38 @@
#include "hid_common.h"
#include <bpf/bpf.h>
+static const __u8 mouse_rdesc[] = {
+ 0x05, 0x01, /* .Usage Page (Generic Desktop) 0 */
+ 0x09, 0x02, /* .Usage (Mouse) 2 */
+ 0xa1, 0x01, /* .Collection (Application) 4 */
+ 0x09, 0x02, /* ..Usage (Mouse) 6 */
+ 0xa1, 0x02, /* ..Collection (Logical) 8 */
+ 0x09, 0x01, /* ...Usage (Pointer) 10 */
+ 0xa1, 0x00, /* ...Collection (Physical) 12 */
+ 0x05, 0x09, /* ....Usage Page (Button) 14 */
+ 0x19, 0x01, /* ....Usage Minimum (1) 16 */
+ 0x29, 0x03, /* ....Usage Maximum (3) 18 */
+ 0x15, 0x00, /* ....Logical Minimum (0) 20 */
+ 0x25, 0x01, /* ....Logical Maximum (1) 22 */
+ 0x75, 0x01, /* ....Report Size (1) 24 */
+ 0x95, 0x03, /* ....Report Count (3) 26 */
+ 0x81, 0x02, /* ....Input (Data,Var,Abs) 28 */
+ 0x75, 0x05, /* ....Report Size (5) 30 */
+ 0x95, 0x01, /* ....Report Count (1) 32 */
+ 0x81, 0x03, /* ....Input (Cnst,Var,Abs) 34 */
+ 0x05, 0x01, /* ....Usage Page (Generic Desktop) 36 */
+ 0x09, 0x30, /* ....Usage (X) 38 */
+ 0x09, 0x31, /* ....Usage (Y) 40 */
+ 0x15, 0x81, /* ....Logical Minimum (-127) 42 */
+ 0x25, 0x7f, /* ....Logical Maximum (127) 44 */
+ 0x75, 0x08, /* ....Report Size (8) 46 */
+ 0x95, 0x02, /* ....Report Count (2) 48 */
+ 0x81, 0x06, /* ....Input (Data,Var,Rel) 50 */
+ 0xc0, /* ...End Collection 52 */
+ 0xc0, /* ..End Collection 53 */
+ 0xc0, /* .End Collection 54 */
+};
+
struct hid_hw_request_syscall_args {
__u8 data[10];
unsigned int hid;
@@ -59,6 +91,8 @@ struct specific_device {
__u16 bus;
__u32 vid;
__u32 pid;
+ const __u8 *rdesc;
+ const size_t rdesc_size;
};
FIXTURE_SETUP(hid_bpf)
@@ -72,11 +106,15 @@ FIXTURE_SETUP(hid_bpf)
.bus = BUS_BLUETOOTH,
.vid = 0x05ac, /* USB_VENDOR_ID_APPLE */
.pid = 0x022c, /* USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI */
+ .rdesc = mouse_rdesc,
+ .rdesc_size = sizeof(mouse_rdesc),
}, {
.test_name = "*",
.bus = BUS_USB,
.vid = 0x0001,
.pid = 0x0a36,
+ .rdesc = rdesc,
+ .rdesc_size = sizeof(rdesc),
}};
for (int i = 0; i < ARRAY_SIZE(devices); i++) {
@@ -88,7 +126,7 @@ FIXTURE_SETUP(hid_bpf)
ASSERT_OK_PTR(match);
err = setup_uhid(_metadata, &self->hid, match->bus, match->vid, match->pid,
- rdesc, sizeof(rdesc));
+ match->rdesc, match->rdesc_size);
ASSERT_OK(err);
}
@@ -914,6 +952,24 @@ static bool is_using_driver(struct __test_metadata *_metadata, struct uhid_devic
return found;
}
+static bool has_hid_input(struct uhid_device *hid)
+{
+ char input[1024];
+ DIR *d;
+
+ sprintf(input, "/sys/bus/hid/devices/%04X:%04X:%04X.%04X/input",
+ hid->bus, hid->vid, hid->pid, hid->hid_id);
+
+ d = opendir(input);
+ if (d) {
+ closedir(d);
+
+ return true;
+ }
+
+ return false;
+}
+
/*
* Attach hid_driver_probe to the given uhid device,
* check that the device is now using hid-generic.
@@ -927,10 +983,12 @@ TEST_F(hid_bpf, test_hid_driver_probe)
};
ASSERT_TRUE(is_using_driver(_metadata, &self->hid, "apple"));
+ ASSERT_TRUE(has_hid_input(&self->hid)) TH_LOG("input node not found");
LOAD_PROGRAMS(progs);
ASSERT_TRUE(is_using_driver(_metadata, &self->hid, "hid-generic"));
+ ASSERT_FALSE(has_hid_input(&self->hid)) TH_LOG("input node unexpectly found");
}
/*
diff --git a/tools/testing/selftests/hid/progs/hid.c b/tools/testing/selftests/hid/progs/hid.c
index 9b22e9a0e658..7e24bec8ef43 100644
--- a/tools/testing/selftests/hid/progs/hid.c
+++ b/tools/testing/selftests/hid/progs/hid.c
@@ -603,6 +603,7 @@ SEC("?struct_ops.s/hid_rdesc_fixup")
int BPF_PROG(hid_test_driver_probe, struct hid_bpf_ctx *hid_ctx)
{
hid_ctx->hid->quirks |= HID_QUIRK_IGNORE_SPECIAL_DRIVER;
+ hid_ctx->hid->quirks |= HID_QUIRK_IGNORE_HIDINPUT;
return 0;
}
diff --git a/tools/testing/selftests/hid/progs/hid_bpf_helpers.h b/tools/testing/selftests/hid/progs/hid_bpf_helpers.h
index 1a645684a117..9c3cfd61d992 100644
--- a/tools/testing/selftests/hid/progs/hid_bpf_helpers.h
+++ b/tools/testing/selftests/hid/progs/hid_bpf_helpers.h
@@ -91,6 +91,7 @@ struct hid_bpf_ops {
#endif
#define HID_QUIRK_IGNORE_SPECIAL_DRIVER BIT(22)
+#define HID_QUIRK_IGNORE_HIDINPUT BIT(23)
/* following are kfuncs exported by HID for HID-BPF */
extern __u8 *hid_bpf_get_data(struct hid_bpf_ctx *ctx,
--
2.46.0
next prev parent reply other threads:[~2024-09-10 14:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-10 14:43 [PATCH HID v2 00/11] HID: bpf: add a new hook to control hid-generic Benjamin Tissoires
2024-09-10 14:43 ` [PATCH HID v2 01/11] HID: bpf: move HID-BPF report descriptor fixup earlier Benjamin Tissoires
2024-09-10 14:43 ` [PATCH HID v2 02/11] HID: core: save one kmemdup during .probe() Benjamin Tissoires
2024-09-12 6:10 ` Peter Hutterer
2024-09-10 14:43 ` [PATCH HID v2 03/11] HID: core: remove one more kmemdup on .probe() Benjamin Tissoires
2024-09-10 14:43 ` [PATCH HID v2 04/11] HID: bpf: allow write access to quirks field in struct hid_device Benjamin Tissoires
2024-09-10 14:43 ` [PATCH HID v2 05/11] selftests/hid: add dependency on hid_common.h Benjamin Tissoires
2024-09-10 14:43 ` [PATCH HID v2 06/11] selftests/hid: cleanup C tests by adding a common struct uhid_device Benjamin Tissoires
2024-09-10 14:43 ` [PATCH HID v2 07/11] selftests/hid: allow to parametrize bus/vid/pid/rdesc on the test device Benjamin Tissoires
2024-09-10 14:43 ` [PATCH HID v2 08/11] HID: add per device quirk to force bind to hid-generic Benjamin Tissoires
2024-09-12 6:13 ` Peter Hutterer
2024-09-10 14:43 ` [PATCH HID v2 09/11] selftests/hid: add test for assigning a given device " Benjamin Tissoires
2024-09-10 14:43 ` [PATCH HID v2 10/11] HID: add quirk to prevent hid-input to be used Benjamin Tissoires
2024-09-10 14:43 ` Benjamin Tissoires [this message]
2024-09-13 13:38 ` (subset) [PATCH HID v2 00/11] HID: bpf: add a new hook to control hid-generic Benjamin Tissoires
2024-09-13 13:47 ` Benjamin Tissoires
2024-09-14 5:26 ` 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=20240910-hid-bpf-hid-generic-v2-11-083dfc189e97@kernel.org \
--to=bentiss@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=peter.hutterer@who-t.net \
--cc=shuah@kernel.org \
--cc=vi@endrift.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).