* [PATCH 0/1] Split bt_iso_qos into dedicated structures @ 2023-03-20 14:36 Iulia Tanasescu 2023-03-20 14:36 ` [PATCH 1/1] Bluetooth: " Iulia Tanasescu 0 siblings, 1 reply; 10+ messages in thread From: Iulia Tanasescu @ 2023-03-20 14:36 UTC (permalink / raw) To: linux-bluetooth; +Cc: Iulia Tanasescu This patch splits the "bt_iso_qos" structure into dedicated unicast and broadcast structures, so that ISO sockets can be configured with dedicated QoS options. This patch also adds some missing broadcast parameters to the Sink and Source bt_iso_qos structures, so that the parameters of the ISO Broadcast procedures that take place in the Bluetooth kernel can be controlled from the user space. This patch depends on the BlueZ patch series [PATCH BlueZ] Split bt_iso_qos into dedicated structures. Iulia Tanasescu (1): Split bt_iso_qos into dedicated structures include/net/bluetooth/bluetooth.h | 47 ++++-- include/net/bluetooth/hci_core.h | 21 +-- net/bluetooth/hci_conn.c | 104 ++++++++----- net/bluetooth/hci_event.c | 38 +++-- net/bluetooth/iso.c | 247 ++++++++++++++++++++++++++---- 5 files changed, 346 insertions(+), 111 deletions(-) base-commit: dd41882582a9ab19938598179386b81b793b4a5c -- 2.34.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/1] Bluetooth: Split bt_iso_qos into dedicated structures 2023-03-20 14:36 [PATCH 0/1] Split bt_iso_qos into dedicated structures Iulia Tanasescu @ 2023-03-20 14:36 ` Iulia Tanasescu 2023-03-20 15:03 ` bluez.test.bot ` (2 more replies) 0 siblings, 3 replies; 10+ messages in thread From: Iulia Tanasescu @ 2023-03-20 14:36 UTC (permalink / raw) To: linux-bluetooth; +Cc: Iulia Tanasescu Split bt_iso_qos into dedicated unicast and broadcast structures and add missing broadcast parameters Signed-off-by: Iulia Tanasescu <iulia.tanasescu@nxp.com> --- include/net/bluetooth/bluetooth.h | 47 ++++-- include/net/bluetooth/hci_core.h | 21 +-- net/bluetooth/hci_conn.c | 104 ++++++++----- net/bluetooth/hci_event.c | 38 +++-- net/bluetooth/iso.c | 247 ++++++++++++++++++++++++++---- 5 files changed, 346 insertions(+), 111 deletions(-) diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index bcc5a4cd2c17..24d303783ea4 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -1,6 +1,7 @@ /* BlueZ - Bluetooth protocol stack for Linux Copyright (C) 2000-2001 Qualcomm Incorporated + Copyright 2023 NXP Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com> @@ -155,11 +156,14 @@ struct bt_voice { #define BT_SCM_PKT_STATUS 0x03 -#define BT_ISO_QOS 17 +#define BT_ISO_UNICAST_QOS 17 #define BT_ISO_QOS_CIG_UNSET 0xff #define BT_ISO_QOS_CIS_UNSET 0xff +#define BT_ISO_BCAST_SINK_QOS 18 +#define BT_ISO_BCAST_SOURCE_QOS 19 + #define BT_ISO_QOS_BIG_UNSET 0xff #define BT_ISO_QOS_BIS_UNSET 0xff @@ -171,25 +175,40 @@ struct bt_iso_io_qos { __u8 rtn; }; -struct bt_iso_qos { - union { - __u8 cig; - __u8 big; - }; - union { - __u8 cis; - __u8 bis; - }; - union { - __u8 sca; - __u8 sync_interval; - }; +struct bt_iso_unicast_qos { + __u8 cig; + __u8 cis; + __u8 sca; __u8 packing; __u8 framing; struct bt_iso_io_qos in; struct bt_iso_io_qos out; }; +struct bt_iso_bcast_sink_qos { + __u8 options; + __u16 skip; + __u16 sync_timeout; + __u8 sync_cte_type; + __u8 big; + __u8 encryption; + __u8 bcode[16]; + __u8 mse; + __u16 timeout; + struct bt_iso_io_qos in; +}; + +struct bt_iso_bcast_source_qos { + __u8 sync_interval; + __u8 big; + __u8 bis; + __u8 packing; + __u8 framing; + __u8 encryption; + __u8 bcode[16]; + struct bt_iso_io_qos out; +}; + #define BT_ISO_PHY_1M 0x01 #define BT_ISO_PHY_2M 0x02 #define BT_ISO_PHY_CODED 0x04 diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 53d3328c2b8b..60b6acb1be2b 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -1,6 +1,7 @@ /* BlueZ - Bluetooth protocol stack for Linux Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved. + Copyright 2023 NXP Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com> @@ -730,7 +731,9 @@ struct hci_conn { __s8 rssi; __s8 tx_power; __s8 max_tx_power; - struct bt_iso_qos iso_qos; + struct bt_iso_unicast_qos iso_unicast_qos; + struct bt_iso_bcast_sink_qos iso_sink_qos; + struct bt_iso_bcast_source_qos iso_source_qos; unsigned long flags; enum conn_reasons conn_reason; @@ -1090,7 +1093,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_bis(struct hci_dev *hdev, if (bacmp(&c->dst, ba) || c->type != ISO_LINK) continue; - if (c->iso_qos.big == big && c->iso_qos.bis == bis) { + if (c->iso_source_qos.big == big && c->iso_source_qos.bis == bis) { rcu_read_unlock(); return c; } @@ -1199,7 +1202,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_cig(struct hci_dev *hdev, if (c->type != ISO_LINK) continue; - if (handle == c->iso_qos.cig) { + if (handle == c->iso_unicast_qos.cig) { rcu_read_unlock(); return c; } @@ -1222,7 +1225,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_big(struct hci_dev *hdev, if (bacmp(&c->dst, BDADDR_ANY) || c->type != ISO_LINK) continue; - if (handle == c->iso_qos.big) { + if (handle == c->iso_source_qos.big) { rcu_read_unlock(); return c; } @@ -1324,15 +1327,15 @@ struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst, struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst, __u16 setting, struct bt_codec *codec); struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst, - __u8 dst_type, struct bt_iso_qos *qos); + __u8 dst_type, struct bt_iso_unicast_qos *qos); struct hci_conn *hci_connect_cis(struct hci_dev *hdev, bdaddr_t *dst, - __u8 dst_type, struct bt_iso_qos *qos); + __u8 dst_type, struct bt_iso_unicast_qos *qos); struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst, - __u8 dst_type, struct bt_iso_qos *qos, + __u8 dst_type, struct bt_iso_bcast_source_qos *qos, __u8 data_len, __u8 *data); int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type, - __u8 sid); -int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_qos *qos, + __u8 sid, struct bt_iso_bcast_sink_qos *qos); +int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_bcast_sink_qos *qos, __u16 sync_handle, __u8 num_bis, __u8 bis[]); int hci_conn_check_link_mode(struct hci_conn *conn); int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level); diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 17b946f9ba31..77f0c89a9089 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -1,6 +1,7 @@ /* BlueZ - Bluetooth protocol stack for Linux Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved. + Copyright 2023 NXP Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com> @@ -771,13 +772,22 @@ struct iso_list_data { static void bis_list(struct hci_conn *conn, void *data) { struct iso_list_data *d = data; + u8 check_big; + u8 check_bis = BT_ISO_QOS_BIS_UNSET; /* Skip if not broadcast/ANY address */ if (bacmp(&conn->dst, BDADDR_ANY)) return; - if (d->big != conn->iso_qos.big || d->bis == BT_ISO_QOS_BIS_UNSET || - d->bis != conn->iso_qos.bis) + if (conn->role == HCI_ROLE_MASTER) { + check_big = conn->iso_source_qos.big; + check_bis = conn->iso_source_qos.bis; + } else { + check_big = conn->iso_sink_qos.big; + } + + if (d->big != check_big || d->bis == BT_ISO_QOS_BIS_UNSET || + d->bis != check_bis) return; d->count++; @@ -897,10 +907,10 @@ static void bis_cleanup(struct hci_conn *conn) if (!test_and_clear_bit(HCI_CONN_PER_ADV, &conn->flags)) return; - hci_le_terminate_big(hdev, conn->iso_qos.big, - conn->iso_qos.bis); + hci_le_terminate_big(hdev, conn->iso_source_qos.big, + conn->iso_source_qos.bis); } else { - hci_le_big_terminate(hdev, conn->iso_qos.big, + hci_le_big_terminate(hdev, conn->iso_sink_qos.big, conn->sync_handle); } } @@ -940,7 +950,7 @@ static void cis_cleanup(struct hci_conn *conn) struct iso_list_data d; memset(&d, 0, sizeof(d)); - d.cig = conn->iso_qos.cig; + d.cig = conn->iso_unicast_qos.cig; /* Check if ISO connection is a CIS and remove CIG if there are * no other connections using it. @@ -949,7 +959,7 @@ static void cis_cleanup(struct hci_conn *conn) if (d.count) return; - hci_le_remove_cig(hdev, conn->iso_qos.cig); + hci_le_remove_cig(hdev, conn->iso_unicast_qos.cig); } struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst, @@ -1398,12 +1408,12 @@ static int hci_explicit_conn_params_set(struct hci_dev *hdev, return 0; } -static int qos_set_big(struct hci_dev *hdev, struct bt_iso_qos *qos) +static int qos_set_big(struct hci_dev *hdev, uint8_t *big) { struct iso_list_data data; /* Allocate a BIG if not set */ - if (qos->big == BT_ISO_QOS_BIG_UNSET) { + if (*big == BT_ISO_QOS_BIG_UNSET) { for (data.big = 0x00; data.big < 0xef; data.big++) { data.count = 0; data.bis = 0xff; @@ -1418,13 +1428,14 @@ static int qos_set_big(struct hci_dev *hdev, struct bt_iso_qos *qos) return -EADDRNOTAVAIL; /* Update BIG */ - qos->big = data.big; + *big = data.big; } return 0; } -static int qos_set_bis(struct hci_dev *hdev, struct bt_iso_qos *qos) +static int qos_set_bis(struct hci_dev *hdev, + struct bt_iso_bcast_source_qos *qos) { struct iso_list_data data; @@ -1455,7 +1466,7 @@ static int qos_set_bis(struct hci_dev *hdev, struct bt_iso_qos *qos) /* This function requires the caller holds hdev->lock */ static struct hci_conn *hci_add_bis(struct hci_dev *hdev, bdaddr_t *dst, - struct bt_iso_qos *qos) + struct bt_iso_bcast_source_qos *qos) { struct hci_conn *conn; struct iso_list_data data; @@ -1468,7 +1479,7 @@ static struct hci_conn *hci_add_bis(struct hci_dev *hdev, bdaddr_t *dst, return ERR_PTR(-EOPNOTSUPP); } - err = qos_set_big(hdev, qos); + err = qos_set_big(hdev, &qos->big); if (err) return ERR_PTR(err); @@ -1636,7 +1647,7 @@ struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst, return sco; } -static void cis_add(struct iso_list_data *d, struct bt_iso_qos *qos) +static void cis_add(struct iso_list_data *d, struct bt_iso_unicast_qos *qos) { struct hci_cis_params *cis = &d->pdu.cis[d->pdu.cp.num_cis]; @@ -1659,8 +1670,8 @@ static void cis_list(struct hci_conn *conn, void *data) if (!bacmp(&conn->dst, BDADDR_ANY)) return; - if (d->cig != conn->iso_qos.cig || d->cis == BT_ISO_QOS_CIS_UNSET || - d->cis != conn->iso_qos.cis) + if (d->cig != conn->iso_unicast_qos.cig || d->cis == BT_ISO_QOS_CIS_UNSET || + d->cis != conn->iso_unicast_qos.cis) return; d->count++; @@ -1669,10 +1680,11 @@ static void cis_list(struct hci_conn *conn, void *data) d->count >= ARRAY_SIZE(d->pdu.cis)) return; - cis_add(d, &conn->iso_qos); + cis_add(d, &conn->iso_unicast_qos); } -static int hci_le_create_big(struct hci_conn *conn, struct bt_iso_qos *qos) +static int hci_le_create_big(struct hci_conn *conn, + struct bt_iso_bcast_source_qos *qos) { struct hci_dev *hdev = conn->hdev; struct hci_cp_le_create_big cp; @@ -1689,13 +1701,14 @@ static int hci_le_create_big(struct hci_conn *conn, struct bt_iso_qos *qos) cp.bis.phy = qos->out.phy; cp.bis.packing = qos->packing; cp.bis.framing = qos->framing; - cp.bis.encryption = 0x00; - memset(&cp.bis.bcode, 0, sizeof(cp.bis.bcode)); + cp.bis.encryption = qos->encryption; + memcpy(&cp.bis.bcode, qos->bcode, sizeof(cp.bis.bcode)); return hci_send_cmd(hdev, HCI_OP_LE_CREATE_BIG, sizeof(cp), &cp); } -static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos) +static bool hci_le_set_cig_params(struct hci_conn *conn, + struct bt_iso_unicast_qos *qos) { struct hci_dev *hdev = conn->hdev; struct iso_list_data data; @@ -1779,7 +1792,7 @@ static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos) } struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst, - __u8 dst_type, struct bt_iso_qos *qos) + __u8 dst_type, struct bt_iso_unicast_qos *qos) { struct hci_conn *cis; @@ -1797,7 +1810,7 @@ struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst, /* Check if CIS has been set and the settings matches */ if (cis->state == BT_BOUND && - !memcmp(&cis->iso_qos, qos, sizeof(*qos))) + !memcmp(&cis->iso_unicast_qos, qos, sizeof(*qos))) return cis; /* Update LINK PHYs according to QoS preference */ @@ -1833,7 +1846,7 @@ struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst, return ERR_PTR(-EINVAL); } - cis->iso_qos = *qos; + cis->iso_unicast_qos = *qos; cis->state = BT_BOUND; return cis; @@ -1843,10 +1856,19 @@ bool hci_iso_setup_path(struct hci_conn *conn) { struct hci_dev *hdev = conn->hdev; struct hci_cp_le_setup_iso_path cmd; + struct bt_iso_io_qos *in = NULL; + struct bt_iso_io_qos *out = NULL; memset(&cmd, 0, sizeof(cmd)); - if (conn->iso_qos.out.sdu) { + if (bacmp(&conn->dst, BDADDR_ANY)) { + in = &conn->iso_unicast_qos.in; + out = &conn->iso_unicast_qos.out; + } else { + out = &conn->iso_source_qos.out; + } + + if (out->sdu) { cmd.handle = cpu_to_le16(conn->handle); cmd.direction = 0x00; /* Input (Host to Controller) */ cmd.path = 0x00; /* HCI path if enabled */ @@ -1857,7 +1879,7 @@ bool hci_iso_setup_path(struct hci_conn *conn) return false; } - if (conn->iso_qos.in.sdu) { + if (in && in->sdu) { cmd.handle = cpu_to_le16(conn->handle); cmd.direction = 0x01; /* Output (Controller to Host) */ cmd.path = 0x00; /* HCI path if enabled */ @@ -1884,7 +1906,7 @@ static int hci_create_cis_sync(struct hci_dev *hdev, void *data) cmd.cis[0].acl_handle = cpu_to_le16(conn->link->handle); cmd.cis[0].cis_handle = cpu_to_le16(conn->handle); cmd.cp.num_cis++; - cig = conn->iso_qos.cig; + cig = conn->iso_unicast_qos.cig; hci_dev_lock(hdev); @@ -1894,7 +1916,7 @@ static int hci_create_cis_sync(struct hci_dev *hdev, void *data) struct hci_cis *cis = &cmd.cis[cmd.cp.num_cis]; if (conn == data || conn->type != ISO_LINK || - conn->state == BT_CONNECTED || conn->iso_qos.cig != cig) + conn->state == BT_CONNECTED || conn->iso_unicast_qos.cig != cig) continue; /* Check if all CIS(s) belonging to a CIG are ready */ @@ -1991,19 +2013,19 @@ static void hci_iso_qos_setup(struct hci_dev *hdev, struct hci_conn *conn, } static void hci_bind_bis(struct hci_conn *conn, - struct bt_iso_qos *qos) + struct bt_iso_bcast_source_qos *qos) { /* Update LINK PHYs according to QoS preference */ conn->le_tx_phy = qos->out.phy; conn->le_tx_phy = qos->out.phy; - conn->iso_qos = *qos; + conn->iso_source_qos = *qos; conn->state = BT_BOUND; } static int create_big_sync(struct hci_dev *hdev, void *data) { struct hci_conn *conn = data; - struct bt_iso_qos *qos = &conn->iso_qos; + struct bt_iso_bcast_source_qos *qos = &conn->iso_source_qos; u16 interval, sync_interval = 0; u32 flags = 0; int err; @@ -2023,7 +2045,7 @@ static int create_big_sync(struct hci_dev *hdev, void *data) if (err) return err; - return hci_le_create_big(conn, &conn->iso_qos); + return hci_le_create_big(conn, &conn->iso_source_qos); } static void create_pa_complete(struct hci_dev *hdev, void *data, int err) @@ -2054,7 +2076,7 @@ static int create_pa_sync(struct hci_dev *hdev, void *data) } int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type, - __u8 sid) + __u8 sid, struct bt_iso_bcast_sink_qos *qos) { struct hci_cp_le_pa_create_sync *cp; @@ -2067,15 +2089,19 @@ int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type, return -ENOMEM; } + cp->options = qos->options; cp->sid = sid; cp->addr_type = dst_type; + cp->skip = qos->skip; + cp->sync_timeout = qos->sync_timeout; + cp->sync_cte_type = qos->sync_cte_type; bacpy(&cp->addr, dst); /* Queue start pa_create_sync and scan */ return hci_cmd_sync_queue(hdev, create_pa_sync, cp, create_pa_complete); } -int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_qos *qos, +int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_bcast_sink_qos *qos, __u16 sync_handle, __u8 num_bis, __u8 bis[]) { struct _packed { @@ -2087,13 +2113,17 @@ int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_qos *qos, if (num_bis > sizeof(pdu.bis)) return -EINVAL; - err = qos_set_big(hdev, qos); + err = qos_set_big(hdev, &qos->big); if (err) return err; memset(&pdu, 0, sizeof(pdu)); pdu.cp.handle = qos->big; pdu.cp.sync_handle = cpu_to_le16(sync_handle); + pdu.cp.encryption = qos->encryption; + memcpy(pdu.cp.bcode, qos->bcode, sizeof(pdu.cp.bcode)); + pdu.cp.mse = qos->mse; + pdu.cp.timeout = qos->timeout; pdu.cp.num_bis = num_bis; memcpy(pdu.bis, bis, num_bis); @@ -2115,7 +2145,7 @@ static void create_big_complete(struct hci_dev *hdev, void *data, int err) } struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst, - __u8 dst_type, struct bt_iso_qos *qos, + __u8 dst_type, struct bt_iso_bcast_source_qos *qos, __u8 base_len, __u8 *base) { struct hci_conn *conn; @@ -2151,7 +2181,7 @@ struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst, } struct hci_conn *hci_connect_cis(struct hci_dev *hdev, bdaddr_t *dst, - __u8 dst_type, struct bt_iso_qos *qos) + __u8 dst_type, struct bt_iso_unicast_qos *qos) { struct hci_conn *le; struct hci_conn *cis; diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 8d8547fa9032..8428a3f75ef7 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1,6 +1,7 @@ /* BlueZ - Bluetooth protocol stack for Linux Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved. + Copyright 2023 NXP Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com> @@ -3843,7 +3844,7 @@ static u8 hci_cc_le_set_cig_params(struct hci_dev *hdev, void *data, rcu_read_lock(); list_for_each_entry_rcu(conn, &hdev->conn_hash.list, list) { - if (conn->type != ISO_LINK || conn->iso_qos.cig != rp->cig_id || + if (conn->type != ISO_LINK || conn->iso_unicast_qos.cig != rp->cig_id || conn->state == BT_CONNECTED) continue; @@ -3877,6 +3878,7 @@ static u8 hci_cc_le_setup_iso_path(struct hci_dev *hdev, void *data, struct hci_rp_le_setup_iso_path *rp = data; struct hci_cp_le_setup_iso_path *cp; struct hci_conn *conn; + bool cfm; bt_dev_dbg(hdev, "status 0x%2.2x", rp->status); @@ -3900,12 +3902,14 @@ static u8 hci_cc_le_setup_iso_path(struct hci_dev *hdev, void *data, /* Input (Host to Controller) */ case 0x00: /* Only confirm connection if output only */ - if (conn->iso_qos.out.sdu && !conn->iso_qos.in.sdu) + cfm = !bacmp(&conn->dst, BDADDR_ANY) || + (conn->iso_unicast_qos.out.sdu && !conn->iso_unicast_qos.in.sdu); + if (cfm) hci_connect_cfm(conn, rp->status); break; /* Output (Controller to Host) */ case 0x01: - /* Confirm connection since conn->iso_qos is always configured + /* Confirm connection since Output is always configured * last. */ hci_connect_cfm(conn, rp->status); @@ -6822,15 +6826,15 @@ static void hci_le_cis_estabilished_evt(struct hci_dev *hdev, void *data, memset(&interval, 0, sizeof(interval)); memcpy(&interval, ev->c_latency, sizeof(ev->c_latency)); - conn->iso_qos.in.interval = le32_to_cpu(interval); + conn->iso_unicast_qos.in.interval = le32_to_cpu(interval); memcpy(&interval, ev->p_latency, sizeof(ev->p_latency)); - conn->iso_qos.out.interval = le32_to_cpu(interval); - conn->iso_qos.in.latency = le16_to_cpu(ev->interval); - conn->iso_qos.out.latency = le16_to_cpu(ev->interval); - conn->iso_qos.in.sdu = le16_to_cpu(ev->c_mtu); - conn->iso_qos.out.sdu = le16_to_cpu(ev->p_mtu); - conn->iso_qos.in.phy = ev->c_phy; - conn->iso_qos.out.phy = ev->p_phy; + conn->iso_unicast_qos.out.interval = le32_to_cpu(interval); + conn->iso_unicast_qos.in.latency = le16_to_cpu(ev->interval); + conn->iso_unicast_qos.out.latency = le16_to_cpu(ev->interval); + conn->iso_unicast_qos.in.sdu = le16_to_cpu(ev->c_mtu); + conn->iso_unicast_qos.out.sdu = le16_to_cpu(ev->p_mtu); + conn->iso_unicast_qos.in.phy = ev->c_phy; + conn->iso_unicast_qos.out.phy = ev->p_phy; } if (!ev->status) { @@ -6904,8 +6908,8 @@ static void hci_le_cis_req_evt(struct hci_dev *hdev, void *data, cis->handle = cis_handle; } - cis->iso_qos.cig = ev->cig_id; - cis->iso_qos.cis = ev->cis_id; + cis->iso_unicast_qos.cig = ev->cig_id; + cis->iso_unicast_qos.cis = ev->cis_id; if (!(flags & HCI_PROTO_DEFER)) { hci_le_accept_cis(hdev, ev->cis_handle); @@ -6992,13 +6996,13 @@ static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data, bis->handle = handle; } - bis->iso_qos.big = ev->handle; + bis->iso_sink_qos.big = ev->handle; memset(&interval, 0, sizeof(interval)); memcpy(&interval, ev->latency, sizeof(ev->latency)); - bis->iso_qos.in.interval = le32_to_cpu(interval); + bis->iso_sink_qos.in.interval = le32_to_cpu(interval); /* Convert ISO Interval (1.25 ms slots) to latency (ms) */ - bis->iso_qos.in.latency = le16_to_cpu(ev->interval) * 125 / 100; - bis->iso_qos.in.sdu = le16_to_cpu(ev->max_pdu); + bis->iso_sink_qos.in.latency = le16_to_cpu(ev->interval) * 125 / 100; + bis->iso_sink_qos.in.sdu = le16_to_cpu(ev->max_pdu); hci_connect_cfm(bis, ev->status); } diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c index 8d136a730163..e660e1c5ea11 100644 --- a/net/bluetooth/iso.c +++ b/net/bluetooth/iso.c @@ -3,6 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2022 Intel Corporation + * Copyright 2023 NXP */ #include <linux/module.h> @@ -58,7 +59,9 @@ struct iso_pinfo { __u8 bc_bis[ISO_MAX_NUM_BIS]; __u16 sync_handle; __u32 flags; - struct bt_iso_qos qos; + struct bt_iso_unicast_qos unicast_qos; + struct bt_iso_bcast_sink_qos sink_qos; + struct bt_iso_bcast_source_qos source_qos; __u8 base_len; __u8 base[BASE_MAX_LENGTH]; struct iso_conn *conn; @@ -265,14 +268,14 @@ static int iso_connect_bis(struct sock *sk) } /* Fail if out PHYs are marked as disabled */ - if (!iso_pi(sk)->qos.out.phy) { + if (!iso_pi(sk)->source_qos.out.phy) { err = -EINVAL; goto unlock; } hcon = hci_connect_bis(hdev, &iso_pi(sk)->dst, le_addr_type(iso_pi(sk)->dst_type), - &iso_pi(sk)->qos, iso_pi(sk)->base_len, + &iso_pi(sk)->source_qos, iso_pi(sk)->base_len, iso_pi(sk)->base); if (IS_ERR(hcon)) { err = PTR_ERR(hcon); @@ -337,7 +340,7 @@ static int iso_connect_cis(struct sock *sk) } /* Fail if either PHYs are marked as disabled */ - if (!iso_pi(sk)->qos.in.phy && !iso_pi(sk)->qos.out.phy) { + if (!iso_pi(sk)->unicast_qos.in.phy && !iso_pi(sk)->unicast_qos.out.phy) { err = -EINVAL; goto unlock; } @@ -346,7 +349,7 @@ static int iso_connect_cis(struct sock *sk) if (test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) { hcon = hci_bind_cis(hdev, &iso_pi(sk)->dst, le_addr_type(iso_pi(sk)->dst_type), - &iso_pi(sk)->qos); + &iso_pi(sk)->unicast_qos); if (IS_ERR(hcon)) { err = PTR_ERR(hcon); goto unlock; @@ -354,7 +357,7 @@ static int iso_connect_cis(struct sock *sk) } else { hcon = hci_connect_cis(hdev, &iso_pi(sk)->dst, le_addr_type(iso_pi(sk)->dst_type), - &iso_pi(sk)->qos); + &iso_pi(sk)->unicast_qos); if (IS_ERR(hcon)) { err = PTR_ERR(hcon); goto unlock; @@ -400,24 +403,40 @@ static int iso_connect_cis(struct sock *sk) return err; } -static struct bt_iso_qos *iso_sock_get_qos(struct sock *sk) +static struct bt_iso_unicast_qos *iso_sock_get_unicast_qos(struct sock *sk) { if (sk->sk_state == BT_CONNECTED || sk->sk_state == BT_CONNECT2) - return &iso_pi(sk)->conn->hcon->iso_qos; + return &iso_pi(sk)->conn->hcon->iso_unicast_qos; - return &iso_pi(sk)->qos; + return &iso_pi(sk)->unicast_qos; } -static int iso_send_frame(struct sock *sk, struct sk_buff *skb) +static struct bt_iso_bcast_sink_qos *iso_sock_get_bcast_sink_qos(struct sock *sk) +{ + if (sk->sk_state == BT_CONNECTED || sk->sk_state == BT_CONNECT2) + return &iso_pi(sk)->conn->hcon->iso_sink_qos; + + return &iso_pi(sk)->sink_qos; +} + +static struct bt_iso_bcast_source_qos *iso_sock_get_bcast_source_qos(struct sock *sk) +{ + if (sk->sk_state == BT_CONNECTED || sk->sk_state == BT_CONNECT2) + return &iso_pi(sk)->conn->hcon->iso_source_qos; + + return &iso_pi(sk)->source_qos; +} + +static int iso_send_frame(struct sock *sk, struct sk_buff *skb, + struct bt_iso_io_qos *out) { struct iso_conn *conn = iso_pi(sk)->conn; - struct bt_iso_qos *qos = iso_sock_get_qos(sk); struct hci_iso_data_hdr *hdr; int len = 0; BT_DBG("sk %p len %d", sk, skb->len); - if (skb->len > qos->out.sdu) + if (skb->len > out->sdu) return -EMSGSIZE; len = skb->len; @@ -679,7 +698,7 @@ static struct proto iso_proto = { .rtn = 2u, \ } -static struct bt_iso_qos default_qos = { +static struct bt_iso_unicast_qos default_unicast_qos = { .cig = BT_ISO_QOS_CIG_UNSET, .cis = BT_ISO_QOS_CIS_UNSET, .sca = 0x00, @@ -689,6 +708,30 @@ static struct bt_iso_qos default_qos = { .out = DEFAULT_IO_QOS, }; +static struct bt_iso_bcast_sink_qos default_sink_qos = { + .options = 0x00, + .skip = 0x0000, + .sync_timeout = 0x4000, + .sync_cte_type = 0x0000, + .big = BT_ISO_QOS_BIG_UNSET, + .encryption = 0x00, + .bcode = {0x00}, + .mse = 0x00, + .timeout = 0x4000, + .in = DEFAULT_IO_QOS, +}; + +static struct bt_iso_bcast_source_qos default_source_qos = { + .sync_interval = 0x07, + .big = BT_ISO_QOS_BIG_UNSET, + .bis = BT_ISO_QOS_BIS_UNSET, + .packing = 0x00, + .framing = 0x00, + .encryption = 0x00, + .bcode = {0x00}, + .out = DEFAULT_IO_QOS, +}; + static struct sock *iso_sock_alloc(struct net *net, struct socket *sock, int proto, gfp_t prio, int kern) { @@ -712,7 +755,9 @@ static struct sock *iso_sock_alloc(struct net *net, struct socket *sock, /* Set address type as public as default src address is BDADDR_ANY */ iso_pi(sk)->src_type = BDADDR_LE_PUBLIC; - iso_pi(sk)->qos = default_qos; + iso_pi(sk)->unicast_qos = default_unicast_qos; + iso_pi(sk)->sink_qos = default_sink_qos; + iso_pi(sk)->source_qos = default_source_qos; bt_sock_link(&iso_sk_list, sk); return sk; @@ -895,7 +940,7 @@ static int iso_listen_bis(struct sock *sk) err = hci_pa_create_sync(hdev, &iso_pi(sk)->dst, le_addr_type(iso_pi(sk)->dst_type), - iso_pi(sk)->bc_sid); + iso_pi(sk)->bc_sid, &iso_pi(sk)->sink_qos); hci_dev_put(hdev); @@ -1086,10 +1131,15 @@ static int iso_sock_sendmsg(struct socket *sock, struct msghdr *msg, lock_sock(sk); - if (sk->sk_state == BT_CONNECTED) - err = iso_send_frame(sk, skb); - else + if (sk->sk_state == BT_CONNECTED) { + if (bacmp(&conn->hcon->dst, BDADDR_ANY)) + err = iso_send_frame(sk, skb, &iso_sock_get_unicast_qos(sk)->out); + else + err = iso_send_frame(sk, skb, + &iso_sock_get_bcast_source_qos(sk)->out); + } else { err = -ENOTCONN; + } release_sock(sk); @@ -1154,7 +1204,7 @@ static bool check_io_qos(struct bt_iso_io_qos *qos) return true; } -static bool check_qos(struct bt_iso_qos *qos) +static bool check_unicast_qos(struct bt_iso_unicast_qos *qos) { if (qos->sca > 0x07) return false; @@ -1174,12 +1224,60 @@ static bool check_qos(struct bt_iso_qos *qos) return true; } +static bool check_bcast_sink_qos(struct bt_iso_bcast_sink_qos *qos) +{ + if (qos->options > 0x07) + return false; + + if (qos->skip > 0x01f3) + return false; + + if (qos->sync_timeout < 0x000a || qos->sync_timeout > 0x4000) + return false; + + if (qos->sync_cte_type > 0x1f) + return false; + + if (qos->encryption > 0x01) + return false; + + if (qos->mse > 0x1f) + return false; + + if (qos->timeout < 0x000a || qos->timeout > 0x4000) + return false; + + if (!check_io_qos(&qos->in)) + return false; + + return true; +} + +static bool check_bcast_source_qos(struct bt_iso_bcast_source_qos *qos) +{ + if (qos->sync_interval > 0x07) + return false; + + if (qos->packing > 0x01) + return false; + + if (qos->framing > 0x01) + return false; + + if (qos->encryption > 0x01) + return false; + + if (!check_io_qos(&qos->out)) + return false; + + return true; +} + static int iso_sock_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval, unsigned int optlen) { struct sock *sk = sock->sk; int len, err = 0; - struct bt_iso_qos qos; u32 opt; BT_DBG("sk %p", sk); @@ -1204,32 +1302,96 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname, clear_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags); break; - case BT_ISO_QOS: + case BT_ISO_UNICAST_QOS: + struct bt_iso_unicast_qos unicast_qos; + + if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND && + sk->sk_state != BT_CONNECT2) { + err = -EINVAL; + break; + } + + len = min_t(unsigned int, sizeof(unicast_qos), optlen); + if (len != sizeof(unicast_qos)) { + err = -EINVAL; + break; + } + + memset(&unicast_qos, 0, sizeof(unicast_qos)); + + if (copy_from_sockptr(&unicast_qos, optval, len)) { + err = -EFAULT; + break; + } + + if (!check_unicast_qos(&unicast_qos)) { + err = -EINVAL; + break; + } + + iso_pi(sk)->unicast_qos = unicast_qos; + + break; + + case BT_ISO_BCAST_SINK_QOS: + struct bt_iso_bcast_sink_qos sink_qos; + if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND && sk->sk_state != BT_CONNECT2) { err = -EINVAL; break; } - len = min_t(unsigned int, sizeof(qos), optlen); - if (len != sizeof(qos)) { + len = min_t(unsigned int, sizeof(sink_qos), optlen); + if (len != sizeof(sink_qos)) { err = -EINVAL; break; } - memset(&qos, 0, sizeof(qos)); + memset(&sink_qos, 0, sizeof(sink_qos)); - if (copy_from_sockptr(&qos, optval, len)) { + if (copy_from_sockptr(&sink_qos, optval, len)) { err = -EFAULT; break; } - if (!check_qos(&qos)) { + if (!check_bcast_sink_qos(&sink_qos)) { err = -EINVAL; break; } - iso_pi(sk)->qos = qos; + iso_pi(sk)->sink_qos = sink_qos; + + break; + + case BT_ISO_BCAST_SOURCE_QOS: + struct bt_iso_bcast_source_qos source_qos; + + if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND && + sk->sk_state != BT_CONNECT2) { + err = -EINVAL; + break; + } + + len = min_t(unsigned int, sizeof(source_qos), optlen); + if (len != sizeof(source_qos)) { + err = -EINVAL; + break; + } + + memset(&source_qos, 0, sizeof(source_qos)); + + if (copy_from_sockptr(&source_qos, optval, len)) { + err = -EFAULT; + break; + } + + if (!check_bcast_source_qos(&source_qos)) { + err = -EINVAL; + break; + } + + iso_pi(sk)->source_qos = source_qos; break; @@ -1270,7 +1432,6 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname, { struct sock *sk = sock->sk; int len, err = 0; - struct bt_iso_qos *qos; u8 base_len; u8 *base; @@ -1294,11 +1455,29 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname, break; - case BT_ISO_QOS: - qos = iso_sock_get_qos(sk); + case BT_ISO_UNICAST_QOS: + struct bt_iso_unicast_qos *unicast_qos = iso_sock_get_unicast_qos(sk); + + len = min_t(unsigned int, len, sizeof(*unicast_qos)); + if (copy_to_user(optval, unicast_qos, len)) + err = -EFAULT; + + break; + + case BT_ISO_BCAST_SINK_QOS: + struct bt_iso_bcast_sink_qos *sink_qos = iso_sock_get_bcast_sink_qos(sk); + + len = min_t(unsigned int, len, sizeof(*sink_qos)); + if (copy_to_user(optval, sink_qos, len)) + err = -EFAULT; + + break; + + case BT_ISO_BCAST_SOURCE_QOS: + struct bt_iso_bcast_source_qos *source_qos = iso_sock_get_bcast_source_qos(sk); - len = min_t(unsigned int, len, sizeof(*qos)); - if (copy_to_user(optval, qos, len)) + len = min_t(unsigned int, len, sizeof(*source_qos)); + if (copy_to_user(optval, source_qos, len)) err = -EFAULT; break; @@ -1419,7 +1598,7 @@ static bool iso_match_big(struct sock *sk, void *data) { struct hci_evt_le_big_sync_estabilished *ev = data; - return ev->handle == iso_pi(sk)->qos.big; + return ev->handle == iso_pi(sk)->sink_qos.big; } static void iso_conn_ready(struct iso_conn *conn) @@ -1550,7 +1729,7 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags) iso_pi(sk)->bc_num_bis = ev2->num_bis; err = hci_le_big_create_sync(hdev, - &iso_pi(sk)->qos, + &iso_pi(sk)->sink_qos, iso_pi(sk)->sync_handle, iso_pi(sk)->bc_num_bis, iso_pi(sk)->bc_bis); -- 2.34.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* RE: Split bt_iso_qos into dedicated structures 2023-03-20 14:36 ` [PATCH 1/1] Bluetooth: " Iulia Tanasescu @ 2023-03-20 15:03 ` bluez.test.bot 2023-03-20 18:43 ` [PATCH 1/1] Bluetooth: " Luiz Augusto von Dentz 2023-03-20 22:49 ` kernel test robot 2 siblings, 0 replies; 10+ messages in thread From: bluez.test.bot @ 2023-03-20 15:03 UTC (permalink / raw) To: linux-bluetooth, iulia.tanasescu [-- Attachment #1: Type: text/plain, Size: 20702 bytes --] 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=731871 ---Test result--- Test Summary: CheckPatch PASS 2.07 seconds GitLint PASS 0.27 seconds SubjectPrefix PASS 0.07 seconds BuildKernel FAIL 44.02 seconds CheckAllWarning FAIL 48.17 seconds CheckSparse FAIL 53.05 seconds CheckSmatch FAIL 141.54 seconds BuildKernel32 FAIL 42.20 seconds TestRunnerSetup FAIL 619.41 seconds TestRunner_l2cap-tester FAIL 0.10 seconds TestRunner_iso-tester FAIL 0.10 seconds TestRunner_bnep-tester FAIL 0.10 seconds TestRunner_mgmt-tester FAIL 0.11 seconds TestRunner_rfcomm-tester FAIL 0.10 seconds TestRunner_sco-tester FAIL 0.11 seconds TestRunner_ioctl-tester FAIL 0.11 seconds TestRunner_mesh-tester FAIL 0.10 seconds TestRunner_smp-tester FAIL 0.10 seconds TestRunner_userchan-tester FAIL 0.10 seconds IncrementalBuild FAIL 38.91 seconds Details ############################## Test: BuildKernel - FAIL Desc: Build Kernel for Bluetooth Output: net/bluetooth/iso.c: In function ‘iso_sock_setsockopt’: net/bluetooth/iso.c:1306:3: error: a label can only be part of a statement and a declaration is not a statement 1306 | struct bt_iso_unicast_qos unicast_qos; | ^~~~~~ net/bluetooth/iso.c:1337:3: error: a label can only be part of a statement and a declaration is not a statement 1337 | struct bt_iso_bcast_sink_qos sink_qos; | ^~~~~~ net/bluetooth/iso.c:1368:3: error: a label can only be part of a statement and a declaration is not a statement 1368 | struct bt_iso_bcast_source_qos source_qos; | ^~~~~~ net/bluetooth/iso.c: In function ‘iso_sock_getsockopt’: net/bluetooth/iso.c:1459:3: error: a label can only be part of a statement and a declaration is not a statement 1459 | struct bt_iso_unicast_qos *unicast_qos = iso_sock_get_unicast_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1468:3: error: a label can only be part of a statement and a declaration is not a statement 1468 | struct bt_iso_bcast_sink_qos *sink_qos = iso_sock_get_bcast_sink_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1477:3: error: a label can only be part of a statement and a declaration is not a statement 1477 | struct bt_iso_bcast_source_qos *source_qos = iso_sock_get_bcast_source_qos(sk); | ^~~~~~ make[3]: *** [scripts/Makefile.build:252: net/bluetooth/iso.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [scripts/Makefile.build:504: net/bluetooth] Error 2 make[1]: *** [scripts/Makefile.build:504: net] Error 2 make: *** [Makefile:2021: .] Error 2 ############################## Test: CheckAllWarning - FAIL Desc: Run linux kernel with all warning enabled Output: net/bluetooth/iso.c: In function ‘iso_sock_setsockopt’: net/bluetooth/iso.c:1306:3: error: a label can only be part of a statement and a declaration is not a statement 1306 | struct bt_iso_unicast_qos unicast_qos; | ^~~~~~ net/bluetooth/iso.c:1337:3: error: a label can only be part of a statement and a declaration is not a statement 1337 | struct bt_iso_bcast_sink_qos sink_qos; | ^~~~~~ net/bluetooth/iso.c:1368:3: error: a label can only be part of a statement and a declaration is not a statement 1368 | struct bt_iso_bcast_source_qos source_qos; | ^~~~~~ net/bluetooth/iso.c: In function ‘iso_sock_getsockopt’: net/bluetooth/iso.c:1459:3: error: a label can only be part of a statement and a declaration is not a statement 1459 | struct bt_iso_unicast_qos *unicast_qos = iso_sock_get_unicast_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1468:3: error: a label can only be part of a statement and a declaration is not a statement 1468 | struct bt_iso_bcast_sink_qos *sink_qos = iso_sock_get_bcast_sink_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1477:3: error: a label can only be part of a statement and a declaration is not a statement 1477 | struct bt_iso_bcast_source_qos *source_qos = iso_sock_get_bcast_source_qos(sk); | ^~~~~~ make[3]: *** [scripts/Makefile.build:252: net/bluetooth/iso.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [scripts/Makefile.build:504: net/bluetooth] Error 2 make[1]: *** [scripts/Makefile.build:504: net] Error 2 make: *** [Makefile:2021: .] Error 2 ############################## Test: CheckSparse - FAIL Desc: Run sparse tool with linux kernel Output: net/bluetooth/af_bluetooth.c:178:25: warning: context imbalance in 'bt_accept_enqueue' - different lock contexts for basic block drivers/bluetooth/hci_ag6xx.c:257:24: warning: restricted __le32 degrades to integer net/bluetooth/hci_conn.c:2095:18: warning: incorrect type in assignment (different base types) net/bluetooth/hci_conn.c:2095:18: expected restricted __le16 [usertype] skip net/bluetooth/hci_conn.c:2095:18: got unsigned short [usertype] skip net/bluetooth/hci_conn.c:2096:26: warning: incorrect type in assignment (different base types) net/bluetooth/hci_conn.c:2096:26: expected restricted __le16 [usertype] sync_timeout net/bluetooth/hci_conn.c:2096:26: got unsigned short [usertype] sync_timeout net/bluetooth/hci_conn.c:2126:24: warning: incorrect type in assignment (different base types) net/bluetooth/hci_conn.c:2126:24: expected restricted __le16 [addressable] [assigned] [usertype] timeout net/bluetooth/hci_conn.c:2126:24: got unsigned short [usertype] timeout drivers/bluetooth/hci_mrvl.c:170:23: warning: restricted __le16 degrades to integer drivers/bluetooth/hci_mrvl.c:203:23: warning: restricted __le16 degrades to integer net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h): ./include/net/bluetooth/hci.h:2638:47: warning: array of flexible structures ./include/net/bluetooth/hci.h:2724:43: warning: array of flexible structures drivers/bluetooth/btmtksdio.c:557:63: warning: Using plain integer as NULL pointer drivers/bluetooth/btmtksdio.c:579:55: warning: Using plain integer as NULL pointer drivers/bluetooth/btmtksdio.c:611:63: warning: Using plain integer as NULL pointer drivers/bluetooth/btmtksdio.c:624:63: warning: Using plain integer as NULL pointer drivers/bluetooth/btrtl.c: note: in included file: drivers/bluetooth/btrtl.h:52:45: warning: array of flexible structures drivers/bluetooth/btqca.c:637:24: warning: restricted __le32 degrades to integer drivers/bluetooth/hci_nokia.c:284:23: warning: incorrect type in assignment (different base types) drivers/bluetooth/hci_nokia.c:284:23: expected unsigned short [usertype] baud drivers/bluetooth/hci_nokia.c:284:23: got restricted __le16 [usertype] drivers/bluetooth/hci_nokia.c:287:26: warning: incorrect type in assignment (different base types) drivers/bluetooth/hci_nokia.c:287:26: expected unsigned short [usertype] sys_clk drivers/bluetooth/hci_nokia.c:287:26: got restricted __le16 [usertype] net/bluetooth/hci_codec.c: note: in included file: ./include/net/bluetooth/hci_core.h:149:35: warning: array of flexible structures net/bluetooth/sco.c: note: in included file: ./include/net/bluetooth/hci_core.h:149:35: warning: array of flexible structures net/bluetooth/iso.c: In function ‘iso_sock_setsockopt’: net/bluetooth/iso.c:1306:3: error: a label can only be part of a statement and a declaration is not a statement 1306 | struct bt_iso_unicast_qos unicast_qos; | ^~~~~~ net/bluetooth/iso.c:1337:3: error: a label can only be part of a statement and a declaration is not a statement 1337 | struct bt_iso_bcast_sink_qos sink_qos; | ^~~~~~ net/bluetooth/iso.c:1368:3: error: a label can only be part of a statement and a declaration is not a statement 1368 | struct bt_iso_bcast_source_qos source_qos; | ^~~~~~ net/bluetooth/iso.c: In function ‘iso_sock_getsockopt’: net/bluetooth/iso.c:1459:3: error: a label can only be part of a statement and a declaration is not a statement 1459 | struct bt_iso_unicast_qos *unicast_qos = iso_sock_get_unicast_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1468:3: error: a label can only be part of a statement and a declaration is not a statement 1468 | struct bt_iso_bcast_sink_qos *sink_qos = iso_sock_get_bcast_sink_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1477:3: error: a label can only be part of a statement and a declaration is not a statement 1477 | struct bt_iso_bcast_source_qos *source_qos = iso_sock_get_bcast_source_qos(sk); | ^~~~~~ make[3]: *** [scripts/Makefile.build:252: net/bluetooth/iso.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [scripts/Makefile.build:504: net/bluetooth] Error 2 make[1]: *** [scripts/Makefile.build:504: net] Error 2 make: *** [Makefile:2021: .] Error 2 ############################## Test: CheckSmatch - FAIL Desc: Run smatch tool with source Output: net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h): ./include/net/bluetooth/hci.h:2638:47: warning: array of flexible structures ./include/net/bluetooth/hci.h:2724:43: warning: array of flexible structures drivers/bluetooth/btrtl.c: note: in included file: drivers/bluetooth/btrtl.h:52:45: warning: array of flexible structures net/bluetooth/hci_codec.c: note: in included file: ./include/net/bluetooth/hci_core.h:149:35: warning: array of flexible structures net/bluetooth/sco.c: note: in included file: ./include/net/bluetooth/hci_core.h:149:35: warning: array of flexible structures net/bluetooth/iso.c: In function ‘iso_sock_setsockopt’: net/bluetooth/iso.c:1306:3: error: a label can only be part of a statement and a declaration is not a statement 1306 | struct bt_iso_unicast_qos unicast_qos; | ^~~~~~ net/bluetooth/iso.c:1337:3: error: a label can only be part of a statement and a declaration is not a statement 1337 | struct bt_iso_bcast_sink_qos sink_qos; | ^~~~~~ net/bluetooth/iso.c:1368:3: error: a label can only be part of a statement and a declaration is not a statement 1368 | struct bt_iso_bcast_source_qos source_qos; | ^~~~~~ net/bluetooth/iso.c: In function ‘iso_sock_getsockopt’: net/bluetooth/iso.c:1459:3: error: a label can only be part of a statement and a declaration is not a statement 1459 | struct bt_iso_unicast_qos *unicast_qos = iso_sock_get_unicast_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1468:3: error: a label can only be part of a statement and a declaration is not a statement 1468 | struct bt_iso_bcast_sink_qos *sink_qos = iso_sock_get_bcast_sink_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1477:3: error: a label can only be part of a statement and a declaration is not a statement 1477 | struct bt_iso_bcast_source_qos *source_qos = iso_sock_get_bcast_source_qos(sk); | ^~~~~~ make[3]: *** [scripts/Makefile.build:252: net/bluetooth/iso.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [scripts/Makefile.build:504: net/bluetooth] Error 2 make[1]: *** [scripts/Makefile.build:504: net] Error 2 make: *** [Makefile:2021: .] Error 2 ############################## Test: BuildKernel32 - FAIL Desc: Build 32bit Kernel for Bluetooth Output: net/bluetooth/iso.c: In function ‘iso_sock_setsockopt’: net/bluetooth/iso.c:1306:3: error: a label can only be part of a statement and a declaration is not a statement 1306 | struct bt_iso_unicast_qos unicast_qos; | ^~~~~~ net/bluetooth/iso.c:1337:3: error: a label can only be part of a statement and a declaration is not a statement 1337 | struct bt_iso_bcast_sink_qos sink_qos; | ^~~~~~ net/bluetooth/iso.c:1368:3: error: a label can only be part of a statement and a declaration is not a statement 1368 | struct bt_iso_bcast_source_qos source_qos; | ^~~~~~ net/bluetooth/iso.c: In function ‘iso_sock_getsockopt’: net/bluetooth/iso.c:1459:3: error: a label can only be part of a statement and a declaration is not a statement 1459 | struct bt_iso_unicast_qos *unicast_qos = iso_sock_get_unicast_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1468:3: error: a label can only be part of a statement and a declaration is not a statement 1468 | struct bt_iso_bcast_sink_qos *sink_qos = iso_sock_get_bcast_sink_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1477:3: error: a label can only be part of a statement and a declaration is not a statement 1477 | struct bt_iso_bcast_source_qos *source_qos = iso_sock_get_bcast_source_qos(sk); | ^~~~~~ make[3]: *** [scripts/Makefile.build:252: net/bluetooth/iso.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [scripts/Makefile.build:504: net/bluetooth] Error 2 make[1]: *** [scripts/Makefile.build:504: net] Error 2 make: *** [Makefile:2021: .] Error 2 ############################## Test: TestRunnerSetup - FAIL Desc: Setup kernel and bluez for test-runner Output: Kernel: net/bluetooth/iso.c: In function ‘iso_sock_setsockopt’: net/bluetooth/iso.c:1306:3: error: a label can only be part of a statement and a declaration is not a statement 1306 | struct bt_iso_unicast_qos unicast_qos; | ^~~~~~ net/bluetooth/iso.c:1337:3: error: a label can only be part of a statement and a declaration is not a statement 1337 | struct bt_iso_bcast_sink_qos sink_qos; | ^~~~~~ net/bluetooth/iso.c:1368:3: error: a label can only be part of a statement and a declaration is not a statement 1368 | struct bt_iso_bcast_source_qos source_qos; | ^~~~~~ net/bluetooth/iso.c: In function ‘iso_sock_getsockopt’: net/bluetooth/iso.c:1459:3: error: a label can only be part of a statement and a declaration is not a statement 1459 | struct bt_iso_unicast_qos *unicast_qos = iso_sock_get_unicast_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1468:3: error: a label can only be part of a statement and a declaration is not a statement 1468 | struct bt_iso_bcast_sink_qos *sink_qos = iso_sock_get_bcast_sink_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1477:3: error: a label can only be part of a statement and a declaration is not a statement 1477 | struct bt_iso_bcast_source_qos *source_qos = iso_sock_get_bcast_source_qos(sk); | ^~~~~~ make[3]: *** [scripts/Makefile.build:252: net/bluetooth/iso.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [scripts/Makefile.build:504: net/bluetooth] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [scripts/Makefile.build:504: net] Error 2 make: *** [Makefile:2021: .] Error 2 ############################## Test: TestRunner_l2cap-tester - FAIL Desc: Run l2cap-tester with test-runner Output: Could not access KVM kernel module: No such file or directory qemu-system-x86_64: failed to initialize KVM: No such file or directory qemu-system-x86_64: Back to tcg accelerator qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory ############################## Test: TestRunner_iso-tester - FAIL Desc: Run iso-tester with test-runner Output: Could not access KVM kernel module: No such file or directory qemu-system-x86_64: failed to initialize KVM: No such file or directory qemu-system-x86_64: Back to tcg accelerator qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory ############################## Test: TestRunner_bnep-tester - FAIL Desc: Run bnep-tester with test-runner Output: Could not access KVM kernel module: No such file or directory qemu-system-x86_64: failed to initialize KVM: No such file or directory qemu-system-x86_64: Back to tcg accelerator qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory ############################## Test: TestRunner_mgmt-tester - FAIL Desc: Run mgmt-tester with test-runner Output: Could not access KVM kernel module: No such file or directory qemu-system-x86_64: failed to initialize KVM: No such file or directory qemu-system-x86_64: Back to tcg accelerator qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory ############################## Test: TestRunner_rfcomm-tester - FAIL Desc: Run rfcomm-tester with test-runner Output: Could not access KVM kernel module: No such file or directory qemu-system-x86_64: failed to initialize KVM: No such file or directory qemu-system-x86_64: Back to tcg accelerator qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory ############################## Test: TestRunner_sco-tester - FAIL Desc: Run sco-tester with test-runner Output: Could not access KVM kernel module: No such file or directory qemu-system-x86_64: failed to initialize KVM: No such file or directory qemu-system-x86_64: Back to tcg accelerator qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory ############################## Test: TestRunner_ioctl-tester - FAIL Desc: Run ioctl-tester with test-runner Output: Could not access KVM kernel module: No such file or directory qemu-system-x86_64: failed to initialize KVM: No such file or directory qemu-system-x86_64: Back to tcg accelerator qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory ############################## Test: TestRunner_mesh-tester - FAIL Desc: Run mesh-tester with test-runner Output: Could not access KVM kernel module: No such file or directory qemu-system-x86_64: failed to initialize KVM: No such file or directory qemu-system-x86_64: Back to tcg accelerator qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory ############################## Test: TestRunner_smp-tester - FAIL Desc: Run smp-tester with test-runner Output: Could not access KVM kernel module: No such file or directory qemu-system-x86_64: failed to initialize KVM: No such file or directory qemu-system-x86_64: Back to tcg accelerator qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory ############################## Test: TestRunner_userchan-tester - FAIL Desc: Run userchan-tester with test-runner Output: Could not access KVM kernel module: No such file or directory qemu-system-x86_64: failed to initialize KVM: No such file or directory qemu-system-x86_64: Back to tcg accelerator qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory ############################## Test: IncrementalBuild - FAIL Desc: Incremental build with the patches in the series Output: [1/1] Bluetooth: Split bt_iso_qos into dedicated structures net/bluetooth/iso.c: In function ‘iso_sock_setsockopt’: net/bluetooth/iso.c:1306:3: error: a label can only be part of a statement and a declaration is not a statement 1306 | struct bt_iso_unicast_qos unicast_qos; | ^~~~~~ net/bluetooth/iso.c:1337:3: error: a label can only be part of a statement and a declaration is not a statement 1337 | struct bt_iso_bcast_sink_qos sink_qos; | ^~~~~~ net/bluetooth/iso.c:1368:3: error: a label can only be part of a statement and a declaration is not a statement 1368 | struct bt_iso_bcast_source_qos source_qos; | ^~~~~~ net/bluetooth/iso.c: In function ‘iso_sock_getsockopt’: net/bluetooth/iso.c:1459:3: error: a label can only be part of a statement and a declaration is not a statement 1459 | struct bt_iso_unicast_qos *unicast_qos = iso_sock_get_unicast_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1468:3: error: a label can only be part of a statement and a declaration is not a statement 1468 | struct bt_iso_bcast_sink_qos *sink_qos = iso_sock_get_bcast_sink_qos(sk); | ^~~~~~ net/bluetooth/iso.c:1477:3: error: a label can only be part of a statement and a declaration is not a statement 1477 | struct bt_iso_bcast_source_qos *source_qos = iso_sock_get_bcast_source_qos(sk); | ^~~~~~ make[3]: *** [scripts/Makefile.build:252: net/bluetooth/iso.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [scripts/Makefile.build:504: net/bluetooth] Error 2 make[1]: *** [scripts/Makefile.build:504: net] Error 2 make: *** [Makefile:2021: .] Error 2 --- Regards, Linux Bluetooth ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] Bluetooth: Split bt_iso_qos into dedicated structures 2023-03-20 14:36 ` [PATCH 1/1] Bluetooth: " Iulia Tanasescu 2023-03-20 15:03 ` bluez.test.bot @ 2023-03-20 18:43 ` Luiz Augusto von Dentz 2023-03-21 8:08 ` Iulia Tanasescu 2023-03-22 15:23 ` Iulia Tanasescu 2023-03-20 22:49 ` kernel test robot 2 siblings, 2 replies; 10+ messages in thread From: Luiz Augusto von Dentz @ 2023-03-20 18:43 UTC (permalink / raw) To: Iulia Tanasescu; +Cc: linux-bluetooth Hi Iulia, On Mon, Mar 20, 2023 at 7:38 AM Iulia Tanasescu <iulia.tanasescu@nxp.com> wrote: > > Split bt_iso_qos into dedicated unicast and broadcast > structures and add missing broadcast parameters > > Signed-off-by: Iulia Tanasescu <iulia.tanasescu@nxp.com> > --- > include/net/bluetooth/bluetooth.h | 47 ++++-- > include/net/bluetooth/hci_core.h | 21 +-- > net/bluetooth/hci_conn.c | 104 ++++++++----- > net/bluetooth/hci_event.c | 38 +++-- > net/bluetooth/iso.c | 247 ++++++++++++++++++++++++++---- > 5 files changed, 346 insertions(+), 111 deletions(-) > > diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h > index bcc5a4cd2c17..24d303783ea4 100644 > --- a/include/net/bluetooth/bluetooth.h > +++ b/include/net/bluetooth/bluetooth.h > @@ -1,6 +1,7 @@ > /* > BlueZ - Bluetooth protocol stack for Linux > Copyright (C) 2000-2001 Qualcomm Incorporated > + Copyright 2023 NXP > > Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com> > > @@ -155,11 +156,14 @@ struct bt_voice { > > #define BT_SCM_PKT_STATUS 0x03 > > -#define BT_ISO_QOS 17 > +#define BT_ISO_UNICAST_QOS 17 Lets keep a single opcode for setting QoS parameters. > #define BT_ISO_QOS_CIG_UNSET 0xff > #define BT_ISO_QOS_CIS_UNSET 0xff > > +#define BT_ISO_BCAST_SINK_QOS 18 > +#define BT_ISO_BCAST_SOURCE_QOS 19 > + > #define BT_ISO_QOS_BIG_UNSET 0xff > #define BT_ISO_QOS_BIS_UNSET 0xff > > @@ -171,25 +175,40 @@ struct bt_iso_io_qos { > __u8 rtn; > }; > > -struct bt_iso_qos { > - union { > - __u8 cig; > - __u8 big; > - }; > - union { > - __u8 cis; > - __u8 bis; > - }; > - union { > - __u8 sca; > - __u8 sync_interval; > - }; > +struct bt_iso_unicast_qos { > + __u8 cig; > + __u8 cis; > + __u8 sca; > __u8 packing; > __u8 framing; > struct bt_iso_io_qos in; > struct bt_iso_io_qos out; > }; How about something like: struct bt_iso_qos { union { struct bt_iso_ucast_qos ucast; struct bt_iso_bcast_qos bcast; }; }; struct bt_iso_bcast_qos { union { struct bt_iso_bcast_src_qos bsrc; struct bt_iso_bcast_snk_qos bsnk; }; }; > +struct bt_iso_bcast_sink_qos { > + __u8 options; > + __u16 skip; > + __u16 sync_timeout; > + __u8 sync_cte_type; > + __u8 big; > + __u8 encryption; > + __u8 bcode[16]; > + __u8 mse; > + __u16 timeout; > + struct bt_iso_io_qos in; > +}; > + > +struct bt_iso_bcast_source_qos { > + __u8 sync_interval; > + __u8 big; > + __u8 bis; > + __u8 packing; > + __u8 framing; > + __u8 encryption; > + __u8 bcode[16]; > + struct bt_iso_io_qos out; > +}; > + > #define BT_ISO_PHY_1M 0x01 > #define BT_ISO_PHY_2M 0x02 > #define BT_ISO_PHY_CODED 0x04 > diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h > index 53d3328c2b8b..60b6acb1be2b 100644 > --- a/include/net/bluetooth/hci_core.h > +++ b/include/net/bluetooth/hci_core.h > @@ -1,6 +1,7 @@ > /* > BlueZ - Bluetooth protocol stack for Linux > Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved. > + Copyright 2023 NXP > > Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com> > > @@ -730,7 +731,9 @@ struct hci_conn { > __s8 rssi; > __s8 tx_power; > __s8 max_tx_power; > - struct bt_iso_qos iso_qos; > + struct bt_iso_unicast_qos iso_unicast_qos; > + struct bt_iso_bcast_sink_qos iso_sink_qos; > + struct bt_iso_bcast_source_qos iso_source_qos; > unsigned long flags; > > enum conn_reasons conn_reason; > @@ -1090,7 +1093,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_bis(struct hci_dev *hdev, > if (bacmp(&c->dst, ba) || c->type != ISO_LINK) > continue; > > - if (c->iso_qos.big == big && c->iso_qos.bis == bis) { > + if (c->iso_source_qos.big == big && c->iso_source_qos.bis == bis) { > rcu_read_unlock(); > return c; > } > @@ -1199,7 +1202,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_cig(struct hci_dev *hdev, > if (c->type != ISO_LINK) > continue; > > - if (handle == c->iso_qos.cig) { > + if (handle == c->iso_unicast_qos.cig) { > rcu_read_unlock(); > return c; > } > @@ -1222,7 +1225,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_big(struct hci_dev *hdev, > if (bacmp(&c->dst, BDADDR_ANY) || c->type != ISO_LINK) > continue; > > - if (handle == c->iso_qos.big) { > + if (handle == c->iso_source_qos.big) { > rcu_read_unlock(); > return c; > } > @@ -1324,15 +1327,15 @@ struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst, > struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst, > __u16 setting, struct bt_codec *codec); > struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst, > - __u8 dst_type, struct bt_iso_qos *qos); > + __u8 dst_type, struct bt_iso_unicast_qos *qos); > struct hci_conn *hci_connect_cis(struct hci_dev *hdev, bdaddr_t *dst, > - __u8 dst_type, struct bt_iso_qos *qos); > + __u8 dst_type, struct bt_iso_unicast_qos *qos); > struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst, > - __u8 dst_type, struct bt_iso_qos *qos, > + __u8 dst_type, struct bt_iso_bcast_source_qos *qos, > __u8 data_len, __u8 *data); > int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type, > - __u8 sid); > -int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_qos *qos, > + __u8 sid, struct bt_iso_bcast_sink_qos *qos); > +int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_bcast_sink_qos *qos, > __u16 sync_handle, __u8 num_bis, __u8 bis[]); > int hci_conn_check_link_mode(struct hci_conn *conn); > int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level); > diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c > index 17b946f9ba31..77f0c89a9089 100644 > --- a/net/bluetooth/hci_conn.c > +++ b/net/bluetooth/hci_conn.c > @@ -1,6 +1,7 @@ > /* > BlueZ - Bluetooth protocol stack for Linux > Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved. > + Copyright 2023 NXP > > Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com> > > @@ -771,13 +772,22 @@ struct iso_list_data { > static void bis_list(struct hci_conn *conn, void *data) > { > struct iso_list_data *d = data; > + u8 check_big; > + u8 check_bis = BT_ISO_QOS_BIS_UNSET; > > /* Skip if not broadcast/ANY address */ > if (bacmp(&conn->dst, BDADDR_ANY)) > return; > > - if (d->big != conn->iso_qos.big || d->bis == BT_ISO_QOS_BIS_UNSET || > - d->bis != conn->iso_qos.bis) > + if (conn->role == HCI_ROLE_MASTER) { > + check_big = conn->iso_source_qos.big; > + check_bis = conn->iso_source_qos.bis; > + } else { > + check_big = conn->iso_sink_qos.big; > + } > + > + if (d->big != check_big || d->bis == BT_ISO_QOS_BIS_UNSET || > + d->bis != check_bis) > return; > > d->count++; > @@ -897,10 +907,10 @@ static void bis_cleanup(struct hci_conn *conn) > if (!test_and_clear_bit(HCI_CONN_PER_ADV, &conn->flags)) > return; > > - hci_le_terminate_big(hdev, conn->iso_qos.big, > - conn->iso_qos.bis); > + hci_le_terminate_big(hdev, conn->iso_source_qos.big, > + conn->iso_source_qos.bis); > } else { > - hci_le_big_terminate(hdev, conn->iso_qos.big, > + hci_le_big_terminate(hdev, conn->iso_sink_qos.big, > conn->sync_handle); > } > } > @@ -940,7 +950,7 @@ static void cis_cleanup(struct hci_conn *conn) > struct iso_list_data d; > > memset(&d, 0, sizeof(d)); > - d.cig = conn->iso_qos.cig; > + d.cig = conn->iso_unicast_qos.cig; > > /* Check if ISO connection is a CIS and remove CIG if there are > * no other connections using it. > @@ -949,7 +959,7 @@ static void cis_cleanup(struct hci_conn *conn) > if (d.count) > return; > > - hci_le_remove_cig(hdev, conn->iso_qos.cig); > + hci_le_remove_cig(hdev, conn->iso_unicast_qos.cig); > } > > struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst, > @@ -1398,12 +1408,12 @@ static int hci_explicit_conn_params_set(struct hci_dev *hdev, > return 0; > } > > -static int qos_set_big(struct hci_dev *hdev, struct bt_iso_qos *qos) > +static int qos_set_big(struct hci_dev *hdev, uint8_t *big) > { > struct iso_list_data data; > > /* Allocate a BIG if not set */ > - if (qos->big == BT_ISO_QOS_BIG_UNSET) { > + if (*big == BT_ISO_QOS_BIG_UNSET) { > for (data.big = 0x00; data.big < 0xef; data.big++) { > data.count = 0; > data.bis = 0xff; > @@ -1418,13 +1428,14 @@ static int qos_set_big(struct hci_dev *hdev, struct bt_iso_qos *qos) > return -EADDRNOTAVAIL; > > /* Update BIG */ > - qos->big = data.big; > + *big = data.big; > } > > return 0; > } > > -static int qos_set_bis(struct hci_dev *hdev, struct bt_iso_qos *qos) > +static int qos_set_bis(struct hci_dev *hdev, > + struct bt_iso_bcast_source_qos *qos) > { > struct iso_list_data data; > > @@ -1455,7 +1466,7 @@ static int qos_set_bis(struct hci_dev *hdev, struct bt_iso_qos *qos) > > /* This function requires the caller holds hdev->lock */ > static struct hci_conn *hci_add_bis(struct hci_dev *hdev, bdaddr_t *dst, > - struct bt_iso_qos *qos) > + struct bt_iso_bcast_source_qos *qos) > { > struct hci_conn *conn; > struct iso_list_data data; > @@ -1468,7 +1479,7 @@ static struct hci_conn *hci_add_bis(struct hci_dev *hdev, bdaddr_t *dst, > return ERR_PTR(-EOPNOTSUPP); > } > > - err = qos_set_big(hdev, qos); > + err = qos_set_big(hdev, &qos->big); > if (err) > return ERR_PTR(err); > > @@ -1636,7 +1647,7 @@ struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst, > return sco; > } > > -static void cis_add(struct iso_list_data *d, struct bt_iso_qos *qos) > +static void cis_add(struct iso_list_data *d, struct bt_iso_unicast_qos *qos) > { > struct hci_cis_params *cis = &d->pdu.cis[d->pdu.cp.num_cis]; > > @@ -1659,8 +1670,8 @@ static void cis_list(struct hci_conn *conn, void *data) > if (!bacmp(&conn->dst, BDADDR_ANY)) > return; > > - if (d->cig != conn->iso_qos.cig || d->cis == BT_ISO_QOS_CIS_UNSET || > - d->cis != conn->iso_qos.cis) > + if (d->cig != conn->iso_unicast_qos.cig || d->cis == BT_ISO_QOS_CIS_UNSET || > + d->cis != conn->iso_unicast_qos.cis) > return; > > d->count++; > @@ -1669,10 +1680,11 @@ static void cis_list(struct hci_conn *conn, void *data) > d->count >= ARRAY_SIZE(d->pdu.cis)) > return; > > - cis_add(d, &conn->iso_qos); > + cis_add(d, &conn->iso_unicast_qos); > } > > -static int hci_le_create_big(struct hci_conn *conn, struct bt_iso_qos *qos) > +static int hci_le_create_big(struct hci_conn *conn, > + struct bt_iso_bcast_source_qos *qos) > { > struct hci_dev *hdev = conn->hdev; > struct hci_cp_le_create_big cp; > @@ -1689,13 +1701,14 @@ static int hci_le_create_big(struct hci_conn *conn, struct bt_iso_qos *qos) > cp.bis.phy = qos->out.phy; > cp.bis.packing = qos->packing; > cp.bis.framing = qos->framing; > - cp.bis.encryption = 0x00; > - memset(&cp.bis.bcode, 0, sizeof(cp.bis.bcode)); > + cp.bis.encryption = qos->encryption; > + memcpy(&cp.bis.bcode, qos->bcode, sizeof(cp.bis.bcode)); > > return hci_send_cmd(hdev, HCI_OP_LE_CREATE_BIG, sizeof(cp), &cp); > } > > -static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos) > +static bool hci_le_set_cig_params(struct hci_conn *conn, > + struct bt_iso_unicast_qos *qos) > { > struct hci_dev *hdev = conn->hdev; > struct iso_list_data data; > @@ -1779,7 +1792,7 @@ static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos) > } > > struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst, > - __u8 dst_type, struct bt_iso_qos *qos) > + __u8 dst_type, struct bt_iso_unicast_qos *qos) > { > struct hci_conn *cis; > > @@ -1797,7 +1810,7 @@ struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst, > > /* Check if CIS has been set and the settings matches */ > if (cis->state == BT_BOUND && > - !memcmp(&cis->iso_qos, qos, sizeof(*qos))) > + !memcmp(&cis->iso_unicast_qos, qos, sizeof(*qos))) > return cis; > > /* Update LINK PHYs according to QoS preference */ > @@ -1833,7 +1846,7 @@ struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst, > return ERR_PTR(-EINVAL); > } > > - cis->iso_qos = *qos; > + cis->iso_unicast_qos = *qos; > cis->state = BT_BOUND; > > return cis; > @@ -1843,10 +1856,19 @@ bool hci_iso_setup_path(struct hci_conn *conn) > { > struct hci_dev *hdev = conn->hdev; > struct hci_cp_le_setup_iso_path cmd; > + struct bt_iso_io_qos *in = NULL; > + struct bt_iso_io_qos *out = NULL; > > memset(&cmd, 0, sizeof(cmd)); > > - if (conn->iso_qos.out.sdu) { > + if (bacmp(&conn->dst, BDADDR_ANY)) { > + in = &conn->iso_unicast_qos.in; > + out = &conn->iso_unicast_qos.out; > + } else { > + out = &conn->iso_source_qos.out; > + } > + > + if (out->sdu) { > cmd.handle = cpu_to_le16(conn->handle); > cmd.direction = 0x00; /* Input (Host to Controller) */ > cmd.path = 0x00; /* HCI path if enabled */ > @@ -1857,7 +1879,7 @@ bool hci_iso_setup_path(struct hci_conn *conn) > return false; > } > > - if (conn->iso_qos.in.sdu) { > + if (in && in->sdu) { > cmd.handle = cpu_to_le16(conn->handle); > cmd.direction = 0x01; /* Output (Controller to Host) */ > cmd.path = 0x00; /* HCI path if enabled */ > @@ -1884,7 +1906,7 @@ static int hci_create_cis_sync(struct hci_dev *hdev, void *data) > cmd.cis[0].acl_handle = cpu_to_le16(conn->link->handle); > cmd.cis[0].cis_handle = cpu_to_le16(conn->handle); > cmd.cp.num_cis++; > - cig = conn->iso_qos.cig; > + cig = conn->iso_unicast_qos.cig; > > hci_dev_lock(hdev); > > @@ -1894,7 +1916,7 @@ static int hci_create_cis_sync(struct hci_dev *hdev, void *data) > struct hci_cis *cis = &cmd.cis[cmd.cp.num_cis]; > > if (conn == data || conn->type != ISO_LINK || > - conn->state == BT_CONNECTED || conn->iso_qos.cig != cig) > + conn->state == BT_CONNECTED || conn->iso_unicast_qos.cig != cig) > continue; > > /* Check if all CIS(s) belonging to a CIG are ready */ > @@ -1991,19 +2013,19 @@ static void hci_iso_qos_setup(struct hci_dev *hdev, struct hci_conn *conn, > } > > static void hci_bind_bis(struct hci_conn *conn, > - struct bt_iso_qos *qos) > + struct bt_iso_bcast_source_qos *qos) > { > /* Update LINK PHYs according to QoS preference */ > conn->le_tx_phy = qos->out.phy; > conn->le_tx_phy = qos->out.phy; > - conn->iso_qos = *qos; > + conn->iso_source_qos = *qos; > conn->state = BT_BOUND; > } > > static int create_big_sync(struct hci_dev *hdev, void *data) > { > struct hci_conn *conn = data; > - struct bt_iso_qos *qos = &conn->iso_qos; > + struct bt_iso_bcast_source_qos *qos = &conn->iso_source_qos; > u16 interval, sync_interval = 0; > u32 flags = 0; > int err; > @@ -2023,7 +2045,7 @@ static int create_big_sync(struct hci_dev *hdev, void *data) > if (err) > return err; > > - return hci_le_create_big(conn, &conn->iso_qos); > + return hci_le_create_big(conn, &conn->iso_source_qos); > } > > static void create_pa_complete(struct hci_dev *hdev, void *data, int err) > @@ -2054,7 +2076,7 @@ static int create_pa_sync(struct hci_dev *hdev, void *data) > } > > int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type, > - __u8 sid) > + __u8 sid, struct bt_iso_bcast_sink_qos *qos) > { > struct hci_cp_le_pa_create_sync *cp; > > @@ -2067,15 +2089,19 @@ int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type, > return -ENOMEM; > } > > + cp->options = qos->options; > cp->sid = sid; > cp->addr_type = dst_type; > + cp->skip = qos->skip; > + cp->sync_timeout = qos->sync_timeout; > + cp->sync_cte_type = qos->sync_cte_type; > bacpy(&cp->addr, dst); > > /* Queue start pa_create_sync and scan */ > return hci_cmd_sync_queue(hdev, create_pa_sync, cp, create_pa_complete); > } > > -int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_qos *qos, > +int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_bcast_sink_qos *qos, > __u16 sync_handle, __u8 num_bis, __u8 bis[]) > { > struct _packed { > @@ -2087,13 +2113,17 @@ int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_qos *qos, > if (num_bis > sizeof(pdu.bis)) > return -EINVAL; > > - err = qos_set_big(hdev, qos); > + err = qos_set_big(hdev, &qos->big); > if (err) > return err; > > memset(&pdu, 0, sizeof(pdu)); > pdu.cp.handle = qos->big; > pdu.cp.sync_handle = cpu_to_le16(sync_handle); > + pdu.cp.encryption = qos->encryption; > + memcpy(pdu.cp.bcode, qos->bcode, sizeof(pdu.cp.bcode)); > + pdu.cp.mse = qos->mse; > + pdu.cp.timeout = qos->timeout; > pdu.cp.num_bis = num_bis; > memcpy(pdu.bis, bis, num_bis); > > @@ -2115,7 +2145,7 @@ static void create_big_complete(struct hci_dev *hdev, void *data, int err) > } > > struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst, > - __u8 dst_type, struct bt_iso_qos *qos, > + __u8 dst_type, struct bt_iso_bcast_source_qos *qos, > __u8 base_len, __u8 *base) > { > struct hci_conn *conn; > @@ -2151,7 +2181,7 @@ struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst, > } > > struct hci_conn *hci_connect_cis(struct hci_dev *hdev, bdaddr_t *dst, > - __u8 dst_type, struct bt_iso_qos *qos) > + __u8 dst_type, struct bt_iso_unicast_qos *qos) > { > struct hci_conn *le; > struct hci_conn *cis; > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > index 8d8547fa9032..8428a3f75ef7 100644 > --- a/net/bluetooth/hci_event.c > +++ b/net/bluetooth/hci_event.c > @@ -1,6 +1,7 @@ > /* > BlueZ - Bluetooth protocol stack for Linux > Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved. > + Copyright 2023 NXP > > Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com> > > @@ -3843,7 +3844,7 @@ static u8 hci_cc_le_set_cig_params(struct hci_dev *hdev, void *data, > rcu_read_lock(); > > list_for_each_entry_rcu(conn, &hdev->conn_hash.list, list) { > - if (conn->type != ISO_LINK || conn->iso_qos.cig != rp->cig_id || > + if (conn->type != ISO_LINK || conn->iso_unicast_qos.cig != rp->cig_id || > conn->state == BT_CONNECTED) > continue; > > @@ -3877,6 +3878,7 @@ static u8 hci_cc_le_setup_iso_path(struct hci_dev *hdev, void *data, > struct hci_rp_le_setup_iso_path *rp = data; > struct hci_cp_le_setup_iso_path *cp; > struct hci_conn *conn; > + bool cfm; > > bt_dev_dbg(hdev, "status 0x%2.2x", rp->status); > > @@ -3900,12 +3902,14 @@ static u8 hci_cc_le_setup_iso_path(struct hci_dev *hdev, void *data, > /* Input (Host to Controller) */ > case 0x00: > /* Only confirm connection if output only */ > - if (conn->iso_qos.out.sdu && !conn->iso_qos.in.sdu) > + cfm = !bacmp(&conn->dst, BDADDR_ANY) || > + (conn->iso_unicast_qos.out.sdu && !conn->iso_unicast_qos.in.sdu); > + if (cfm) > hci_connect_cfm(conn, rp->status); > break; > /* Output (Controller to Host) */ > case 0x01: > - /* Confirm connection since conn->iso_qos is always configured > + /* Confirm connection since Output is always configured > * last. > */ > hci_connect_cfm(conn, rp->status); > @@ -6822,15 +6826,15 @@ static void hci_le_cis_estabilished_evt(struct hci_dev *hdev, void *data, > memset(&interval, 0, sizeof(interval)); > > memcpy(&interval, ev->c_latency, sizeof(ev->c_latency)); > - conn->iso_qos.in.interval = le32_to_cpu(interval); > + conn->iso_unicast_qos.in.interval = le32_to_cpu(interval); > memcpy(&interval, ev->p_latency, sizeof(ev->p_latency)); > - conn->iso_qos.out.interval = le32_to_cpu(interval); > - conn->iso_qos.in.latency = le16_to_cpu(ev->interval); > - conn->iso_qos.out.latency = le16_to_cpu(ev->interval); > - conn->iso_qos.in.sdu = le16_to_cpu(ev->c_mtu); > - conn->iso_qos.out.sdu = le16_to_cpu(ev->p_mtu); > - conn->iso_qos.in.phy = ev->c_phy; > - conn->iso_qos.out.phy = ev->p_phy; > + conn->iso_unicast_qos.out.interval = le32_to_cpu(interval); > + conn->iso_unicast_qos.in.latency = le16_to_cpu(ev->interval); > + conn->iso_unicast_qos.out.latency = le16_to_cpu(ev->interval); > + conn->iso_unicast_qos.in.sdu = le16_to_cpu(ev->c_mtu); > + conn->iso_unicast_qos.out.sdu = le16_to_cpu(ev->p_mtu); > + conn->iso_unicast_qos.in.phy = ev->c_phy; > + conn->iso_unicast_qos.out.phy = ev->p_phy; > } > > if (!ev->status) { > @@ -6904,8 +6908,8 @@ static void hci_le_cis_req_evt(struct hci_dev *hdev, void *data, > cis->handle = cis_handle; > } > > - cis->iso_qos.cig = ev->cig_id; > - cis->iso_qos.cis = ev->cis_id; > + cis->iso_unicast_qos.cig = ev->cig_id; > + cis->iso_unicast_qos.cis = ev->cis_id; > > if (!(flags & HCI_PROTO_DEFER)) { > hci_le_accept_cis(hdev, ev->cis_handle); > @@ -6992,13 +6996,13 @@ static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data, > bis->handle = handle; > } > > - bis->iso_qos.big = ev->handle; > + bis->iso_sink_qos.big = ev->handle; > memset(&interval, 0, sizeof(interval)); > memcpy(&interval, ev->latency, sizeof(ev->latency)); > - bis->iso_qos.in.interval = le32_to_cpu(interval); > + bis->iso_sink_qos.in.interval = le32_to_cpu(interval); > /* Convert ISO Interval (1.25 ms slots) to latency (ms) */ > - bis->iso_qos.in.latency = le16_to_cpu(ev->interval) * 125 / 100; > - bis->iso_qos.in.sdu = le16_to_cpu(ev->max_pdu); > + bis->iso_sink_qos.in.latency = le16_to_cpu(ev->interval) * 125 / 100; > + bis->iso_sink_qos.in.sdu = le16_to_cpu(ev->max_pdu); > > hci_connect_cfm(bis, ev->status); > } > diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c > index 8d136a730163..e660e1c5ea11 100644 > --- a/net/bluetooth/iso.c > +++ b/net/bluetooth/iso.c > @@ -3,6 +3,7 @@ > * BlueZ - Bluetooth protocol stack for Linux > * > * Copyright (C) 2022 Intel Corporation > + * Copyright 2023 NXP > */ > > #include <linux/module.h> > @@ -58,7 +59,9 @@ struct iso_pinfo { > __u8 bc_bis[ISO_MAX_NUM_BIS]; > __u16 sync_handle; > __u32 flags; > - struct bt_iso_qos qos; > + struct bt_iso_unicast_qos unicast_qos; > + struct bt_iso_bcast_sink_qos sink_qos; > + struct bt_iso_bcast_source_qos source_qos; > __u8 base_len; > __u8 base[BASE_MAX_LENGTH]; > struct iso_conn *conn; > @@ -265,14 +268,14 @@ static int iso_connect_bis(struct sock *sk) > } > > /* Fail if out PHYs are marked as disabled */ > - if (!iso_pi(sk)->qos.out.phy) { > + if (!iso_pi(sk)->source_qos.out.phy) { > err = -EINVAL; > goto unlock; > } > > hcon = hci_connect_bis(hdev, &iso_pi(sk)->dst, > le_addr_type(iso_pi(sk)->dst_type), > - &iso_pi(sk)->qos, iso_pi(sk)->base_len, > + &iso_pi(sk)->source_qos, iso_pi(sk)->base_len, > iso_pi(sk)->base); > if (IS_ERR(hcon)) { > err = PTR_ERR(hcon); > @@ -337,7 +340,7 @@ static int iso_connect_cis(struct sock *sk) > } > > /* Fail if either PHYs are marked as disabled */ > - if (!iso_pi(sk)->qos.in.phy && !iso_pi(sk)->qos.out.phy) { > + if (!iso_pi(sk)->unicast_qos.in.phy && !iso_pi(sk)->unicast_qos.out.phy) { > err = -EINVAL; > goto unlock; > } > @@ -346,7 +349,7 @@ static int iso_connect_cis(struct sock *sk) > if (test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) { > hcon = hci_bind_cis(hdev, &iso_pi(sk)->dst, > le_addr_type(iso_pi(sk)->dst_type), > - &iso_pi(sk)->qos); > + &iso_pi(sk)->unicast_qos); > if (IS_ERR(hcon)) { > err = PTR_ERR(hcon); > goto unlock; > @@ -354,7 +357,7 @@ static int iso_connect_cis(struct sock *sk) > } else { > hcon = hci_connect_cis(hdev, &iso_pi(sk)->dst, > le_addr_type(iso_pi(sk)->dst_type), > - &iso_pi(sk)->qos); > + &iso_pi(sk)->unicast_qos); > if (IS_ERR(hcon)) { > err = PTR_ERR(hcon); > goto unlock; > @@ -400,24 +403,40 @@ static int iso_connect_cis(struct sock *sk) > return err; > } > > -static struct bt_iso_qos *iso_sock_get_qos(struct sock *sk) > +static struct bt_iso_unicast_qos *iso_sock_get_unicast_qos(struct sock *sk) > { > if (sk->sk_state == BT_CONNECTED || sk->sk_state == BT_CONNECT2) > - return &iso_pi(sk)->conn->hcon->iso_qos; > + return &iso_pi(sk)->conn->hcon->iso_unicast_qos; > > - return &iso_pi(sk)->qos; > + return &iso_pi(sk)->unicast_qos; > } > > -static int iso_send_frame(struct sock *sk, struct sk_buff *skb) > +static struct bt_iso_bcast_sink_qos *iso_sock_get_bcast_sink_qos(struct sock *sk) > +{ > + if (sk->sk_state == BT_CONNECTED || sk->sk_state == BT_CONNECT2) > + return &iso_pi(sk)->conn->hcon->iso_sink_qos; > + > + return &iso_pi(sk)->sink_qos; > +} > + > +static struct bt_iso_bcast_source_qos *iso_sock_get_bcast_source_qos(struct sock *sk) > +{ > + if (sk->sk_state == BT_CONNECTED || sk->sk_state == BT_CONNECT2) > + return &iso_pi(sk)->conn->hcon->iso_source_qos; > + > + return &iso_pi(sk)->source_qos; > +} > + > +static int iso_send_frame(struct sock *sk, struct sk_buff *skb, > + struct bt_iso_io_qos *out) > { > struct iso_conn *conn = iso_pi(sk)->conn; > - struct bt_iso_qos *qos = iso_sock_get_qos(sk); > struct hci_iso_data_hdr *hdr; > int len = 0; > > BT_DBG("sk %p len %d", sk, skb->len); > > - if (skb->len > qos->out.sdu) > + if (skb->len > out->sdu) > return -EMSGSIZE; > > len = skb->len; > @@ -679,7 +698,7 @@ static struct proto iso_proto = { > .rtn = 2u, \ > } > > -static struct bt_iso_qos default_qos = { > +static struct bt_iso_unicast_qos default_unicast_qos = { > .cig = BT_ISO_QOS_CIG_UNSET, > .cis = BT_ISO_QOS_CIS_UNSET, > .sca = 0x00, > @@ -689,6 +708,30 @@ static struct bt_iso_qos default_qos = { > .out = DEFAULT_IO_QOS, > }; > > +static struct bt_iso_bcast_sink_qos default_sink_qos = { > + .options = 0x00, > + .skip = 0x0000, > + .sync_timeout = 0x4000, > + .sync_cte_type = 0x0000, > + .big = BT_ISO_QOS_BIG_UNSET, > + .encryption = 0x00, > + .bcode = {0x00}, > + .mse = 0x00, > + .timeout = 0x4000, > + .in = DEFAULT_IO_QOS, > +}; > + > +static struct bt_iso_bcast_source_qos default_source_qos = { > + .sync_interval = 0x07, > + .big = BT_ISO_QOS_BIG_UNSET, > + .bis = BT_ISO_QOS_BIS_UNSET, > + .packing = 0x00, > + .framing = 0x00, > + .encryption = 0x00, > + .bcode = {0x00}, > + .out = DEFAULT_IO_QOS, > +}; > + > static struct sock *iso_sock_alloc(struct net *net, struct socket *sock, > int proto, gfp_t prio, int kern) > { > @@ -712,7 +755,9 @@ static struct sock *iso_sock_alloc(struct net *net, struct socket *sock, > /* Set address type as public as default src address is BDADDR_ANY */ > iso_pi(sk)->src_type = BDADDR_LE_PUBLIC; > > - iso_pi(sk)->qos = default_qos; > + iso_pi(sk)->unicast_qos = default_unicast_qos; > + iso_pi(sk)->sink_qos = default_sink_qos; > + iso_pi(sk)->source_qos = default_source_qos; No need to keep 3 different structures for the QoS, the socket can only be used for 1 at the time and we should be able to detect what defaults to load when allocating, this is another reason why I don't want multiple QoS options since it make user to believe they can setup a socket for both unicast and broadcast when in fact this shall not be possible. > bt_sock_link(&iso_sk_list, sk); > return sk; > @@ -895,7 +940,7 @@ static int iso_listen_bis(struct sock *sk) > > err = hci_pa_create_sync(hdev, &iso_pi(sk)->dst, > le_addr_type(iso_pi(sk)->dst_type), > - iso_pi(sk)->bc_sid); > + iso_pi(sk)->bc_sid, &iso_pi(sk)->sink_qos); > > hci_dev_put(hdev); > > @@ -1086,10 +1131,15 @@ static int iso_sock_sendmsg(struct socket *sock, struct msghdr *msg, > > lock_sock(sk); > > - if (sk->sk_state == BT_CONNECTED) > - err = iso_send_frame(sk, skb); > - else > + if (sk->sk_state == BT_CONNECTED) { > + if (bacmp(&conn->hcon->dst, BDADDR_ANY)) > + err = iso_send_frame(sk, skb, &iso_sock_get_unicast_qos(sk)->out); > + else > + err = iso_send_frame(sk, skb, > + &iso_sock_get_bcast_source_qos(sk)->out); > + } else { > err = -ENOTCONN; > + } > > release_sock(sk); > > @@ -1154,7 +1204,7 @@ static bool check_io_qos(struct bt_iso_io_qos *qos) > return true; > } > > -static bool check_qos(struct bt_iso_qos *qos) > +static bool check_unicast_qos(struct bt_iso_unicast_qos *qos) > { > if (qos->sca > 0x07) > return false; > @@ -1174,12 +1224,60 @@ static bool check_qos(struct bt_iso_qos *qos) > return true; > } > > +static bool check_bcast_sink_qos(struct bt_iso_bcast_sink_qos *qos) > +{ > + if (qos->options > 0x07) > + return false; > + > + if (qos->skip > 0x01f3) > + return false; > + > + if (qos->sync_timeout < 0x000a || qos->sync_timeout > 0x4000) > + return false; > + > + if (qos->sync_cte_type > 0x1f) > + return false; > + > + if (qos->encryption > 0x01) > + return false; > + > + if (qos->mse > 0x1f) > + return false; > + > + if (qos->timeout < 0x000a || qos->timeout > 0x4000) > + return false; > + > + if (!check_io_qos(&qos->in)) > + return false; > + > + return true; > +} > + > +static bool check_bcast_source_qos(struct bt_iso_bcast_source_qos *qos) > +{ > + if (qos->sync_interval > 0x07) > + return false; > + > + if (qos->packing > 0x01) > + return false; > + > + if (qos->framing > 0x01) > + return false; > + > + if (qos->encryption > 0x01) > + return false; > + > + if (!check_io_qos(&qos->out)) > + return false; > + > + return true; > +} > + > static int iso_sock_setsockopt(struct socket *sock, int level, int optname, > sockptr_t optval, unsigned int optlen) > { > struct sock *sk = sock->sk; > int len, err = 0; > - struct bt_iso_qos qos; > u32 opt; > > BT_DBG("sk %p", sk); > @@ -1204,32 +1302,96 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname, > clear_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags); > break; > > - case BT_ISO_QOS: > + case BT_ISO_UNICAST_QOS: > + struct bt_iso_unicast_qos unicast_qos; > + > + if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND && > + sk->sk_state != BT_CONNECT2) { > + err = -EINVAL; > + break; > + } > + > + len = min_t(unsigned int, sizeof(unicast_qos), optlen); > + if (len != sizeof(unicast_qos)) { > + err = -EINVAL; > + break; > + } > + > + memset(&unicast_qos, 0, sizeof(unicast_qos)); > + > + if (copy_from_sockptr(&unicast_qos, optval, len)) { > + err = -EFAULT; > + break; > + } > + > + if (!check_unicast_qos(&unicast_qos)) { > + err = -EINVAL; > + break; > + } > + > + iso_pi(sk)->unicast_qos = unicast_qos; > + > + break; > + > + case BT_ISO_BCAST_SINK_QOS: > + struct bt_iso_bcast_sink_qos sink_qos; > + > if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND && > sk->sk_state != BT_CONNECT2) { > err = -EINVAL; > break; > } > > - len = min_t(unsigned int, sizeof(qos), optlen); > - if (len != sizeof(qos)) { > + len = min_t(unsigned int, sizeof(sink_qos), optlen); > + if (len != sizeof(sink_qos)) { > err = -EINVAL; > break; > } > > - memset(&qos, 0, sizeof(qos)); > + memset(&sink_qos, 0, sizeof(sink_qos)); > > - if (copy_from_sockptr(&qos, optval, len)) { > + if (copy_from_sockptr(&sink_qos, optval, len)) { > err = -EFAULT; > break; > } > > - if (!check_qos(&qos)) { > + if (!check_bcast_sink_qos(&sink_qos)) { > err = -EINVAL; > break; > } > > - iso_pi(sk)->qos = qos; > + iso_pi(sk)->sink_qos = sink_qos; > + > + break; > + > + case BT_ISO_BCAST_SOURCE_QOS: > + struct bt_iso_bcast_source_qos source_qos; > + > + if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND && > + sk->sk_state != BT_CONNECT2) { > + err = -EINVAL; > + break; > + } > + > + len = min_t(unsigned int, sizeof(source_qos), optlen); > + if (len != sizeof(source_qos)) { > + err = -EINVAL; > + break; > + } > + > + memset(&source_qos, 0, sizeof(source_qos)); > + > + if (copy_from_sockptr(&source_qos, optval, len)) { > + err = -EFAULT; > + break; > + } > + > + if (!check_bcast_source_qos(&source_qos)) { > + err = -EINVAL; > + break; > + } > + > + iso_pi(sk)->source_qos = source_qos; > > break; > > @@ -1270,7 +1432,6 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname, > { > struct sock *sk = sock->sk; > int len, err = 0; > - struct bt_iso_qos *qos; > u8 base_len; > u8 *base; > > @@ -1294,11 +1455,29 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname, > > break; > > - case BT_ISO_QOS: > - qos = iso_sock_get_qos(sk); > + case BT_ISO_UNICAST_QOS: > + struct bt_iso_unicast_qos *unicast_qos = iso_sock_get_unicast_qos(sk); > + > + len = min_t(unsigned int, len, sizeof(*unicast_qos)); > + if (copy_to_user(optval, unicast_qos, len)) > + err = -EFAULT; > + > + break; > + > + case BT_ISO_BCAST_SINK_QOS: > + struct bt_iso_bcast_sink_qos *sink_qos = iso_sock_get_bcast_sink_qos(sk); > + > + len = min_t(unsigned int, len, sizeof(*sink_qos)); > + if (copy_to_user(optval, sink_qos, len)) > + err = -EFAULT; > + > + break; > + > + case BT_ISO_BCAST_SOURCE_QOS: > + struct bt_iso_bcast_source_qos *source_qos = iso_sock_get_bcast_source_qos(sk); > > - len = min_t(unsigned int, len, sizeof(*qos)); > - if (copy_to_user(optval, qos, len)) > + len = min_t(unsigned int, len, sizeof(*source_qos)); > + if (copy_to_user(optval, source_qos, len)) > err = -EFAULT; > > break; > @@ -1419,7 +1598,7 @@ static bool iso_match_big(struct sock *sk, void *data) > { > struct hci_evt_le_big_sync_estabilished *ev = data; > > - return ev->handle == iso_pi(sk)->qos.big; > + return ev->handle == iso_pi(sk)->sink_qos.big; > } > > static void iso_conn_ready(struct iso_conn *conn) > @@ -1550,7 +1729,7 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags) > iso_pi(sk)->bc_num_bis = ev2->num_bis; > > err = hci_le_big_create_sync(hdev, > - &iso_pi(sk)->qos, > + &iso_pi(sk)->sink_qos, > iso_pi(sk)->sync_handle, > iso_pi(sk)->bc_num_bis, > iso_pi(sk)->bc_bis); > -- > 2.34.1 > -- Luiz Augusto von Dentz ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] Bluetooth: Split bt_iso_qos into dedicated structures 2023-03-20 18:43 ` [PATCH 1/1] Bluetooth: " Luiz Augusto von Dentz @ 2023-03-21 8:08 ` Iulia Tanasescu 2023-03-22 15:23 ` Iulia Tanasescu 1 sibling, 0 replies; 10+ messages in thread From: Iulia Tanasescu @ 2023-03-21 8:08 UTC (permalink / raw) To: luiz.dentz; +Cc: iulia.tanasescu, linux-bluetooth Hi Luiz, Thank you for your comments, I will update the patch and I will resubmit as soon as possible. Regards, Iulia ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] Bluetooth: Split bt_iso_qos into dedicated structures 2023-03-20 18:43 ` [PATCH 1/1] Bluetooth: " Luiz Augusto von Dentz 2023-03-21 8:08 ` Iulia Tanasescu @ 2023-03-22 15:23 ` Iulia Tanasescu 2023-03-22 17:38 ` Luiz Augusto von Dentz 1 sibling, 1 reply; 10+ messages in thread From: Iulia Tanasescu @ 2023-03-22 15:23 UTC (permalink / raw) To: luiz.dentz; +Cc: iulia.tanasescu, linux-bluetooth Hi Luiz, I have investigated some possible ways to update my patch using your suggestions. I think the most convenient method would be to implement the structure as an union of dedicated parameters and to add an additional parameter that would indicate the type of QoS the structure is holding. It would be something like this: struct bt_iso_bcast_qos { union { struct bt_iso_bcast_src_qos bsrc; struct bt_iso_bcast_snk_qos bsnk; }; }; enum { BT_ISO_UCAST_QOS, BT_ISO_BCAST_SRC_QOS, BT_ISO_BCAST_SNK_QOS, }; struct bt_iso_qos { int qos_type; union { struct bt_iso_ucast_qos ucast; struct bt_iso_bcast_qos bcast; }; }; The flow would be something like this: At socket creation, some default unicast QoS parameters are loaded in the qos field of the socket structure. When the "setsockopt" function is called on an ISO socket from user space, the user will provide a bt_iso_qos structure as defined above, containing the type of QoS to set and the desired parameters. The kernel will validate the parameters depending on their type, and it will overwrite the unicast defaults if the check is succesful. When the user calls other ISO socket APIs, like connect or listen, and the procedures to execute are broadcast related, the kernel will either use the QoS options that had been previously set by the user, or, if the user did not set any options, the unicast defaults will be replaced with broadcast defaults, and the procedures will start this way. Do you think this is a good design? Please let me know if I should proceed with this implementation. Regards, Iulia ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] Bluetooth: Split bt_iso_qos into dedicated structures 2023-03-22 15:23 ` Iulia Tanasescu @ 2023-03-22 17:38 ` Luiz Augusto von Dentz 2023-03-23 15:06 ` Iulia Tanasescu 0 siblings, 1 reply; 10+ messages in thread From: Luiz Augusto von Dentz @ 2023-03-22 17:38 UTC (permalink / raw) To: Iulia Tanasescu; +Cc: linux-bluetooth Hi Iulia, On Wed, Mar 22, 2023 at 8:24 AM Iulia Tanasescu <iulia.tanasescu@nxp.com> wrote: > > Hi Luiz, > > I have investigated some possible ways to update my patch using your > suggestions. > > I think the most convenient method would be to implement the structure > as an union of dedicated parameters and to add an additional parameter > that would indicate the type of QoS the structure is holding. > > It would be something like this: > > struct bt_iso_bcast_qos { > union { > struct bt_iso_bcast_src_qos bsrc; > struct bt_iso_bcast_snk_qos bsnk; > }; > }; > > enum { > BT_ISO_UCAST_QOS, > BT_ISO_BCAST_SRC_QOS, > BT_ISO_BCAST_SNK_QOS, > }; We don't really need a type like that because the socket can already tell what type it is based on the address: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/tree/net/bluetooth/iso.c#n853 > struct bt_iso_qos { > int qos_type; > union { > struct bt_iso_ucast_qos ucast; > struct bt_iso_bcast_qos bcast; > }; > }; > > The flow would be something like this: > > At socket creation, some default unicast QoS parameters are loaded > in the qos field of the socket structure. > > When the "setsockopt" function is called on an ISO socket from user > space, the user will provide a bt_iso_qos structure as defined above, > containing the type of QoS to set and the desired parameters. > The kernel will validate the parameters depending on their type, and > it will overwrite the unicast defaults if the check is succesful. > > When the user calls other ISO socket APIs, like connect or listen, > and the procedures to execute are broadcast related, the kernel will > either use the QoS options that had been previously set by the user, > or, if the user did not set any options, the unicast defaults will > be replaced with broadcast defaults, and the procedures will start > this way. In case of iso_sock_alloc being called from parent you might be able to allocate it with proper defaults since you know what address was used in the parent thus can detect if it is a unicast or broadcast, also you may need to detect if BT_ISO_QOS is used before bind we can either reject it or just copy as is but then check_qos shall be run on bind/connect since only at that point we know the destination address. > Do you think this is a good design? Please let me know if I should > proceed with this implementation. Yep, apart from the comments above. > Regards, > Iulia > -- Luiz Augusto von Dentz ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] Bluetooth: Split bt_iso_qos into dedicated structures 2023-03-22 17:38 ` Luiz Augusto von Dentz @ 2023-03-23 15:06 ` Iulia Tanasescu 0 siblings, 0 replies; 10+ messages in thread From: Iulia Tanasescu @ 2023-03-23 15:06 UTC (permalink / raw) To: luiz.dentz; +Cc: iulia.tanasescu, linux-bluetooth Hi Luiz, Thank you, I will update this way. Regards, Iulia ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] Bluetooth: Split bt_iso_qos into dedicated structures 2023-03-20 14:36 ` [PATCH 1/1] Bluetooth: " Iulia Tanasescu 2023-03-20 15:03 ` bluez.test.bot 2023-03-20 18:43 ` [PATCH 1/1] Bluetooth: " Luiz Augusto von Dentz @ 2023-03-20 22:49 ` kernel test robot 2 siblings, 0 replies; 10+ messages in thread From: kernel test robot @ 2023-03-20 22:49 UTC (permalink / raw) To: Iulia Tanasescu, linux-bluetooth; +Cc: llvm, oe-kbuild-all, Iulia Tanasescu Hi Iulia, Thank you for the patch! Yet something to improve: [auto build test ERROR on dd41882582a9ab19938598179386b81b793b4a5c] url: https://github.com/intel-lab-lkp/linux/commits/Iulia-Tanasescu/Bluetooth-Split-bt_iso_qos-into-dedicated-structures/20230320-223805 base: dd41882582a9ab19938598179386b81b793b4a5c patch link: https://lore.kernel.org/r/20230320143608.25399-2-iulia.tanasescu%40nxp.com patch subject: [PATCH 1/1] Bluetooth: Split bt_iso_qos into dedicated structures config: x86_64-randconfig-a005-20230320 (https://download.01.org/0day-ci/archive/20230321/202303210652.rxBfO9uo-lkp@intel.com/config) compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1) reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://github.com/intel-lab-lkp/linux/commit/656a3f84716d5b683951fe8c2cdc3fd17a09950c git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Iulia-Tanasescu/Bluetooth-Split-bt_iso_qos-into-dedicated-structures/20230320-223805 git checkout 656a3f84716d5b683951fe8c2cdc3fd17a09950c # save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot <lkp@intel.com> | Link: https://lore.kernel.org/oe-kbuild-all/202303210652.rxBfO9uo-lkp@intel.com/ All errors (new ones prefixed by >>): >> net/bluetooth/iso.c:1306:3: error: expected expression struct bt_iso_unicast_qos unicast_qos; ^ >> net/bluetooth/iso.c:1314:36: error: use of undeclared identifier 'unicast_qos' len = min_t(unsigned int, sizeof(unicast_qos), optlen); ^ >> net/bluetooth/iso.c:1314:36: error: use of undeclared identifier 'unicast_qos' net/bluetooth/iso.c:1315:21: error: use of undeclared identifier 'unicast_qos' if (len != sizeof(unicast_qos)) { ^ net/bluetooth/iso.c:1320:34: error: use of undeclared identifier 'unicast_qos' memset(&unicast_qos, 0, sizeof(unicast_qos)); ^ net/bluetooth/iso.c:1320:11: error: use of undeclared identifier 'unicast_qos' memset(&unicast_qos, 0, sizeof(unicast_qos)); ^ net/bluetooth/iso.c:1320:11: error: use of undeclared identifier 'unicast_qos' net/bluetooth/iso.c:1320:11: error: use of undeclared identifier 'unicast_qos' net/bluetooth/iso.c:1322:26: error: use of undeclared identifier 'unicast_qos' if (copy_from_sockptr(&unicast_qos, optval, len)) { ^ net/bluetooth/iso.c:1327:27: error: use of undeclared identifier 'unicast_qos' if (!check_unicast_qos(&unicast_qos)) { ^ net/bluetooth/iso.c:1332:29: error: use of undeclared identifier 'unicast_qos' iso_pi(sk)->unicast_qos = unicast_qos; ^ net/bluetooth/iso.c:1337:3: error: expected expression struct bt_iso_bcast_sink_qos sink_qos; ^ >> net/bluetooth/iso.c:1345:36: error: use of undeclared identifier 'sink_qos' len = min_t(unsigned int, sizeof(sink_qos), optlen); ^ >> net/bluetooth/iso.c:1345:36: error: use of undeclared identifier 'sink_qos' net/bluetooth/iso.c:1346:21: error: use of undeclared identifier 'sink_qos' if (len != sizeof(sink_qos)) { ^ net/bluetooth/iso.c:1351:31: error: use of undeclared identifier 'sink_qos' memset(&sink_qos, 0, sizeof(sink_qos)); ^ net/bluetooth/iso.c:1351:11: error: use of undeclared identifier 'sink_qos' memset(&sink_qos, 0, sizeof(sink_qos)); ^ net/bluetooth/iso.c:1351:11: error: use of undeclared identifier 'sink_qos' net/bluetooth/iso.c:1351:11: error: use of undeclared identifier 'sink_qos' fatal error: too many errors emitted, stopping now [-ferror-limit=] 20 errors generated. vim +1306 net/bluetooth/iso.c 1275 1276 static int iso_sock_setsockopt(struct socket *sock, int level, int optname, 1277 sockptr_t optval, unsigned int optlen) 1278 { 1279 struct sock *sk = sock->sk; 1280 int len, err = 0; 1281 u32 opt; 1282 1283 BT_DBG("sk %p", sk); 1284 1285 lock_sock(sk); 1286 1287 switch (optname) { 1288 case BT_DEFER_SETUP: 1289 if (sk->sk_state != BT_BOUND && sk->sk_state != BT_LISTEN) { 1290 err = -EINVAL; 1291 break; 1292 } 1293 1294 if (copy_from_sockptr(&opt, optval, sizeof(u32))) { 1295 err = -EFAULT; 1296 break; 1297 } 1298 1299 if (opt) 1300 set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags); 1301 else 1302 clear_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags); 1303 break; 1304 1305 case BT_ISO_UNICAST_QOS: > 1306 struct bt_iso_unicast_qos unicast_qos; 1307 1308 if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND && 1309 sk->sk_state != BT_CONNECT2) { 1310 err = -EINVAL; 1311 break; 1312 } 1313 > 1314 len = min_t(unsigned int, sizeof(unicast_qos), optlen); 1315 if (len != sizeof(unicast_qos)) { 1316 err = -EINVAL; 1317 break; 1318 } 1319 1320 memset(&unicast_qos, 0, sizeof(unicast_qos)); 1321 1322 if (copy_from_sockptr(&unicast_qos, optval, len)) { 1323 err = -EFAULT; 1324 break; 1325 } 1326 1327 if (!check_unicast_qos(&unicast_qos)) { 1328 err = -EINVAL; 1329 break; 1330 } 1331 1332 iso_pi(sk)->unicast_qos = unicast_qos; 1333 1334 break; 1335 1336 case BT_ISO_BCAST_SINK_QOS: 1337 struct bt_iso_bcast_sink_qos sink_qos; 1338 1339 if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND && 1340 sk->sk_state != BT_CONNECT2) { 1341 err = -EINVAL; 1342 break; 1343 } 1344 > 1345 len = min_t(unsigned int, sizeof(sink_qos), optlen); 1346 if (len != sizeof(sink_qos)) { 1347 err = -EINVAL; 1348 break; 1349 } 1350 1351 memset(&sink_qos, 0, sizeof(sink_qos)); 1352 1353 if (copy_from_sockptr(&sink_qos, optval, len)) { 1354 err = -EFAULT; 1355 break; 1356 } 1357 1358 if (!check_bcast_sink_qos(&sink_qos)) { 1359 err = -EINVAL; 1360 break; 1361 } 1362 1363 iso_pi(sk)->sink_qos = sink_qos; 1364 1365 break; 1366 1367 case BT_ISO_BCAST_SOURCE_QOS: 1368 struct bt_iso_bcast_source_qos source_qos; 1369 1370 if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND && 1371 sk->sk_state != BT_CONNECT2) { 1372 err = -EINVAL; 1373 break; 1374 } 1375 1376 len = min_t(unsigned int, sizeof(source_qos), optlen); 1377 if (len != sizeof(source_qos)) { 1378 err = -EINVAL; 1379 break; 1380 } 1381 1382 memset(&source_qos, 0, sizeof(source_qos)); 1383 1384 if (copy_from_sockptr(&source_qos, optval, len)) { 1385 err = -EFAULT; 1386 break; 1387 } 1388 1389 if (!check_bcast_source_qos(&source_qos)) { 1390 err = -EINVAL; 1391 break; 1392 } 1393 1394 iso_pi(sk)->source_qos = source_qos; 1395 1396 break; 1397 1398 case BT_ISO_BASE: 1399 if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND && 1400 sk->sk_state != BT_CONNECT2) { 1401 err = -EINVAL; 1402 break; 1403 } 1404 1405 if (optlen > sizeof(iso_pi(sk)->base)) { 1406 err = -EOVERFLOW; 1407 break; 1408 } 1409 1410 len = min_t(unsigned int, sizeof(iso_pi(sk)->base), optlen); 1411 1412 if (copy_from_sockptr(iso_pi(sk)->base, optval, len)) { 1413 err = -EFAULT; 1414 break; 1415 } 1416 1417 iso_pi(sk)->base_len = len; 1418 1419 break; 1420 1421 default: 1422 err = -ENOPROTOOPT; 1423 break; 1424 } 1425 1426 release_sock(sk); 1427 return err; 1428 } 1429 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 0/1] Split bt_iso_qos into dedicated structures @ 2023-03-27 13:45 Iulia Tanasescu 2023-03-27 13:45 ` [PATCH 1/1] Bluetooth: " Iulia Tanasescu 0 siblings, 1 reply; 10+ messages in thread From: Iulia Tanasescu @ 2023-03-27 13:45 UTC (permalink / raw) To: linux-bluetooth; +Cc: Iulia Tanasescu This patch adds support for additional ISO broadcast QoS parameters, that the user can set before performing broadcast procedures using an ISO socket. This patch splits the "bt_iso_qos" structure into dedicated unicast and broadcast structures, so that ISO sockets can be configured with dedicated QoS options depending on the type of ISO procedures to run. This patch depends on the BlueZ patch [PATCH BlueZ] Split bt_iso_qos into dedicated structures. Iulia Tanasescu (1): Split bt_iso_qos into dedicated structures include/net/bluetooth/bluetooth.h | 56 ++++++-- include/net/bluetooth/hci_core.h | 17 +-- net/bluetooth/hci_conn.c | 104 +++++++++------ net/bluetooth/hci_event.c | 38 +++--- net/bluetooth/iso.c | 205 ++++++++++++++++++++++++------ 5 files changed, 305 insertions(+), 115 deletions(-) base-commit: db0fc80ec686774f1ca4606e752bf42af1f1cd97 -- 2.34.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/1] Bluetooth: Split bt_iso_qos into dedicated structures 2023-03-27 13:45 [PATCH 0/1] " Iulia Tanasescu @ 2023-03-27 13:45 ` Iulia Tanasescu 0 siblings, 0 replies; 10+ messages in thread From: Iulia Tanasescu @ 2023-03-27 13:45 UTC (permalink / raw) To: linux-bluetooth; +Cc: Iulia Tanasescu Split bt_iso_qos into dedicated unicast and broadcast structures and add additional broadcast parameters. Signed-off-by: Iulia Tanasescu <iulia.tanasescu@nxp.com> --- include/net/bluetooth/bluetooth.h | 56 ++++++-- include/net/bluetooth/hci_core.h | 17 +-- net/bluetooth/hci_conn.c | 104 +++++++++------ net/bluetooth/hci_event.c | 38 +++--- net/bluetooth/iso.c | 205 ++++++++++++++++++++++++------ 5 files changed, 305 insertions(+), 115 deletions(-) diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index bcc5a4cd2c17..bc2503d9c3cd 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -1,6 +1,7 @@ /* BlueZ - Bluetooth protocol stack for Linux Copyright (C) 2000-2001 Qualcomm Incorporated + Copyright 2023 NXP Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com> @@ -171,25 +172,54 @@ struct bt_iso_io_qos { __u8 rtn; }; -struct bt_iso_qos { - union { - __u8 cig; - __u8 big; - }; - union { - __u8 cis; - __u8 bis; - }; - union { - __u8 sca; - __u8 sync_interval; - }; +struct bt_iso_ucast_qos { + __u8 cig; + __u8 cis; + __u8 sca; __u8 packing; __u8 framing; struct bt_iso_io_qos in; struct bt_iso_io_qos out; }; +struct bt_iso_bcast_src_qos { + __u8 sync_interval; + __u8 big; + __u8 bis; + __u8 packing; + __u8 framing; + __u8 encryption; + __u8 bcode[16]; + struct bt_iso_io_qos out; +}; + +struct bt_iso_bcast_snk_qos { + __u8 options; + __u16 skip; + __u16 sync_timeout; + __u8 sync_cte_type; + __u8 big; + __u8 encryption; + __u8 bcode[16]; + __u8 mse; + __u16 timeout; + struct bt_iso_io_qos in; +}; + +struct bt_iso_bcast_qos { +union { + struct bt_iso_bcast_src_qos bsrc; + struct bt_iso_bcast_snk_qos bsnk; + }; +}; + +struct bt_iso_qos { + union { + struct bt_iso_ucast_qos ucast; + struct bt_iso_bcast_qos bcast; + }; +}; + #define BT_ISO_PHY_1M 0x01 #define BT_ISO_PHY_2M 0x02 #define BT_ISO_PHY_CODED 0x04 diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 53d3328c2b8b..e6e6217a4509 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -1,6 +1,7 @@ /* BlueZ - Bluetooth protocol stack for Linux Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved. + Copyright 2023 NXP Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com> @@ -1090,7 +1091,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_bis(struct hci_dev *hdev, if (bacmp(&c->dst, ba) || c->type != ISO_LINK) continue; - if (c->iso_qos.big == big && c->iso_qos.bis == bis) { + if (c->iso_qos.bcast.bsrc.big == big && c->iso_qos.bcast.bsrc.bis == bis) { rcu_read_unlock(); return c; } @@ -1199,7 +1200,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_cig(struct hci_dev *hdev, if (c->type != ISO_LINK) continue; - if (handle == c->iso_qos.cig) { + if (handle == c->iso_qos.ucast.cig) { rcu_read_unlock(); return c; } @@ -1222,7 +1223,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_big(struct hci_dev *hdev, if (bacmp(&c->dst, BDADDR_ANY) || c->type != ISO_LINK) continue; - if (handle == c->iso_qos.big) { + if (handle == c->iso_qos.bcast.bsrc.big) { rcu_read_unlock(); return c; } @@ -1324,15 +1325,15 @@ struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst, struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst, __u16 setting, struct bt_codec *codec); struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst, - __u8 dst_type, struct bt_iso_qos *qos); + __u8 dst_type, struct bt_iso_ucast_qos *qos); struct hci_conn *hci_connect_cis(struct hci_dev *hdev, bdaddr_t *dst, - __u8 dst_type, struct bt_iso_qos *qos); + __u8 dst_type, struct bt_iso_ucast_qos *qos); struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst, - __u8 dst_type, struct bt_iso_qos *qos, + __u8 dst_type, struct bt_iso_bcast_src_qos *qos, __u8 data_len, __u8 *data); int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type, - __u8 sid); -int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_qos *qos, + __u8 sid, struct bt_iso_bcast_snk_qos *qos); +int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_bcast_snk_qos *qos, __u16 sync_handle, __u8 num_bis, __u8 bis[]); int hci_conn_check_link_mode(struct hci_conn *conn); int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level); diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 17b946f9ba31..8e12b00b45a2 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -1,6 +1,7 @@ /* BlueZ - Bluetooth protocol stack for Linux Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved. + Copyright 2023 NXP Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com> @@ -771,13 +772,22 @@ struct iso_list_data { static void bis_list(struct hci_conn *conn, void *data) { struct iso_list_data *d = data; + u8 check_big; + u8 check_bis = BT_ISO_QOS_BIS_UNSET; /* Skip if not broadcast/ANY address */ if (bacmp(&conn->dst, BDADDR_ANY)) return; - if (d->big != conn->iso_qos.big || d->bis == BT_ISO_QOS_BIS_UNSET || - d->bis != conn->iso_qos.bis) + if (conn->role == HCI_ROLE_MASTER) { + check_big = conn->iso_qos.bcast.bsrc.big; + check_bis = conn->iso_qos.bcast.bsrc.bis; + } else { + check_big = conn->iso_qos.bcast.bsnk.big; + } + + if (d->big != check_big || d->bis == BT_ISO_QOS_BIS_UNSET || + d->bis != check_bis) return; d->count++; @@ -897,10 +907,10 @@ static void bis_cleanup(struct hci_conn *conn) if (!test_and_clear_bit(HCI_CONN_PER_ADV, &conn->flags)) return; - hci_le_terminate_big(hdev, conn->iso_qos.big, - conn->iso_qos.bis); + hci_le_terminate_big(hdev, conn->iso_qos.bcast.bsrc.big, + conn->iso_qos.bcast.bsrc.bis); } else { - hci_le_big_terminate(hdev, conn->iso_qos.big, + hci_le_big_terminate(hdev, conn->iso_qos.bcast.bsnk.big, conn->sync_handle); } } @@ -940,7 +950,7 @@ static void cis_cleanup(struct hci_conn *conn) struct iso_list_data d; memset(&d, 0, sizeof(d)); - d.cig = conn->iso_qos.cig; + d.cig = conn->iso_qos.ucast.cig; /* Check if ISO connection is a CIS and remove CIG if there are * no other connections using it. @@ -949,7 +959,7 @@ static void cis_cleanup(struct hci_conn *conn) if (d.count) return; - hci_le_remove_cig(hdev, conn->iso_qos.cig); + hci_le_remove_cig(hdev, conn->iso_qos.ucast.cig); } struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst, @@ -1398,12 +1408,12 @@ static int hci_explicit_conn_params_set(struct hci_dev *hdev, return 0; } -static int qos_set_big(struct hci_dev *hdev, struct bt_iso_qos *qos) +static int qos_set_big(struct hci_dev *hdev, uint8_t *big) { struct iso_list_data data; /* Allocate a BIG if not set */ - if (qos->big == BT_ISO_QOS_BIG_UNSET) { + if (*big == BT_ISO_QOS_BIG_UNSET) { for (data.big = 0x00; data.big < 0xef; data.big++) { data.count = 0; data.bis = 0xff; @@ -1418,13 +1428,14 @@ static int qos_set_big(struct hci_dev *hdev, struct bt_iso_qos *qos) return -EADDRNOTAVAIL; /* Update BIG */ - qos->big = data.big; + *big = data.big; } return 0; } -static int qos_set_bis(struct hci_dev *hdev, struct bt_iso_qos *qos) +static int qos_set_bis(struct hci_dev *hdev, + struct bt_iso_bcast_src_qos *qos) { struct iso_list_data data; @@ -1455,7 +1466,7 @@ static int qos_set_bis(struct hci_dev *hdev, struct bt_iso_qos *qos) /* This function requires the caller holds hdev->lock */ static struct hci_conn *hci_add_bis(struct hci_dev *hdev, bdaddr_t *dst, - struct bt_iso_qos *qos) + struct bt_iso_bcast_src_qos *qos) { struct hci_conn *conn; struct iso_list_data data; @@ -1468,7 +1479,7 @@ static struct hci_conn *hci_add_bis(struct hci_dev *hdev, bdaddr_t *dst, return ERR_PTR(-EOPNOTSUPP); } - err = qos_set_big(hdev, qos); + err = qos_set_big(hdev, &qos->big); if (err) return ERR_PTR(err); @@ -1636,7 +1647,7 @@ struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst, return sco; } -static void cis_add(struct iso_list_data *d, struct bt_iso_qos *qos) +static void cis_add(struct iso_list_data *d, struct bt_iso_ucast_qos *qos) { struct hci_cis_params *cis = &d->pdu.cis[d->pdu.cp.num_cis]; @@ -1659,8 +1670,8 @@ static void cis_list(struct hci_conn *conn, void *data) if (!bacmp(&conn->dst, BDADDR_ANY)) return; - if (d->cig != conn->iso_qos.cig || d->cis == BT_ISO_QOS_CIS_UNSET || - d->cis != conn->iso_qos.cis) + if (d->cig != conn->iso_qos.ucast.cig || d->cis == BT_ISO_QOS_CIS_UNSET || + d->cis != conn->iso_qos.ucast.cis) return; d->count++; @@ -1669,10 +1680,11 @@ static void cis_list(struct hci_conn *conn, void *data) d->count >= ARRAY_SIZE(d->pdu.cis)) return; - cis_add(d, &conn->iso_qos); + cis_add(d, &conn->iso_qos.ucast); } -static int hci_le_create_big(struct hci_conn *conn, struct bt_iso_qos *qos) +static int hci_le_create_big(struct hci_conn *conn, + struct bt_iso_bcast_src_qos *qos) { struct hci_dev *hdev = conn->hdev; struct hci_cp_le_create_big cp; @@ -1689,13 +1701,14 @@ static int hci_le_create_big(struct hci_conn *conn, struct bt_iso_qos *qos) cp.bis.phy = qos->out.phy; cp.bis.packing = qos->packing; cp.bis.framing = qos->framing; - cp.bis.encryption = 0x00; - memset(&cp.bis.bcode, 0, sizeof(cp.bis.bcode)); + cp.bis.encryption = qos->encryption; + memcpy(&cp.bis.bcode, qos->bcode, sizeof(cp.bis.bcode)); return hci_send_cmd(hdev, HCI_OP_LE_CREATE_BIG, sizeof(cp), &cp); } -static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos) +static bool hci_le_set_cig_params(struct hci_conn *conn, + struct bt_iso_ucast_qos *qos) { struct hci_dev *hdev = conn->hdev; struct iso_list_data data; @@ -1779,7 +1792,7 @@ static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos) } struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst, - __u8 dst_type, struct bt_iso_qos *qos) + __u8 dst_type, struct bt_iso_ucast_qos *qos) { struct hci_conn *cis; @@ -1797,7 +1810,7 @@ struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst, /* Check if CIS has been set and the settings matches */ if (cis->state == BT_BOUND && - !memcmp(&cis->iso_qos, qos, sizeof(*qos))) + !memcmp(&cis->iso_qos.ucast, qos, sizeof(*qos))) return cis; /* Update LINK PHYs according to QoS preference */ @@ -1833,7 +1846,7 @@ struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst, return ERR_PTR(-EINVAL); } - cis->iso_qos = *qos; + cis->iso_qos.ucast = *qos; cis->state = BT_BOUND; return cis; @@ -1843,10 +1856,19 @@ bool hci_iso_setup_path(struct hci_conn *conn) { struct hci_dev *hdev = conn->hdev; struct hci_cp_le_setup_iso_path cmd; + struct bt_iso_io_qos *in = NULL; + struct bt_iso_io_qos *out = NULL; memset(&cmd, 0, sizeof(cmd)); - if (conn->iso_qos.out.sdu) { + if (bacmp(&conn->dst, BDADDR_ANY)) { + in = &conn->iso_qos.ucast.in; + out = &conn->iso_qos.ucast.out; + } else { + out = &conn->iso_qos.bcast.bsrc.out; + } + + if (out->sdu) { cmd.handle = cpu_to_le16(conn->handle); cmd.direction = 0x00; /* Input (Host to Controller) */ cmd.path = 0x00; /* HCI path if enabled */ @@ -1857,7 +1879,7 @@ bool hci_iso_setup_path(struct hci_conn *conn) return false; } - if (conn->iso_qos.in.sdu) { + if (in && in->sdu) { cmd.handle = cpu_to_le16(conn->handle); cmd.direction = 0x01; /* Output (Controller to Host) */ cmd.path = 0x00; /* HCI path if enabled */ @@ -1884,7 +1906,7 @@ static int hci_create_cis_sync(struct hci_dev *hdev, void *data) cmd.cis[0].acl_handle = cpu_to_le16(conn->link->handle); cmd.cis[0].cis_handle = cpu_to_le16(conn->handle); cmd.cp.num_cis++; - cig = conn->iso_qos.cig; + cig = conn->iso_qos.ucast.cig; hci_dev_lock(hdev); @@ -1894,7 +1916,7 @@ static int hci_create_cis_sync(struct hci_dev *hdev, void *data) struct hci_cis *cis = &cmd.cis[cmd.cp.num_cis]; if (conn == data || conn->type != ISO_LINK || - conn->state == BT_CONNECTED || conn->iso_qos.cig != cig) + conn->state == BT_CONNECTED || conn->iso_qos.ucast.cig != cig) continue; /* Check if all CIS(s) belonging to a CIG are ready */ @@ -1991,19 +2013,19 @@ static void hci_iso_qos_setup(struct hci_dev *hdev, struct hci_conn *conn, } static void hci_bind_bis(struct hci_conn *conn, - struct bt_iso_qos *qos) + struct bt_iso_bcast_src_qos *qos) { /* Update LINK PHYs according to QoS preference */ conn->le_tx_phy = qos->out.phy; conn->le_tx_phy = qos->out.phy; - conn->iso_qos = *qos; + conn->iso_qos.bcast.bsrc = *qos; conn->state = BT_BOUND; } static int create_big_sync(struct hci_dev *hdev, void *data) { struct hci_conn *conn = data; - struct bt_iso_qos *qos = &conn->iso_qos; + struct bt_iso_bcast_src_qos *qos = &conn->iso_qos.bcast.bsrc; u16 interval, sync_interval = 0; u32 flags = 0; int err; @@ -2023,7 +2045,7 @@ static int create_big_sync(struct hci_dev *hdev, void *data) if (err) return err; - return hci_le_create_big(conn, &conn->iso_qos); + return hci_le_create_big(conn, &conn->iso_qos.bcast.bsrc); } static void create_pa_complete(struct hci_dev *hdev, void *data, int err) @@ -2054,7 +2076,7 @@ static int create_pa_sync(struct hci_dev *hdev, void *data) } int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type, - __u8 sid) + __u8 sid, struct bt_iso_bcast_snk_qos *qos) { struct hci_cp_le_pa_create_sync *cp; @@ -2067,15 +2089,19 @@ int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type, return -ENOMEM; } + cp->options = qos->options; cp->sid = sid; cp->addr_type = dst_type; + cp->skip = qos->skip; + cp->sync_timeout = qos->sync_timeout; + cp->sync_cte_type = qos->sync_cte_type; bacpy(&cp->addr, dst); /* Queue start pa_create_sync and scan */ return hci_cmd_sync_queue(hdev, create_pa_sync, cp, create_pa_complete); } -int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_qos *qos, +int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_bcast_snk_qos *qos, __u16 sync_handle, __u8 num_bis, __u8 bis[]) { struct _packed { @@ -2087,13 +2113,17 @@ int hci_le_big_create_sync(struct hci_dev *hdev, struct bt_iso_qos *qos, if (num_bis > sizeof(pdu.bis)) return -EINVAL; - err = qos_set_big(hdev, qos); + err = qos_set_big(hdev, &qos->big); if (err) return err; memset(&pdu, 0, sizeof(pdu)); pdu.cp.handle = qos->big; pdu.cp.sync_handle = cpu_to_le16(sync_handle); + pdu.cp.encryption = qos->encryption; + memcpy(pdu.cp.bcode, qos->bcode, sizeof(pdu.cp.bcode)); + pdu.cp.mse = qos->mse; + pdu.cp.timeout = qos->timeout; pdu.cp.num_bis = num_bis; memcpy(pdu.bis, bis, num_bis); @@ -2115,7 +2145,7 @@ static void create_big_complete(struct hci_dev *hdev, void *data, int err) } struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst, - __u8 dst_type, struct bt_iso_qos *qos, + __u8 dst_type, struct bt_iso_bcast_src_qos *qos, __u8 base_len, __u8 *base) { struct hci_conn *conn; @@ -2151,7 +2181,7 @@ struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst, } struct hci_conn *hci_connect_cis(struct hci_dev *hdev, bdaddr_t *dst, - __u8 dst_type, struct bt_iso_qos *qos) + __u8 dst_type, struct bt_iso_ucast_qos *qos) { struct hci_conn *le; struct hci_conn *cis; diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 8d8547fa9032..0a7c2c759ac8 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1,6 +1,7 @@ /* BlueZ - Bluetooth protocol stack for Linux Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved. + Copyright 2023 NXP Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com> @@ -3843,7 +3844,7 @@ static u8 hci_cc_le_set_cig_params(struct hci_dev *hdev, void *data, rcu_read_lock(); list_for_each_entry_rcu(conn, &hdev->conn_hash.list, list) { - if (conn->type != ISO_LINK || conn->iso_qos.cig != rp->cig_id || + if (conn->type != ISO_LINK || conn->iso_qos.ucast.cig != rp->cig_id || conn->state == BT_CONNECTED) continue; @@ -3877,6 +3878,7 @@ static u8 hci_cc_le_setup_iso_path(struct hci_dev *hdev, void *data, struct hci_rp_le_setup_iso_path *rp = data; struct hci_cp_le_setup_iso_path *cp; struct hci_conn *conn; + bool cfm; bt_dev_dbg(hdev, "status 0x%2.2x", rp->status); @@ -3900,12 +3902,14 @@ static u8 hci_cc_le_setup_iso_path(struct hci_dev *hdev, void *data, /* Input (Host to Controller) */ case 0x00: /* Only confirm connection if output only */ - if (conn->iso_qos.out.sdu && !conn->iso_qos.in.sdu) + cfm = !bacmp(&conn->dst, BDADDR_ANY) || + (conn->iso_qos.ucast.out.sdu && !conn->iso_qos.ucast.in.sdu); + if (cfm) hci_connect_cfm(conn, rp->status); break; /* Output (Controller to Host) */ case 0x01: - /* Confirm connection since conn->iso_qos is always configured + /* Confirm connection since Output is always configured * last. */ hci_connect_cfm(conn, rp->status); @@ -6822,15 +6826,15 @@ static void hci_le_cis_estabilished_evt(struct hci_dev *hdev, void *data, memset(&interval, 0, sizeof(interval)); memcpy(&interval, ev->c_latency, sizeof(ev->c_latency)); - conn->iso_qos.in.interval = le32_to_cpu(interval); + conn->iso_qos.ucast.in.interval = le32_to_cpu(interval); memcpy(&interval, ev->p_latency, sizeof(ev->p_latency)); - conn->iso_qos.out.interval = le32_to_cpu(interval); - conn->iso_qos.in.latency = le16_to_cpu(ev->interval); - conn->iso_qos.out.latency = le16_to_cpu(ev->interval); - conn->iso_qos.in.sdu = le16_to_cpu(ev->c_mtu); - conn->iso_qos.out.sdu = le16_to_cpu(ev->p_mtu); - conn->iso_qos.in.phy = ev->c_phy; - conn->iso_qos.out.phy = ev->p_phy; + conn->iso_qos.ucast.out.interval = le32_to_cpu(interval); + conn->iso_qos.ucast.in.latency = le16_to_cpu(ev->interval); + conn->iso_qos.ucast.out.latency = le16_to_cpu(ev->interval); + conn->iso_qos.ucast.in.sdu = le16_to_cpu(ev->c_mtu); + conn->iso_qos.ucast.out.sdu = le16_to_cpu(ev->p_mtu); + conn->iso_qos.ucast.in.phy = ev->c_phy; + conn->iso_qos.ucast.out.phy = ev->p_phy; } if (!ev->status) { @@ -6904,8 +6908,8 @@ static void hci_le_cis_req_evt(struct hci_dev *hdev, void *data, cis->handle = cis_handle; } - cis->iso_qos.cig = ev->cig_id; - cis->iso_qos.cis = ev->cis_id; + cis->iso_qos.ucast.cig = ev->cig_id; + cis->iso_qos.ucast.cis = ev->cis_id; if (!(flags & HCI_PROTO_DEFER)) { hci_le_accept_cis(hdev, ev->cis_handle); @@ -6992,13 +6996,13 @@ static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data, bis->handle = handle; } - bis->iso_qos.big = ev->handle; + bis->iso_qos.bcast.bsnk.big = ev->handle; memset(&interval, 0, sizeof(interval)); memcpy(&interval, ev->latency, sizeof(ev->latency)); - bis->iso_qos.in.interval = le32_to_cpu(interval); + bis->iso_qos.bcast.bsnk.in.interval = le32_to_cpu(interval); /* Convert ISO Interval (1.25 ms slots) to latency (ms) */ - bis->iso_qos.in.latency = le16_to_cpu(ev->interval) * 125 / 100; - bis->iso_qos.in.sdu = le16_to_cpu(ev->max_pdu); + bis->iso_qos.bcast.bsnk.in.latency = le16_to_cpu(ev->interval) * 125 / 100; + bis->iso_qos.bcast.bsnk.in.sdu = le16_to_cpu(ev->max_pdu); hci_connect_cfm(bis, ev->status); } diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c index 8d136a730163..4bbac01c84c2 100644 --- a/net/bluetooth/iso.c +++ b/net/bluetooth/iso.c @@ -3,6 +3,7 @@ * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2022 Intel Corporation + * Copyright 2023 NXP */ #include <linux/module.h> @@ -59,11 +60,55 @@ struct iso_pinfo { __u16 sync_handle; __u32 flags; struct bt_iso_qos qos; + bool qos_user_set; __u8 base_len; __u8 base[BASE_MAX_LENGTH]; struct iso_conn *conn; }; +#define DEFAULT_IO_QOS \ +{ \ + .interval = 10000u, \ + .latency = 10u, \ + .sdu = 40u, \ + .phy = BT_ISO_PHY_2M, \ + .rtn = 2u, \ +} + +static struct bt_iso_ucast_qos default_ucast_qos = { + .cig = BT_ISO_QOS_CIG_UNSET, + .cis = BT_ISO_QOS_CIS_UNSET, + .sca = 0x00, + .packing = 0x00, + .framing = 0x00, + .in = DEFAULT_IO_QOS, + .out = DEFAULT_IO_QOS, +}; + +static struct bt_iso_bcast_snk_qos default_snk_qos = { + .options = 0x00, + .skip = 0x0000, + .sync_timeout = 0x4000, + .sync_cte_type = 0x0000, + .big = BT_ISO_QOS_BIG_UNSET, + .encryption = 0x00, + .bcode = {0x00}, + .mse = 0x00, + .timeout = 0x4000, + .in = DEFAULT_IO_QOS, +}; + +static struct bt_iso_bcast_src_qos default_src_qos = { + .sync_interval = 0x07, + .big = BT_ISO_QOS_BIG_UNSET, + .bis = BT_ISO_QOS_BIS_UNSET, + .packing = 0x00, + .framing = 0x00, + .encryption = 0x00, + .bcode = {0x00}, + .out = DEFAULT_IO_QOS, +}; + /* ---- ISO timers ---- */ #define ISO_CONN_TIMEOUT (HZ * 40) #define ISO_DISCONN_TIMEOUT (HZ * 2) @@ -243,6 +288,8 @@ static inline u8 le_addr_type(u8 bdaddr_type) return ADDR_LE_DEV_RANDOM; } +static bool check_bcast_src_qos(struct bt_iso_bcast_src_qos *qos); + static int iso_connect_bis(struct sock *sk) { struct iso_conn *conn; @@ -264,15 +311,27 @@ static int iso_connect_bis(struct sock *sk) goto unlock; } + /* Check QoS */ + if (!check_bcast_src_qos(&iso_pi(sk)->qos.bcast.bsrc)) { + if (!iso_pi(sk)->qos_user_set) { + /* Set default broadcast source QoS */ + iso_pi(sk)->qos.bcast.bsrc = default_src_qos; + } else { + /* Fail if the user provided invalid QoS */ + err = -EINVAL; + goto unlock; + } + } + /* Fail if out PHYs are marked as disabled */ - if (!iso_pi(sk)->qos.out.phy) { + if (!iso_pi(sk)->qos.bcast.bsrc.out.phy) { err = -EINVAL; goto unlock; } hcon = hci_connect_bis(hdev, &iso_pi(sk)->dst, le_addr_type(iso_pi(sk)->dst_type), - &iso_pi(sk)->qos, iso_pi(sk)->base_len, + &iso_pi(sk)->qos.bcast.bsrc, iso_pi(sk)->base_len, iso_pi(sk)->base); if (IS_ERR(hcon)) { err = PTR_ERR(hcon); @@ -315,6 +374,8 @@ static int iso_connect_bis(struct sock *sk) return err; } +static bool check_ucast_qos(struct bt_iso_ucast_qos *qos); + static int iso_connect_cis(struct sock *sk) { struct iso_conn *conn; @@ -336,8 +397,14 @@ static int iso_connect_cis(struct sock *sk) goto unlock; } + /* Check QoS */ + if (!check_ucast_qos(&iso_pi(sk)->qos.ucast)) { + err = -EINVAL; + goto unlock; + } + /* Fail if either PHYs are marked as disabled */ - if (!iso_pi(sk)->qos.in.phy && !iso_pi(sk)->qos.out.phy) { + if (!iso_pi(sk)->qos.ucast.in.phy && !iso_pi(sk)->qos.ucast.out.phy) { err = -EINVAL; goto unlock; } @@ -346,7 +413,7 @@ static int iso_connect_cis(struct sock *sk) if (test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) { hcon = hci_bind_cis(hdev, &iso_pi(sk)->dst, le_addr_type(iso_pi(sk)->dst_type), - &iso_pi(sk)->qos); + &iso_pi(sk)->qos.ucast); if (IS_ERR(hcon)) { err = PTR_ERR(hcon); goto unlock; @@ -354,7 +421,7 @@ static int iso_connect_cis(struct sock *sk) } else { hcon = hci_connect_cis(hdev, &iso_pi(sk)->dst, le_addr_type(iso_pi(sk)->dst_type), - &iso_pi(sk)->qos); + &iso_pi(sk)->qos.ucast); if (IS_ERR(hcon)) { err = PTR_ERR(hcon); goto unlock; @@ -408,16 +475,16 @@ static struct bt_iso_qos *iso_sock_get_qos(struct sock *sk) return &iso_pi(sk)->qos; } -static int iso_send_frame(struct sock *sk, struct sk_buff *skb) +static int iso_send_frame(struct sock *sk, struct sk_buff *skb, + struct bt_iso_io_qos *out) { struct iso_conn *conn = iso_pi(sk)->conn; - struct bt_iso_qos *qos = iso_sock_get_qos(sk); struct hci_iso_data_hdr *hdr; int len = 0; BT_DBG("sk %p len %d", sk, skb->len); - if (skb->len > qos->out.sdu) + if (skb->len > out->sdu) return -EMSGSIZE; len = skb->len; @@ -661,6 +728,13 @@ static void iso_sock_init(struct sock *sk, struct sock *parent) sk->sk_type = parent->sk_type; bt_sk(sk)->flags = bt_sk(parent)->flags; security_sk_clone(parent, sk); + + if (bacmp(&iso_pi(parent)->dst, BDADDR_ANY)) + iso_pi(sk)->qos.bcast.bsnk = default_snk_qos; + else + iso_pi(sk)->qos.ucast = default_ucast_qos; + } else { + iso_pi(sk)->qos.ucast = default_ucast_qos; } } @@ -670,25 +744,6 @@ static struct proto iso_proto = { .obj_size = sizeof(struct iso_pinfo) }; -#define DEFAULT_IO_QOS \ -{ \ - .interval = 10000u, \ - .latency = 10u, \ - .sdu = 40u, \ - .phy = BT_ISO_PHY_2M, \ - .rtn = 2u, \ -} - -static struct bt_iso_qos default_qos = { - .cig = BT_ISO_QOS_CIG_UNSET, - .cis = BT_ISO_QOS_CIS_UNSET, - .sca = 0x00, - .packing = 0x00, - .framing = 0x00, - .in = DEFAULT_IO_QOS, - .out = DEFAULT_IO_QOS, -}; - static struct sock *iso_sock_alloc(struct net *net, struct socket *sock, int proto, gfp_t prio, int kern) { @@ -712,8 +767,6 @@ static struct sock *iso_sock_alloc(struct net *net, struct socket *sock, /* Set address type as public as default src address is BDADDR_ANY */ iso_pi(sk)->src_type = BDADDR_LE_PUBLIC; - iso_pi(sk)->qos = default_qos; - bt_sock_link(&iso_sk_list, sk); return sk; } @@ -869,6 +922,8 @@ static int iso_sock_connect(struct socket *sock, struct sockaddr *addr, return err; } +static bool check_bcast_snk_qos(struct bt_iso_bcast_snk_qos *qos); + static int iso_listen_bis(struct sock *sk) { struct hci_dev *hdev; @@ -893,9 +948,20 @@ static int iso_listen_bis(struct sock *sk) if (!hdev) return -EHOSTUNREACH; + /* Check QoS */ + if (!check_bcast_snk_qos(&iso_pi(sk)->qos.bcast.bsnk)) { + if (!iso_pi(sk)->qos_user_set) { + /* Set default broadcast sink QoS */ + iso_pi(sk)->qos.bcast.bsnk = default_snk_qos; + } else { + /* Fail if the user provided invalid QoS */ + return -EINVAL; + } + } + err = hci_pa_create_sync(hdev, &iso_pi(sk)->dst, le_addr_type(iso_pi(sk)->dst_type), - iso_pi(sk)->bc_sid); + iso_pi(sk)->bc_sid, &iso_pi(sk)->qos.bcast.bsnk); hci_dev_put(hdev); @@ -1086,10 +1152,15 @@ static int iso_sock_sendmsg(struct socket *sock, struct msghdr *msg, lock_sock(sk); - if (sk->sk_state == BT_CONNECTED) - err = iso_send_frame(sk, skb); - else + if (sk->sk_state == BT_CONNECTED) { + if (bacmp(&conn->hcon->dst, BDADDR_ANY)) + err = iso_send_frame(sk, skb, &iso_pi(sk)->qos.ucast.out); + else + err = iso_send_frame(sk, skb, + &iso_pi(sk)->qos.bcast.bsrc.out); + } else { err = -ENOTCONN; + } release_sock(sk); @@ -1154,7 +1225,7 @@ static bool check_io_qos(struct bt_iso_io_qos *qos) return true; } -static bool check_qos(struct bt_iso_qos *qos) +static bool check_ucast_qos(struct bt_iso_ucast_qos *qos) { if (qos->sca > 0x07) return false; @@ -1174,6 +1245,55 @@ static bool check_qos(struct bt_iso_qos *qos) return true; } +static bool check_bcast_snk_qos(struct bt_iso_bcast_snk_qos *qos) +{ + if (qos->options > 0x07) + return false; + + if (qos->skip > 0x01f3) + return false; + + if (qos->sync_timeout < 0x000a || qos->sync_timeout > 0x4000) + return false; + + if (qos->sync_cte_type > 0x1f) + return false; + + if (qos->encryption > 0x01) + return false; + + if (qos->mse > 0x1f) + return false; + + if (qos->timeout < 0x000a || qos->timeout > 0x4000) + return false; + + if (!check_io_qos(&qos->in)) + return false; + + return true; +} + +static bool check_bcast_src_qos(struct bt_iso_bcast_src_qos *qos) +{ + if (qos->sync_interval > 0x07) + return false; + + if (qos->packing > 0x01) + return false; + + if (qos->framing > 0x01) + return false; + + if (qos->encryption > 0x01) + return false; + + if (!check_io_qos(&qos->out)) + return false; + + return true; +} + static int iso_sock_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval, unsigned int optlen) { @@ -1224,12 +1344,17 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname, break; } - if (!check_qos(&qos)) { - err = -EINVAL; - break; - } + if (sk->sk_state == BT_BOUND && bacmp(&iso_pi(sk)->dst, BDADDR_ANY)) + /* If socket is bound with broadcast address, + * check broadcast sink QoS + */ + if (!check_bcast_snk_qos(&qos.bcast.bsnk)) { + err = -EINVAL; + break; + } iso_pi(sk)->qos = qos; + iso_pi(sk)->qos_user_set = true; break; @@ -1419,7 +1544,7 @@ static bool iso_match_big(struct sock *sk, void *data) { struct hci_evt_le_big_sync_estabilished *ev = data; - return ev->handle == iso_pi(sk)->qos.big; + return ev->handle == iso_pi(sk)->qos.bcast.bsnk.big; } static void iso_conn_ready(struct iso_conn *conn) @@ -1550,7 +1675,7 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags) iso_pi(sk)->bc_num_bis = ev2->num_bis; err = hci_le_big_create_sync(hdev, - &iso_pi(sk)->qos, + &iso_pi(sk)->qos.bcast.bsnk, iso_pi(sk)->sync_handle, iso_pi(sk)->bc_num_bis, iso_pi(sk)->bc_bis); -- 2.34.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-03-27 13:45 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-03-20 14:36 [PATCH 0/1] Split bt_iso_qos into dedicated structures Iulia Tanasescu 2023-03-20 14:36 ` [PATCH 1/1] Bluetooth: " Iulia Tanasescu 2023-03-20 15:03 ` bluez.test.bot 2023-03-20 18:43 ` [PATCH 1/1] Bluetooth: " Luiz Augusto von Dentz 2023-03-21 8:08 ` Iulia Tanasescu 2023-03-22 15:23 ` Iulia Tanasescu 2023-03-22 17:38 ` Luiz Augusto von Dentz 2023-03-23 15:06 ` Iulia Tanasescu 2023-03-20 22:49 ` kernel test robot -- strict thread matches above, loose matches on Subject: below -- 2023-03-27 13:45 [PATCH 0/1] " Iulia Tanasescu 2023-03-27 13:45 ` [PATCH 1/1] Bluetooth: " Iulia Tanasescu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox