0002_fix_not_handling_IdleTimeout_when_uhid_is_in_use.patch

From patchwork Mon Apr  1 18:58:06 2024
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Luiz Augusto von Dentz <[email protected]>
X-Patchwork-Id: 13612954
Received: from mail-yw1-f179.google.com (mail-yw1-f179.google.com
 [209.85.128.179])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED1E4F9DF
	for <[email protected]>; Mon,  1 Apr 2024 18:58:12 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 arc=none smtp.client-ip=209.85.128.179
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1711997894; cv=none;
 b=B3cq6f25GXf6cJCF+YuDbFwqnbpHcN9aJqk9VCifzJCGL/nA3oojqGSsbTQ8UoTH0pUiLQvS1+kT8m9sC+Du/uu5QerxWWAcinTzz5LtfDWvIfNokQ3PlpuoTe7u3WabwY5lf7gm6ww5tG0cs9D3EbLGmN3+xlJ+8hHJdIUdriM=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1711997894; c=relaxed/simple;
	bh=jc27TBSDxlljRPF07T3OnDVRGhlpgDIJWgSIqWSiYiM=;
	h=From:To:Subject:Date:Message-ID:MIME-Version;
 b=f7W9a0JVEeH9A6+xazDsrEnC/AHcarHVHIpX7LahXfTgMOfWUlRiwlPNsrHX7IeJ7iU5zr2qgyNGRoWl9s97tj8oHy16fRXGZ/2JoJhaYK0PYwzihA9qo7OoHkxrMHzTZ6XWQKQdWq3bQLfTWoHRGGABXFwYrN/xajl9tkz6HSA=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
 dmarc=pass (p=none dis=none) header.from=gmail.com;
 spf=pass smtp.mailfrom=gmail.com;
 dkim=pass (2048-bit key) header.d=gmail.com [email protected]
 header.b=OBz3o4ya; arc=none smtp.client-ip=209.85.128.179
Authentication-Results: smtp.subspace.kernel.org;
 dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
 spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com [email protected]
 header.b="OBz3o4ya"
Received: by mail-yw1-f179.google.com with SMTP id
 00721157ae682-60a434ea806so47192097b3.3
        for <[email protected]>;
 Mon, 01 Apr 2024 11:58:12 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1711997891; x=1712602691;
 darn=vger.kernel.org;
        h=content-transfer-encoding:mime-version:message-id:date:subject:to
         :from:from:to:cc:subject:date:message-id:reply-to;
        bh=cXA+oiwz2b8EHFOBjQLtlpM7ubcXnMrzwUHSkgQ2sUk=;
        b=OBz3o4yaFnlio2b2MMhwX97tyoKz1hw9NLa6BFyj4v/PP4dYRNV9UtCx0VncJrM/wx
         khn/fb9fM7Uxp2tj9EPr7uKYu0FBkdeP6JETVGfs+ur4y6vWamFWPagBj3qwiXVs6xWR
         8i/NVJtP44mzHUmW5nr2GzcwVQerQSyk1DGyqRrvKeTtQNVviTnELZupZfHp9zoEl3FJ
         L8m8KyoSoSnJthwXvrtI0D7dEVXSYNtp6xa5/Ap3aUD64C0Ni6O0M07m05aYxMm+XiQr
         4nhN7iW9b8DV+voaIOP2ycqObT1koX8OnWkjqdpsYhLFW41jhIx4MzogtYvX4MKSTSrP
         0ywQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1711997891; x=1712602691;
        h=content-transfer-encoding:mime-version:message-id:date:subject:to
         :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=cXA+oiwz2b8EHFOBjQLtlpM7ubcXnMrzwUHSkgQ2sUk=;
        b=oh2pf1oWwaU0MO+XS79SBmSd7UowHIDPgXgpHrfLx0cwWmttFPMPeL5ErevpdKj255
         z80Pe+v1v8nagpIKXxaAxhwnl8Hh2hqg27/8IJQoctGFxTcG7APiUS2fPhz8LqiUP62h
         GOmHPQWYYyLrUHrY1SeNFa02OqHwNXlpu8aFN1JseCcxsWSwo7MWY1tkTSnw5K8Ux096
         PZe/OjObQzzCu3P4rc8auiKCQveehrNtxG6v5ztJTpGCiHGj+M5VsVHj0SVTAzs32RGk
         dLe+V9kVhEVUnqexI2J50VrLV3ciiKV7k0/2wxZccZa7NoKUDwZxM/CD9YP4RJenhoHA
         m7fQ==
X-Gm-Message-State: AOJu0YwjWaMGKgeJL1E9Gx6R2DAc2Q/DDT5+yaYu7MnfvmMi0V5tExzj
	9JEiGixvCSXlL9zldDBN4Tj0p3nZ9ppu79j5/lFcDv+gnD70Gb81dFlMXE8g
X-Google-Smtp-Source: 
 AGHT+IGeePDJ/1CBvfkj98bCvpFTbn/eSl4jPp8G3uy6fwVnurf0FFV8Tu+lKOQmjp/04L2wZ8C+3w==
X-Received: by 2002:a25:1f82:0:b0:dd0:97e8:74e6 with SMTP id
 f124-20020a251f82000000b00dd097e874e6mr8361019ybf.55.1711997890844;
        Mon, 01 Apr 2024 11:58:10 -0700 (PDT)
Received: from lvondent-mobl4.. (107-146-107-067.biz.spectrum.com.
 [107.146.107.67])
        by smtp.gmail.com with ESMTPSA id
 o9-20020a25ea49000000b00dcc234241c4sm2153739ybe.55.2024.04.01.11.58.09
        for <[email protected]>
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Mon, 01 Apr 2024 11:58:10 -0700 (PDT)
From: Luiz Augusto von Dentz <[email protected]>
To: [email protected]
Subject: [PATCH BlueZ v4 1/3] input/device: Fix not handling IdleTimeout when
 uhid is in use
Date: Mon,  1 Apr 2024 14:58:06 -0400
Message-ID: <[email protected]>
X-Mailer: git-send-email 2.44.0
Precedence: bulk
X-Mailing-List: [email protected]
List-Id: <linux-bluetooth.vger.kernel.org>
List-Subscribe: <mailto:[email protected]>
List-Unsubscribe: <mailto:[email protected]>
MIME-Version: 1.0

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

When uhid is in use IdleTimeout was not taking any effect, this also
attempt to force the destroy the input device node to make it useful
for users that don't want to keep the input node forever.
---
 profiles/input/device.c   | 86 +++++++++++++++++++++++++++------------
 profiles/input/input.conf |  2 +-
 2 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/profiles/input/device.c b/profiles/input/device.c
index 1b28cdc174b1..b622ee8cd681 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -77,6 +77,7 @@ struct input_device {
 	unsigned int		report_req_timer;
 	uint32_t		report_rsp_id;
 	bool			virtual_cable_unplug;
+	unsigned int		idle_timer;
 };
 
 static int idle_timeout = 0;
@@ -105,7 +122,7 @@
 
 static void input_device_enter_reconnect_mode(struct input_device *idev);
 static int connection_disconnect(struct input_device *idev, uint32_t flags);
-static int uhid_disconnect(struct input_device *idev);
+static int uhid_disconnect(struct input_device *idev, bool force);
 
 static bool input_device_bonded(struct input_device *idev)
 {
@@ -139,6 +140,9 @@ static void input_device_free(struct input_device *idev)
 		g_free(idev->req);
 	}
 
+	if (idev->idle_timer)
+		timeout_remove(idev->idle_timer);
+
 	if (idev->reconnect_timer > 0)
 		timeout_remove(idev->reconnect_timer);
 
@@ -157,8 +199,32 @@ static void virtual_cable_unplug(struct input_device *idev)
 	idev->virtual_cable_unplug = false;
 }
 
-static bool hidp_send_message(GIOChannel *chan, uint8_t hdr,
-					const uint8_t *data, size_t size)
+static bool input_device_idle_timeout(gpointer user_data)
+{
+	struct input_device *idev = user_data;
+
+	idev->idle_timer = 0;
+
+	DBG("path=%s", idev->path);
+
+	uhid_disconnect(idev, true);
+	connection_disconnect(idev, 0);
+
+	return false;
+}
+
+static void input_device_idle_reset(struct input_device *idev)
+{
+	timeout_remove(idev->idle_timer);
+
+	if (idle_timeout)
+		idev->idle_timer = timeout_add_seconds(idle_timeout,
+					input_device_idle_timeout, idev,
+					NULL);
+}
+
+static bool hidp_send_message(struct input_device *idev, GIOChannel *chan,
+				uint8_t hdr, const uint8_t *data, size_t size)
 {
 	int fd;
 	ssize_t len;
@@ -191,6 +241,8 @@ static bool hidp_send_message(GIOChannel *chan, uint8_t hdr,
 		return false;
 	}
 
+	input_device_idle_reset(idev);
+
 	return true;
 }
 
@@ -200,13 +252,13 @@ static bool hidp_send_ctrl_message(struct input_device *idev, uint8_t hdr,
 	if (hdr == (HIDP_TRANS_HID_CONTROL | HIDP_CTRL_VIRTUAL_CABLE_UNPLUG))
 		idev->virtual_cable_unplug = true;
 
-	return hidp_send_message(idev->ctrl_io, hdr, data, size);
+	return hidp_send_message(idev, idev->ctrl_io, hdr, data, size);
 }
 
 static bool hidp_send_intr_message(struct input_device *idev, uint8_t hdr,
 					const uint8_t *data, size_t size)
 {
-	return hidp_send_message(idev->intr_io, hdr, data, size);
+	return hidp_send_message(idev, idev->intr_io, hdr, data, size);
 }
 
 static bool uhid_send_get_report_reply(struct input_device *idev,
@@ -297,6 +349,8 @@ static bool hidp_recv_intr_data(GIOChannel *chan, struct input_device *idev)
 		return true;
 	}
 
+	input_device_idle_reset(idev);
+
 	hdr = data[0];
 	if (hdr != (HIDP_TRANS_DATA | HIDP_DATA_RTYPE_INPUT)) {
 		DBG("unsupported HIDP protocol header 0x%02x", hdr);
@@ -357,7 +510,7 @@
 
 	/* If connection abruptly ended, uhid might be not yet disconnected */
 	if (bt_uhid_created(idev->uhid))
-		uhid_disconnect(idev);
+		uhid_disconnect(idev, false);
 
 	return FALSE;
 }
@@ -520,6 +552,8 @@ static bool hidp_recv_ctrl_message(GIOChannel *chan, struct input_device *idev)
 		return true;
 	}
 
+	input_device_idle_reset(idev);
+
 	hdr = data[0];
 	type = hdr & HIDP_HEADER_TRANS_MASK;
 	param = hdr & HIDP_HEADER_PARAM_MASK;
@@ -934,7 +1135,7 @@
 	return err;
 }
 
-static int uhid_disconnect(struct input_device *idev)
+static int uhid_disconnect(struct input_device *idev, bool force)
 {
 	int err;
 
@@ -942,7 +1143,7 @@
 		return 0;
 
 	/* Only destroy the node if virtual cable unplug flag has been set */
-	if (!idev->virtual_cable_unplug)
+	if (!idev->virtual_cable_unplug && !force)
 		return 0;
 
 	bt_uhid_unregister_all(idev->uhid);
@@ -1087,7 +1288,7 @@
 		idev->virtual_cable_unplug = true;
 
 	if (idev->uhid)
-		return uhid_disconnect(idev);
+		return uhid_disconnect(idev, false);
 	else
 		return ioctl_disconnect(idev, flags);
 }
diff --git a/profiles/input/input.conf b/profiles/input/input.conf
index 00a34eb63de1..fc20c58b6b32 100644
--- a/profiles/input/input.conf
+++ b/profiles/input/input.conf
@@ -6,7 +6,7 @@
 
 # Set idle timeout (in minutes) before the connection will
 # be disconnect (defaults to 0 for no timeout)
-#IdleTimeout=30
+#IdleTimeout=0
 
 # Enable HID protocol handling in userspace input profile
 # Defaults to true (Use UHID instead of kernel HIDP)

From patchwork Mon Apr  1 18:58:07 2024
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Luiz Augusto von Dentz <[email protected]>
X-Patchwork-Id: 13612955
Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com
 [209.85.219.182])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 119C34EB24
	for <[email protected]>; Mon,  1 Apr 2024 18:58:14 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 arc=none smtp.client-ip=209.85.219.182
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1711997896; cv=none;
 b=pcjMpe++3v6FxHxJvib+7nmB6ogp2xdvMK2XtuCXJYC2kHF5YSDby8ExmZ5eIVg0yt98+1MS3ftKaDW1OES6lyDZbFSjO25GeOarZkADw/n7J9IFoQ06UekQUZW/na6mz556YiZRK4Ql1rWgA+nvrDbfwRHby+hIjNUIYoXQzvM=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1711997896; c=relaxed/simple;
	bh=oBYiZuw4EXH6CclXvwVXPz++tRo1ZT9usZqsMq50P3o=;
	h=From:To:Subject:Date:Message-ID:In-Reply-To:References:
	 MIME-Version;
 b=d+jHbPPDGda4dVYJB+zhVeQwDNrCeimtikHvY9CY8+TgeTfrQuSqnAajJwDZRKhI8WDRjxwfOl3uS9INCLaSHZkC5mRkEvwgLjRO+6ikAx+NfYQjGYawpWWAH9Ft+/TCyFpexEbzskib5+WVXVTH9Koq/4fiLvlU5pCdUnNIdAU=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
 dmarc=pass (p=none dis=none) header.from=gmail.com;
 spf=pass smtp.mailfrom=gmail.com;
 dkim=pass (2048-bit key) header.d=gmail.com [email protected]
 header.b=WK0+NXLX; arc=none smtp.client-ip=209.85.219.182
Authentication-Results: smtp.subspace.kernel.org;
 dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
 spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com [email protected]
 header.b="WK0+NXLX"
Received: by mail-yb1-f182.google.com with SMTP id
 3f1490d57ef6-dcc6fc978ddso3366080276.0
        for <[email protected]>;
 Mon, 01 Apr 2024 11:58:14 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1711997893; x=1712602693;
 darn=vger.kernel.org;
        h=content-transfer-encoding:mime-version:references:in-reply-to
         :message-id:date:subject:to:from:from:to:cc:subject:date:message-id
         :reply-to;
        bh=5xhyNVQ9ZSEd+DznykOtJOMpyp8tgw0j029Fgjisiwo=;
        b=WK0+NXLXdnNeKWkMkSqs6oUwHJ+SY6b2Uc4v2obqGrIYWeKysQk9hm6WknOHdXnai+
         wXPknpVLu81I4RSfsgGFvJnxeaFfjqQJIvLYFrp6mTfrYd+XBrmVt3349XC0Dy4JL0BH
         E+S/GcbyQjee5X/AHcKiwoX23MqJLB0dodwanuYFFk0dtAduoY0Cf0CPKD4urDbO/+N1
         ZJVTavwk8nJ/WfkWypNDJs6FkiaLvDDL6OoraboLRixfJN3HKrb9kNHfjpSv51epTLQB
         vs4SeP4dH95LY9XyejsWe5Ch9il5V+kvz1DPxxB9Dgm6agfhJsDF/yyYQ0PraAC01WMZ
         7DGg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1711997893; x=1712602693;
        h=content-transfer-encoding:mime-version:references:in-reply-to
         :message-id:date:subject:to:from:x-gm-message-state:from:to:cc
         :subject:date:message-id:reply-to;
        bh=5xhyNVQ9ZSEd+DznykOtJOMpyp8tgw0j029Fgjisiwo=;
        b=m/D2X7PGI1BoKSyYWgkoCg6YRIo/5NtuYfAHgv9Gqf3R1bVFFYpcT7RijKH4DRZews
         /nkeTsFCfd12ucAFwWcRSVGvZFW/k0qU4HdX8JjtpYZ2e0uKAibl/0UYWp3pWTusW3hV
         n2zVi067UtvO2fcn+GqfadWOySQIApvaAPXl30eHjGKmeAaUtZC9auUGmxGpLLSk+4CW
         O2zPgut5I9rBOZouDm0G5+s0fUYp/ZUO9hPpUwUrysRgYb+Lz9IwTXtA2S4lW2VkTrkJ
         WpHqWwYKk/bzev+s04oQOMP568BkEUsB/tUekEC4TSKd/RbNyT1je8/lGGt6MrDWhAxJ
         ITew==
X-Gm-Message-State: AOJu0Yx28PsvCDGzamFC50iiQQPSvJXwvb14bWO+m1XnF9ekYTUXGGiP
	nu5xi4HLexdarY8avq7b9Yo2pir+o/EwlFps7dc17+sXhRjgsBygDgZtx/Mq
X-Google-Smtp-Source: 
 AGHT+IGRRK97d1wbPKPqlHKvj1RE5Pgu+KUt+pca5JKxOCZoWwWBLvRIad3LOhOYia1iuQRLEkTi5w==
X-Received: by 2002:a25:ade0:0:b0:dcf:bf81:5f28 with SMTP id
 d32-20020a25ade0000000b00dcfbf815f28mr10192375ybe.0.1711997893281;
        Mon, 01 Apr 2024 11:58:13 -0700 (PDT)
Received: from lvondent-mobl4.. (107-146-107-067.biz.spectrum.com.
 [107.146.107.67])
        by smtp.gmail.com with ESMTPSA id
 o9-20020a25ea49000000b00dcc234241c4sm2153739ybe.55.2024.04.01.11.58.11
        for <[email protected]>
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Mon, 01 Apr 2024 11:58:11 -0700 (PDT)
From: Luiz Augusto von Dentz <[email protected]>
To: [email protected]
Subject: [PATCH BlueZ v4 2/3] input.conf: Change IdleTimeout unit to be in
 seconds
Date: Mon,  1 Apr 2024 14:58:07 -0400
Message-ID: <[email protected]>
X-Mailer: git-send-email 2.44.0
In-Reply-To: <[email protected]>
References: <[email protected]>
Precedence: bulk
X-Mailing-List: [email protected]
List-Id: <linux-bluetooth.vger.kernel.org>
List-Subscribe: <mailto:[email protected]>
List-Unsubscribe: <mailto:[email protected]>
MIME-Version: 1.0

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

This changes IdleTimeout unit to be in seconds instead of in minutes
which offer better granularity.
---
 profiles/input/input.conf | 5 +++--
 profiles/input/manager.c  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/profiles/input/input.conf b/profiles/input/input.conf
index fc20c58b6b32..273e15bc9c80 100644
--- a/profiles/input/input.conf
+++ b/profiles/input/input.conf
@@ -4,8 +4,9 @@
 # particular interface
 [General]
 
-# Set idle timeout (in minutes) before the connection will
-# be disconnect (defaults to 0 for no timeout)
+# Set idle timeout (in seconds) before the connection will be disconnect and
+# the input device is removed.
+# Defaults: 0 (disabled)
 #IdleTimeout=0
 
 # Enable HID protocol handling in userspace input profile
diff --git a/profiles/input/manager.c b/profiles/input/manager.c
index 92789a003c89..f4598bcd4e47 100644
--- a/profiles/input/manager.c
+++ b/profiles/input/manager.c
@@ -89,7 +89,7 @@ static int input_init(void)
 							"IdleTimeout", &err);
 		if (!err) {
 			DBG("input.conf: IdleTimeout=%d", idle_timeout);
-			input_set_idle_timeout(idle_timeout * 60);
+			input_set_idle_timeout(idle_timeout);
 		} else
 			g_clear_error(&err);
 

From patchwork Mon Apr  1 18:58:08 2024
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Luiz Augusto von Dentz <[email protected]>
X-Patchwork-Id: 13612956
Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com
 [209.85.219.180])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0ADDE4EB24
	for <[email protected]>; Mon,  1 Apr 2024 18:58:17 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 arc=none smtp.client-ip=209.85.219.180
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1711997899; cv=none;
 b=MjP5WdA/Yas0NF4/bfFUyl4GM+0DRRDToxJmRRItDQabLbKRb/KZFRxq8AagxWBSqHMqoZ1VBSHW5WJgTfL9o/0lplJzVH+XKqxJL23O3ViFE0cPZNTGDAAnqBQ4Z9tbaz/rfMR+i6JoMMJhafBTXeJrD+1aeFpL8GW4tGN7RUM=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1711997899; c=relaxed/simple;
	bh=hw8OXYTtBKtj9JO0Gr0/1t8xbk4BmKmZqW3GagAzeF8=;
	h=From:To:Subject:Date:Message-ID:In-Reply-To:References:
	 MIME-Version;
 b=K10L8utiivFhGhBS6v5bfnNgab09BHh5DpeXB2d9mtZX/kXy2rS88PH3puZVtL+bYSBGzwPHHSntb9xRzalYM207HXaNoEYypB0urW4UExXZbn6s1m79QHJjj48rdf8z5E2lb91Y4ffOtyJIsRX1rVkg1sbUfo9luaBW8W8NQgw=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
 dmarc=pass (p=none dis=none) header.from=gmail.com;
 spf=pass smtp.mailfrom=gmail.com;
 dkim=pass (2048-bit key) header.d=gmail.com [email protected]
 header.b=VhWC0yhI; arc=none smtp.client-ip=209.85.219.180
Authentication-Results: smtp.subspace.kernel.org;
 dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
 spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com [email protected]
 header.b="VhWC0yhI"
