This adds a watchdog timer to prevent race caused by rapid index_added()
event following index_removed() event during system resume. The issue
can happen on the platform where the power of controller would be cut
off when the system goes to suspend. If there is an audio device paired
and connected before the suspend, there is a chance that index_added()
event happens before the device is fully torn down. The D-Bus interface
of the same device cannot be added during the loading of paired device,
and then the session_cb() of AVDTP arrives and triggers device_free().
The symptom is that device wouldn't be presented to D-Bus interface at
all.
The watchdog timeout is set to 1000 ms based on AVDTP disconnection
timeout. The experiments shows that it took about ~50ms for session_cb()
to arrive after index_removed().
The following test steps were performed:
(1) Pair and connect to Bose QC35
(2) Call powerd_dbus_suspend
(3) Suspend the device, wait for 30 seconds and resume the device.
(4) Verify if device shows up on the paired device list.
---
Hi BlueZ Maintainers,
This issue was discovered during a platform bring-up where the reload of
the Bluetooth firmware is fast enough and index_added() arrives before
the torn-down of an audio device.
Chrome OS Bluetooth Team
src/adapter.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 130 insertions(+), 1 deletion(-)
diff --git a/src/adapter.c b/src/adapter.c
index c1f976323..e0ee16085 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -86,6 +86,11 @@
#define DISTANCE_VAL_INVALID 0x7FFF
#define PATHLOSS_MAX 137
+/* The unit is millisecons, and the value refers to the disconnection timeout
+ * of AVDTP session.
+ */
+#define CLEANUP_WATCHDOG_TIMEOUT 1000
+
/*
* These are known security keys that have been compromised.
* If this grows or there are needs to be platform specific, it is
@@ -121,6 +126,13 @@ static GSList *adapter_drivers = NULL;
static GSList *disconnect_list = NULL;
static GSList *conn_fail_list = NULL;
+/* Watchdog timer of rapid index added after index removed */
+static guint cleanup_watchdog_timer;
+/* List of struct cleanup_watchdog, used to prevent rapid index added after
+ * index removed.
+ */
+static struct queue *cleanup_watchdogs;
+
struct link_key_info {
bdaddr_t bdaddr;
unsigned char key[16];
@@ -288,6 +300,14 @@ typedef enum {
ADAPTER_AUTHORIZE_CHECK_CONNECTED
} adapter_authorize_type;
+struct cleanup_watchdog {
+ uint16_t index; /* adapter index */
+ time_t target_ts; /* targeted timestamp for index added to be
+ * triggered
+ */
+ bool should_add;
+};
+
static struct btd_adapter *btd_adapter_lookup(uint16_t index)
{
GList *list;
@@ -517,6 +537,9 @@ static void adapter_stop(struct btd_adapter *adapter);
static void trigger_passive_scanning(struct btd_adapter *adapter);
static bool set_mode(struct btd_adapter *adapter, uint16_t opcode,
uint8_t mode);
+static void index_added(uint16_t index, uint16_t length, const void *param,
+ void *user_data);
+static gboolean expire_cleanup_watchdog(gpointer user_data);
static void settings_changed(struct btd_adapter *adapter, uint32_t settings)
{
@@ -5319,9 +5342,81 @@ static void remove_discovery_list(struct btd_adapter *adapter)
adapter->discovery_list = NULL;
}
+static void cleanup_watchdog_free(void *data)
+{
+ struct cleanup_watchdog *watchdog = data;
+
+ free(watchdog);
+}
+
+static void start_cleanup_watchdog_timer(time_t current_ts)
+{
+ double diff_ts;
+ struct cleanup_watchdog *watchdog;
+
+ if (cleanup_watchdog_timer)
+ return;
+
+ watchdog = queue_peek_head(cleanup_watchdogs);
+ if (!watchdog)
+ return;
+
+ diff_ts = difftime(watchdog->target_ts, current_ts) * 1000;
+ cleanup_watchdog_timer = g_timeout_add(diff_ts, expire_cleanup_watchdog,
+ NULL);
+
+ DBG("Cleanup watchdog timer set for adapter %u with %f ms",
+ watchdog->index, diff_ts);
+}
+
+static gboolean expire_cleanup_watchdog(gpointer user_data)
+{
+ time_t current_ts;
+ struct cleanup_watchdog *watchdog;
+
+ g_source_remove(cleanup_watchdog_timer);
+ cleanup_watchdog_timer = 0;
+
+ time(¤t_ts);
+
+ while (watchdog = queue_peek_head(cleanup_watchdogs)) {
+ if (watchdog->target_ts <= current_ts) {
+ queue_pop_head(cleanup_watchdogs);
+
+ DBG("expire cleanup watchdog for adapter %u",
+ watchdog->index);
+
+ if (watchdog->should_add)
+ index_added(watchdog->index, 0, NULL, NULL);
+
+ cleanup_watchdog_free(watchdog);
+ } else {
+ start_cleanup_watchdog_timer(current_ts);
+ return FALSE;
+ }
+ }
+
+ return FALSE;
+}
+
+static bool match_cleanup_watchdog_by_index(const void *data,
+ const void *user_data)
+{
+ const uint16_t *index = user_data;
+ const struct cleanup_watchdog *watchdog = data;
+
+ if (!watchdog || !index)
+ return false;
+
+ return watchdog->index == *index;
+}
+
static void adapter_free(gpointer user_data)
{
+ struct cleanup_watchdog *watchdog;
struct btd_adapter *adapter = user_data;
+ time_t current_ts;
+ uint16_t index = adapter->dev_id;
DBG("%p", adapter);
@@ -5384,6 +5479,23 @@ static void adapter_free(gpointer user_data)
g_free(adapter->current_alias);
free(adapter->modalias);
g_free(adapter);
+
+ DBG("Set cleanup watchdog for adapter %u", index);
+ watchdog = queue_find(cleanup_watchdogs,
+ match_cleanup_watchdog_by_index, NULL);
+ if (watchdog) {
+ queue_remove(cleanup_watchdogs, watchdog);
+ } else {
+ watchdog = new0(struct cleanup_watchdog, 1);
+ watchdog->index = index;
+ }
+
+ time(¤t_ts);
+ watchdog->should_add = false;
+ watchdog->target_ts = current_ts + (CLEANUP_WATCHDOG_TIMEOUT / 1000);
+
+ queue_push_tail(cleanup_watchdogs, watchdog);
+ start_cleanup_watchdog_timer(current_ts);
}
struct btd_adapter *btd_adapter_ref(struct btd_adapter *adapter)
@@ -9568,6 +9680,18 @@ static void index_added(uint16_t index, uint16_t length, const void *param,
void *user_data)
{
struct btd_adapter *adapter;
+ struct cleanup_watchdog *watchdog;
+
+ if (!!cleanup_watchdog_timer) {
+ watchdog = queue_find(cleanup_watchdogs,
+ match_cleanup_watchdog_by_index,
+ &index);
+ if (watchdog) {
+ warn("Postpone adding adapter %u", index);
+ watchdog->should_add = true;
+ return;
+ }
+ }
DBG("index %u", index);
@@ -9829,8 +9953,10 @@ int adapter_init(void)
if (mgmt_send(mgmt_master, MGMT_OP_READ_VERSION,
MGMT_INDEX_NONE, 0, NULL,
- read_version_complete, NULL, NULL) > 0)
+ read_version_complete, NULL, NULL) > 0) {
+ cleanup_watchdogs = queue_new();
return 0;
+ }
error("Failed to read management version information");
@@ -9880,6 +10006,9 @@ void adapter_shutdown(void)
DBG("");
+ queue_destroy(cleanup_watchdogs, cleanup_watchdog_free);
+ cleanup_watchdogs = NULL;
+
powering_down = true;
for (list = g_list_first(adapter_list); list;
--
2.30.0.478.g8a0d178c01-goog
