Skip to contentSkip to conversation

hog-lib: Don't destroy UHID device on detach

PATCH Superseded Luiz Augusto von Dentz 2 participants 4 messages Feb 9, 2024 Bluetooth drivers

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

PATCH v2 1/3 hog-lib: Don't destroy UHID device on detach

From: Luiz Augusto von Dentz <[email protected]>

This makes bt_hog_detach not to destroy UHID device which means the device node don't need to be recreated in case of reconnections which speeds up the process.

---
 profiles/input/hog-lib.c | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)
profiles/input/hog-lib.c +24 -24
index 7ff1ede3db35..67492a63eca3 100644
@@ -1309,11 +1309,35 @@ static bool cancel_gatt_req(const void *data, const void *user_data)
 	return g_attrib_cancel(hog->attrib, req->id);
 }
 
+static void uhid_destroy(struct bt_hog *hog)
+{
+	int err;
+	struct uhid_event ev;
+
+	if (!hog->uhid_created)
+		return;
+
+	bt_uhid_unregister_all(hog->uhid);
+
+	memset(&ev, 0, sizeof(ev));
+	ev.type = UHID_DESTROY;
+
+	err = bt_uhid_send(hog->uhid, &ev);
+
+	if (err < 0) {
+		error("bt_uhid_send: %s", strerror(-err));
+		return;
+	}
+
+	hog->uhid_created = false;
+}
+
 static void hog_free(void *data)
 {
 	struct bt_hog *hog = data;
 
 	bt_hog_detach(hog);
+	uhid_destroy(hog);
 
 	queue_destroy(hog->input, free);
 	queue_destroy(hog->bas, (void *) bt_bas_unref);
@@ -1823,29 +1847,6 @@ bool bt_hog_attach(struct bt_hog *hog, void *gatt)
 	return true;
 }
 
-static void uhid_destroy(struct bt_hog *hog)
-{
-	int err;
-	struct uhid_event ev;
-
-	if (!hog->uhid_created)
-		return;
-
-	bt_uhid_unregister_all(hog->uhid);
-
-	memset(&ev, 0, sizeof(ev));
-	ev.type = UHID_DESTROY;
-
-	err = bt_uhid_send(hog->uhid, &ev);
-
-	if (err < 0) {
-		error("bt_uhid_send: %s", strerror(-err));
-		return;
-	}
-
-	hog->uhid_created = false;
-}
-
 void bt_hog_detach(struct bt_hog *hog)
 {
 	GSList *l;
@@ -1879,7 +1880,6 @@ void bt_hog_detach(struct bt_hog *hog)
 	queue_remove_all(hog->gatt_op, cancel_gatt_req, hog, destroy_gatt_req);
 	g_attrib_unref(hog->attrib);
 	hog->attrib = NULL;
-	uhid_destroy(hog);
 }
 
 int bt_hog_set_control_point(struct bt_hog *hog, bool suspend)
Signature · 1 line
2.43.0
author maintainer
#1 lore raw

PATCH v2 2/3 input.conf: Make UserspaceHID defaults to true

From: Luiz Augusto von Dentz <[email protected]>

This makes UserspaceHID defaults to true so the plugin has more control over the input device lifetime.

---
 profiles/input/input.conf | 2 +-
 profiles/input/manager.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
profiles/input/input.conf +1 -1
index d8645f3dd664..00a34eb63de1 100644
@@ -9,7 +9,7 @@
 #IdleTimeout=30
 
 # Enable HID protocol handling in userspace input profile
-# Defaults to false (HIDP handled in HIDP kernel module)
+# Defaults to true (Use UHID instead of kernel HIDP)
 #UserspaceHID=true
 
 # Limit HID connections to bonded devices
profiles/input/manager.c +1 -1
index 92789a003c89..69ed646727d5 100644
@@ -83,7 +83,7 @@ static int input_init(void)
 	config = load_config_file(CONFIGDIR "/input.conf");
 	if (config) {
 		int idle_timeout;
-		gboolean uhid_enabled, classic_bonded_only, auto_sec;
+		gboolean uhid_enabled = TRUE, classic_bonded_only, auto_sec;
 
 		idle_timeout = g_key_file_get_integer(config, "General",
 							"IdleTimeout", &err);
Signature · 1 line
2.43.0
author maintainer
#2 lore raw

PATCH v2 3/3 input/device: Don't destroy UHID device on disconnect

In reply to Luiz Augusto von Dentz

From: Luiz Augusto von Dentz <[email protected]>

This makes classic HID behave like HoG which keeps the UHID device around while disconnected so it doesn't have to be recreated on every reconnection.

---
 profiles/input/device.c | 4 ++++
 1 file changed, 4 insertions(+)
profiles/input/device.c +4 -0
index 6c64ff1c1c52..9aea9e48891e 100644
@@ -985,6 +985,10 @@ static int uhid_disconnect(struct input_device *idev)
 	if (!idev->uhid_created)
 		return 0;
 
+	/* Only destroy the node if virtual cable unplug flag has been set */
+	if (idev->virtual_cable_unplug)
+		return 0;
+
 	bt_uhid_unregister_all(idev->uhid);
 
 	memset(&ev, 0, sizeof(ev));
Signature · 1 line
2.43.0
#3 lore raw
In reply to Luiz Augusto von Dentz

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=824770

---Test result---

Test Summary:

CheckPatch                    PASS      0.89 seconds
GitLint                       PASS      0.73 seconds
BuildEll                      PASS      23.77 seconds
BluezMake                     PASS      697.84 seconds
MakeCheck                     PASS      11.40 seconds
MakeDistcheck                 PASS      158.14 seconds
CheckValgrind                 PASS      217.52 seconds
CheckSmatch                   PASS      319.69 seconds
bluezmakeextell               PASS      103.81 seconds
IncrementalBuild              PASS      1995.02 seconds
ScanBuild                     PASS      912.29 seconds

---
Regards,
Linux Bluetooth