Received: by mail-yb1-f180.google.com with SMTP id
 3f1490d57ef6-dc6dcd9124bso4065528276.1
        for <[email protected]>;
 Mon, 01 Apr 2024 11:58:17 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1711997896; x=1712602696;
 darn=vger.kernel.org;
        h=content-transfer-encoding:mime-version:references:in-reply-to
         :message-id:date:subject:to:from:from:to:cc:subject:date:message-id
         :reply-to;
        bh=5OQ2+f5h0a/jQeGROK30s9fYXFaaR/lH4klznMiUDcY=;
        b=VhWC0yhI5kefcalmyQsSnmRMLJtOI9zHf1jmat4gdXgBFHEGnAfspN3aAuBFrS7yqp
         20ylHPU1UZFFLaFOu7vphvm1QauxDxwoqUYNMvslymPF+CNYVV/U6eQBuoxQ7HBfVAkv
         NSDAB06rlgID3KE3Fktl9+97dzUYBvoXmv/5CHiUcz49OBKo3c2as/7ITRgzoBtmAwfi
         GvY58fvUB1YlKtktIcEGA4TQ5gkA/CnEUs1hMnzBBwJ8QgrxQdMLZR+/wecpTnO2phTB
         Mj8IOiY1DWPgK5P03A5CKuDvPkCvGmDxsHZ93C7PQO+1FdyB+1+oB6vvPjySfcrxKrnS
         XF7w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1711997896; x=1712602696;
        h=content-transfer-encoding:mime-version:references:in-reply-to
         :message-id:date:subject:to:from:x-gm-message-state:from:to:cc
         :subject:date:message-id:reply-to;
        bh=5OQ2+f5h0a/jQeGROK30s9fYXFaaR/lH4klznMiUDcY=;
        b=GbXuzLG3eZYVfhq2JrJyGaCXF8UhTZZfkgeQt7WkQlpSdLtV5tchRvmcjc2O78sIC7
         klK/qivViswpFdhFLbA7iG7VsB83HJfKPT3zWfDQyPXgYSGxHKK9gLJbtJuGJx3Fj8fD
         yHzufeEJxQGZMaXab5GJ0RO+WmLAR5467F8lxemsW7pQyDy4Lg9M5hR8GIDvJyMuFhrH
         2tpAcnl/gBW3HcxBW+LPuO0pxW39uMCBmNhN4nUu0DOktYaqtpOuaKAhxelYBk00s+8l
         Vlmdcgl5N2EsQsAlxVizXdzOt8cnGVfLS7iCeTj10v+e/KrEDqCYeOl01GxRVKQrmOw6
         3rMQ==
X-Gm-Message-State: AOJu0YyBfqhbP4m51VfIWwKXgY2D8N62jHoiSXVR+QJQzYTN7OrpD/Z2
	i5tdgfFDf2yhJo5ep8Du+8GKPpmuGZmfOZ/GX+5eWIez7O73SarUyad/fmfS
X-Google-Smtp-Source: 
 AGHT+IHnkKoescqXHuE3AEFctXQSQXki3MZVSZ1OICLVk9eQ6EaJ2BwH15Cjt9uCxSVvHoNPq6LmBw==
X-Received: by 2002:a25:1e54:0:b0:dcd:3d6:68ad with SMTP id
 e81-20020a251e54000000b00dcd03d668admr7641989ybe.0.1711997895819;
        Mon, 01 Apr 2024 11:58:15 -0700 (PDT)
Received: from lvondent-mobl4.. (107-146-107-067.biz.spectrum.com.
 [107.146.107.67])
        by smtp.gmail.com with ESMTPSA id
 o9-20020a25ea49000000b00dcc234241c4sm2153739ybe.55.2024.04.01.11.58.13
        for <[email protected]>
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Mon, 01 Apr 2024 11:58:13 -0700 (PDT)
From: Luiz Augusto von Dentz <[email protected]>
To: [email protected]
Subject: [PATCH BlueZ v4 3/3] input/device: Add replay support
Date: Mon,  1 Apr 2024 14:58:08 -0400
Message-ID: <[email protected]>
X-Mailer: git-send-email 2.44.0
In-Reply-To: <[email protected]>
References: <[email protected]>
Precedence: bulk
X-Mailing-List: [email protected]
List-Id: <linux-bluetooth.vger.kernel.org>
List-Subscribe: <mailto:[email protected]>
List-Unsubscribe: <mailto:[email protected]>
MIME-Version: 1.0

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

This adds replay support when uhid is in use and the input node is keep
while disconnected:

Fixes: https://github.com/bluez/bluez/issues/777
---
 profiles/input/device.c | 169 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 168 insertions(+), 1 deletion(-)

diff --git a/profiles/input/device.c b/profiles/input/device.c
index b622ee8cd681..b3d69d86f3d4 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -42,6 +42,8 @@
 #include "src/sdp-client.h"
 #include "src/shared/timeout.h"
 #include "src/shared/uhid.h"
+#include "src/shared/util.h"
+#include "src/shared/queue.h"
 
 #include "device.h"
 #include "hidp_defs.h"
@@ -55,6 +57,19 @@ enum reconnect_mode_t {
 	RECONNECT_ANY
 };
 
