iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: Add vendor-specific packet classification for ISO data

Browse Source 
When HCI raw sockets are opened, the Bluetooth kernel module doesn't
track CIS/BIS connections. User-space applications have to identify
ISO data by maintaining connection information and look up the mapping
for each ACL data packet received. Besides, btsnoop log captured in
kernel couldn't tell ISO data from ACL data in this case.

To avoid additional lookups, this patch introduces vendor-specific
packet classification for Intel BT controllers to distinguish
ISO data packets from ACL data packets.

Signed-off-by: Ying Hsu <yinghsu@chromium.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Ying Hsu 2024-05-29 08:00:00 +00:00 committed by Luiz Augusto von Dentz
parent d4cc4ee481
commit f25b7fd36c
3 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/bluetooth/btintel.c
View File

@ -2549,6 +2549,24 @@ static void btintel_set_dsm_reset_method(struct hci_dev *hdev,
data->acpi_reset_method = btintel_acpi_reset_method; data->acpi_reset_method = btintel_acpi_reset_method;
} }
#define BTINTEL_ISODATA_HANDLE_BASE 0x900
static u8 btintel_classify_pkt_type(struct hci_dev *hdev, struct sk_buff *skb)
{
/*
* Distinguish ISO data packets form ACL data packets
* based on their connection handle value range.
*/
if (hci_skb_pkt_type(skb) == HCI_ACLDATA_PKT) {
__u16 handle = __le16_to_cpu(hci_acl_hdr(skb)->handle);
if (hci_handle(handle) >= BTINTEL_ISODATA_HANDLE_BASE)
return HCI_ISODATA_PKT;
}
return hci_skb_pkt_type(skb);
}
int btintel_bootloader_setup_tlv(struct hci_dev *hdev, int btintel_bootloader_setup_tlv(struct hci_dev *hdev,
struct intel_version_tlv *ver) struct intel_version_tlv *ver)
{ {
@ -2989,11 +3007,14 @@ static int btintel_setup_combined(struct hci_dev *hdev)
err = btintel_bootloader_setup(hdev, &ver); err = btintel_bootloader_setup(hdev, &ver);
btintel_register_devcoredump_support(hdev); btintel_register_devcoredump_support(hdev);
break; break;
case 0x18: /* GfP2 */
case 0x1c: /* GaP */
/* Re-classify packet type for controllers with LE audio */
hdev->classify_pkt_type = btintel_classify_pkt_type;
fallthrough;
case 0x17: case 0x17:
case 0x18:
case 0x19: case 0x19:
case 0x1b: case 0x1b:
case 0x1c:
case 0x1e: case 0x1e:
/* Display version information of TLV type */ /* Display version information of TLV type */
btintel_version_info_tlv(hdev, &ver_tlv); btintel_version_info_tlv(hdev, &ver_tlv);

1
include/net/bluetooth/hci_core.h
View File

@ -649,6 +649,7 @@ struct hci_dev {
int (*get_codec_config_data)(struct hci_dev *hdev, __u8 type, int (*get_codec_config_data)(struct hci_dev *hdev, __u8 type,
struct bt_codec *codec, __u8 *vnd_len, struct bt_codec *codec, __u8 *vnd_len,
__u8 **vnd_data); __u8 **vnd_data);
u8 (*classify_pkt_type)(struct hci_dev *hdev, struct sk_buff *skb);
}; };
#define HCI_PHY_HANDLE(handle) (handle & 0xff) #define HCI_PHY_HANDLE(handle) (handle & 0xff)

16
net/bluetooth/hci_core.c
View File

@ -2909,15 +2909,31 @@ int hci_reset_dev(struct hci_dev *hdev)
} }
EXPORT_SYMBOL(hci_reset_dev); EXPORT_SYMBOL(hci_reset_dev);
static u8 hci_dev_classify_pkt_type(struct hci_dev *hdev, struct sk_buff *skb)
{
if (hdev->classify_pkt_type)
return hdev->classify_pkt_type(hdev, skb);
return hci_skb_pkt_type(skb);
}
/* Receive frame from HCI drivers */ /* Receive frame from HCI drivers */
int hci_recv_frame(struct hci_dev *hdev, struct sk_buff *skb) int hci_recv_frame(struct hci_dev *hdev, struct sk_buff *skb)
{ {
u8 dev_pkt_type;
if (!hdev || (!test_bit(HCI_UP, &hdev->flags) if (!hdev || (!test_bit(HCI_UP, &hdev->flags)
&& !test_bit(HCI_INIT, &hdev->flags))) { && !test_bit(HCI_INIT, &hdev->flags))) {
kfree_skb(skb); kfree_skb(skb);
return -ENXIO; return -ENXIO;
} }
/* Check if the driver agree with packet type classification */
dev_pkt_type = hci_dev_classify_pkt_type(hdev, skb);
if (hci_skb_pkt_type(skb) != dev_pkt_type) {
hci_skb_pkt_type(skb) = dev_pkt_type;
}
switch (hci_skb_pkt_type(skb)) { switch (hci_skb_pkt_type(skb)) {
case HCI_EVENT_PKT: case HCI_EVENT_PKT:
break; break;