| Message ID | 20230302151413.v7.4.I8ac78c64382c66cdb49076a2053ef9c44ebf1ea3@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v7,1/4] Bluetooth: Add support for hci devcoredump | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/CheckPatch | success | CheckPatch PASS |
| tedd_an/GitLint | success | Gitlint PASS |
| tedd_an/SubjectPrefix | success | Gitlint PASS |
| tedd_an/IncrementalBuild | success | Incremental Build PASS |
Hi Manish, On Thu, Mar 2, 2023 at 3:15 PM Manish Mandlik <mmandlik@google.com> wrote: > > From: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> > > Intercept debug exception events from the controller and put them into > a devcoredump using hci devcoredump APIs. The debug exception contains > data in a TLV format and it will be parsed in userspace. > > Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> > Signed-off-by: Manish Mandlik <mmandlik@google.com> > Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> > Reviewed-by: Chethan Tumkur Narayan <chethan.tumkur.narayan@intel.com> > --- > > Changes in v7: > - Update btintel_coredump() and btusb_intel_diagnostics() > > Changes in v6: > - Implement btintel_coredump() > > Changes in v4: > - Add btintel_coredump() placeholder > > Changes in v2: > - Create a local struct to store coredump_info in btintel.c > - Call btintel_register_devcoredump_support() from btintel.c > - Fix strncpy() destination bound warning > > drivers/bluetooth/btintel.c | 81 ++++++++++++++++++++++++++++++++++++- > drivers/bluetooth/btintel.h | 12 +++++- > drivers/bluetooth/btusb.c | 54 +++++++++++++++++++++---- > 3 files changed, 137 insertions(+), 10 deletions(-) > > diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c > index bede8b005594..3f0bc3ea4af7 100644 > --- a/drivers/bluetooth/btintel.c > +++ b/drivers/bluetooth/btintel.c > @@ -36,6 +36,13 @@ struct cmd_write_boot_params { > u8 fw_build_yy; > } __packed; > > +#define DRIVER_NAME_LEN 16 > +static struct { > + char driver_name[DRIVER_NAME_LEN]; Can't we access the driver name directly from another structure? Don't really like the idea of having to truncate the name if the driver name is bigger than expected, besides the size itself seems to be arbitrary selected here. > + u8 hw_variant; > + u32 fw_build_num; > +} coredump_info; > + > int btintel_check_bdaddr(struct hci_dev *hdev) > { > struct hci_rp_read_bd_addr *bda; > @@ -308,6 +315,9 @@ int btintel_version_info(struct hci_dev *hdev, struct intel_version *ver) > return -EINVAL; > } > > + coredump_info.hw_variant = ver->hw_variant; > + coredump_info.fw_build_num = ver->fw_build_num; > + > bt_dev_info(hdev, "%s revision %u.%u build %u week %u %u", > variant, ver->fw_revision >> 4, ver->fw_revision & 0x0f, > ver->fw_build_num, ver->fw_build_ww, > @@ -502,6 +512,9 @@ static int btintel_version_info_tlv(struct hci_dev *hdev, > return -EINVAL; > } > > + coredump_info.hw_variant = INTEL_HW_VARIANT(version->cnvi_bt); > + coredump_info.fw_build_num = version->build_num; > + > bt_dev_info(hdev, "%s timestamp %u.%u buildtype %u build %u", variant, > 2000 + (version->timestamp >> 8), version->timestamp & 0xff, > version->build_type, version->build_num); > @@ -1453,6 +1466,67 @@ int btintel_set_quality_report(struct hci_dev *hdev, bool enable) > } > EXPORT_SYMBOL_GPL(btintel_set_quality_report); > > +static void btintel_coredump(struct hci_dev *hdev) > +{ > + struct sk_buff *skb; > + > + skb = __hci_cmd_sync(hdev, 0xfc4e, 0, NULL, HCI_CMD_TIMEOUT); > + if (IS_ERR(skb)) { > + bt_dev_err(hdev, "Coredump failed (%ld)", PTR_ERR(skb)); > + return; > + } > + > + kfree_skb(skb); > +} > + > +static int btintel_dmp_hdr(struct hci_dev *hdev, char *buf, size_t size) > +{ > + char *ptr = buf; > + size_t rem = size; > + size_t read = 0; > + > + read = snprintf(ptr, rem, "Controller Name: 0x%X\n", > + coredump_info.hw_variant); > + rem -= read; > + ptr += read; Same thing here, I'd recommend using an skb and then use the likes of skb_push, etc, to append into the buffer. > + read = snprintf(ptr, rem, "Firmware Version: 0x%X\n", > + coredump_info.fw_build_num); > + rem -= read; > + ptr += read; > + > + read = snprintf(ptr, rem, "Driver: %s\n", coredump_info.driver_name); > + rem -= read; > + ptr += read; > + > + read = snprintf(ptr, rem, "Vendor: Intel\n"); > + rem -= read; > + ptr += read; > + > + return size - rem; > +} > + > +static int btintel_register_devcoredump_support(struct hci_dev *hdev) > +{ > + struct intel_debug_features features; > + int err; > + > + err = btintel_read_debug_features(hdev, &features); > + if (err) { > + bt_dev_info(hdev, "Error reading debug features"); > + return err; > + } > + > + if (!(features.page1[0] & 0x3f)) { > + bt_dev_info(hdev, "Telemetry exception format not supported"); Does this really need to be an info, I'd leave it as bt_dev_debug. > + return -EOPNOTSUPP; > + } > + > + hci_devcoredump_register(hdev, btintel_coredump, btintel_dmp_hdr, NULL); > + > + return err; > +} > + > static const struct firmware *btintel_legacy_rom_get_fw(struct hci_dev *hdev, > struct intel_version *ver) > { > @@ -2582,6 +2656,7 @@ static int btintel_setup_combined(struct hci_dev *hdev) > btintel_set_msft_opcode(hdev, ver.hw_variant); > > err = btintel_bootloader_setup(hdev, &ver); > + btintel_register_devcoredump_support(hdev); > break; > default: > bt_dev_err(hdev, "Unsupported Intel hw variant (%u)", > @@ -2655,6 +2730,7 @@ static int btintel_setup_combined(struct hci_dev *hdev) > btintel_set_msft_opcode(hdev, ver.hw_variant); > > err = btintel_bootloader_setup(hdev, &ver); > + btintel_register_devcoredump_support(hdev); > break; > case 0x17: > case 0x18: > @@ -2678,6 +2754,7 @@ static int btintel_setup_combined(struct hci_dev *hdev) > INTEL_HW_VARIANT(ver_tlv.cnvi_bt)); > > err = btintel_bootloader_setup_tlv(hdev, &ver_tlv); > + btintel_register_devcoredump_support(hdev); > break; > default: > bt_dev_err(hdev, "Unsupported Intel hw variant (%u)", > @@ -2727,7 +2804,7 @@ static int btintel_shutdown_combined(struct hci_dev *hdev) > return 0; > } > > -int btintel_configure_setup(struct hci_dev *hdev) > +int btintel_configure_setup(struct hci_dev *hdev, const char *driver_name) > { > hdev->manufacturer = 2; > hdev->setup = btintel_setup_combined; > @@ -2736,6 +2813,8 @@ int btintel_configure_setup(struct hci_dev *hdev) > hdev->set_diag = btintel_set_diag_combined; > hdev->set_bdaddr = btintel_set_bdaddr; > > + strncpy(coredump_info.driver_name, driver_name, DRIVER_NAME_LEN - 1); Like I said I don't really like the idea of truncating the driver name, can't we just refer to the pointer directly? In fact can't we just resolve the driver name at runtime with use of hci_dev? > return 0; > } > EXPORT_SYMBOL_GPL(btintel_configure_setup); > diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h > index 8e7da877efae..c34553fef3b0 100644 > --- a/drivers/bluetooth/btintel.h > +++ b/drivers/bluetooth/btintel.h > @@ -150,6 +150,13 @@ struct btintel_loc_aware_reg { > __le32 delta; > } __packed; > > +#define INTEL_TLV_TYPE_ID 0x01 > + > +#define INTEL_TLV_SYSTEM_EXCEPTION 0x00 > +#define INTEL_TLV_FATAL_EXCEPTION 0x01 > +#define INTEL_TLV_DEBUG_EXCEPTION 0x02 > +#define INTEL_TLV_TEST_EXCEPTION 0xDE > + > #define INTEL_HW_PLATFORM(cnvx_bt) ((u8)(((cnvx_bt) & 0x0000ff00) >> 8)) > #define INTEL_HW_VARIANT(cnvx_bt) ((u8)(((cnvx_bt) & 0x003f0000) >> 16)) > #define INTEL_CNVX_TOP_TYPE(cnvx_top) ((cnvx_top) & 0x00000fff) > @@ -219,7 +226,7 @@ int btintel_read_boot_params(struct hci_dev *hdev, > struct intel_boot_params *params); > int btintel_download_firmware(struct hci_dev *dev, struct intel_version *ver, > const struct firmware *fw, u32 *boot_param); > -int btintel_configure_setup(struct hci_dev *hdev); > +int btintel_configure_setup(struct hci_dev *hdev, const char *driver_name); > void btintel_bootup(struct hci_dev *hdev, const void *ptr, unsigned int len); > void btintel_secure_send_result(struct hci_dev *hdev, > const void *ptr, unsigned int len); > @@ -300,7 +307,8 @@ static inline int btintel_download_firmware(struct hci_dev *dev, > return -EOPNOTSUPP; > } > > -static inline int btintel_configure_setup(struct hci_dev *hdev) > +static inline int btintel_configure_setup(struct hci_dev *hdev, > + const char *driver_name) > { > return -ENODEV; > } > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index 9c9f7bf1375a..4f7aa32696f4 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -2376,16 +2376,47 @@ static int btusb_recv_bulk_intel(struct btusb_data *data, void *buffer, > return btusb_recv_bulk(data, buffer, count); > } > > +static int btusb_intel_diagnostics(struct hci_dev *hdev, struct sk_buff *skb) > +{ > + struct intel_tlv *tlv = (void *)&skb->data[5]; > + > + /* The first event is always an event type TLV */ > + if (tlv->type != INTEL_TLV_TYPE_ID) > + goto recv_frame; > + > + switch (tlv->val[0]) { > + case INTEL_TLV_SYSTEM_EXCEPTION: > + case INTEL_TLV_FATAL_EXCEPTION: > + case INTEL_TLV_DEBUG_EXCEPTION: > + case INTEL_TLV_TEST_EXCEPTION: > + /* Generate devcoredump from exception */ > + if (!hci_devcoredump_init(hdev, skb->len)) { > + hci_devcoredump_append(hdev, skb); > + hci_devcoredump_complete(hdev); > + } else { > + bt_dev_err(hdev, "Failed to generate devcoredump"); > + kfree_skb(skb); > + } > + return 0; > + default: > + bt_dev_err(hdev, "Invalid exception type %02X", tlv->val[0]); > + } > + > +recv_frame: > + return hci_recv_frame(hdev, skb); > +} > + > static int btusb_recv_event_intel(struct hci_dev *hdev, struct sk_buff *skb) > { > - if (btintel_test_flag(hdev, INTEL_BOOTLOADER)) { > - struct hci_event_hdr *hdr = (void *)skb->data; > + struct hci_event_hdr *hdr = (void *)skb->data; Lets use skb_pull_data here, or if that is not possible since it changes the packet then perhaps we need something that reset the skb state, anway at the very least lets not access skb->data without first checking the skb->len, I think in the long term what we really need is a way for driver to register for its own event opcodes so we don't have to intercept them like this. > + const char diagnostics_hdr[] = { 0x87, 0x80, 0x03 }; > > - if (skb->len > HCI_EVENT_HDR_SIZE && hdr->evt == 0xff && > - hdr->plen > 0) { > - const void *ptr = skb->data + HCI_EVENT_HDR_SIZE + 1; > - unsigned int len = skb->len - HCI_EVENT_HDR_SIZE - 1; > + if (skb->len > HCI_EVENT_HDR_SIZE && hdr->evt == 0xff && > + hdr->plen > 0) { > + const void *ptr = skb->data + HCI_EVENT_HDR_SIZE + 1; > + unsigned int len = skb->len - HCI_EVENT_HDR_SIZE - 1; > > + if (btintel_test_flag(hdev, INTEL_BOOTLOADER)) { > switch (skb->data[2]) { > case 0x02: > /* When switching to the operational firmware > @@ -2404,6 +2435,15 @@ static int btusb_recv_event_intel(struct hci_dev *hdev, struct sk_buff *skb) > break; > } > } > + > + /* Handle all diagnostics events separately. May still call > + * hci_recv_frame. > + */ > + if (len >= sizeof(diagnostics_hdr) && > + memcmp(&skb->data[2], diagnostics_hdr, > + sizeof(diagnostics_hdr)) == 0) { > + return btusb_intel_diagnostics(hdev, skb); > + } > } > > return hci_recv_frame(hdev, skb); > @@ -4008,7 +4048,7 @@ static int btusb_probe(struct usb_interface *intf, > > /* Combined Intel Device setup to support multiple setup routine */ > if (id->driver_info & BTUSB_INTEL_COMBINED) { > - err = btintel_configure_setup(hdev); > + err = btintel_configure_setup(hdev, btusb_driver.name); > if (err) > goto out_free_dev; > > -- > 2.40.0.rc0.216.gc4246ad0f0-goog >
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index bede8b005594..3f0bc3ea4af7 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -36,6 +36,13 @@ struct cmd_write_boot_params { u8 fw_build_yy; } __packed; +#define DRIVER_NAME_LEN 16 +static struct { + char driver_name[DRIVER_NAME_LEN]; + u8 hw_variant; + u32 fw_build_num; +} coredump_info; + int btintel_check_bdaddr(struct hci_dev *hdev) { struct hci_rp_read_bd_addr *bda; @@ -308,6 +315,9 @@ int btintel_version_info(struct hci_dev *hdev, struct intel_version *ver) return -EINVAL; } + coredump_info.hw_variant = ver->hw_variant; + coredump_info.fw_build_num = ver->fw_build_num; + bt_dev_info(hdev, "%s revision %u.%u build %u week %u %u", variant, ver->fw_revision >> 4, ver->fw_revision & 0x0f, ver->fw_build_num, ver->fw_build_ww, @@ -502,6 +512,9 @@ static int btintel_version_info_tlv(struct hci_dev *hdev, return -EINVAL; } + coredump_info.hw_variant = INTEL_HW_VARIANT(version->cnvi_bt); + coredump_info.fw_build_num = version->build_num; + bt_dev_info(hdev, "%s timestamp %u.%u buildtype %u build %u", variant, 2000 + (version->timestamp >> 8), version->timestamp & 0xff, version->build_type, version->build_num); @@ -1453,6 +1466,67 @@ int btintel_set_quality_report(struct hci_dev *hdev, bool enable) } EXPORT_SYMBOL_GPL(btintel_set_quality_report); +static void btintel_coredump(struct hci_dev *hdev) +{ + struct sk_buff *skb; + + skb = __hci_cmd_sync(hdev, 0xfc4e, 0, NULL, HCI_CMD_TIMEOUT); + if (IS_ERR(skb)) { + bt_dev_err(hdev, "Coredump failed (%ld)", PTR_ERR(skb)); + return; + } + + kfree_skb(skb); +} + +static int btintel_dmp_hdr(struct hci_dev *hdev, char *buf, size_t size) +{ + char *ptr = buf; + size_t rem = size; + size_t read = 0; + + read = snprintf(ptr, rem, "Controller Name: 0x%X\n", + coredump_info.hw_variant); + rem -= read; + ptr += read; + + read = snprintf(ptr, rem, "Firmware Version: 0x%X\n", + coredump_info.fw_build_num); + rem -= read; + ptr += read; + + read = snprintf(ptr, rem, "Driver: %s\n", coredump_info.driver_name); + rem -= read; + ptr += read; + + read = snprintf(ptr, rem, "Vendor: Intel\n"); + rem -= read; + ptr += read; + + return size - rem; +} + +static int btintel_register_devcoredump_support(struct hci_dev *hdev) +{ + struct intel_debug_features features; + int err; + + err = btintel_read_debug_features(hdev, &features); + if (err) { + bt_dev_info(hdev, "Error reading debug features"); + return err; + } + + if (!(features.page1[0] & 0x3f)) { + bt_dev_info(hdev, "Telemetry exception format not supported"); + return -EOPNOTSUPP; + } + + hci_devcoredump_register(hdev, btintel_coredump, btintel_dmp_hdr, NULL); + + return err; +} + static const struct firmware *btintel_legacy_rom_get_fw(struct hci_dev *hdev, struct intel_version *ver) { @@ -2582,6 +2656,7 @@ static int btintel_setup_combined(struct hci_dev *hdev) btintel_set_msft_opcode(hdev, ver.hw_variant); err = btintel_bootloader_setup(hdev, &ver); + btintel_register_devcoredump_support(hdev); break; default: bt_dev_err(hdev, "Unsupported Intel hw variant (%u)", @@ -2655,6 +2730,7 @@ static int btintel_setup_combined(struct hci_dev *hdev) btintel_set_msft_opcode(hdev, ver.hw_variant); err = btintel_bootloader_setup(hdev, &ver); + btintel_register_devcoredump_support(hdev); break; case 0x17: case 0x18: @@ -2678,6 +2754,7 @@ static int btintel_setup_combined(struct hci_dev *hdev) INTEL_HW_VARIANT(ver_tlv.cnvi_bt)); err = btintel_bootloader_setup_tlv(hdev, &ver_tlv); + btintel_register_devcoredump_support(hdev); break; default: bt_dev_err(hdev, "Unsupported Intel hw variant (%u)", @@ -2727,7 +2804,7 @@ static int btintel_shutdown_combined(struct hci_dev *hdev) return 0; } -int btintel_configure_setup(struct hci_dev *hdev) +int btintel_configure_setup(struct hci_dev *hdev, const char *driver_name) { hdev->manufacturer = 2; hdev->setup = btintel_setup_combined; @@ -2736,6 +2813,8 @@ int btintel_configure_setup(struct hci_dev *hdev) hdev->set_diag = btintel_set_diag_combined; hdev->set_bdaddr = btintel_set_bdaddr; + strncpy(coredump_info.driver_name, driver_name, DRIVER_NAME_LEN - 1); + return 0; } EXPORT_SYMBOL_GPL(btintel_configure_setup); diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index 8e7da877efae..c34553fef3b0 100644 --- a/drivers/bluetooth/btintel.h +++ b/drivers/bluetooth/btintel.h @@ -150,6 +150,13 @@ struct btintel_loc_aware_reg { __le32 delta; } __packed; +#define INTEL_TLV_TYPE_ID 0x01 + +#define INTEL_TLV_SYSTEM_EXCEPTION 0x00 +#define INTEL_TLV_FATAL_EXCEPTION 0x01 +#define INTEL_TLV_DEBUG_EXCEPTION 0x02 +#define INTEL_TLV_TEST_EXCEPTION 0xDE + #define INTEL_HW_PLATFORM(cnvx_bt) ((u8)(((cnvx_bt) & 0x0000ff00) >> 8)) #define INTEL_HW_VARIANT(cnvx_bt) ((u8)(((cnvx_bt) & 0x003f0000) >> 16)) #define INTEL_CNVX_TOP_TYPE(cnvx_top) ((cnvx_top) & 0x00000fff) @@ -219,7 +226,7 @@ int btintel_read_boot_params(struct hci_dev *hdev, struct intel_boot_params *params); int btintel_download_firmware(struct hci_dev *dev, struct intel_version *ver, const struct firmware *fw, u32 *boot_param); -int btintel_configure_setup(struct hci_dev *hdev); +int btintel_configure_setup(struct hci_dev *hdev, const char *driver_name); void btintel_bootup(struct hci_dev *hdev, const void *ptr, unsigned int len); void btintel_secure_send_result(struct hci_dev *hdev, const void *ptr, unsigned int len); @@ -300,7 +307,8 @@ static inline int btintel_download_firmware(struct hci_dev *dev, return -EOPNOTSUPP; } -static inline int btintel_configure_setup(struct hci_dev *hdev) +static inline int btintel_configure_setup(struct hci_dev *hdev, + const char *driver_name) { return -ENODEV; } diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 9c9f7bf1375a..4f7aa32696f4 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2376,16 +2376,47 @@ static int btusb_recv_bulk_intel(struct btusb_data *data, void *buffer, return btusb_recv_bulk(data, buffer, count); } +static int btusb_intel_diagnostics(struct hci_dev *hdev, struct sk_buff *skb) +{ + struct intel_tlv *tlv = (void *)&skb->data[5]; + + /* The first event is always an event type TLV */ + if (tlv->type != INTEL_TLV_TYPE_ID) + goto recv_frame; + + switch (tlv->val[0]) { + case INTEL_TLV_SYSTEM_EXCEPTION: + case INTEL_TLV_FATAL_EXCEPTION: + case INTEL_TLV_DEBUG_EXCEPTION: + case INTEL_TLV_TEST_EXCEPTION: + /* Generate devcoredump from exception */ + if (!hci_devcoredump_init(hdev, skb->len)) { + hci_devcoredump_append(hdev, skb); + hci_devcoredump_complete(hdev); + } else { + bt_dev_err(hdev, "Failed to generate devcoredump"); + kfree_skb(skb); + } + return 0; + default: + bt_dev_err(hdev, "Invalid exception type %02X", tlv->val[0]); + } + +recv_frame: + return hci_recv_frame(hdev, skb); +} + static int btusb_recv_event_intel(struct hci_dev *hdev, struct sk_buff *skb) { - if (btintel_test_flag(hdev, INTEL_BOOTLOADER)) { - struct hci_event_hdr *hdr = (void *)skb->data; + struct hci_event_hdr *hdr = (void *)skb->data; + const char diagnostics_hdr[] = { 0x87, 0x80, 0x03 }; - if (skb->len > HCI_EVENT_HDR_SIZE && hdr->evt == 0xff && - hdr->plen > 0) { - const void *ptr = skb->data + HCI_EVENT_HDR_SIZE + 1; - unsigned int len = skb->len - HCI_EVENT_HDR_SIZE - 1; + if (skb->len > HCI_EVENT_HDR_SIZE && hdr->evt == 0xff && + hdr->plen > 0) { + const void *ptr = skb->data + HCI_EVENT_HDR_SIZE + 1; + unsigned int len = skb->len - HCI_EVENT_HDR_SIZE - 1; + if (btintel_test_flag(hdev, INTEL_BOOTLOADER)) { switch (skb->data[2]) { case 0x02: /* When switching to the operational firmware @@ -2404,6 +2435,15 @@ static int btusb_recv_event_intel(struct hci_dev *hdev, struct sk_buff *skb) break; } } + + /* Handle all diagnostics events separately. May still call + * hci_recv_frame. + */ + if (len >= sizeof(diagnostics_hdr) && + memcmp(&skb->data[2], diagnostics_hdr, + sizeof(diagnostics_hdr)) == 0) { + return btusb_intel_diagnostics(hdev, skb); + } } return hci_recv_frame(hdev, skb); @@ -4008,7 +4048,7 @@ static int btusb_probe(struct usb_interface *intf, /* Combined Intel Device setup to support multiple setup routine */ if (id->driver_info & BTUSB_INTEL_COMBINED) { - err = btintel_configure_setup(hdev); + err = btintel_configure_setup(hdev, btusb_driver.name); if (err) goto out_free_dev;