+struct hidp_msg {
+	uint8_t hdr;
+	struct iovec *iov;
+};
+
+struct hidp_replay {
+	bool replaying;
+	struct queue *out;
+	struct queue *in;
+	struct queue *re_out;
+	struct queue *re_in;
+};
+
 struct input_device {
 	struct btd_service	*service;
 	struct btd_device	*device;
@@ -78,6 +93,7 @@ struct input_device {
 	uint32_t		report_rsp_id;
 	bool			virtual_cable_unplug;
 	unsigned int		idle_timer;
+	struct hidp_replay	*replay;
 };
 
 static int idle_timeout = 0;
@@ -113,8 +129,30 @@ static bool input_device_bonded(struct input_device *idev)
 				btd_device_get_bdaddr_type(idev->device));
 }
 
+static void hidp_msg_free(void *data)
+{
+	struct hidp_msg *msg = data;
+
+	util_iov_free(msg->iov, 1);
+	free(msg);
+}
+
+static void hidp_replay_free(struct hidp_replay *replay)
+{
+	if (!replay)
+		return;
+
+	queue_destroy(replay->re_in, NULL);
+	queue_destroy(replay->in, hidp_msg_free);
+	queue_destroy(replay->re_out, NULL);
+	queue_destroy(replay->out, hidp_msg_free);
+	free(replay);
+}
+
 static void input_device_free(struct input_device *idev)
 {
+	hidp_replay_free(idev->replay);
+
 	bt_uhid_unref(idev->uhid);
 	btd_service_unref(idev->service);
 	btd_device_unref(idev->device);
@@ -246,12 +284,95 @@ static bool hidp_send_message(struct input_device *idev, GIOChannel *chan,
 	return true;
 }
 
+static void hidp_replay_send(struct input_device *idev)
+{
+	struct hidp_msg *msg;
+
+	if (!idev->replay || !idev->replay->replaying)
+		return;
+
+	msg = queue_pop_head(idev->replay->re_out);
+	if (!msg) {
+		DBG("uhid replay finished");
+		idev->replay->replaying = false;
+		return;
+	}
+
+	DBG("hdr 0x%02x size %zu", msg->hdr, msg->iov->iov_len);
+
+	hidp_send_message(idev, NULL, msg->hdr, msg->iov->iov_base,
+			  msg->iov->iov_len);
+}
+
+static void hidp_replay_recv(struct input_device *idev, uint8_t hdr,
+				const uint8_t *data, size_t size)
+{
+	struct hidp_msg *msg;
+
+	if (!idev->replay || !idev->replay->replaying)
+		return;
+
+	msg = queue_pop_head(idev->replay->re_in);
+
+	if (msg && (msg->hdr != hdr || msg->iov->iov_len != size ||
+			memcmp(msg->iov->iov_base, data, size)))
+		error("uhid replay input error... discarding");
+
+	hidp_replay_send(idev);
+}
+
+static struct hidp_replay *hidp_replay_new(void)
+{
+	struct hidp_replay *replay = new0(struct hidp_replay, 1);
+
+	replay->out = queue_new();
+	replay->in = queue_new();
+
+	return replay;
+}
+
+static void hidp_record_message(struct input_device *idev, bool out,
+				uint8_t hdr, const uint8_t *data, size_t size)
+{
+	struct hidp_msg *msg;
+	struct iovec iov = { (void *)data, size };
+
+	/* Only record messages if uhid has been created */
+	if (!bt_uhid_created(idev->uhid))
+		return;
+
+	if (idev->replay && idev->replay->replaying) {
+		if (!out)
+			hidp_replay_recv(idev, hdr, data, size);
+		return;
+	}
+
+	if (!idev->replay)
+		idev->replay = hidp_replay_new();
+
+	msg = new0(struct hidp_msg, 1);
+	msg->hdr = hdr;
+	msg->iov = util_iov_dup(&iov, 1);
+
+	if (out) {
+		DBG("output[%u]: hdr 0x%02x size %zu",
+			queue_length(idev->replay->out), hdr, size);
+		queue_push_tail(idev->replay->out, msg);
+	} else {
+		DBG("input[%u]: hdr 0x%02x size %zu",
+			queue_length(idev->replay->in), hdr, size);
+		queue_push_tail(idev->replay->in, msg);
+	}
+}
+
 static bool hidp_send_ctrl_message(struct input_device *idev, uint8_t hdr,
 					const uint8_t *data, size_t size)
 {
 	if (hdr == (HIDP_TRANS_HID_CONTROL | HIDP_CTRL_VIRTUAL_CABLE_UNPLUG))
 		idev->virtual_cable_unplug = true;
 
+	hidp_record_message(idev, true, hdr, data, size);
+
 	return hidp_send_message(idev, idev->ctrl_io, hdr, data, size);
 }
 
@@ -558,6 +679,12 @@ static bool hidp_recv_ctrl_message(GIOChannel *chan, struct input_device *idev)
 	type = hdr & HIDP_HEADER_TRANS_MASK;
 	param = hdr & HIDP_HEADER_PARAM_MASK;
 
+	/* While replaying don't involve the driver since it will likely get
+	 * confused with messages it already things it has received.
+	 */
+	if (idev->replay && idev->replay->replaying)
+		goto done;
+
 	switch (type) {
 	case HIDP_TRANS_HANDSHAKE:
 		hidp_recv_ctrl_handshake(idev, param);
@@ -575,6 +702,9 @@ static bool hidp_recv_ctrl_message(GIOChannel *chan, struct input_device *idev)
 		break;
 	}
 
+done:
+	hidp_record_message(idev, false, hdr, data + 1, len - 1);
+
 	return true;
 }
 
