Bluetooth: ISO: Fix bcast listener cleanup

This fixes the cleanup callback for slave bis and pa sync hcons.

Closing all bis hcons will trigger BIG Terminate Sync, while closing
all bises and the pa sync hcon will also trigger PA Terminate Sync.

Signed-off-by: Iulia Tanasescu <iulia.tanasescu@nxp.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index f36c1fd5d64ed00a6fa904e5c6281252bd17c9d9..99865c23e461f92ada855949cb648046eaa9c11d 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1290,29 +1290,6 @@ static inline struct hci_conn *hci_conn_hash_lookup_big(struct hci_dev *hdev,
        return NULL;
 }
 
-static inline struct hci_conn *hci_conn_hash_lookup_big_any_dst(struct hci_dev *hdev,
-                                                       __u8 handle)
-{
-       struct hci_conn_hash *h = &hdev->conn_hash;
-       struct hci_conn  *c;
-
-       rcu_read_lock();
-
-       list_for_each_entry_rcu(c, &h->list, list) {
-               if (c->type != ISO_LINK)
-                       continue;
-
-               if (handle != BT_ISO_QOS_BIG_UNSET && handle == c->iso_qos.bcast.big) {
-                       rcu_read_unlock();
-                       return c;
-               }
-       }
-
-       rcu_read_unlock();
-
-       return NULL;
-}
-
 static inline struct hci_conn *
 hci_conn_hash_lookup_pa_sync_big_handle(struct hci_dev *hdev, __u8 big)
 {
@@ -1400,6 +1377,26 @@ static inline void hci_conn_hash_list_state(struct hci_dev *hdev,
        rcu_read_unlock();
 }
 
+static inline void hci_conn_hash_list_flag(struct hci_dev *hdev,
+                                           hci_conn_func_t func, __u8 type,
+                                           __u8 flag, void *data)
+{
+       struct hci_conn_hash *h = &hdev->conn_hash;
+       struct hci_conn  *c;
+
+       if (!func)
+               return;
+
+       rcu_read_lock();
+
+       list_for_each_entry_rcu(c, &h->list, list) {
+               if (c->type == type && test_bit(flag, &c->flags))
+                       func(c, data);
+       }
+
+       rcu_read_unlock();
+}
+
 static inline struct hci_conn *hci_lookup_le_connect(struct hci_dev *hdev)
 {
        struct hci_conn_hash *h = &hdev->conn_hash;

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 974631e652c1ddafe960b35ff2dc7e7804b838f4..7727fe30e5c365df6777e42443c7397e6fe62124 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -815,6 +815,17 @@ static int big_terminate_sync(struct hci_dev *hdev, void *data)
        return 0;
 }
 
+static void find_bis(struct hci_conn *conn, void *data)
+{
+       struct iso_list_data *d = data;
+
+       /* Ignore if BIG doesn't match */
+       if (d->big != conn->iso_qos.bcast.big)
+               return;
+
+       d->count++;
+}
+
 static int hci_le_big_terminate(struct hci_dev *hdev, u8 big, struct hci_conn *conn)
 {
        struct iso_list_data *d;
@@ -826,10 +837,27 @@ static int hci_le_big_terminate(struct hci_dev *hdev, u8 big, struct hci_conn *c
        if (!d)
                return -ENOMEM;
 
+       memset(d, 0, sizeof(*d));
        d->big = big;
        d->sync_handle = conn->sync_handle;
-       d->pa_sync_term = test_and_clear_bit(HCI_CONN_PA_SYNC, &conn->flags);
-       d->big_sync_term = test_and_clear_bit(HCI_CONN_BIG_SYNC, &conn->flags);
+
+       if (test_and_clear_bit(HCI_CONN_PA_SYNC, &conn->flags)) {
+               hci_conn_hash_list_flag(hdev, find_bis, ISO_LINK,
+                                       HCI_CONN_PA_SYNC, d);
+
+               if (!d->count)
+                       d->pa_sync_term = true;
+
+               d->count = 0;
+       }
+
+       if (test_and_clear_bit(HCI_CONN_BIG_SYNC, &conn->flags)) {
+               hci_conn_hash_list_flag(hdev, find_bis, ISO_LINK,
+                                       HCI_CONN_BIG_SYNC, d);
+
+               if (!d->count)
+                       d->big_sync_term = true;
+       }
 
        ret = hci_cmd_sync_queue(hdev, big_terminate_sync, d,
                                 terminate_big_destroy);
@@ -865,12 +893,6 @@ static void bis_cleanup(struct hci_conn *conn)
 
                hci_le_terminate_big(hdev, conn);
        } else {
-               bis = hci_conn_hash_lookup_big_any_dst(hdev,
-                                                      conn->iso_qos.bcast.big);
-
-               if (bis)
-                       return;
-
                hci_le_big_terminate(hdev, conn->iso_qos.bcast.big,
                                     conn);
        }

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 9b34c9f8ee02cf12787ac783dea269111af3303a..32fb2f102a126efab0faec4208b00761386f17ad 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -7112,7 +7112,6 @@ static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data,
 {
        struct hci_evt_le_big_sync_estabilished *ev = data;
        struct hci_conn *bis;
-       struct hci_conn *pa_sync;
        int i;
 
        bt_dev_dbg(hdev, "status 0x%2.2x", ev->status);
@@ -7123,15 +7122,6 @@ static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data,
 
        hci_dev_lock(hdev);
 
-       if (!ev->status) {
-               pa_sync = hci_conn_hash_lookup_pa_sync_big_handle(hdev, ev->handle);
-               if (pa_sync)
-                       /* Also mark the BIG sync established event on the
-                        * associated PA sync hcon
-                        */
-                       set_bit(HCI_CONN_BIG_SYNC, &pa_sync->flags);
-       }
-
        for (i = 0; i < ev->num_bis; i++) {
                u16 handle = le16_to_cpu(ev->bis[i]);
                __le32 interval;