@@ -973,12 +1103,49 @@ static int ioctl_disconnect(struct input_device *idev, uint32_t flags)
 	return err;
 }
 
+static void queue_append(void *data, void *user_data)
+{
+	queue_push_tail(user_data, data);
+}
+
+static struct queue *queue_dup(struct queue *q)
+{
+	struct queue *dup;
+
+	if (!q || queue_isempty(q))
+		return NULL;
+
+	dup = queue_new();
+
+	queue_foreach(q, queue_append, dup);
+
+	return dup;
+}
+
+static void hidp_replay_init(struct input_device *idev)
+{
+	if (!idev->replay || idev->replay->replaying)
+		return;
+
+	idev->replay->replaying = true;
+
+	queue_destroy(idev->replay->re_in, NULL);
+	idev->replay->re_in = queue_dup(idev->replay->in);
+
+	queue_destroy(idev->replay->re_out, NULL);
+	idev->replay->re_out = queue_dup(idev->replay->out);
+
+	hidp_replay_send(idev);
+}
+
 static int uhid_connadd(struct input_device *idev, struct hidp_connadd_req *req)
 {
 	int err;
 
-	if (bt_uhid_created(idev->uhid))
+	if (bt_uhid_created(idev->uhid)) {
+		hidp_replay_init(idev);
 		return 0;
+	}
 
 	err = bt_uhid_create(idev->uhid, req->name, &idev->src, &idev->dst,
 				req->vendor, req->product, req->version,

gistfile1.txt

# Maintainer: Andreas Radke <[email protected]>
# Maintainer: Robin Candau <[email protected]>
# Contributor: Tom Gundersen <[email protected]>
# Contributor: Andrea Scarpino <[email protected]>
# Contributor: Geoffroy Carrier <[email protected]>

pkgbase=bluez
pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-deprecated-tools' 'bluez-hid2hci' 'bluez-mesh' 'bluez-obex')
pkgver=5.73
pkgrel=4
url="http://www.bluez.org/"
arch=('x86_64')
license=('GPL-2.0-only')
makedepends=('dbus' 'libical' 'systemd' 'alsa-lib' 'json-c' 'ell' 'python-docutils' 'python-pygments' 'cups')
source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
        bluetooth.modprobe
        0001_use_bt_uhid_functions.patch
        0002_fix_not_handling_IdleTimeout_when_uhid_is_in_use.patch)
# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
sha256sums=('257e9075ce05c70d48c5defd254e78c418416f7584b45f9dddc884ff88e3fc53'
            'SKIP'
            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
            '24780fc689dc4041ab0c5713c8f2cb09a7038d4936812310534762592d76e2f8'
            'aaccd3e4cd64ad722d05c2de851644e73a16472ff47b09c6b42bb13576407819')
validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <[email protected]>

prepare() {
  cd "${pkgname}"-${pkgver}
  # fix DualShock 3 connection - #6
  # https://github.com/bluez/bluez/issues/771
  patch -Np1 -i ../0001_use_bt_uhid_functions.patch

  # fix DualShock 4 / DualSense connection
  # https://github.com/bluez/bluez/issues/777
  patch -Np1 -i ../0002_fix_not_handling_IdleTimeout_when_uhid_is_in_use.patch
}

build() {
  cd "${pkgname}"-${pkgver}
  ./configure \
          --prefix=/usr \
          --mandir=/usr/share/man \
          --sysconfdir=/etc \
          --localstatedir=/var \
          --libexecdir=/usr/lib \
          --with-dbusconfdir=/usr/share \
          --enable-btpclient \
          --enable-midi \
          --enable-sixaxis \
          --enable-mesh \
          --enable-hid2hci \
          --enable-experimental \
          --enable-datafiles \
          --enable-library --enable-deprecated # libraries and these tools are deprecated
  make

  # fake installation to be seperated into packages
  make DESTDIR="${srcdir}/fakeinstall" install

  # add missing tools FS#41132, FS#41687, FS#42716
  for files in `find tools/ -type f -perm -755`; do
    filename=$(basename $files)
    install -Dm755 "${srcdir}"/"${pkgbase}"-${pkgver}/tools/$filename "${srcdir}/fakeinstall"/usr/bin/$filename
  done
}

_install() {
  local src f dir
  for src; do
    f="${src#fakeinstall/}"
    dir="${pkgdir}/${f%/*}"
    install -m755 -d "${dir}"
    # use copy so a new file is created and fakeroot can track properties such as setuid
    cp -av "${src}" "${dir}/"
    rm -rf "${src}"
  done
}

check() {
  cd "$pkgname"-$pkgver
  # fails test-vcp due to lto - https://github.com/bluez/bluez/issues/683
  make check || /bin/true
}


package_bluez() {
  pkgdesc="Daemons for the bluetooth protocol stack"
  depends=('systemd' 'dbus' 'glib2' 'alsa-lib' 'glibc')
  backup=(etc/bluetooth/{main,input,network}.conf)

  _install fakeinstall/etc/bluetooth/main.conf
  _install fakeinstall/etc/bluetooth/input.conf
  _install fakeinstall/etc/bluetooth/network.conf
  _install fakeinstall/usr/lib/bluetooth/bluetoothd
  _install fakeinstall/usr/lib/systemd/system/bluetooth.service
  _install fakeinstall/usr/share/dbus-1/system-services/org.bluez.service
  _install fakeinstall/usr/share/dbus-1/system.d/bluetooth.conf
  _install fakeinstall/usr/share/man/man8/bluetoothd.8

  # bluetooth.service wants ConfigurationDirectoryMode=0555
  chmod -v 555 "${pkgdir}"/etc/bluetooth

  # add basic documention
  install -dm755 "${pkgdir}"/usr/share/doc/"${pkgbase}"/dbus-apis
  cp -a "${pkgbase}"-${pkgver}/doc/*.txt "${pkgdir}"/usr/share/doc/"${pkgbase}"/dbus-apis/
  # fix module loading errors
  install -dm755 "${pkgdir}"/usr/lib/modprobe.d
  install -Dm644 "${srcdir}"/bluetooth.modprobe "${pkgdir}"/usr/lib/modprobe.d/bluetooth-usb.conf
  # load module at system start required by some functions
  # https://bugzilla.kernel.org/show_bug.cgi?id=196621
  install -dm755 "$pkgdir"/usr/lib/modules-load.d
  echo "crypto_user" > "$pkgdir"/usr/lib/modules-load.d/bluez.conf
}

package_bluez-utils() {
  pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
  depends=('dbus' 'systemd-libs' 'glib2' 'glibc' 'readline')
  optdepends=('ell: for btpclient')
  provides=('bluez-plugins')
  replaces=('bluez-plugins')

  _install fakeinstall/usr/bin/{advtest,amptest,avinfo,avtest,bcmfw,bdaddr,bluemoon,bluetoothctl,bluetooth-player,bneptest,btattach,btconfig,btgatt-client,btgatt-server,btinfo,btiotest,btmgmt,btmon,btpclient,btpclientctl,btproxy,btsnoop,check-selftest,cltest,create-image,eddystone,gatt-service,hcieventmask,hcisecfilter,hex2hcd,hid2hci,hwdb,ibeacon,isotest,l2ping,l2test,mcaptest,mpris-proxy,nokfw,oobtest,rctest,rtlfw,scotest,seq2bseq,test-runner}
  _install fakeinstall/usr/share/man/man1/bluetoothctl*.1
  _install fakeinstall/usr/share/man/man1/{btattach,btmgmt,btmon,isotest,l2ping,rctest}.1
  _install fakeinstall/usr/share/man/man5/org.bluez.{A,B,D,G,I,L,M,N,P}*.5
  _install fakeinstall/usr/share/zsh/site-functions/_bluetoothctl
}

package_bluez-deprecated-tools() {
  pkgdesc="Deprecated tools that are no longer maintained"
  depends=('json-c' 'systemd-libs' 'glib2' 'dbus' 'readline' 'glibc')

  _install fakeinstall/usr/bin/{ciptool,hciattach,hciconfig,hcidump,hcitool,meshctl,rfcomm,sdptool}
  _install fakeinstall/usr/share/man/man1/{ciptool,hciattach,hciconfig,hcidump,hcitool,rfcomm,sdptool}.1
}

package_bluez-libs() {
  pkgdesc="Deprecated libraries for the bluetooth protocol stack"
  depends=('glibc')
  provides=('libbluetooth.so')
  license=('LGPL-2.1-only')

  _install fakeinstall/usr/include/bluetooth/*
  _install fakeinstall/usr/lib/libbluetooth.so*
  _install fakeinstall/usr/lib/pkgconfig/*
}

package_bluez-cups() {
  pkgdesc="CUPS printer backend for Bluetooth printers"
  depends=('cups' 'glib2' 'glibc' 'dbus')

  _install fakeinstall/usr/lib/cups/backend/bluetooth
}

package_bluez-hid2hci() {
  pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
  depends=('systemd-libs' 'glibc')

  _install fakeinstall/usr/lib/udev/*
  _install fakeinstall/usr/share/man/man1/hid2hci.1
}

package_bluez-mesh() {
  pkgdesc="Services for bluetooth mesh"
  depends=('systemd' 'json-c' 'readline' 'glibc')
  backup=('etc/bluetooth/mesh-main.conf')

  _install fakeinstall/etc/bluetooth/mesh-main.conf
  _install fakeinstall/usr/bin/{mesh-cfgclient,mesh-cfgtest}
  _install fakeinstall/usr/lib/bluetooth/bluetooth-meshd
  _install fakeinstall/usr/lib/systemd/system/bluetooth-mesh.service
  _install fakeinstall/usr/share/dbus-1/system-services/org.bluez.mesh.service
  _install fakeinstall/usr/share/dbus-1/system.d/bluetooth-mesh.conf
  _install fakeinstall/usr/share/man/man8/bluetooth-meshd.8

  # bluetooth.service wants ConfigurationDirectoryMode=0555
  chmod -v 555 "${pkgdir}"/etc/bluetooth
}

package_bluez-obex() {
  pkgdesc="Object Exchange daemon for sharing content"
  depends=('systemd' 'glib2' 'libical' 'dbus' 'readline' 'glibc')

  _install fakeinstall/usr/bin/{obexctl,obex-client-tool,obex-server-tool}
  _install fakeinstall/usr/lib/bluetooth/obexd
  _install fakeinstall/usr/lib/systemd/user/obex.service
  _install fakeinstall/usr/share/dbus-1/services/org.bluez.obex.service
  _install fakeinstall/usr/lib/systemd/user/dbus-org.bluez.obex.service
  _install fakeinstall/usr/share/man/man5/org.bluez.obex*.5  

  # make sure there are no files left to install
  rm fakeinstall/usr/lib/libbluetooth.la
  find fakeinstall -depth -print0 | xargs -0 rmdir
}